innetjs 2.0.5 → 2.0.8

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 +18 -4
  2. package/index.es6.js +16 -3
  3. package/index.js +17 -3
  4. package/package.json +2 -1
package/bin/innet CHANGED
@@ -26,6 +26,7 @@ var jsx = require('rollup-plugin-innet-jsx');
26
26
  var filesize = require('rollup-plugin-filesize');
27
27
  var image = require('@rollup/plugin-image');
28
28
  var eslint = require('@rollup/plugin-eslint');
29
+ var injectEnv = require('rollup-plugin-inject-process-env');
29
30
  var linesAndColumns = require('lines-and-columns');
30
31
  var unzipper = require('unzipper');
31
32
  var commander = require('commander');
@@ -54,6 +55,7 @@ var jsx__default = /*#__PURE__*/_interopDefaultLegacy(jsx);
54
55
  var filesize__default = /*#__PURE__*/_interopDefaultLegacy(filesize);
55
56
  var image__default = /*#__PURE__*/_interopDefaultLegacy(image);
56
57
  var eslint__default = /*#__PURE__*/_interopDefaultLegacy(eslint);
58
+ var injectEnv__default = /*#__PURE__*/_interopDefaultLegacy(injectEnv);
57
59
 
58
60
  /******************************************************************************
59
61
  Copyright (c) Microsoft Corporation.
@@ -192,6 +194,12 @@ const readline = require('readline');
192
194
  const execAsync = util.promisify(exec);
193
195
  const copyFiles = util.promisify(fs__default["default"].copy);
194
196
  require('dotenv').config();
197
+ const innetEnv = Object.keys(process.env).reduce((result, key) => {
198
+ if (key.startsWith('INNETJS_')) {
199
+ result[key] = process.env[key];
200
+ }
201
+ return result;
202
+ }, {});
195
203
  class InnetJS {
196
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/?*', } = {}) {
197
205
  this.projectFolder = path__default["default"].resolve(projectFolder);
@@ -294,7 +302,9 @@ class InnetJS {
294
302
  include: lintIncludeDom,
295
303
  }),
296
304
  ...inputOptions.plugins,
297
- pluginNodeResolve.nodeResolve(),
305
+ pluginNodeResolve.nodeResolve({
306
+ browser: true,
307
+ }),
298
308
  image__default["default"](),
299
309
  styles__default["default"]({
300
310
  mode: this.cssInJs ? 'inject' : 'extract',
@@ -308,6 +318,7 @@ class InnetJS {
308
318
  include: '**/*.*',
309
319
  exclude: stringExcludeDom,
310
320
  }),
321
+ injectEnv__default["default"](innetEnv),
311
322
  ];
312
323
  outputOptions.format = 'es';
313
324
  outputOptions.plugins = [
@@ -396,7 +407,9 @@ class InnetJS {
396
407
  include: lintIncludeDom,
397
408
  }),
398
409
  ...options.plugins,
399
- pluginNodeResolve.nodeResolve(),
410
+ pluginNodeResolve.nodeResolve({
411
+ browser: true,
412
+ }),
400
413
  image__default["default"](),
401
414
  styles__default["default"]({
402
415
  mode: this.cssInJs ? 'inject' : 'extract',
@@ -410,7 +423,8 @@ class InnetJS {
410
423
  exclude: stringExcludeDom,
411
424
  }),
412
425
  this.createClient(key, cert, pkg),
413
- livereload(Object.assign({ watch: this.devBuildFolder, verbose: false }, (key && cert ? { https: { key, cert } } : {})))
426
+ 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 } } : {}))),
427
+ injectEnv__default["default"](innetEnv),
414
428
  ];
415
429
  }
416
430
  const watcher = rollup__default["default"].watch(options);
@@ -601,7 +615,7 @@ class InnetJS {
601
615
  }
602
616
  }
603
617
 
604
- var version = "2.0.5";
618
+ var version = "2.0.8";
605
619
 
606
620
  require('dotenv').config();
607
621
  const innetJS = new InnetJS();
package/index.es6.js CHANGED
@@ -23,6 +23,7 @@ import jsx from 'rollup-plugin-innet-jsx';
23
23
  import filesize from 'rollup-plugin-filesize';
24
24
  import image from '@rollup/plugin-image';
25
25
  import eslint from '@rollup/plugin-eslint';
26
+ import injectEnv from 'rollup-plugin-inject-process-env';
26
27
  import { LinesAndColumns } from 'lines-and-columns';
27
28
  import { Parse } from 'unzipper';
28
29
 
@@ -163,6 +164,12 @@ const readline = require('readline');
163
164
  const execAsync = promisify(exec);
164
165
  const copyFiles = promisify(fs.copy);
165
166
  require('dotenv').config();
167
+ const innetEnv = Object.keys(process.env).reduce((result, key) => {
168
+ if (key.startsWith('INNETJS_')) {
169
+ result[key] = process.env[key];
170
+ }
171
+ return result;
172
+ }, {});
166
173
  class InnetJS {
167
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/?*', } = {}) {
168
175
  this.projectFolder = path$1.resolve(projectFolder);
@@ -265,7 +272,9 @@ class InnetJS {
265
272
  include: lintIncludeDom,
266
273
  }),
267
274
  ...inputOptions.plugins,
268
- nodeResolve(),
275
+ nodeResolve({
276
+ browser: true,
277
+ }),
269
278
  image(),
270
279
  styles({
271
280
  mode: this.cssInJs ? 'inject' : 'extract',
@@ -279,6 +288,7 @@ class InnetJS {
279
288
  include: '**/*.*',
280
289
  exclude: stringExcludeDom,
281
290
  }),
291
+ injectEnv(innetEnv),
282
292
  ];
283
293
  outputOptions.format = 'es';
284
294
  outputOptions.plugins = [
@@ -367,7 +377,9 @@ class InnetJS {
367
377
  include: lintIncludeDom,
368
378
  }),
369
379
  ...options.plugins,
370
- nodeResolve(),
380
+ nodeResolve({
381
+ browser: true,
382
+ }),
371
383
  image(),
372
384
  styles({
373
385
  mode: this.cssInJs ? 'inject' : 'extract',
@@ -381,7 +393,8 @@ class InnetJS {
381
393
  exclude: stringExcludeDom,
382
394
  }),
383
395
  this.createClient(key, cert, pkg),
384
- livereload(Object.assign({ watch: this.devBuildFolder, verbose: false }, (key && cert ? { https: { key, cert } } : {})))
396
+ 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 } } : {}))),
397
+ injectEnv(innetEnv),
385
398
  ];
386
399
  }
387
400
  const watcher = rollup.watch(options);
package/index.js CHANGED
@@ -25,6 +25,7 @@ var jsx = require('rollup-plugin-innet-jsx');
25
25
  var filesize = require('rollup-plugin-filesize');
26
26
  var image = require('@rollup/plugin-image');
27
27
  var eslint = require('@rollup/plugin-eslint');
28
+ var injectEnv = require('rollup-plugin-inject-process-env');
28
29
  var linesAndColumns = require('lines-and-columns');
29
30
  var unzipper = require('unzipper');
30
31
 
@@ -52,6 +53,7 @@ var jsx__default = /*#__PURE__*/_interopDefaultLegacy(jsx);
52
53
  var filesize__default = /*#__PURE__*/_interopDefaultLegacy(filesize);
53
54
  var image__default = /*#__PURE__*/_interopDefaultLegacy(image);
54
55
  var eslint__default = /*#__PURE__*/_interopDefaultLegacy(eslint);
56
+ var injectEnv__default = /*#__PURE__*/_interopDefaultLegacy(injectEnv);
55
57
 
56
58
  /******************************************************************************
57
59
  Copyright (c) Microsoft Corporation.
@@ -190,6 +192,12 @@ const readline = require('readline');
190
192
  const execAsync = util.promisify(exec);
191
193
  const copyFiles = util.promisify(fs__default["default"].copy);
192
194
  require('dotenv').config();
195
+ const innetEnv = Object.keys(process.env).reduce((result, key) => {
196
+ if (key.startsWith('INNETJS_')) {
197
+ result[key] = process.env[key];
198
+ }
199
+ return result;
200
+ }, {});
193
201
  class InnetJS {
194
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/?*', } = {}) {
195
203
  this.projectFolder = path__default["default"].resolve(projectFolder);
@@ -292,7 +300,9 @@ class InnetJS {
292
300
  include: lintIncludeDom,
293
301
  }),
294
302
  ...inputOptions.plugins,
295
- pluginNodeResolve.nodeResolve(),
303
+ pluginNodeResolve.nodeResolve({
304
+ browser: true,
305
+ }),
296
306
  image__default["default"](),
297
307
  styles__default["default"]({
298
308
  mode: this.cssInJs ? 'inject' : 'extract',
@@ -306,6 +316,7 @@ class InnetJS {
306
316
  include: '**/*.*',
307
317
  exclude: stringExcludeDom,
308
318
  }),
319
+ injectEnv__default["default"](innetEnv),
309
320
  ];
310
321
  outputOptions.format = 'es';
311
322
  outputOptions.plugins = [
@@ -394,7 +405,9 @@ class InnetJS {
394
405
  include: lintIncludeDom,
395
406
  }),
396
407
  ...options.plugins,
397
- pluginNodeResolve.nodeResolve(),
408
+ pluginNodeResolve.nodeResolve({
409
+ browser: true,
410
+ }),
398
411
  image__default["default"](),
399
412
  styles__default["default"]({
400
413
  mode: this.cssInJs ? 'inject' : 'extract',
@@ -408,7 +421,8 @@ class InnetJS {
408
421
  exclude: stringExcludeDom,
409
422
  }),
410
423
  this.createClient(key, cert, pkg),
411
- livereload(Object.assign({ watch: this.devBuildFolder, verbose: false }, (key && cert ? { https: { key, cert } } : {})))
424
+ 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 } } : {}))),
425
+ injectEnv__default["default"](innetEnv),
412
426
  ];
413
427
  }
414
428
  const watcher = rollup__default["default"].watch(options);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "innetjs",
3
- "version": "2.0.5",
3
+ "version": "2.0.8",
4
4
  "description": "CLI for innet boilerplate",
5
5
  "homepage": "https://github.com/d8corp/innetjs",
6
6
  "author": "Mikhail Lysikov <d8corp@mail.ru>",
@@ -52,6 +52,7 @@
52
52
  "prompts": "^2.4.2",
53
53
  "rollup": "^2.77.2",
54
54
  "rollup-plugin-filesize": "^9.1.2",
55
+ "rollup-plugin-inject-process-env": "^1.3.1",
55
56
  "rollup-plugin-innet-jsx": "^1.3.0",
56
57
  "rollup-plugin-livereload": "^2.0.5",
57
58
  "rollup-plugin-string": "^3.0.0",