innetjs 2.0.3 → 2.0.6

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.
Files changed (4) hide show
  1. package/bin/innet +27 -6
  2. package/index.es6.js +25 -5
  3. package/index.js +26 -5
  4. package/package.json +2 -1
package/bin/innet CHANGED
@@ -21,6 +21,7 @@ var json = require('@rollup/plugin-json');
21
21
  var tmp = require('tmp');
22
22
  var proxy = require('express-http-proxy');
23
23
  var selector = require('cli-select');
24
+ var prompt = require('prompts');
24
25
  var jsx = require('rollup-plugin-innet-jsx');
25
26
  var filesize = require('rollup-plugin-filesize');
26
27
  var image = require('@rollup/plugin-image');
@@ -48,6 +49,7 @@ var json__default = /*#__PURE__*/_interopDefaultLegacy(json);
48
49
  var tmp__default = /*#__PURE__*/_interopDefaultLegacy(tmp);
49
50
  var proxy__default = /*#__PURE__*/_interopDefaultLegacy(proxy);
50
51
  var selector__default = /*#__PURE__*/_interopDefaultLegacy(selector);
52
+ var prompt__default = /*#__PURE__*/_interopDefaultLegacy(prompt);
51
53
  var jsx__default = /*#__PURE__*/_interopDefaultLegacy(jsx);
52
54
  var filesize__default = /*#__PURE__*/_interopDefaultLegacy(filesize);
53
55
  var image__default = /*#__PURE__*/_interopDefaultLegacy(image);
@@ -191,7 +193,7 @@ const execAsync = util.promisify(exec);
191
193
  const copyFiles = util.promisify(fs__default["default"].copy);
192
194
  require('dotenv').config();
193
195
  class InnetJS {
194
- 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 || '*', } = {}) {
196
+ 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/?*', } = {}) {
195
197
  this.projectFolder = path__default["default"].resolve(projectFolder);
196
198
  this.publicFolder = path__default["default"].resolve(publicFolder);
197
199
  this.buildFolder = path__default["default"].resolve(buildFolder);
@@ -408,7 +410,7 @@ class InnetJS {
408
410
  exclude: stringExcludeDom,
409
411
  }),
410
412
  this.createClient(key, cert, pkg),
411
- livereload(Object.assign({ watch: this.publicFolder, verbose: false }, (key && cert ? { https: { key, cert } } : {})))
413
+ livereload(Object.assign({ exts: ['html', 'css', 'js', 'png', 'svg', 'webp', 'gif', 'jpg', 'json'], watch: [this.devBuildFolder, this.publicFolder], verbose: false }, (key && cert ? { https: { key, cert } } : {})))
412
414
  ];
413
415
  }
414
416
  const watcher = rollup__default["default"].watch(options);
@@ -557,9 +559,28 @@ class InnetJS {
557
559
  res.sendFile(this.devBuildFolder + '/index.html');
558
560
  });
559
561
  const server = httpsUsing ? https__default["default"].createServer({ key, cert }, app) : http__default["default"].createServer(app);
560
- server.listen(this.port, () => {
561
- console.log(`${chalk__default["default"].green('➤')} Server started on http${httpsUsing ? 's' : ''}://localhost:${this.port}`);
562
- });
562
+ let port = this.port;
563
+ const listener = () => {
564
+ console.log(`${chalk__default["default"].green('➤')} Server started on http${httpsUsing ? 's' : ''}://localhost:${port}`);
565
+ };
566
+ server.listen(port, listener);
567
+ server.on('error', (e) => __awaiter(this, void 0, void 0, function* () {
568
+ if (e.code === 'EADDRINUSE') {
569
+ port++;
570
+ const { userPort } = yield prompt__default["default"]({
571
+ name: 'userPort',
572
+ type: 'number',
573
+ message: `Port ${e.port} is reserved, please enter another one [${port}]:`
574
+ });
575
+ if (userPort) {
576
+ port = userPort;
577
+ }
578
+ server.listen(port);
579
+ }
580
+ else {
581
+ throw e;
582
+ }
583
+ }));
563
584
  }
564
585
  })
565
586
  };
@@ -580,7 +601,7 @@ class InnetJS {
580
601
  }
581
602
  }
582
603
 
583
- var version = "2.0.3";
604
+ var version = "2.0.6";
584
605
 
585
606
  require('dotenv').config();
586
607
  const innetJS = new InnetJS();
package/index.es6.js CHANGED
@@ -18,6 +18,7 @@ import json from '@rollup/plugin-json';
18
18
  import tmp from 'tmp';
19
19
  import proxy from 'express-http-proxy';
20
20
  import selector from 'cli-select';
21
+ import prompt from 'prompts';
21
22
  import jsx from 'rollup-plugin-innet-jsx';
22
23
  import filesize from 'rollup-plugin-filesize';
23
24
  import image from '@rollup/plugin-image';
@@ -163,7 +164,7 @@ const execAsync = promisify(exec);
163
164
  const copyFiles = promisify(fs.copy);
164
165
  require('dotenv').config();
165
166
  class InnetJS {
166
- 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 || '*', } = {}) {
167
+ 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/?*', } = {}) {
167
168
  this.projectFolder = path$1.resolve(projectFolder);
168
169
  this.publicFolder = path$1.resolve(publicFolder);
169
170
  this.buildFolder = path$1.resolve(buildFolder);
@@ -380,7 +381,7 @@ class InnetJS {
380
381
  exclude: stringExcludeDom,
381
382
  }),
382
383
  this.createClient(key, cert, pkg),
383
- livereload(Object.assign({ watch: this.publicFolder, verbose: false }, (key && cert ? { https: { key, cert } } : {})))
384
+ livereload(Object.assign({ exts: ['html', 'css', 'js', 'png', 'svg', 'webp', 'gif', 'jpg', 'json'], watch: [this.devBuildFolder, this.publicFolder], verbose: false }, (key && cert ? { https: { key, cert } } : {})))
384
385
  ];
385
386
  }
386
387
  const watcher = rollup.watch(options);
@@ -529,9 +530,28 @@ class InnetJS {
529
530
  res.sendFile(this.devBuildFolder + '/index.html');
530
531
  });
531
532
  const server = httpsUsing ? https.createServer({ key, cert }, app) : http.createServer(app);
532
- server.listen(this.port, () => {
533
- console.log(`${chalk.green('➤')} Server started on http${httpsUsing ? 's' : ''}://localhost:${this.port}`);
534
- });
533
+ let port = this.port;
534
+ const listener = () => {
535
+ console.log(`${chalk.green('➤')} Server started on http${httpsUsing ? 's' : ''}://localhost:${port}`);
536
+ };
537
+ server.listen(port, listener);
538
+ server.on('error', (e) => __awaiter(this, void 0, void 0, function* () {
539
+ if (e.code === 'EADDRINUSE') {
540
+ port++;
541
+ const { userPort } = yield prompt({
542
+ name: 'userPort',
543
+ type: 'number',
544
+ message: `Port ${e.port} is reserved, please enter another one [${port}]:`
545
+ });
546
+ if (userPort) {
547
+ port = userPort;
548
+ }
549
+ server.listen(port);
550
+ }
551
+ else {
552
+ throw e;
553
+ }
554
+ }));
535
555
  }
536
556
  })
537
557
  };
package/index.js CHANGED
@@ -20,6 +20,7 @@ var json = require('@rollup/plugin-json');
20
20
  var tmp = require('tmp');
21
21
  var proxy = require('express-http-proxy');
22
22
  var selector = require('cli-select');
23
+ var prompt = require('prompts');
23
24
  var jsx = require('rollup-plugin-innet-jsx');
24
25
  var filesize = require('rollup-plugin-filesize');
25
26
  var image = require('@rollup/plugin-image');
@@ -46,6 +47,7 @@ var json__default = /*#__PURE__*/_interopDefaultLegacy(json);
46
47
  var tmp__default = /*#__PURE__*/_interopDefaultLegacy(tmp);
47
48
  var proxy__default = /*#__PURE__*/_interopDefaultLegacy(proxy);
48
49
  var selector__default = /*#__PURE__*/_interopDefaultLegacy(selector);
50
+ var prompt__default = /*#__PURE__*/_interopDefaultLegacy(prompt);
49
51
  var jsx__default = /*#__PURE__*/_interopDefaultLegacy(jsx);
50
52
  var filesize__default = /*#__PURE__*/_interopDefaultLegacy(filesize);
51
53
  var image__default = /*#__PURE__*/_interopDefaultLegacy(image);
@@ -189,7 +191,7 @@ const execAsync = util.promisify(exec);
189
191
  const copyFiles = util.promisify(fs__default["default"].copy);
190
192
  require('dotenv').config();
191
193
  class InnetJS {
192
- 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 || '*', } = {}) {
194
+ 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/?*', } = {}) {
193
195
  this.projectFolder = path__default["default"].resolve(projectFolder);
194
196
  this.publicFolder = path__default["default"].resolve(publicFolder);
195
197
  this.buildFolder = path__default["default"].resolve(buildFolder);
@@ -406,7 +408,7 @@ class InnetJS {
406
408
  exclude: stringExcludeDom,
407
409
  }),
408
410
  this.createClient(key, cert, pkg),
409
- livereload(Object.assign({ watch: this.publicFolder, verbose: false }, (key && cert ? { https: { key, cert } } : {})))
411
+ livereload(Object.assign({ exts: ['html', 'css', 'js', 'png', 'svg', 'webp', 'gif', 'jpg', 'json'], watch: [this.devBuildFolder, this.publicFolder], verbose: false }, (key && cert ? { https: { key, cert } } : {})))
410
412
  ];
411
413
  }
412
414
  const watcher = rollup__default["default"].watch(options);
@@ -555,9 +557,28 @@ class InnetJS {
555
557
  res.sendFile(this.devBuildFolder + '/index.html');
556
558
  });
557
559
  const server = httpsUsing ? https__default["default"].createServer({ key, cert }, app) : http__default["default"].createServer(app);
558
- server.listen(this.port, () => {
559
- console.log(`${chalk__default["default"].green('➤')} Server started on http${httpsUsing ? 's' : ''}://localhost:${this.port}`);
560
- });
560
+ let port = this.port;
561
+ const listener = () => {
562
+ console.log(`${chalk__default["default"].green('➤')} Server started on http${httpsUsing ? 's' : ''}://localhost:${port}`);
563
+ };
564
+ server.listen(port, listener);
565
+ server.on('error', (e) => __awaiter(this, void 0, void 0, function* () {
566
+ if (e.code === 'EADDRINUSE') {
567
+ port++;
568
+ const { userPort } = yield prompt__default["default"]({
569
+ name: 'userPort',
570
+ type: 'number',
571
+ message: `Port ${e.port} is reserved, please enter another one [${port}]:`
572
+ });
573
+ if (userPort) {
574
+ port = userPort;
575
+ }
576
+ server.listen(port);
577
+ }
578
+ else {
579
+ throw e;
580
+ }
581
+ }));
561
582
  }
562
583
  })
563
584
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "innetjs",
3
- "version": "2.0.3",
3
+ "version": "2.0.6",
4
4
  "description": "CLI for innet boilerplate",
5
5
  "homepage": "https://github.com/d8corp/innetjs",
6
6
  "author": "Mikhail Lysikov <d8corp@mail.ru>",
@@ -49,6 +49,7 @@
49
49
  "lines-and-columns": "^2.0.3",
50
50
  "node-sass": "^7.0.1",
51
51
  "postcss": "^8.4.16",
52
+ "prompts": "^2.4.2",
52
53
  "rollup": "^2.77.2",
53
54
  "rollup-plugin-filesize": "^9.1.2",
54
55
  "rollup-plugin-innet-jsx": "^1.3.0",