innetjs 2.2.3 → 2.2.5
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 +79 -31
- package/index.d.ts +2 -2
- package/index.js +31 -26
- package/index.mjs +31 -26
- package/package.json +5 -4
- package/updateDotenv.d.ts +1 -0
- package/updateDotenv.js +16 -0
- package/updateDotenv.mjs +12 -0
package/bin/innet
CHANGED
|
@@ -68,7 +68,7 @@ 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.3"};
|
|
72
72
|
try {
|
|
73
73
|
if (process) {
|
|
74
74
|
process.env = Object.assign({}, process.env);
|
|
@@ -184,14 +184,22 @@ const reporter = (options, outputOptions, info) => {
|
|
|
184
184
|
return '';
|
|
185
185
|
};
|
|
186
186
|
|
|
187
|
+
function updateDotenv() {
|
|
188
|
+
const { INNETJS_INNETJS_PACKAGE_VERSION } = process.env;
|
|
189
|
+
delete process.env.INNETJS_INNETJS_PACKAGE_VERSION;
|
|
190
|
+
require('dotenv-expand').expand(require('dotenv').config());
|
|
191
|
+
if (!('INNETJS_INNETJS_PACKAGE_VERSION' in process.env)) {
|
|
192
|
+
process.env.INNETJS_INNETJS_PACKAGE_VERSION = INNETJS_INNETJS_PACKAGE_VERSION;
|
|
193
|
+
}
|
|
194
|
+
}
|
|
195
|
+
|
|
187
196
|
const livereload = require('rollup-plugin-livereload');
|
|
188
197
|
const { string } = require('rollup-plugin-string');
|
|
189
198
|
const { exec, spawn } = require('child_process');
|
|
190
199
|
const readline = require('readline');
|
|
191
200
|
const execAsync = node_util.promisify(exec);
|
|
192
201
|
const copyFiles = node_util.promisify(fs__default["default"].copy);
|
|
193
|
-
|
|
194
|
-
require('dotenv-expand').expand(dotenvConfigOutput$1);
|
|
202
|
+
updateDotenv();
|
|
195
203
|
const REG_CLEAR_TEXT = /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g;
|
|
196
204
|
function normalizeEnv(value) {
|
|
197
205
|
if (value) {
|
|
@@ -506,34 +514,11 @@ class InnetJS {
|
|
|
506
514
|
}));
|
|
507
515
|
});
|
|
508
516
|
}
|
|
509
|
-
release({ node = false, index = 'index',
|
|
517
|
+
release({ node = false, index = 'index', pub } = {}) {
|
|
510
518
|
return tslib.__awaiter(this, void 0, void 0, function* () {
|
|
511
519
|
const { releaseFolder, cssModules } = this;
|
|
512
520
|
yield logger__default["default"].start('Remove previous release', () => fs__default["default"].remove(releaseFolder));
|
|
513
521
|
const pkg = yield this.getPackage();
|
|
514
|
-
yield logger__default["default"].start('Prepare package.json', () => tslib.__awaiter(this, void 0, void 0, function* () {
|
|
515
|
-
const version = pkg.version.split('.');
|
|
516
|
-
switch (release) {
|
|
517
|
-
case 'patch': {
|
|
518
|
-
version[2]++;
|
|
519
|
-
break;
|
|
520
|
-
}
|
|
521
|
-
case 'minor': {
|
|
522
|
-
version[1]++;
|
|
523
|
-
version[2] = 0;
|
|
524
|
-
break;
|
|
525
|
-
}
|
|
526
|
-
case 'major': {
|
|
527
|
-
version[1] = 0;
|
|
528
|
-
version[2] = 0;
|
|
529
|
-
version[0]++;
|
|
530
|
-
break;
|
|
531
|
-
}
|
|
532
|
-
default: return;
|
|
533
|
-
}
|
|
534
|
-
pkg.version = version.join('.');
|
|
535
|
-
yield fs__default["default"].writeFile(path__default["default"].resolve(this.projectFolder, 'package.json'), JSON.stringify(pkg, undefined, 2), 'UTF-8');
|
|
536
|
-
}));
|
|
537
522
|
function build(format) {
|
|
538
523
|
var _a, _b;
|
|
539
524
|
return tslib.__awaiter(this, void 0, void 0, function* () {
|
|
@@ -673,6 +658,34 @@ class InnetJS {
|
|
|
673
658
|
}
|
|
674
659
|
});
|
|
675
660
|
}
|
|
661
|
+
increaseVersion(release) {
|
|
662
|
+
return tslib.__awaiter(this, void 0, void 0, function* () {
|
|
663
|
+
const pkg = yield this.getPackage();
|
|
664
|
+
yield logger__default["default"].start('Prepare package.json', () => tslib.__awaiter(this, void 0, void 0, function* () {
|
|
665
|
+
const version = pkg.version.split('.');
|
|
666
|
+
switch (release) {
|
|
667
|
+
case 'patch': {
|
|
668
|
+
version[2]++;
|
|
669
|
+
break;
|
|
670
|
+
}
|
|
671
|
+
case 'minor': {
|
|
672
|
+
version[1]++;
|
|
673
|
+
version[2] = 0;
|
|
674
|
+
break;
|
|
675
|
+
}
|
|
676
|
+
case 'major': {
|
|
677
|
+
version[1] = 0;
|
|
678
|
+
version[2] = 0;
|
|
679
|
+
version[0]++;
|
|
680
|
+
break;
|
|
681
|
+
}
|
|
682
|
+
default: return;
|
|
683
|
+
}
|
|
684
|
+
pkg.version = version.join('.');
|
|
685
|
+
yield fs__default["default"].writeFile(path__default["default"].resolve(this.projectFolder, 'package.json'), JSON.stringify(pkg, undefined, 2), 'UTF-8');
|
|
686
|
+
}));
|
|
687
|
+
});
|
|
688
|
+
}
|
|
676
689
|
getPackage() {
|
|
677
690
|
return tslib.__awaiter(this, void 0, void 0, function* () {
|
|
678
691
|
if (this.package) {
|
|
@@ -753,8 +766,7 @@ class InnetJS {
|
|
|
753
766
|
}
|
|
754
767
|
}
|
|
755
768
|
|
|
756
|
-
|
|
757
|
-
require('dotenv-expand').expand(dotenvConfigOutput);
|
|
769
|
+
updateDotenv();
|
|
758
770
|
const innetJS = new InnetJS();
|
|
759
771
|
const errorOption = new commander.Option('-e, --error', 'Show error details');
|
|
760
772
|
const releaseOption = new commander.Option('-r, --release <release>', 'Select release type')
|
|
@@ -822,8 +834,44 @@ commander.program
|
|
|
822
834
|
.option('-p, --public', 'Public the package')
|
|
823
835
|
.addOption(releaseOption)
|
|
824
836
|
.addOption(errorOption)
|
|
825
|
-
.action(({ error, node, index,
|
|
826
|
-
innetJS.release({ node, index,
|
|
837
|
+
.action(({ error, node, index, public: pub }) => {
|
|
838
|
+
innetJS.release({ node, index, pub }).catch(e => {
|
|
839
|
+
if (error) {
|
|
840
|
+
console.error(e);
|
|
841
|
+
process.exit(1);
|
|
842
|
+
}
|
|
843
|
+
});
|
|
844
|
+
});
|
|
845
|
+
commander.program
|
|
846
|
+
.command('patch')
|
|
847
|
+
.description('Increase patch version of package')
|
|
848
|
+
.addOption(errorOption)
|
|
849
|
+
.action(({ error }) => {
|
|
850
|
+
innetJS.increaseVersion('patch').catch(e => {
|
|
851
|
+
if (error) {
|
|
852
|
+
console.error(e);
|
|
853
|
+
process.exit(1);
|
|
854
|
+
}
|
|
855
|
+
});
|
|
856
|
+
});
|
|
857
|
+
commander.program
|
|
858
|
+
.command('minor')
|
|
859
|
+
.description('Increase minor version of package')
|
|
860
|
+
.addOption(errorOption)
|
|
861
|
+
.action(({ error }) => {
|
|
862
|
+
innetJS.increaseVersion('minor').catch(e => {
|
|
863
|
+
if (error) {
|
|
864
|
+
console.error(e);
|
|
865
|
+
process.exit(1);
|
|
866
|
+
}
|
|
867
|
+
});
|
|
868
|
+
});
|
|
869
|
+
commander.program
|
|
870
|
+
.command('major')
|
|
871
|
+
.description('Increase major version of package')
|
|
872
|
+
.addOption(errorOption)
|
|
873
|
+
.action(({ error }) => {
|
|
874
|
+
innetJS.increaseVersion('major').catch(e => {
|
|
827
875
|
if (error) {
|
|
828
876
|
console.error(e);
|
|
829
877
|
process.exit(1);
|
package/index.d.ts
CHANGED
|
@@ -2,7 +2,6 @@ import rollup from 'rollup';
|
|
|
2
2
|
export interface ReleaseOptions {
|
|
3
3
|
node?: boolean;
|
|
4
4
|
index?: string;
|
|
5
|
-
release?: string;
|
|
6
5
|
pub?: boolean;
|
|
7
6
|
}
|
|
8
7
|
export declare const scriptExtensions: string[];
|
|
@@ -60,7 +59,8 @@ export declare class InnetJS {
|
|
|
60
59
|
index?: string;
|
|
61
60
|
}): Promise<void>;
|
|
62
61
|
run(file: any): Promise<void>;
|
|
63
|
-
release({ node, index,
|
|
62
|
+
release({ node, index, pub }?: ReleaseOptions): Promise<void>;
|
|
63
|
+
increaseVersion(release: string): Promise<void>;
|
|
64
64
|
getPackage(): Promise<Record<string, any>>;
|
|
65
65
|
createClient(key: any, cert: any, pkg: any): rollup.Plugin;
|
|
66
66
|
createServer(): rollup.Plugin;
|
package/index.js
CHANGED
|
@@ -39,6 +39,7 @@ var node_util = require('node:util');
|
|
|
39
39
|
var constants = require('./constants.js');
|
|
40
40
|
var extract = require('./extract.js');
|
|
41
41
|
var helpers = require('./helpers.js');
|
|
42
|
+
var updateDotenv = require('./updateDotenv.js');
|
|
42
43
|
|
|
43
44
|
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
|
|
44
45
|
|
|
@@ -76,8 +77,7 @@ const { exec, spawn } = require('child_process');
|
|
|
76
77
|
const readline = require('readline');
|
|
77
78
|
const execAsync = node_util.promisify(exec);
|
|
78
79
|
const copyFiles = node_util.promisify(fs__default["default"].copy);
|
|
79
|
-
|
|
80
|
-
require('dotenv-expand').expand(dotenvConfigOutput);
|
|
80
|
+
updateDotenv.updateDotenv();
|
|
81
81
|
const REG_CLEAR_TEXT = /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g;
|
|
82
82
|
function normalizeEnv(value) {
|
|
83
83
|
if (value) {
|
|
@@ -392,34 +392,11 @@ class InnetJS {
|
|
|
392
392
|
}));
|
|
393
393
|
});
|
|
394
394
|
}
|
|
395
|
-
release({ node = false, index = 'index',
|
|
395
|
+
release({ node = false, index = 'index', pub } = {}) {
|
|
396
396
|
return tslib.__awaiter(this, void 0, void 0, function* () {
|
|
397
397
|
const { releaseFolder, cssModules } = this;
|
|
398
398
|
yield logger__default["default"].start('Remove previous release', () => fs__default["default"].remove(releaseFolder));
|
|
399
399
|
const pkg = yield this.getPackage();
|
|
400
|
-
yield logger__default["default"].start('Prepare package.json', () => tslib.__awaiter(this, void 0, void 0, function* () {
|
|
401
|
-
const version = pkg.version.split('.');
|
|
402
|
-
switch (release) {
|
|
403
|
-
case 'patch': {
|
|
404
|
-
version[2]++;
|
|
405
|
-
break;
|
|
406
|
-
}
|
|
407
|
-
case 'minor': {
|
|
408
|
-
version[1]++;
|
|
409
|
-
version[2] = 0;
|
|
410
|
-
break;
|
|
411
|
-
}
|
|
412
|
-
case 'major': {
|
|
413
|
-
version[1] = 0;
|
|
414
|
-
version[2] = 0;
|
|
415
|
-
version[0]++;
|
|
416
|
-
break;
|
|
417
|
-
}
|
|
418
|
-
default: return;
|
|
419
|
-
}
|
|
420
|
-
pkg.version = version.join('.');
|
|
421
|
-
yield fs__default["default"].writeFile(path__default["default"].resolve(this.projectFolder, 'package.json'), JSON.stringify(pkg, undefined, 2), 'UTF-8');
|
|
422
|
-
}));
|
|
423
400
|
function build(format) {
|
|
424
401
|
var _a, _b;
|
|
425
402
|
return tslib.__awaiter(this, void 0, void 0, function* () {
|
|
@@ -559,6 +536,34 @@ class InnetJS {
|
|
|
559
536
|
}
|
|
560
537
|
});
|
|
561
538
|
}
|
|
539
|
+
increaseVersion(release) {
|
|
540
|
+
return tslib.__awaiter(this, void 0, void 0, function* () {
|
|
541
|
+
const pkg = yield this.getPackage();
|
|
542
|
+
yield logger__default["default"].start('Prepare package.json', () => tslib.__awaiter(this, void 0, void 0, function* () {
|
|
543
|
+
const version = pkg.version.split('.');
|
|
544
|
+
switch (release) {
|
|
545
|
+
case 'patch': {
|
|
546
|
+
version[2]++;
|
|
547
|
+
break;
|
|
548
|
+
}
|
|
549
|
+
case 'minor': {
|
|
550
|
+
version[1]++;
|
|
551
|
+
version[2] = 0;
|
|
552
|
+
break;
|
|
553
|
+
}
|
|
554
|
+
case 'major': {
|
|
555
|
+
version[1] = 0;
|
|
556
|
+
version[2] = 0;
|
|
557
|
+
version[0]++;
|
|
558
|
+
break;
|
|
559
|
+
}
|
|
560
|
+
default: return;
|
|
561
|
+
}
|
|
562
|
+
pkg.version = version.join('.');
|
|
563
|
+
yield fs__default["default"].writeFile(path__default["default"].resolve(this.projectFolder, 'package.json'), JSON.stringify(pkg, undefined, 2), 'UTF-8');
|
|
564
|
+
}));
|
|
565
|
+
});
|
|
566
|
+
}
|
|
562
567
|
getPackage() {
|
|
563
568
|
return tslib.__awaiter(this, void 0, void 0, function* () {
|
|
564
569
|
if (this.package) {
|
package/index.mjs
CHANGED
|
@@ -35,6 +35,7 @@ import { promisify } from 'node:util';
|
|
|
35
35
|
import { lintInclude, stringExcludeNode, stringExcludeDom } from './constants.mjs';
|
|
36
36
|
import { Extract } from './extract.mjs';
|
|
37
37
|
import { reporter, convertIndexFile, getFile } from './helpers.mjs';
|
|
38
|
+
import { updateDotenv } from './updateDotenv.mjs';
|
|
38
39
|
|
|
39
40
|
const livereload = require('rollup-plugin-livereload');
|
|
40
41
|
const { string } = require('rollup-plugin-string');
|
|
@@ -42,8 +43,7 @@ const { exec, spawn } = require('child_process');
|
|
|
42
43
|
const readline = require('readline');
|
|
43
44
|
const execAsync = promisify(exec);
|
|
44
45
|
const copyFiles = promisify(fs.copy);
|
|
45
|
-
|
|
46
|
-
require('dotenv-expand').expand(dotenvConfigOutput);
|
|
46
|
+
updateDotenv();
|
|
47
47
|
const REG_CLEAR_TEXT = /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g;
|
|
48
48
|
function normalizeEnv(value) {
|
|
49
49
|
if (value) {
|
|
@@ -358,34 +358,11 @@ class InnetJS {
|
|
|
358
358
|
}));
|
|
359
359
|
});
|
|
360
360
|
}
|
|
361
|
-
release({ node = false, index = 'index',
|
|
361
|
+
release({ node = false, index = 'index', pub } = {}) {
|
|
362
362
|
return __awaiter(this, void 0, void 0, function* () {
|
|
363
363
|
const { releaseFolder, cssModules } = this;
|
|
364
364
|
yield logger.start('Remove previous release', () => fs.remove(releaseFolder));
|
|
365
365
|
const pkg = yield this.getPackage();
|
|
366
|
-
yield logger.start('Prepare package.json', () => __awaiter(this, void 0, void 0, function* () {
|
|
367
|
-
const version = pkg.version.split('.');
|
|
368
|
-
switch (release) {
|
|
369
|
-
case 'patch': {
|
|
370
|
-
version[2]++;
|
|
371
|
-
break;
|
|
372
|
-
}
|
|
373
|
-
case 'minor': {
|
|
374
|
-
version[1]++;
|
|
375
|
-
version[2] = 0;
|
|
376
|
-
break;
|
|
377
|
-
}
|
|
378
|
-
case 'major': {
|
|
379
|
-
version[1] = 0;
|
|
380
|
-
version[2] = 0;
|
|
381
|
-
version[0]++;
|
|
382
|
-
break;
|
|
383
|
-
}
|
|
384
|
-
default: return;
|
|
385
|
-
}
|
|
386
|
-
pkg.version = version.join('.');
|
|
387
|
-
yield fs.writeFile(path.resolve(this.projectFolder, 'package.json'), JSON.stringify(pkg, undefined, 2), 'UTF-8');
|
|
388
|
-
}));
|
|
389
366
|
function build(format) {
|
|
390
367
|
var _a, _b;
|
|
391
368
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -525,6 +502,34 @@ class InnetJS {
|
|
|
525
502
|
}
|
|
526
503
|
});
|
|
527
504
|
}
|
|
505
|
+
increaseVersion(release) {
|
|
506
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
507
|
+
const pkg = yield this.getPackage();
|
|
508
|
+
yield logger.start('Prepare package.json', () => __awaiter(this, void 0, void 0, function* () {
|
|
509
|
+
const version = pkg.version.split('.');
|
|
510
|
+
switch (release) {
|
|
511
|
+
case 'patch': {
|
|
512
|
+
version[2]++;
|
|
513
|
+
break;
|
|
514
|
+
}
|
|
515
|
+
case 'minor': {
|
|
516
|
+
version[1]++;
|
|
517
|
+
version[2] = 0;
|
|
518
|
+
break;
|
|
519
|
+
}
|
|
520
|
+
case 'major': {
|
|
521
|
+
version[1] = 0;
|
|
522
|
+
version[2] = 0;
|
|
523
|
+
version[0]++;
|
|
524
|
+
break;
|
|
525
|
+
}
|
|
526
|
+
default: return;
|
|
527
|
+
}
|
|
528
|
+
pkg.version = version.join('.');
|
|
529
|
+
yield fs.writeFile(path.resolve(this.projectFolder, 'package.json'), JSON.stringify(pkg, undefined, 2), 'UTF-8');
|
|
530
|
+
}));
|
|
531
|
+
});
|
|
532
|
+
}
|
|
528
533
|
getPackage() {
|
|
529
534
|
return __awaiter(this, void 0, void 0, function* () {
|
|
530
535
|
if (this.package) {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "innetjs",
|
|
3
|
-
"version": "2.2.
|
|
3
|
+
"version": "2.2.5",
|
|
4
4
|
"description": "CLI for innet boilerplate",
|
|
5
5
|
"homepage": "https://github.com/d8corp/innetjs",
|
|
6
6
|
"author": "Mikhail Lysikov <d8corp@mail.ru>",
|
|
@@ -21,9 +21,10 @@
|
|
|
21
21
|
"start": "npm run build && cd release && npm link",
|
|
22
22
|
"stop": "npm unlink innetjs -g",
|
|
23
23
|
"restart": "npm run stop && npm start",
|
|
24
|
-
"
|
|
25
|
-
"
|
|
26
|
-
"
|
|
24
|
+
"release": "innetjs release -n -p",
|
|
25
|
+
"patch": "innetjs patch",
|
|
26
|
+
"minor": "innetjs minor",
|
|
27
|
+
"major": "innetjs major"
|
|
27
28
|
},
|
|
28
29
|
"repository": {
|
|
29
30
|
"type": "git",
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare function updateDotenv(): void;
|
package/updateDotenv.js
ADDED
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
'use strict';
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
|
+
|
|
5
|
+
require('./_virtual/_rollup-plugin-inject-process-env.js');
|
|
6
|
+
|
|
7
|
+
function updateDotenv() {
|
|
8
|
+
const { INNETJS_INNETJS_PACKAGE_VERSION } = process.env;
|
|
9
|
+
delete process.env.INNETJS_INNETJS_PACKAGE_VERSION;
|
|
10
|
+
require('dotenv-expand').expand(require('dotenv').config());
|
|
11
|
+
if (!('INNETJS_INNETJS_PACKAGE_VERSION' in process.env)) {
|
|
12
|
+
process.env.INNETJS_INNETJS_PACKAGE_VERSION = INNETJS_INNETJS_PACKAGE_VERSION;
|
|
13
|
+
}
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
exports.updateDotenv = updateDotenv;
|
package/updateDotenv.mjs
ADDED
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import './_virtual/_rollup-plugin-inject-process-env.mjs';
|
|
2
|
+
|
|
3
|
+
function updateDotenv() {
|
|
4
|
+
const { INNETJS_INNETJS_PACKAGE_VERSION } = process.env;
|
|
5
|
+
delete process.env.INNETJS_INNETJS_PACKAGE_VERSION;
|
|
6
|
+
require('dotenv-expand').expand(require('dotenv').config());
|
|
7
|
+
if (!('INNETJS_INNETJS_PACKAGE_VERSION' in process.env)) {
|
|
8
|
+
process.env.INNETJS_INNETJS_PACKAGE_VERSION = INNETJS_INNETJS_PACKAGE_VERSION;
|
|
9
|
+
}
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
export { updateDotenv };
|