innetjs 2.2.8 → 2.2.10
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/_virtual/_rollup-plugin-inject-process-env.js +1 -1
- package/_virtual/_rollup-plugin-inject-process-env.mjs +1 -1
- package/bin/innet +88 -78
- package/constants.js +0 -2
- package/constants.mjs +0 -2
- package/extract.js +0 -1
- package/extract.mjs +0 -1
- package/helpers.js +0 -1
- package/helpers.mjs +0 -1
- package/index.d.ts +2 -0
- package/index.js +87 -77
- package/index.mjs +87 -77
- package/package.json +2 -2
- package/updateDotenv.js +0 -2
- package/updateDotenv.mjs +0 -2
package/bin/innet
CHANGED
|
@@ -25,11 +25,11 @@ var path$1 = require('node:path');
|
|
|
25
25
|
var prompt = require('prompts');
|
|
26
26
|
var rollup = require('rollup');
|
|
27
27
|
var filesize = require('rollup-plugin-filesize');
|
|
28
|
-
var injectEnv = require('rollup-plugin-inject-process-env');
|
|
29
28
|
var jsx = require('rollup-plugin-innet-jsx');
|
|
30
29
|
var externals = require('rollup-plugin-node-externals');
|
|
31
30
|
var polyfill = require('rollup-plugin-polyfill-node');
|
|
32
31
|
var rollupPluginPreserveShebangs = require('rollup-plugin-preserve-shebangs');
|
|
32
|
+
var env = require('rollup-plugin-process-env');
|
|
33
33
|
var styles = require('rollup-plugin-styles');
|
|
34
34
|
var rollupPluginTerser = require('rollup-plugin-terser');
|
|
35
35
|
var typescript = require('rollup-plugin-typescript2');
|
|
@@ -59,16 +59,16 @@ var path__default = /*#__PURE__*/_interopDefaultLegacy(path$1);
|
|
|
59
59
|
var prompt__default = /*#__PURE__*/_interopDefaultLegacy(prompt);
|
|
60
60
|
var rollup__default = /*#__PURE__*/_interopDefaultLegacy(rollup);
|
|
61
61
|
var filesize__default = /*#__PURE__*/_interopDefaultLegacy(filesize);
|
|
62
|
-
var injectEnv__default = /*#__PURE__*/_interopDefaultLegacy(injectEnv);
|
|
63
62
|
var jsx__default = /*#__PURE__*/_interopDefaultLegacy(jsx);
|
|
64
63
|
var externals__default = /*#__PURE__*/_interopDefaultLegacy(externals);
|
|
65
64
|
var polyfill__default = /*#__PURE__*/_interopDefaultLegacy(polyfill);
|
|
65
|
+
var env__default = /*#__PURE__*/_interopDefaultLegacy(env);
|
|
66
66
|
var styles__default = /*#__PURE__*/_interopDefaultLegacy(styles);
|
|
67
67
|
var typescript__default = /*#__PURE__*/_interopDefaultLegacy(typescript);
|
|
68
68
|
var tmp__default = /*#__PURE__*/_interopDefaultLegacy(tmp);
|
|
69
69
|
|
|
70
70
|
(function() {
|
|
71
|
-
const env = {"INNETJS_INNETJS_PACKAGE_VERSION":"2.2.
|
|
71
|
+
const env = {"INNETJS_INNETJS_PACKAGE_VERSION":"2.2.10"};
|
|
72
72
|
try {
|
|
73
73
|
if (process) {
|
|
74
74
|
process.env = Object.assign({}, process.env);
|
|
@@ -305,11 +305,9 @@ class InnetJS {
|
|
|
305
305
|
json__default["default"](),
|
|
306
306
|
typescript__default["default"](),
|
|
307
307
|
jsx__default["default"](),
|
|
308
|
-
eslint__default["default"]({
|
|
309
|
-
include: lintInclude,
|
|
310
|
-
}),
|
|
311
308
|
],
|
|
312
309
|
};
|
|
310
|
+
this.withLint(inputOptions);
|
|
313
311
|
const outputOptions = {
|
|
314
312
|
dir: this.buildFolder,
|
|
315
313
|
sourcemap: this.sourcemap,
|
|
@@ -335,7 +333,7 @@ class InnetJS {
|
|
|
335
333
|
}), string({
|
|
336
334
|
include: '**/*.*',
|
|
337
335
|
exclude: stringExcludeDom,
|
|
338
|
-
}),
|
|
336
|
+
}), env__default["default"](innetEnv, { include: input }));
|
|
339
337
|
outputOptions.format = 'es';
|
|
340
338
|
outputOptions.plugins = [
|
|
341
339
|
rollupPluginTerser.terser(),
|
|
@@ -397,11 +395,9 @@ class InnetJS {
|
|
|
397
395
|
},
|
|
398
396
|
}),
|
|
399
397
|
jsx__default["default"](),
|
|
400
|
-
eslint__default["default"]({
|
|
401
|
-
include: lintInclude,
|
|
402
|
-
}),
|
|
403
398
|
],
|
|
404
399
|
};
|
|
400
|
+
this.withLint(options);
|
|
405
401
|
if (node) {
|
|
406
402
|
// @ts-expect-error
|
|
407
403
|
options.output.format = 'cjs';
|
|
@@ -435,7 +431,7 @@ class InnetJS {
|
|
|
435
431
|
}), string({
|
|
436
432
|
include: '**/*.*',
|
|
437
433
|
exclude: stringExcludeDom,
|
|
438
|
-
}), this.createClient(key, cert, pkg, index), 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 } } : {}))),
|
|
434
|
+
}), this.createClient(key, cert, pkg, index), 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 } } : {}))), env__default["default"](innetEnv, { include: input }));
|
|
439
435
|
}
|
|
440
436
|
const watcher = rollup__default["default"].watch(options);
|
|
441
437
|
watcher.on('event', (e) => tslib.__awaiter(this, void 0, void 0, function* () {
|
|
@@ -519,72 +515,75 @@ class InnetJS {
|
|
|
519
515
|
const { releaseFolder, cssModules } = this;
|
|
520
516
|
yield logger__default["default"].start('Remove previous release', () => fs__default["default"].remove(releaseFolder));
|
|
521
517
|
const pkg = yield this.getPackage();
|
|
522
|
-
|
|
518
|
+
const build = (format) => tslib.__awaiter(this, void 0, void 0, function* () {
|
|
523
519
|
var _a, _b;
|
|
524
|
-
|
|
525
|
-
|
|
526
|
-
|
|
527
|
-
|
|
528
|
-
|
|
529
|
-
|
|
530
|
-
|
|
531
|
-
|
|
532
|
-
|
|
533
|
-
|
|
534
|
-
|
|
535
|
-
|
|
536
|
-
|
|
537
|
-
|
|
538
|
-
|
|
539
|
-
|
|
540
|
-
|
|
541
|
-
|
|
542
|
-
|
|
543
|
-
|
|
544
|
-
|
|
545
|
-
|
|
546
|
-
|
|
547
|
-
|
|
548
|
-
|
|
549
|
-
|
|
550
|
-
|
|
551
|
-
|
|
552
|
-
|
|
553
|
-
|
|
554
|
-
|
|
555
|
-
|
|
556
|
-
|
|
557
|
-
|
|
558
|
-
|
|
559
|
-
|
|
560
|
-
|
|
561
|
-
|
|
562
|
-
|
|
563
|
-
|
|
564
|
-
|
|
565
|
-
|
|
566
|
-
|
|
567
|
-
|
|
568
|
-
|
|
569
|
-
|
|
570
|
-
|
|
571
|
-
|
|
572
|
-
|
|
573
|
-
|
|
574
|
-
|
|
575
|
-
|
|
576
|
-
|
|
577
|
-
|
|
578
|
-
|
|
579
|
-
|
|
580
|
-
|
|
581
|
-
|
|
582
|
-
|
|
583
|
-
|
|
584
|
-
|
|
585
|
-
|
|
586
|
-
}
|
|
587
|
-
|
|
520
|
+
const ext = format === 'es'
|
|
521
|
+
? ((_a = (pkg.module || pkg.esnext || pkg['jsnext:main'])) === null || _a === void 0 ? void 0 : _a.replace('index', '')) || '.mjs'
|
|
522
|
+
: ((_b = pkg.main) === null || _b === void 0 ? void 0 : _b.replace('index', '')) || '.js';
|
|
523
|
+
const input = glob__default["default"].sync(`src/${index}.{${indexExt}}`);
|
|
524
|
+
if (!input.length) {
|
|
525
|
+
throw Error('index file is not detected');
|
|
526
|
+
}
|
|
527
|
+
const options = {
|
|
528
|
+
input,
|
|
529
|
+
external: [...Object.keys(pkg.dependencies), 'tslib'],
|
|
530
|
+
preserveEntrySignatures: 'strict',
|
|
531
|
+
output: {
|
|
532
|
+
dir: releaseFolder,
|
|
533
|
+
entryFileNames: `[name]${ext}`,
|
|
534
|
+
format,
|
|
535
|
+
preserveModules: true,
|
|
536
|
+
exports: 'auto',
|
|
537
|
+
},
|
|
538
|
+
plugins: [
|
|
539
|
+
json__default["default"](),
|
|
540
|
+
typescript__default["default"]({
|
|
541
|
+
clean: true,
|
|
542
|
+
useTsconfigDeclarationDir: true,
|
|
543
|
+
tsconfigOverride: {
|
|
544
|
+
compilerOptions: {
|
|
545
|
+
declarationDir: releaseFolder,
|
|
546
|
+
sourceMap: false,
|
|
547
|
+
},
|
|
548
|
+
},
|
|
549
|
+
}),
|
|
550
|
+
jsx__default["default"](),
|
|
551
|
+
env__default["default"](innetEnv, { include: input }),
|
|
552
|
+
],
|
|
553
|
+
};
|
|
554
|
+
this.withLint(options);
|
|
555
|
+
if (node) {
|
|
556
|
+
options.plugins = [
|
|
557
|
+
...options.plugins,
|
|
558
|
+
externals__default["default"](),
|
|
559
|
+
string({
|
|
560
|
+
include: '**/*.*',
|
|
561
|
+
exclude: stringExcludeNode,
|
|
562
|
+
}),
|
|
563
|
+
];
|
|
564
|
+
}
|
|
565
|
+
else {
|
|
566
|
+
options.plugins = [
|
|
567
|
+
...options.plugins,
|
|
568
|
+
string({
|
|
569
|
+
include: '**/*.*',
|
|
570
|
+
exclude: stringExcludeDom,
|
|
571
|
+
}),
|
|
572
|
+
polyfill__default["default"](),
|
|
573
|
+
image__default["default"](),
|
|
574
|
+
styles__default["default"]({
|
|
575
|
+
mode: 'inject',
|
|
576
|
+
url: true,
|
|
577
|
+
plugins: [autoprefixer__default["default"]()],
|
|
578
|
+
modules: cssModules,
|
|
579
|
+
minimize: true,
|
|
580
|
+
}),
|
|
581
|
+
];
|
|
582
|
+
}
|
|
583
|
+
const bundle = yield rollup__default["default"].rollup(options);
|
|
584
|
+
yield bundle.write(options.output);
|
|
585
|
+
yield bundle.close();
|
|
586
|
+
});
|
|
588
587
|
yield logger__default["default"].start('Build cjs bundle', () => tslib.__awaiter(this, void 0, void 0, function* () {
|
|
589
588
|
yield build('cjs');
|
|
590
589
|
}));
|
|
@@ -602,7 +601,7 @@ class InnetJS {
|
|
|
602
601
|
const { bin } = pkg;
|
|
603
602
|
for (const name in bin) {
|
|
604
603
|
const value = bin[name];
|
|
605
|
-
const input = glob__default["default"].sync(`src/${value}.{${
|
|
604
|
+
const input = glob__default["default"].sync(`src/${value}.{${indexExt}}`);
|
|
606
605
|
const file = path__default["default"].join(this.releaseFolder, value);
|
|
607
606
|
const options = {
|
|
608
607
|
input,
|
|
@@ -624,9 +623,10 @@ class InnetJS {
|
|
|
624
623
|
}),
|
|
625
624
|
externals__default["default"](),
|
|
626
625
|
jsx__default["default"](),
|
|
627
|
-
|
|
626
|
+
env__default["default"](innetEnv, { include: input }),
|
|
628
627
|
],
|
|
629
628
|
};
|
|
629
|
+
this.withLint(options);
|
|
630
630
|
const bundle = yield rollup__default["default"].rollup(options);
|
|
631
631
|
yield bundle.write(options.output);
|
|
632
632
|
yield bundle.close();
|
|
@@ -656,6 +656,16 @@ class InnetJS {
|
|
|
656
656
|
}
|
|
657
657
|
});
|
|
658
658
|
}
|
|
659
|
+
withLint(options) {
|
|
660
|
+
if (this._lintUsage === undefined) {
|
|
661
|
+
this._lintUsage = fs__default["default"].existsSync(path__default["default"].join(this.projectFolder, '.eslintrc'));
|
|
662
|
+
}
|
|
663
|
+
if (this._lintUsage) {
|
|
664
|
+
options.plugins.push(eslint__default["default"]({
|
|
665
|
+
include: lintInclude,
|
|
666
|
+
}));
|
|
667
|
+
}
|
|
668
|
+
}
|
|
659
669
|
increaseVersion(release) {
|
|
660
670
|
return tslib.__awaiter(this, void 0, void 0, function* () {
|
|
661
671
|
const pkg = yield this.getPackage();
|
package/constants.js
CHANGED
package/constants.mjs
CHANGED
package/extract.js
CHANGED
package/extract.mjs
CHANGED
package/helpers.js
CHANGED
package/helpers.mjs
CHANGED
package/index.d.ts
CHANGED
|
@@ -60,6 +60,8 @@ export declare class InnetJS {
|
|
|
60
60
|
}): Promise<void>;
|
|
61
61
|
run(file: any): Promise<void>;
|
|
62
62
|
release({ node, index, pub }?: ReleaseOptions): Promise<void>;
|
|
63
|
+
private _lintUsage;
|
|
64
|
+
withLint(options: rollup.RollupOptions): void;
|
|
63
65
|
increaseVersion(release: string): Promise<void>;
|
|
64
66
|
getPackage(): Promise<Record<string, any>>;
|
|
65
67
|
createClient(key: any, cert: any, pkg: any, index: string): rollup.Plugin;
|
package/index.js
CHANGED
|
@@ -26,11 +26,11 @@ var path = require('node:path');
|
|
|
26
26
|
var prompt = require('prompts');
|
|
27
27
|
var rollup = require('rollup');
|
|
28
28
|
var filesize = require('rollup-plugin-filesize');
|
|
29
|
-
var injectEnv = require('rollup-plugin-inject-process-env');
|
|
30
29
|
var jsx = require('rollup-plugin-innet-jsx');
|
|
31
30
|
var externals = require('rollup-plugin-node-externals');
|
|
32
31
|
var polyfill = require('rollup-plugin-polyfill-node');
|
|
33
32
|
var rollupPluginPreserveShebangs = require('rollup-plugin-preserve-shebangs');
|
|
33
|
+
var env = require('rollup-plugin-process-env');
|
|
34
34
|
var styles = require('rollup-plugin-styles');
|
|
35
35
|
var rollupPluginTerser = require('rollup-plugin-terser');
|
|
36
36
|
var typescript = require('rollup-plugin-typescript2');
|
|
@@ -63,10 +63,10 @@ var path__default = /*#__PURE__*/_interopDefaultLegacy(path);
|
|
|
63
63
|
var prompt__default = /*#__PURE__*/_interopDefaultLegacy(prompt);
|
|
64
64
|
var rollup__default = /*#__PURE__*/_interopDefaultLegacy(rollup);
|
|
65
65
|
var filesize__default = /*#__PURE__*/_interopDefaultLegacy(filesize);
|
|
66
|
-
var injectEnv__default = /*#__PURE__*/_interopDefaultLegacy(injectEnv);
|
|
67
66
|
var jsx__default = /*#__PURE__*/_interopDefaultLegacy(jsx);
|
|
68
67
|
var externals__default = /*#__PURE__*/_interopDefaultLegacy(externals);
|
|
69
68
|
var polyfill__default = /*#__PURE__*/_interopDefaultLegacy(polyfill);
|
|
69
|
+
var env__default = /*#__PURE__*/_interopDefaultLegacy(env);
|
|
70
70
|
var styles__default = /*#__PURE__*/_interopDefaultLegacy(styles);
|
|
71
71
|
var typescript__default = /*#__PURE__*/_interopDefaultLegacy(typescript);
|
|
72
72
|
var tmp__default = /*#__PURE__*/_interopDefaultLegacy(tmp);
|
|
@@ -183,11 +183,9 @@ class InnetJS {
|
|
|
183
183
|
json__default["default"](),
|
|
184
184
|
typescript__default["default"](),
|
|
185
185
|
jsx__default["default"](),
|
|
186
|
-
eslint__default["default"]({
|
|
187
|
-
include: constants.lintInclude,
|
|
188
|
-
}),
|
|
189
186
|
],
|
|
190
187
|
};
|
|
188
|
+
this.withLint(inputOptions);
|
|
191
189
|
const outputOptions = {
|
|
192
190
|
dir: this.buildFolder,
|
|
193
191
|
sourcemap: this.sourcemap,
|
|
@@ -213,7 +211,7 @@ class InnetJS {
|
|
|
213
211
|
}), string({
|
|
214
212
|
include: '**/*.*',
|
|
215
213
|
exclude: constants.stringExcludeDom,
|
|
216
|
-
}),
|
|
214
|
+
}), env__default["default"](innetEnv, { include: input }));
|
|
217
215
|
outputOptions.format = 'es';
|
|
218
216
|
outputOptions.plugins = [
|
|
219
217
|
rollupPluginTerser.terser(),
|
|
@@ -275,11 +273,9 @@ class InnetJS {
|
|
|
275
273
|
},
|
|
276
274
|
}),
|
|
277
275
|
jsx__default["default"](),
|
|
278
|
-
eslint__default["default"]({
|
|
279
|
-
include: constants.lintInclude,
|
|
280
|
-
}),
|
|
281
276
|
],
|
|
282
277
|
};
|
|
278
|
+
this.withLint(options);
|
|
283
279
|
if (node) {
|
|
284
280
|
// @ts-expect-error
|
|
285
281
|
options.output.format = 'cjs';
|
|
@@ -313,7 +309,7 @@ class InnetJS {
|
|
|
313
309
|
}), string({
|
|
314
310
|
include: '**/*.*',
|
|
315
311
|
exclude: constants.stringExcludeDom,
|
|
316
|
-
}), this.createClient(key, cert, pkg, index), 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 } } : {}))),
|
|
312
|
+
}), this.createClient(key, cert, pkg, index), 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 } } : {}))), env__default["default"](innetEnv, { include: input }));
|
|
317
313
|
}
|
|
318
314
|
const watcher = rollup__default["default"].watch(options);
|
|
319
315
|
watcher.on('event', (e) => tslib.__awaiter(this, void 0, void 0, function* () {
|
|
@@ -397,72 +393,75 @@ class InnetJS {
|
|
|
397
393
|
const { releaseFolder, cssModules } = this;
|
|
398
394
|
yield logger__default["default"].start('Remove previous release', () => fs__default["default"].remove(releaseFolder));
|
|
399
395
|
const pkg = yield this.getPackage();
|
|
400
|
-
|
|
396
|
+
const build = (format) => tslib.__awaiter(this, void 0, void 0, function* () {
|
|
401
397
|
var _a, _b;
|
|
402
|
-
|
|
403
|
-
|
|
404
|
-
|
|
405
|
-
|
|
406
|
-
|
|
407
|
-
|
|
408
|
-
|
|
409
|
-
|
|
410
|
-
|
|
411
|
-
|
|
412
|
-
|
|
413
|
-
|
|
414
|
-
|
|
415
|
-
|
|
416
|
-
|
|
417
|
-
|
|
418
|
-
|
|
419
|
-
|
|
420
|
-
|
|
421
|
-
|
|
422
|
-
|
|
423
|
-
|
|
424
|
-
|
|
425
|
-
|
|
426
|
-
|
|
427
|
-
|
|
428
|
-
|
|
429
|
-
|
|
430
|
-
|
|
431
|
-
|
|
432
|
-
|
|
433
|
-
|
|
434
|
-
|
|
435
|
-
|
|
436
|
-
|
|
437
|
-
|
|
438
|
-
|
|
439
|
-
|
|
440
|
-
|
|
441
|
-
|
|
442
|
-
|
|
443
|
-
|
|
444
|
-
|
|
445
|
-
|
|
446
|
-
|
|
447
|
-
|
|
448
|
-
|
|
449
|
-
|
|
450
|
-
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
|
|
455
|
-
|
|
456
|
-
|
|
457
|
-
|
|
458
|
-
|
|
459
|
-
|
|
460
|
-
|
|
461
|
-
|
|
462
|
-
|
|
463
|
-
|
|
464
|
-
}
|
|
465
|
-
|
|
398
|
+
const ext = format === 'es'
|
|
399
|
+
? ((_a = (pkg.module || pkg.esnext || pkg['jsnext:main'])) === null || _a === void 0 ? void 0 : _a.replace('index', '')) || '.mjs'
|
|
400
|
+
: ((_b = pkg.main) === null || _b === void 0 ? void 0 : _b.replace('index', '')) || '.js';
|
|
401
|
+
const input = glob__default["default"].sync(`src/${index}.{${indexExt}}`);
|
|
402
|
+
if (!input.length) {
|
|
403
|
+
throw Error('index file is not detected');
|
|
404
|
+
}
|
|
405
|
+
const options = {
|
|
406
|
+
input,
|
|
407
|
+
external: [...Object.keys(pkg.dependencies), 'tslib'],
|
|
408
|
+
preserveEntrySignatures: 'strict',
|
|
409
|
+
output: {
|
|
410
|
+
dir: releaseFolder,
|
|
411
|
+
entryFileNames: `[name]${ext}`,
|
|
412
|
+
format,
|
|
413
|
+
preserveModules: true,
|
|
414
|
+
exports: 'auto',
|
|
415
|
+
},
|
|
416
|
+
plugins: [
|
|
417
|
+
json__default["default"](),
|
|
418
|
+
typescript__default["default"]({
|
|
419
|
+
clean: true,
|
|
420
|
+
useTsconfigDeclarationDir: true,
|
|
421
|
+
tsconfigOverride: {
|
|
422
|
+
compilerOptions: {
|
|
423
|
+
declarationDir: releaseFolder,
|
|
424
|
+
sourceMap: false,
|
|
425
|
+
},
|
|
426
|
+
},
|
|
427
|
+
}),
|
|
428
|
+
jsx__default["default"](),
|
|
429
|
+
env__default["default"](innetEnv, { include: input }),
|
|
430
|
+
],
|
|
431
|
+
};
|
|
432
|
+
this.withLint(options);
|
|
433
|
+
if (node) {
|
|
434
|
+
options.plugins = [
|
|
435
|
+
...options.plugins,
|
|
436
|
+
externals__default["default"](),
|
|
437
|
+
string({
|
|
438
|
+
include: '**/*.*',
|
|
439
|
+
exclude: constants.stringExcludeNode,
|
|
440
|
+
}),
|
|
441
|
+
];
|
|
442
|
+
}
|
|
443
|
+
else {
|
|
444
|
+
options.plugins = [
|
|
445
|
+
...options.plugins,
|
|
446
|
+
string({
|
|
447
|
+
include: '**/*.*',
|
|
448
|
+
exclude: constants.stringExcludeDom,
|
|
449
|
+
}),
|
|
450
|
+
polyfill__default["default"](),
|
|
451
|
+
image__default["default"](),
|
|
452
|
+
styles__default["default"]({
|
|
453
|
+
mode: 'inject',
|
|
454
|
+
url: true,
|
|
455
|
+
plugins: [autoprefixer__default["default"]()],
|
|
456
|
+
modules: cssModules,
|
|
457
|
+
minimize: true,
|
|
458
|
+
}),
|
|
459
|
+
];
|
|
460
|
+
}
|
|
461
|
+
const bundle = yield rollup__default["default"].rollup(options);
|
|
462
|
+
yield bundle.write(options.output);
|
|
463
|
+
yield bundle.close();
|
|
464
|
+
});
|
|
466
465
|
yield logger__default["default"].start('Build cjs bundle', () => tslib.__awaiter(this, void 0, void 0, function* () {
|
|
467
466
|
yield build('cjs');
|
|
468
467
|
}));
|
|
@@ -480,7 +479,7 @@ class InnetJS {
|
|
|
480
479
|
const { bin } = pkg;
|
|
481
480
|
for (const name in bin) {
|
|
482
481
|
const value = bin[name];
|
|
483
|
-
const input = glob__default["default"].sync(`src/${value}.{${
|
|
482
|
+
const input = glob__default["default"].sync(`src/${value}.{${indexExt}}`);
|
|
484
483
|
const file = path__default["default"].join(this.releaseFolder, value);
|
|
485
484
|
const options = {
|
|
486
485
|
input,
|
|
@@ -502,9 +501,10 @@ class InnetJS {
|
|
|
502
501
|
}),
|
|
503
502
|
externals__default["default"](),
|
|
504
503
|
jsx__default["default"](),
|
|
505
|
-
|
|
504
|
+
env__default["default"](innetEnv, { include: input }),
|
|
506
505
|
],
|
|
507
506
|
};
|
|
507
|
+
this.withLint(options);
|
|
508
508
|
const bundle = yield rollup__default["default"].rollup(options);
|
|
509
509
|
yield bundle.write(options.output);
|
|
510
510
|
yield bundle.close();
|
|
@@ -534,6 +534,16 @@ class InnetJS {
|
|
|
534
534
|
}
|
|
535
535
|
});
|
|
536
536
|
}
|
|
537
|
+
withLint(options) {
|
|
538
|
+
if (this._lintUsage === undefined) {
|
|
539
|
+
this._lintUsage = fs__default["default"].existsSync(path__default["default"].join(this.projectFolder, '.eslintrc'));
|
|
540
|
+
}
|
|
541
|
+
if (this._lintUsage) {
|
|
542
|
+
options.plugins.push(eslint__default["default"]({
|
|
543
|
+
include: constants.lintInclude,
|
|
544
|
+
}));
|
|
545
|
+
}
|
|
546
|
+
}
|
|
537
547
|
increaseVersion(release) {
|
|
538
548
|
return tslib.__awaiter(this, void 0, void 0, function* () {
|
|
539
549
|
const pkg = yield this.getPackage();
|
package/index.mjs
CHANGED
|
@@ -22,17 +22,17 @@ import path from 'node:path';
|
|
|
22
22
|
import prompt from 'prompts';
|
|
23
23
|
import rollup from 'rollup';
|
|
24
24
|
import filesize from 'rollup-plugin-filesize';
|
|
25
|
-
import injectEnv from 'rollup-plugin-inject-process-env';
|
|
26
25
|
import jsx from 'rollup-plugin-innet-jsx';
|
|
27
26
|
import externals from 'rollup-plugin-node-externals';
|
|
28
27
|
import polyfill from 'rollup-plugin-polyfill-node';
|
|
29
28
|
import { preserveShebangs } from 'rollup-plugin-preserve-shebangs';
|
|
29
|
+
import env from 'rollup-plugin-process-env';
|
|
30
30
|
import styles from 'rollup-plugin-styles';
|
|
31
31
|
import { terser } from 'rollup-plugin-terser';
|
|
32
32
|
import typescript from 'rollup-plugin-typescript2';
|
|
33
33
|
import tmp from 'tmp';
|
|
34
34
|
import { promisify } from 'node:util';
|
|
35
|
-
import {
|
|
35
|
+
import { stringExcludeNode, stringExcludeDom, lintInclude } from './constants.mjs';
|
|
36
36
|
import { Extract } from './extract.mjs';
|
|
37
37
|
import { reporter, convertIndexFile, getFile } from './helpers.mjs';
|
|
38
38
|
import { updateDotenv } from './updateDotenv.mjs';
|
|
@@ -149,11 +149,9 @@ class InnetJS {
|
|
|
149
149
|
json(),
|
|
150
150
|
typescript(),
|
|
151
151
|
jsx(),
|
|
152
|
-
eslint({
|
|
153
|
-
include: lintInclude,
|
|
154
|
-
}),
|
|
155
152
|
],
|
|
156
153
|
};
|
|
154
|
+
this.withLint(inputOptions);
|
|
157
155
|
const outputOptions = {
|
|
158
156
|
dir: this.buildFolder,
|
|
159
157
|
sourcemap: this.sourcemap,
|
|
@@ -179,7 +177,7 @@ class InnetJS {
|
|
|
179
177
|
}), string({
|
|
180
178
|
include: '**/*.*',
|
|
181
179
|
exclude: stringExcludeDom,
|
|
182
|
-
}),
|
|
180
|
+
}), env(innetEnv, { include: input }));
|
|
183
181
|
outputOptions.format = 'es';
|
|
184
182
|
outputOptions.plugins = [
|
|
185
183
|
terser(),
|
|
@@ -241,11 +239,9 @@ class InnetJS {
|
|
|
241
239
|
},
|
|
242
240
|
}),
|
|
243
241
|
jsx(),
|
|
244
|
-
eslint({
|
|
245
|
-
include: lintInclude,
|
|
246
|
-
}),
|
|
247
242
|
],
|
|
248
243
|
};
|
|
244
|
+
this.withLint(options);
|
|
249
245
|
if (node) {
|
|
250
246
|
// @ts-expect-error
|
|
251
247
|
options.output.format = 'cjs';
|
|
@@ -279,7 +275,7 @@ class InnetJS {
|
|
|
279
275
|
}), string({
|
|
280
276
|
include: '**/*.*',
|
|
281
277
|
exclude: stringExcludeDom,
|
|
282
|
-
}), this.createClient(key, cert, pkg, index), 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 } } : {}))),
|
|
278
|
+
}), this.createClient(key, cert, pkg, index), 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 } } : {}))), env(innetEnv, { include: input }));
|
|
283
279
|
}
|
|
284
280
|
const watcher = rollup.watch(options);
|
|
285
281
|
watcher.on('event', (e) => __awaiter(this, void 0, void 0, function* () {
|
|
@@ -363,72 +359,75 @@ class InnetJS {
|
|
|
363
359
|
const { releaseFolder, cssModules } = this;
|
|
364
360
|
yield logger.start('Remove previous release', () => fs.remove(releaseFolder));
|
|
365
361
|
const pkg = yield this.getPackage();
|
|
366
|
-
|
|
362
|
+
const build = (format) => __awaiter(this, void 0, void 0, function* () {
|
|
367
363
|
var _a, _b;
|
|
368
|
-
|
|
369
|
-
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
|
|
373
|
-
|
|
374
|
-
|
|
375
|
-
|
|
376
|
-
|
|
377
|
-
|
|
378
|
-
|
|
379
|
-
|
|
380
|
-
|
|
381
|
-
|
|
382
|
-
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
|
|
395
|
-
|
|
396
|
-
|
|
397
|
-
|
|
398
|
-
|
|
399
|
-
|
|
400
|
-
|
|
401
|
-
|
|
402
|
-
|
|
403
|
-
|
|
404
|
-
|
|
405
|
-
|
|
406
|
-
|
|
407
|
-
|
|
408
|
-
|
|
409
|
-
|
|
410
|
-
|
|
411
|
-
|
|
412
|
-
|
|
413
|
-
|
|
414
|
-
|
|
415
|
-
|
|
416
|
-
|
|
417
|
-
|
|
418
|
-
|
|
419
|
-
|
|
420
|
-
|
|
421
|
-
|
|
422
|
-
|
|
423
|
-
|
|
424
|
-
|
|
425
|
-
|
|
426
|
-
|
|
427
|
-
|
|
428
|
-
|
|
429
|
-
|
|
430
|
-
}
|
|
431
|
-
|
|
364
|
+
const ext = format === 'es'
|
|
365
|
+
? ((_a = (pkg.module || pkg.esnext || pkg['jsnext:main'])) === null || _a === void 0 ? void 0 : _a.replace('index', '')) || '.mjs'
|
|
366
|
+
: ((_b = pkg.main) === null || _b === void 0 ? void 0 : _b.replace('index', '')) || '.js';
|
|
367
|
+
const input = glob.sync(`src/${index}.{${indexExt}}`);
|
|
368
|
+
if (!input.length) {
|
|
369
|
+
throw Error('index file is not detected');
|
|
370
|
+
}
|
|
371
|
+
const options = {
|
|
372
|
+
input,
|
|
373
|
+
external: [...Object.keys(pkg.dependencies), 'tslib'],
|
|
374
|
+
preserveEntrySignatures: 'strict',
|
|
375
|
+
output: {
|
|
376
|
+
dir: releaseFolder,
|
|
377
|
+
entryFileNames: `[name]${ext}`,
|
|
378
|
+
format,
|
|
379
|
+
preserveModules: true,
|
|
380
|
+
exports: 'auto',
|
|
381
|
+
},
|
|
382
|
+
plugins: [
|
|
383
|
+
json(),
|
|
384
|
+
typescript({
|
|
385
|
+
clean: true,
|
|
386
|
+
useTsconfigDeclarationDir: true,
|
|
387
|
+
tsconfigOverride: {
|
|
388
|
+
compilerOptions: {
|
|
389
|
+
declarationDir: releaseFolder,
|
|
390
|
+
sourceMap: false,
|
|
391
|
+
},
|
|
392
|
+
},
|
|
393
|
+
}),
|
|
394
|
+
jsx(),
|
|
395
|
+
env(innetEnv, { include: input }),
|
|
396
|
+
],
|
|
397
|
+
};
|
|
398
|
+
this.withLint(options);
|
|
399
|
+
if (node) {
|
|
400
|
+
options.plugins = [
|
|
401
|
+
...options.plugins,
|
|
402
|
+
externals(),
|
|
403
|
+
string({
|
|
404
|
+
include: '**/*.*',
|
|
405
|
+
exclude: stringExcludeNode,
|
|
406
|
+
}),
|
|
407
|
+
];
|
|
408
|
+
}
|
|
409
|
+
else {
|
|
410
|
+
options.plugins = [
|
|
411
|
+
...options.plugins,
|
|
412
|
+
string({
|
|
413
|
+
include: '**/*.*',
|
|
414
|
+
exclude: stringExcludeDom,
|
|
415
|
+
}),
|
|
416
|
+
polyfill(),
|
|
417
|
+
image(),
|
|
418
|
+
styles({
|
|
419
|
+
mode: 'inject',
|
|
420
|
+
url: true,
|
|
421
|
+
plugins: [autoprefixer()],
|
|
422
|
+
modules: cssModules,
|
|
423
|
+
minimize: true,
|
|
424
|
+
}),
|
|
425
|
+
];
|
|
426
|
+
}
|
|
427
|
+
const bundle = yield rollup.rollup(options);
|
|
428
|
+
yield bundle.write(options.output);
|
|
429
|
+
yield bundle.close();
|
|
430
|
+
});
|
|
432
431
|
yield logger.start('Build cjs bundle', () => __awaiter(this, void 0, void 0, function* () {
|
|
433
432
|
yield build('cjs');
|
|
434
433
|
}));
|
|
@@ -446,7 +445,7 @@ class InnetJS {
|
|
|
446
445
|
const { bin } = pkg;
|
|
447
446
|
for (const name in bin) {
|
|
448
447
|
const value = bin[name];
|
|
449
|
-
const input = glob.sync(`src/${value}.{${
|
|
448
|
+
const input = glob.sync(`src/${value}.{${indexExt}}`);
|
|
450
449
|
const file = path.join(this.releaseFolder, value);
|
|
451
450
|
const options = {
|
|
452
451
|
input,
|
|
@@ -468,9 +467,10 @@ class InnetJS {
|
|
|
468
467
|
}),
|
|
469
468
|
externals(),
|
|
470
469
|
jsx(),
|
|
471
|
-
|
|
470
|
+
env(innetEnv, { include: input }),
|
|
472
471
|
],
|
|
473
472
|
};
|
|
473
|
+
this.withLint(options);
|
|
474
474
|
const bundle = yield rollup.rollup(options);
|
|
475
475
|
yield bundle.write(options.output);
|
|
476
476
|
yield bundle.close();
|
|
@@ -500,6 +500,16 @@ class InnetJS {
|
|
|
500
500
|
}
|
|
501
501
|
});
|
|
502
502
|
}
|
|
503
|
+
withLint(options) {
|
|
504
|
+
if (this._lintUsage === undefined) {
|
|
505
|
+
this._lintUsage = fs.existsSync(path.join(this.projectFolder, '.eslintrc'));
|
|
506
|
+
}
|
|
507
|
+
if (this._lintUsage) {
|
|
508
|
+
options.plugins.push(eslint({
|
|
509
|
+
include: lintInclude,
|
|
510
|
+
}));
|
|
511
|
+
}
|
|
512
|
+
}
|
|
503
513
|
increaseVersion(release) {
|
|
504
514
|
return __awaiter(this, void 0, void 0, function* () {
|
|
505
515
|
const pkg = yield this.getPackage();
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "innetjs",
|
|
3
|
-
"version": "2.2.
|
|
3
|
+
"version": "2.2.10",
|
|
4
4
|
"description": "CLI for innet boilerplate",
|
|
5
5
|
"homepage": "https://github.com/d8corp/innetjs",
|
|
6
6
|
"author": "Mikhail Lysikov <d8corp@mail.ru>",
|
|
@@ -72,7 +72,7 @@
|
|
|
72
72
|
"prompts": "^2.4.2",
|
|
73
73
|
"rollup": "^2.79.1",
|
|
74
74
|
"rollup-plugin-filesize": "^9.1.2",
|
|
75
|
-
"rollup-plugin-
|
|
75
|
+
"rollup-plugin-process-env": "^1.0.0",
|
|
76
76
|
"rollup-plugin-innet-jsx": "^1.3.2",
|
|
77
77
|
"rollup-plugin-livereload": "^2.0.5",
|
|
78
78
|
"rollup-plugin-node-externals": "^5.0.2",
|
package/updateDotenv.js
CHANGED
|
@@ -2,8 +2,6 @@
|
|
|
2
2
|
|
|
3
3
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
4
|
|
|
5
|
-
require('./_virtual/_rollup-plugin-inject-process-env.js');
|
|
6
|
-
|
|
7
5
|
function updateDotenv() {
|
|
8
6
|
const { INNETJS_INNETJS_PACKAGE_VERSION } = process.env;
|
|
9
7
|
delete process.env.INNETJS_INNETJS_PACKAGE_VERSION;
|