innetjs 2.1.0 → 2.1.2

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 +10 -3
  2. package/index.es6.js +8 -2
  3. package/index.js +9 -2
  4. package/package.json +3 -2
package/bin/innet CHANGED
@@ -27,6 +27,7 @@ var jsx = require('rollup-plugin-innet-jsx');
27
27
  var filesize = require('rollup-plugin-filesize');
28
28
  var image = require('@rollup/plugin-image');
29
29
  var eslint = require('@rollup/plugin-eslint');
30
+ var polyfill = require('rollup-plugin-polyfill-node');
30
31
  var injectEnv = require('rollup-plugin-inject-process-env');
31
32
  var linesAndColumns = require('lines-and-columns');
32
33
  var unzipper = require('unzipper');
@@ -57,6 +58,7 @@ var jsx__default = /*#__PURE__*/_interopDefaultLegacy(jsx);
57
58
  var filesize__default = /*#__PURE__*/_interopDefaultLegacy(filesize);
58
59
  var image__default = /*#__PURE__*/_interopDefaultLegacy(image);
59
60
  var eslint__default = /*#__PURE__*/_interopDefaultLegacy(eslint);
61
+ var polyfill__default = /*#__PURE__*/_interopDefaultLegacy(polyfill);
60
62
  var injectEnv__default = /*#__PURE__*/_interopDefaultLegacy(injectEnv);
61
63
 
62
64
  /******************************************************************************
@@ -196,6 +198,7 @@ const readline = require('readline');
196
198
  const execAsync = util.promisify(exec);
197
199
  const copyFiles = util.promisify(fs__default["default"].copy);
198
200
  require('dotenv').config();
201
+ const REG_CLEAR_TEXT = /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g;
199
202
  function normalizeEnv(value) {
200
203
  if (value) {
201
204
  return value.replace(/\${([a-zA-Z0-9]+)}/g, (placeholder, placeholderId) => { var _a; return (_a = process.env[placeholderId]) !== null && _a !== void 0 ? _a : placeholder; });
@@ -313,6 +316,7 @@ class InnetJS {
313
316
  pluginNodeResolve.nodeResolve({
314
317
  browser: true,
315
318
  }),
319
+ polyfill__default["default"](),
316
320
  image__default["default"](),
317
321
  styles__default["default"]({
318
322
  mode: this.cssInJs ? 'inject' : 'extract',
@@ -383,7 +387,7 @@ class InnetJS {
383
387
  compilerOptions: {
384
388
  sourceMap: true
385
389
  }
386
- }
390
+ },
387
391
  }),
388
392
  jsx__default["default"](),
389
393
  ],
@@ -418,6 +422,7 @@ class InnetJS {
418
422
  pluginNodeResolve.nodeResolve({
419
423
  browser: true,
420
424
  }),
425
+ polyfill__default["default"](),
421
426
  image__default["default"](),
422
427
  styles__default["default"]({
423
428
  mode: this.cssInJs ? 'inject' : 'extract',
@@ -447,7 +452,9 @@ class InnetJS {
447
452
  console.log(`ERROR in ${file}:${line + 1}:${column + 1}`);
448
453
  }
449
454
  else if (e.error.code === 'PLUGIN_ERROR' && ['rpt2', 'commonjs'].includes(e.error.plugin)) {
450
- const [, file, line, column] = e.error.message.match(/^[^(]+(src[^(]+)\((\d+),(\d+)\)/) || [];
455
+ const [, file, line, column] = e.error.message
456
+ .replace(REG_CLEAR_TEXT, '')
457
+ .match(/^(src[^:]+):(\d+):(\d+)/) || [];
451
458
  logger__default["default"].end('Bundling', e.error.message);
452
459
  if (file) {
453
460
  console.log(`ERROR in ${file}:${line}:${column}`);
@@ -619,7 +626,7 @@ class InnetJS {
619
626
  }
620
627
  }
621
628
 
622
- var version = "2.1.0";
629
+ var version = "2.1.2";
623
630
 
624
631
  require('dotenv').config();
625
632
  const innetJS = new InnetJS();
package/index.es6.js CHANGED
@@ -24,6 +24,7 @@ import jsx from 'rollup-plugin-innet-jsx';
24
24
  import filesize from 'rollup-plugin-filesize';
25
25
  import image from '@rollup/plugin-image';
26
26
  import eslint from '@rollup/plugin-eslint';
27
+ import polyfill from 'rollup-plugin-polyfill-node';
27
28
  import injectEnv from 'rollup-plugin-inject-process-env';
28
29
  import { LinesAndColumns } from 'lines-and-columns';
29
30
  import { Parse } from 'unzipper';
@@ -165,6 +166,7 @@ const readline = require('readline');
165
166
  const execAsync = promisify(exec);
166
167
  const copyFiles = promisify(fs.copy);
167
168
  require('dotenv').config();
169
+ const REG_CLEAR_TEXT = /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g;
168
170
  function normalizeEnv(value) {
169
171
  if (value) {
170
172
  return value.replace(/\${([a-zA-Z0-9]+)}/g, (placeholder, placeholderId) => { var _a; return (_a = process.env[placeholderId]) !== null && _a !== void 0 ? _a : placeholder; });
@@ -282,6 +284,7 @@ class InnetJS {
282
284
  nodeResolve({
283
285
  browser: true,
284
286
  }),
287
+ polyfill(),
285
288
  image(),
286
289
  styles({
287
290
  mode: this.cssInJs ? 'inject' : 'extract',
@@ -352,7 +355,7 @@ class InnetJS {
352
355
  compilerOptions: {
353
356
  sourceMap: true
354
357
  }
355
- }
358
+ },
356
359
  }),
357
360
  jsx(),
358
361
  ],
@@ -387,6 +390,7 @@ class InnetJS {
387
390
  nodeResolve({
388
391
  browser: true,
389
392
  }),
393
+ polyfill(),
390
394
  image(),
391
395
  styles({
392
396
  mode: this.cssInJs ? 'inject' : 'extract',
@@ -416,7 +420,9 @@ class InnetJS {
416
420
  console.log(`ERROR in ${file}:${line + 1}:${column + 1}`);
417
421
  }
418
422
  else if (e.error.code === 'PLUGIN_ERROR' && ['rpt2', 'commonjs'].includes(e.error.plugin)) {
419
- const [, file, line, column] = e.error.message.match(/^[^(]+(src[^(]+)\((\d+),(\d+)\)/) || [];
423
+ const [, file, line, column] = e.error.message
424
+ .replace(REG_CLEAR_TEXT, '')
425
+ .match(/^(src[^:]+):(\d+):(\d+)/) || [];
420
426
  logger.end('Bundling', e.error.message);
421
427
  if (file) {
422
428
  console.log(`ERROR in ${file}:${line}:${column}`);
package/index.js 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 polyfill = require('rollup-plugin-polyfill-node');
29
30
  var injectEnv = require('rollup-plugin-inject-process-env');
30
31
  var linesAndColumns = require('lines-and-columns');
31
32
  var unzipper = require('unzipper');
@@ -55,6 +56,7 @@ var jsx__default = /*#__PURE__*/_interopDefaultLegacy(jsx);
55
56
  var filesize__default = /*#__PURE__*/_interopDefaultLegacy(filesize);
56
57
  var image__default = /*#__PURE__*/_interopDefaultLegacy(image);
57
58
  var eslint__default = /*#__PURE__*/_interopDefaultLegacy(eslint);
59
+ var polyfill__default = /*#__PURE__*/_interopDefaultLegacy(polyfill);
58
60
  var injectEnv__default = /*#__PURE__*/_interopDefaultLegacy(injectEnv);
59
61
 
60
62
  /******************************************************************************
@@ -194,6 +196,7 @@ const readline = require('readline');
194
196
  const execAsync = util.promisify(exec);
195
197
  const copyFiles = util.promisify(fs__default["default"].copy);
196
198
  require('dotenv').config();
199
+ const REG_CLEAR_TEXT = /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g;
197
200
  function normalizeEnv(value) {
198
201
  if (value) {
199
202
  return value.replace(/\${([a-zA-Z0-9]+)}/g, (placeholder, placeholderId) => { var _a; return (_a = process.env[placeholderId]) !== null && _a !== void 0 ? _a : placeholder; });
@@ -311,6 +314,7 @@ class InnetJS {
311
314
  pluginNodeResolve.nodeResolve({
312
315
  browser: true,
313
316
  }),
317
+ polyfill__default["default"](),
314
318
  image__default["default"](),
315
319
  styles__default["default"]({
316
320
  mode: this.cssInJs ? 'inject' : 'extract',
@@ -381,7 +385,7 @@ class InnetJS {
381
385
  compilerOptions: {
382
386
  sourceMap: true
383
387
  }
384
- }
388
+ },
385
389
  }),
386
390
  jsx__default["default"](),
387
391
  ],
@@ -416,6 +420,7 @@ class InnetJS {
416
420
  pluginNodeResolve.nodeResolve({
417
421
  browser: true,
418
422
  }),
423
+ polyfill__default["default"](),
419
424
  image__default["default"](),
420
425
  styles__default["default"]({
421
426
  mode: this.cssInJs ? 'inject' : 'extract',
@@ -445,7 +450,9 @@ class InnetJS {
445
450
  console.log(`ERROR in ${file}:${line + 1}:${column + 1}`);
446
451
  }
447
452
  else if (e.error.code === 'PLUGIN_ERROR' && ['rpt2', 'commonjs'].includes(e.error.plugin)) {
448
- const [, file, line, column] = e.error.message.match(/^[^(]+(src[^(]+)\((\d+),(\d+)\)/) || [];
453
+ const [, file, line, column] = e.error.message
454
+ .replace(REG_CLEAR_TEXT, '')
455
+ .match(/^(src[^:]+):(\d+):(\d+)/) || [];
449
456
  logger__default["default"].end('Bundling', e.error.message);
450
457
  if (file) {
451
458
  console.log(`ERROR in ${file}:${line}:${column}`);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "innetjs",
3
- "version": "2.1.0",
3
+ "version": "2.1.2",
4
4
  "description": "CLI for innet boilerplate",
5
5
  "homepage": "https://github.com/d8corp/innetjs",
6
6
  "author": "Mikhail Lysikov <d8corp@mail.ru>",
@@ -59,7 +59,8 @@
59
59
  "rollup-plugin-string": "^3.0.0",
60
60
  "rollup-plugin-styles": "^4.0.0",
61
61
  "rollup-plugin-terser": "^7.0.2",
62
- "rollup-plugin-typescript2": "^0.34.1",
62
+ "rollup-plugin-typescript2": "^0.33.0",
63
+ "rollup-plugin-polyfill-node": "^0.11.0",
63
64
  "tmp": "^0.2.1",
64
65
  "typescript": "^4.8.4",
65
66
  "unzipper": "^0.10.11"