innetjs 2.0.8 → 2.0.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/bin/innet CHANGED
@@ -4,6 +4,7 @@
4
4
  var path$1 = require('path');
5
5
  var fs = require('fs-extra');
6
6
  var http = require('http');
7
+ var address = require('address');
7
8
  var https = require('https');
8
9
  var util = require('util');
9
10
  var axios = require('axios');
@@ -36,6 +37,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
36
37
  var path__default = /*#__PURE__*/_interopDefaultLegacy(path$1);
37
38
  var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
38
39
  var http__default = /*#__PURE__*/_interopDefaultLegacy(http);
40
+ var address__default = /*#__PURE__*/_interopDefaultLegacy(address);
39
41
  var https__default = /*#__PURE__*/_interopDefaultLegacy(https);
40
42
  var axios__default = /*#__PURE__*/_interopDefaultLegacy(axios);
41
43
  var logger__default = /*#__PURE__*/_interopDefaultLegacy(logger);
@@ -175,11 +177,11 @@ function getFile(file) {
175
177
  }
176
178
  return file;
177
179
  }
178
- function convertIndexFile(data, version) {
180
+ function convertIndexFile(data, version, baseUrl) {
179
181
  return __awaiter(this, void 0, void 0, function* () {
180
182
  return data
181
183
  .toString()
182
- .replace('</head>', `<script type="module" defer src="index.js${version ? `?v=${version}` : ''}"></script></head>`);
184
+ .replace('</head>', `<script type="module" defer src="${baseUrl}index.js${version ? `?v=${version}` : ''}"></script></head>`);
183
185
  });
184
186
  }
185
187
  const reporter = (options, outputOptions, info) => {
@@ -201,7 +203,7 @@ const innetEnv = Object.keys(process.env).reduce((result, key) => {
201
203
  return result;
202
204
  }, {});
203
205
  class InnetJS {
204
- constructor({ projectFolder = process.env.PROJECT_FOLDER || '', publicFolder = process.env.PUBLIC_FOLDER || 'public', buildFolder = process.env.BUILD_FOLDER || 'build', srcFolder = process.env.SRC_FOLDER || 'src', sourcemap = process.env.SOURCEMAP ? process.env.SOURCEMAP === 'true' : false, cssModules = process.env.CSS_MODULES ? process.env.CSS_MODULES === 'true' : true, cssInJs = process.env.CSS_IN_JS ? process.env.CSS_IN_JS === 'true' : true, sslKey = process.env.SSL_KEY || 'localhost.key', sslCrt = process.env.SSL_CRT || 'localhost.crt', proxy = process.env.PROXY || '', port = process.env.PORT ? +process.env.PORT : 3000, api = process.env.API || '/api/?*', } = {}) {
206
+ constructor({ projectFolder = process.env.PROJECT_FOLDER || '', baseUrl = process.env.BASE_URL || '/', publicFolder = process.env.PUBLIC_FOLDER || 'public', buildFolder = process.env.BUILD_FOLDER || 'build', srcFolder = process.env.SRC_FOLDER || 'src', sourcemap = process.env.SOURCEMAP ? process.env.SOURCEMAP === 'true' : false, cssModules = process.env.CSS_MODULES ? process.env.CSS_MODULES === 'true' : true, cssInJs = process.env.CSS_IN_JS ? process.env.CSS_IN_JS === 'true' : true, sslKey = process.env.SSL_KEY || 'localhost.key', sslCrt = process.env.SSL_CRT || 'localhost.crt', proxy = process.env.PROXY || '', port = process.env.PORT ? +process.env.PORT : 3000, api = process.env.API || '/api/?*', } = {}) {
205
207
  this.projectFolder = path__default["default"].resolve(projectFolder);
206
208
  this.publicFolder = path__default["default"].resolve(publicFolder);
207
209
  this.buildFolder = path__default["default"].resolve(buildFolder);
@@ -218,6 +220,7 @@ class InnetJS {
218
220
  this.port = port;
219
221
  this.proxy = proxy;
220
222
  this.api = api;
223
+ this.baseUrl = baseUrl;
221
224
  }
222
225
  // Methods
223
226
  init(appName, { template, force = false } = {}) {
@@ -336,7 +339,7 @@ class InnetJS {
336
339
  yield copyFiles(this.publicFolder, this.buildFolder);
337
340
  const data = yield fs.promises.readFile(this.publicIndexFile);
338
341
  const pkg = yield this.getPackage();
339
- yield fs.promises.writeFile(this.buildIndexFile, yield convertIndexFile(data, pkg.version));
342
+ yield fs.promises.writeFile(this.buildIndexFile, yield convertIndexFile(data, pkg.version, this.baseUrl));
340
343
  }
341
344
  }));
342
345
  if (pkg) {
@@ -365,7 +368,7 @@ class InnetJS {
365
368
  preserveEntrySignatures: 'strict',
366
369
  output: {
367
370
  dir: this.devBuildFolder,
368
- sourcemap: true
371
+ sourcemap: true,
369
372
  },
370
373
  plugins: [
371
374
  commonjs__default["default"](),
@@ -556,7 +559,7 @@ class InnetJS {
556
559
  app = express__default["default"]();
557
560
  const update = () => __awaiter(this, void 0, void 0, function* () {
558
561
  const data = yield fs.promises.readFile(this.publicIndexFile);
559
- yield fs.promises.writeFile(this.devBuildIndexFile, yield convertIndexFile(data, pkg.version));
562
+ yield fs.promises.writeFile(this.devBuildIndexFile, yield convertIndexFile(data, pkg.version, this.baseUrl));
560
563
  });
561
564
  fs__default["default"].watch(this.publicIndexFile, update);
562
565
  yield update();
@@ -569,13 +572,13 @@ class InnetJS {
569
572
  proxyReqPathResolver: req => req.originalUrl
570
573
  }));
571
574
  }
572
- app.use(/^[^.]+$/, (req, res) => {
575
+ app.use(/^([^.]*|.*\.[^.]{5,})$/, (req, res) => {
573
576
  res.sendFile(this.devBuildFolder + '/index.html');
574
577
  });
575
578
  const server = httpsUsing ? https__default["default"].createServer({ key, cert }, app) : http__default["default"].createServer(app);
576
579
  let port = this.port;
577
580
  const listener = () => {
578
- console.log(`${chalk__default["default"].green('➤')} Server started on http${httpsUsing ? 's' : ''}://localhost:${port}`);
581
+ console.log(`${chalk__default["default"].green('➤')} Started on http${httpsUsing ? 's' : ''}://localhost:${port} and http${httpsUsing ? 's' : ''}://${address__default["default"].ip()}:${port}`);
579
582
  };
580
583
  server.listen(port, listener);
581
584
  server.on('error', (e) => __awaiter(this, void 0, void 0, function* () {
@@ -615,7 +618,7 @@ class InnetJS {
615
618
  }
616
619
  }
617
620
 
618
- var version = "2.0.8";
621
+ var version = "2.0.11";
619
622
 
620
623
  require('dotenv').config();
621
624
  const innetJS = new InnetJS();
package/helpers.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  /// <reference types="node" />
2
2
  import { FileSizeRender } from 'rollup-plugin-filesize';
3
3
  export declare function getFile(file: any): any;
4
- export declare function convertIndexFile(data: Buffer, version: string): Promise<string>;
4
+ export declare function convertIndexFile(data: Buffer, version: string, baseUrl: string): Promise<string>;
5
5
  export declare const reporter: FileSizeRender<string | Promise<string>>;
package/index.d.ts CHANGED
@@ -1,5 +1,6 @@
1
1
  declare type Extensions = 'js' | 'ts' | 'tsx' | 'jsx';
2
2
  export default class InnetJS {
3
+ baseUrl: string;
3
4
  projectFolder: string;
4
5
  publicFolder: string;
5
6
  buildFolder: string;
@@ -18,8 +19,9 @@ export default class InnetJS {
18
19
  api: string;
19
20
  private projectExtension;
20
21
  private package;
21
- constructor({ projectFolder, publicFolder, buildFolder, srcFolder, sourcemap, cssModules, cssInJs, sslKey, sslCrt, proxy, port, api, }?: {
22
+ constructor({ projectFolder, baseUrl, publicFolder, buildFolder, srcFolder, sourcemap, cssModules, cssInJs, sslKey, sslCrt, proxy, port, api, }?: {
22
23
  projectFolder?: string;
24
+ baseUrl?: string;
23
25
  publicFolder?: string;
24
26
  buildFolder?: string;
25
27
  srcFolder?: string;
package/index.es6.js CHANGED
@@ -1,6 +1,7 @@
1
1
  import path$1 from 'path';
2
2
  import fs, { promises } from 'fs-extra';
3
3
  import http from 'http';
4
+ import address from 'address';
4
5
  import https from 'https';
5
6
  import { promisify } from 'util';
6
7
  import axios from 'axios';
@@ -145,11 +146,11 @@ function getFile(file) {
145
146
  }
146
147
  return file;
147
148
  }
148
- function convertIndexFile(data, version) {
149
+ function convertIndexFile(data, version, baseUrl) {
149
150
  return __awaiter(this, void 0, void 0, function* () {
150
151
  return data
151
152
  .toString()
152
- .replace('</head>', `<script type="module" defer src="index.js${version ? `?v=${version}` : ''}"></script></head>`);
153
+ .replace('</head>', `<script type="module" defer src="${baseUrl}index.js${version ? `?v=${version}` : ''}"></script></head>`);
153
154
  });
154
155
  }
155
156
  const reporter = (options, outputOptions, info) => {
@@ -171,7 +172,7 @@ const innetEnv = Object.keys(process.env).reduce((result, key) => {
171
172
  return result;
172
173
  }, {});
173
174
  class InnetJS {
174
- constructor({ projectFolder = process.env.PROJECT_FOLDER || '', publicFolder = process.env.PUBLIC_FOLDER || 'public', buildFolder = process.env.BUILD_FOLDER || 'build', srcFolder = process.env.SRC_FOLDER || 'src', sourcemap = process.env.SOURCEMAP ? process.env.SOURCEMAP === 'true' : false, cssModules = process.env.CSS_MODULES ? process.env.CSS_MODULES === 'true' : true, cssInJs = process.env.CSS_IN_JS ? process.env.CSS_IN_JS === 'true' : true, sslKey = process.env.SSL_KEY || 'localhost.key', sslCrt = process.env.SSL_CRT || 'localhost.crt', proxy = process.env.PROXY || '', port = process.env.PORT ? +process.env.PORT : 3000, api = process.env.API || '/api/?*', } = {}) {
175
+ constructor({ projectFolder = process.env.PROJECT_FOLDER || '', baseUrl = process.env.BASE_URL || '/', publicFolder = process.env.PUBLIC_FOLDER || 'public', buildFolder = process.env.BUILD_FOLDER || 'build', srcFolder = process.env.SRC_FOLDER || 'src', sourcemap = process.env.SOURCEMAP ? process.env.SOURCEMAP === 'true' : false, cssModules = process.env.CSS_MODULES ? process.env.CSS_MODULES === 'true' : true, cssInJs = process.env.CSS_IN_JS ? process.env.CSS_IN_JS === 'true' : true, sslKey = process.env.SSL_KEY || 'localhost.key', sslCrt = process.env.SSL_CRT || 'localhost.crt', proxy = process.env.PROXY || '', port = process.env.PORT ? +process.env.PORT : 3000, api = process.env.API || '/api/?*', } = {}) {
175
176
  this.projectFolder = path$1.resolve(projectFolder);
176
177
  this.publicFolder = path$1.resolve(publicFolder);
177
178
  this.buildFolder = path$1.resolve(buildFolder);
@@ -188,6 +189,7 @@ class InnetJS {
188
189
  this.port = port;
189
190
  this.proxy = proxy;
190
191
  this.api = api;
192
+ this.baseUrl = baseUrl;
191
193
  }
192
194
  // Methods
193
195
  init(appName, { template, force = false } = {}) {
@@ -306,7 +308,7 @@ class InnetJS {
306
308
  yield copyFiles(this.publicFolder, this.buildFolder);
307
309
  const data = yield promises.readFile(this.publicIndexFile);
308
310
  const pkg = yield this.getPackage();
309
- yield promises.writeFile(this.buildIndexFile, yield convertIndexFile(data, pkg.version));
311
+ yield promises.writeFile(this.buildIndexFile, yield convertIndexFile(data, pkg.version, this.baseUrl));
310
312
  }
311
313
  }));
312
314
  if (pkg) {
@@ -335,7 +337,7 @@ class InnetJS {
335
337
  preserveEntrySignatures: 'strict',
336
338
  output: {
337
339
  dir: this.devBuildFolder,
338
- sourcemap: true
340
+ sourcemap: true,
339
341
  },
340
342
  plugins: [
341
343
  commonjs(),
@@ -526,7 +528,7 @@ class InnetJS {
526
528
  app = express();
527
529
  const update = () => __awaiter(this, void 0, void 0, function* () {
528
530
  const data = yield promises.readFile(this.publicIndexFile);
529
- yield promises.writeFile(this.devBuildIndexFile, yield convertIndexFile(data, pkg.version));
531
+ yield promises.writeFile(this.devBuildIndexFile, yield convertIndexFile(data, pkg.version, this.baseUrl));
530
532
  });
531
533
  fs.watch(this.publicIndexFile, update);
532
534
  yield update();
@@ -539,13 +541,13 @@ class InnetJS {
539
541
  proxyReqPathResolver: req => req.originalUrl
540
542
  }));
541
543
  }
542
- app.use(/^[^.]+$/, (req, res) => {
544
+ app.use(/^([^.]*|.*\.[^.]{5,})$/, (req, res) => {
543
545
  res.sendFile(this.devBuildFolder + '/index.html');
544
546
  });
545
547
  const server = httpsUsing ? https.createServer({ key, cert }, app) : http.createServer(app);
546
548
  let port = this.port;
547
549
  const listener = () => {
548
- console.log(`${chalk.green('➤')} Server started on http${httpsUsing ? 's' : ''}://localhost:${port}`);
550
+ console.log(`${chalk.green('➤')} Started on http${httpsUsing ? 's' : ''}://localhost:${port} and http${httpsUsing ? 's' : ''}://${address.ip()}:${port}`);
549
551
  };
550
552
  server.listen(port, listener);
551
553
  server.on('error', (e) => __awaiter(this, void 0, void 0, function* () {
package/index.js CHANGED
@@ -3,6 +3,7 @@
3
3
  var path$1 = require('path');
4
4
  var fs = require('fs-extra');
5
5
  var http = require('http');
6
+ var address = require('address');
6
7
  var https = require('https');
7
8
  var util = require('util');
8
9
  var axios = require('axios');
@@ -34,6 +35,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
34
35
  var path__default = /*#__PURE__*/_interopDefaultLegacy(path$1);
35
36
  var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
36
37
  var http__default = /*#__PURE__*/_interopDefaultLegacy(http);
38
+ var address__default = /*#__PURE__*/_interopDefaultLegacy(address);
37
39
  var https__default = /*#__PURE__*/_interopDefaultLegacy(https);
38
40
  var axios__default = /*#__PURE__*/_interopDefaultLegacy(axios);
39
41
  var logger__default = /*#__PURE__*/_interopDefaultLegacy(logger);
@@ -173,11 +175,11 @@ function getFile(file) {
173
175
  }
174
176
  return file;
175
177
  }
176
- function convertIndexFile(data, version) {
178
+ function convertIndexFile(data, version, baseUrl) {
177
179
  return __awaiter(this, void 0, void 0, function* () {
178
180
  return data
179
181
  .toString()
180
- .replace('</head>', `<script type="module" defer src="index.js${version ? `?v=${version}` : ''}"></script></head>`);
182
+ .replace('</head>', `<script type="module" defer src="${baseUrl}index.js${version ? `?v=${version}` : ''}"></script></head>`);
181
183
  });
182
184
  }
183
185
  const reporter = (options, outputOptions, info) => {
@@ -199,7 +201,7 @@ const innetEnv = Object.keys(process.env).reduce((result, key) => {
199
201
  return result;
200
202
  }, {});
201
203
  class InnetJS {
202
- constructor({ projectFolder = process.env.PROJECT_FOLDER || '', publicFolder = process.env.PUBLIC_FOLDER || 'public', buildFolder = process.env.BUILD_FOLDER || 'build', srcFolder = process.env.SRC_FOLDER || 'src', sourcemap = process.env.SOURCEMAP ? process.env.SOURCEMAP === 'true' : false, cssModules = process.env.CSS_MODULES ? process.env.CSS_MODULES === 'true' : true, cssInJs = process.env.CSS_IN_JS ? process.env.CSS_IN_JS === 'true' : true, sslKey = process.env.SSL_KEY || 'localhost.key', sslCrt = process.env.SSL_CRT || 'localhost.crt', proxy = process.env.PROXY || '', port = process.env.PORT ? +process.env.PORT : 3000, api = process.env.API || '/api/?*', } = {}) {
204
+ constructor({ projectFolder = process.env.PROJECT_FOLDER || '', baseUrl = process.env.BASE_URL || '/', publicFolder = process.env.PUBLIC_FOLDER || 'public', buildFolder = process.env.BUILD_FOLDER || 'build', srcFolder = process.env.SRC_FOLDER || 'src', sourcemap = process.env.SOURCEMAP ? process.env.SOURCEMAP === 'true' : false, cssModules = process.env.CSS_MODULES ? process.env.CSS_MODULES === 'true' : true, cssInJs = process.env.CSS_IN_JS ? process.env.CSS_IN_JS === 'true' : true, sslKey = process.env.SSL_KEY || 'localhost.key', sslCrt = process.env.SSL_CRT || 'localhost.crt', proxy = process.env.PROXY || '', port = process.env.PORT ? +process.env.PORT : 3000, api = process.env.API || '/api/?*', } = {}) {
203
205
  this.projectFolder = path__default["default"].resolve(projectFolder);
204
206
  this.publicFolder = path__default["default"].resolve(publicFolder);
205
207
  this.buildFolder = path__default["default"].resolve(buildFolder);
@@ -216,6 +218,7 @@ class InnetJS {
216
218
  this.port = port;
217
219
  this.proxy = proxy;
218
220
  this.api = api;
221
+ this.baseUrl = baseUrl;
219
222
  }
220
223
  // Methods
221
224
  init(appName, { template, force = false } = {}) {
@@ -334,7 +337,7 @@ class InnetJS {
334
337
  yield copyFiles(this.publicFolder, this.buildFolder);
335
338
  const data = yield fs.promises.readFile(this.publicIndexFile);
336
339
  const pkg = yield this.getPackage();
337
- yield fs.promises.writeFile(this.buildIndexFile, yield convertIndexFile(data, pkg.version));
340
+ yield fs.promises.writeFile(this.buildIndexFile, yield convertIndexFile(data, pkg.version, this.baseUrl));
338
341
  }
339
342
  }));
340
343
  if (pkg) {
@@ -363,7 +366,7 @@ class InnetJS {
363
366
  preserveEntrySignatures: 'strict',
364
367
  output: {
365
368
  dir: this.devBuildFolder,
366
- sourcemap: true
369
+ sourcemap: true,
367
370
  },
368
371
  plugins: [
369
372
  commonjs__default["default"](),
@@ -554,7 +557,7 @@ class InnetJS {
554
557
  app = express__default["default"]();
555
558
  const update = () => __awaiter(this, void 0, void 0, function* () {
556
559
  const data = yield fs.promises.readFile(this.publicIndexFile);
557
- yield fs.promises.writeFile(this.devBuildIndexFile, yield convertIndexFile(data, pkg.version));
560
+ yield fs.promises.writeFile(this.devBuildIndexFile, yield convertIndexFile(data, pkg.version, this.baseUrl));
558
561
  });
559
562
  fs__default["default"].watch(this.publicIndexFile, update);
560
563
  yield update();
@@ -567,13 +570,13 @@ class InnetJS {
567
570
  proxyReqPathResolver: req => req.originalUrl
568
571
  }));
569
572
  }
570
- app.use(/^[^.]+$/, (req, res) => {
573
+ app.use(/^([^.]*|.*\.[^.]{5,})$/, (req, res) => {
571
574
  res.sendFile(this.devBuildFolder + '/index.html');
572
575
  });
573
576
  const server = httpsUsing ? https__default["default"].createServer({ key, cert }, app) : http__default["default"].createServer(app);
574
577
  let port = this.port;
575
578
  const listener = () => {
576
- console.log(`${chalk__default["default"].green('➤')} Server started on http${httpsUsing ? 's' : ''}://localhost:${port}`);
579
+ console.log(`${chalk__default["default"].green('➤')} Started on http${httpsUsing ? 's' : ''}://localhost:${port} and http${httpsUsing ? 's' : ''}://${address__default["default"].ip()}:${port}`);
577
580
  };
578
581
  server.listen(port, listener);
579
582
  server.on('error', (e) => __awaiter(this, void 0, void 0, function* () {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "innetjs",
3
- "version": "2.0.8",
3
+ "version": "2.0.11",
4
4
  "description": "CLI for innet boilerplate",
5
5
  "homepage": "https://github.com/d8corp/innetjs",
6
6
  "author": "Mikhail Lysikov <d8corp@mail.ru>",
@@ -37,6 +37,7 @@
37
37
  "@rollup/plugin-image": "^2.1.1",
38
38
  "@rollup/plugin-json": "^4.1.0",
39
39
  "@rollup/plugin-node-resolve": "^13.3.0",
40
+ "address": "^1.2.0",
40
41
  "autoprefixer": "^10.4.8",
41
42
  "axios": "^0.27.2",
42
43
  "chalk": "^4.1.2",