innetjs 2.3.4 → 2.3.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 (8) hide show
  1. package/_virtual/_rollup-plugin-process-env.js +12 -0
  2. package/_virtual/_rollup-plugin-process-env.mjs +10 -0
  3. package/bin/innet +5 -4
  4. package/helpers.js +3 -1
  5. package/helpers.mjs +3 -1
  6. package/index.js +2 -12
  7. package/index.mjs +2 -12
  8. package/package.json +1 -1
package/_virtual/_rollup-plugin-process-env.js ADDED
@@ -0,0 +1,12 @@
1
+ 'use strict';
2
+
3
+ ;(function () {
4
+ const env = {"__INNETJS__PACKAGE_VERSION":"2.3.6"};
5
+ if (typeof process === 'undefined') {
6
+ globalThis.process = { env: env };
7
+ } else if (process.env) {
8
+ Object.assign(process.env, env);
9
+ } else {
10
+ process.env = env;
11
+ }
12
+ })();
package/_virtual/_rollup-plugin-process-env.mjs ADDED
@@ -0,0 +1,10 @@
1
+ ;(function () {
2
+ const env = {"__INNETJS__PACKAGE_VERSION":"2.3.6"};
3
+ if (typeof process === 'undefined') {
4
+ globalThis.process = { env: env };
5
+ } else if (process.env) {
6
+ Object.assign(process.env, env);
7
+ } else {
8
+ process.env = env;
9
+ }
10
+ })();
package/bin/innet CHANGED
@@ -164,9 +164,11 @@ function getFile(file) {
164
164
  }
165
165
  function convertIndexFile(data, version, baseUrl, index) {
166
166
  return tslib.__awaiter(this, void 0, void 0, function* () {
167
+ const { env } = process;
167
168
  return data
168
169
  .toString()
169
- .replace('</head>', `<script type="module" defer src="${baseUrl}${index}.js${version ? `?v=${version}` : ''}"></script></head>`);
170
+ .replace('</head>', `<script type="module" defer src="${baseUrl}${index}.js${version ? `?v=${version}` : ''}"></script></head>`)
171
+ .replace(/%([A-Z0-9_]+)%/g, (placeholder, placeholderId) => { var _a; return (_a = env[placeholderId]) !== null && _a !== void 0 ? _a : placeholder; });
170
172
  });
171
173
  }
172
174
  const reporter = (options, outputOptions, info) => {
@@ -196,7 +198,6 @@ const REG_TJSX = /\.[tj]sx?$/;
196
198
  const REG_EXT = /\.([^.]+)$/;
197
199
  const scriptExtensions = ['ts', 'js', 'tsx', 'jsx'];
198
200
  const indexExt = scriptExtensions.join(',');
199
- console.log('!!!!!!!!!');
200
201
  class InnetJS {
201
202
  constructor({ envPrefix = process.env.INNETJS_ENV_PREFIX || 'INNETJS_', projectFolder = process.env.PROJECT_FOLDER || '', baseUrl = process.env.BASE_URL || '/', publicFolder = process.env.PUBLIC_FOLDER || 'public', releaseFolder = process.env.RELEASE_FOLDER || 'release', 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/?*', } = {}) {
202
203
  this.projectFolder = path__default["default"].resolve(projectFolder);
@@ -559,7 +560,7 @@ class InnetJS {
559
560
  styles__default["default"]({
560
561
  mode: this.cssInJs ? 'inject' : 'extract',
561
562
  plugins: [autoprefixer__default["default"]()],
562
- autoModules: this.cssModules ? (id) => !id.includes('.global.') : true,
563
+ autoModules: cssModules ? (id) => !id.includes('.global.') : true,
563
564
  minimize: true,
564
565
  }),
565
566
  pluginNodeResolve.nodeResolve(),
@@ -770,7 +771,7 @@ class InnetJS {
770
771
  }
771
772
 
772
773
  (function () {
773
- const env = {"__INNETJS__PACKAGE_VERSION":"2.3.4"};
774
+ const env = {"__INNETJS__PACKAGE_VERSION":"2.3.6"};
774
775
  if (typeof process === 'undefined') {
775
776
  globalThis.process = { env: env };
776
777
  } else if (process.env) {
package/helpers.js CHANGED
@@ -39,9 +39,11 @@ function getFile(file) {
39
39
  }
40
40
  function convertIndexFile(data, version, baseUrl, index) {
41
41
  return tslib.__awaiter(this, void 0, void 0, function* () {
42
+ const { env } = process;
42
43
  return data
43
44
  .toString()
44
- .replace('</head>', `<script type="module" defer src="${baseUrl}${index}.js${version ? `?v=${version}` : ''}"></script></head>`);
45
+ .replace('</head>', `<script type="module" defer src="${baseUrl}${index}.js${version ? `?v=${version}` : ''}"></script></head>`)
46
+ .replace(/%([A-Z0-9_]+)%/g, (placeholder, placeholderId) => { var _a; return (_a = env[placeholderId]) !== null && _a !== void 0 ? _a : placeholder; });
45
47
  });
46
48
  }
47
49
  const reporter = (options, outputOptions, info) => {
package/helpers.mjs CHANGED
@@ -28,9 +28,11 @@ function getFile(file) {
28
28
  }
29
29
  function convertIndexFile(data, version, baseUrl, index) {
30
30
  return __awaiter(this, void 0, void 0, function* () {
31
+ const { env } = process;
31
32
  return data
32
33
  .toString()
33
- .replace('</head>', `<script type="module" defer src="${baseUrl}${index}.js${version ? `?v=${version}` : ''}"></script></head>`);
34
+ .replace('</head>', `<script type="module" defer src="${baseUrl}${index}.js${version ? `?v=${version}` : ''}"></script></head>`)
35
+ .replace(/%([A-Z0-9_]+)%/g, (placeholder, placeholderId) => { var _a; return (_a = env[placeholderId]) !== null && _a !== void 0 ? _a : placeholder; });
34
36
  });
35
37
  }
36
38
  const reporter = (options, outputOptions, info) => {
package/index.js CHANGED
@@ -2,6 +2,7 @@
2
2
 
3
3
  Object.defineProperty(exports, '__esModule', { value: true });
4
4
 
5
+ require('./_virtual/_rollup-plugin-process-env.js');
5
6
  var tslib = require('tslib');
6
7
  var logger = require('@cantinc/logger');
7
8
  var commonjs = require('@rollup/plugin-commonjs');
@@ -72,16 +73,6 @@ var styles__default = /*#__PURE__*/_interopDefaultLegacy(styles);
72
73
  var typescript__default = /*#__PURE__*/_interopDefaultLegacy(typescript);
73
74
  var tmp__default = /*#__PURE__*/_interopDefaultLegacy(tmp);
74
75
 
75
- ;(function () {
76
- const env = {"__INNETJS__PACKAGE_VERSION":"2.3.4"};
77
- if (typeof process === 'undefined') {
78
- globalThis.process = { env: env };
79
- } else if (process.env) {
80
- Object.assign(process.env, env);
81
- } else {
82
- process.env = env;
83
- }
84
- })();
85
76
  const livereload = require('rollup-plugin-livereload');
86
77
  const { string } = require('rollup-plugin-string');
87
78
  const { exec, spawn } = require('child_process');
@@ -95,7 +86,6 @@ const REG_TJSX = /\.[tj]sx?$/;
95
86
  const REG_EXT = /\.([^.]+)$/;
96
87
  const scriptExtensions = ['ts', 'js', 'tsx', 'jsx'];
97
88
  const indexExt = scriptExtensions.join(',');
98
- console.log('!!!!!!!!!');
99
89
  class InnetJS {
100
90
  constructor({ envPrefix = process.env.INNETJS_ENV_PREFIX || 'INNETJS_', projectFolder = process.env.PROJECT_FOLDER || '', baseUrl = process.env.BASE_URL || '/', publicFolder = process.env.PUBLIC_FOLDER || 'public', releaseFolder = process.env.RELEASE_FOLDER || 'release', 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/?*', } = {}) {
101
91
  this.projectFolder = path__default["default"].resolve(projectFolder);
@@ -458,7 +448,7 @@ class InnetJS {
458
448
  styles__default["default"]({
459
449
  mode: this.cssInJs ? 'inject' : 'extract',
460
450
  plugins: [autoprefixer__default["default"]()],
461
- autoModules: this.cssModules ? (id) => !id.includes('.global.') : true,
451
+ autoModules: cssModules ? (id) => !id.includes('.global.') : true,
462
452
  minimize: true,
463
453
  }),
464
454
  pluginNodeResolve.nodeResolve(),
package/index.mjs CHANGED
@@ -1,3 +1,4 @@
1
+ import './_virtual/_rollup-plugin-process-env.mjs';
1
2
  import { __awaiter } from 'tslib';
2
3
  import logger from '@cantinc/logger';
3
4
  import commonjs from '@rollup/plugin-commonjs';
@@ -37,16 +38,6 @@ import { Extract } from './extract.mjs';
37
38
  import { reporter, convertIndexFile, getFile } from './helpers.mjs';
38
39
  import { updateDotenv } from './updateDotenv.mjs';
39
40
 
40
- ;(function () {
41
- const env = {"__INNETJS__PACKAGE_VERSION":"2.3.4"};
42
- if (typeof process === 'undefined') {
43
- globalThis.process = { env: env };
44
- } else if (process.env) {
45
- Object.assign(process.env, env);
46
- } else {
47
- process.env = env;
48
- }
49
- })();
50
41
  const livereload = require('rollup-plugin-livereload');
51
42
  const { string } = require('rollup-plugin-string');
52
43
  const { exec, spawn } = require('child_process');
@@ -60,7 +51,6 @@ const REG_TJSX = /\.[tj]sx?$/;
60
51
  const REG_EXT = /\.([^.]+)$/;
61
52
  const scriptExtensions = ['ts', 'js', 'tsx', 'jsx'];
62
53
  const indexExt = scriptExtensions.join(',');
63
- console.log('!!!!!!!!!');
64
54
  class InnetJS {
65
55
  constructor({ envPrefix = process.env.INNETJS_ENV_PREFIX || 'INNETJS_', projectFolder = process.env.PROJECT_FOLDER || '', baseUrl = process.env.BASE_URL || '/', publicFolder = process.env.PUBLIC_FOLDER || 'public', releaseFolder = process.env.RELEASE_FOLDER || 'release', 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/?*', } = {}) {
66
56
  this.projectFolder = path.resolve(projectFolder);
@@ -423,7 +413,7 @@ class InnetJS {
423
413
  styles({
424
414
  mode: this.cssInJs ? 'inject' : 'extract',
425
415
  plugins: [autoprefixer()],
426
- autoModules: this.cssModules ? (id) => !id.includes('.global.') : true,
416
+ autoModules: cssModules ? (id) => !id.includes('.global.') : true,
427
417
  minimize: true,
428
418
  }),
429
419
  nodeResolve(),
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "innetjs",
3
- "version": "2.3.4",
3
+ "version": "2.3.6",
4
4
  "description": "CLI for innet boilerplate",
5
5
  "homepage": "https://github.com/d8corp/innetjs",
6
6
  "author": "Mikhail Lysikov <d8corp@mail.ru>",