innetjs 2.2.4 → 2.2.6

package/_virtual/_rollup-plugin-inject-process-env.js

@@ -1,7 +1,7 @@
 'use strict';
 
 (function() {
-    const env = {"INNETJS_INNETJS_PACKAGE_VERSION":"2.2.3"};
+    const env = {"INNETJS_INNETJS_PACKAGE_VERSION":"2.2.6"};
     try {
         if (process) {
             process.env = Object.assign({}, process.env);

package/_virtual/_rollup-plugin-inject-process-env.mjs

@@ -1,5 +1,5 @@
 (function() {
-    const env = {"INNETJS_INNETJS_PACKAGE_VERSION":"2.2.3"};
+    const env = {"INNETJS_INNETJS_PACKAGE_VERSION":"2.2.6"};
     try {
         if (process) {
             process.env = Object.assign({}, process.env);

package/bin/innet

@@ -68,7 +68,7 @@ var typescript__default = /*#__PURE__*/_interopDefaultLegacy(typescript);
 var tmp__default = /*#__PURE__*/_interopDefaultLegacy(tmp);
 
 (function() {
-    const env = {"INNETJS_INNETJS_PACKAGE_VERSION":"2.2.3"};
+    const env = {"INNETJS_INNETJS_PACKAGE_VERSION":"2.2.6"};
     try {
         if (process) {
             process.env = Object.assign({}, process.env);
@@ -184,14 +184,22 @@ const reporter = (options, outputOptions, info) => {
     return '';
 };
 
+function updateDotenv() {
+    const { INNETJS_INNETJS_PACKAGE_VERSION } = process.env;
+    delete process.env.INNETJS_INNETJS_PACKAGE_VERSION;
+    require('dotenv-expand').expand(require('dotenv').config());
+    if (!('INNETJS_INNETJS_PACKAGE_VERSION' in process.env)) {
+        process.env.INNETJS_INNETJS_PACKAGE_VERSION = INNETJS_INNETJS_PACKAGE_VERSION;
+    }
+}
+
 const livereload = require('rollup-plugin-livereload');
 const { string } = require('rollup-plugin-string');
 const { exec, spawn } = require('child_process');
 const readline = require('readline');
 const execAsync = node_util.promisify(exec);
 const copyFiles = node_util.promisify(fs__default["default"].copy);
-const dotenvConfigOutput$1 = require('dotenv').config();
-require('dotenv-expand').expand(dotenvConfigOutput$1);
+updateDotenv();
 const REG_CLEAR_TEXT = /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g;
 function normalizeEnv(value) {
     if (value) {
@@ -758,8 +766,7 @@ class InnetJS {
     }
 }
 
-const dotenvConfigOutput = require('dotenv').config();
-require('dotenv-expand').expand(dotenvConfigOutput);
+updateDotenv();
 const innetJS = new InnetJS();
 const errorOption = new commander.Option('-e, --error', 'Show error details');
 const releaseOption = new commander.Option('-r, --release <release>', 'Select release type')

package/index.js

@@ -39,6 +39,7 @@ var node_util = require('node:util');
 var constants = require('./constants.js');
 var extract = require('./extract.js');
 var helpers = require('./helpers.js');
+var updateDotenv = require('./updateDotenv.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -76,8 +77,7 @@ const { exec, spawn } = require('child_process');
 const readline = require('readline');
 const execAsync = node_util.promisify(exec);
 const copyFiles = node_util.promisify(fs__default["default"].copy);
-const dotenvConfigOutput = require('dotenv').config();
-require('dotenv-expand').expand(dotenvConfigOutput);
+updateDotenv.updateDotenv();
 const REG_CLEAR_TEXT = /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g;
 function normalizeEnv(value) {
     if (value) {

package/index.mjs

@@ -35,6 +35,7 @@ import { promisify } from 'node:util';
 import { lintInclude, stringExcludeNode, stringExcludeDom } from './constants.mjs';
 import { Extract } from './extract.mjs';
 import { reporter, convertIndexFile, getFile } from './helpers.mjs';
+import { updateDotenv } from './updateDotenv.mjs';
 
 const livereload = require('rollup-plugin-livereload');
 const { string } = require('rollup-plugin-string');
@@ -42,8 +43,7 @@ const { exec, spawn } = require('child_process');
 const readline = require('readline');
 const execAsync = promisify(exec);
 const copyFiles = promisify(fs.copy);
-const dotenvConfigOutput = require('dotenv').config();
-require('dotenv-expand').expand(dotenvConfigOutput);
+updateDotenv();
 const REG_CLEAR_TEXT = /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g;
 function normalizeEnv(value) {
     if (value) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "innetjs",
-  "version": "2.2.4",
+  "version": "2.2.6",
   "description": "CLI for innet boilerplate",
   "homepage": "https://github.com/d8corp/innetjs",
   "author": "Mikhail Lysikov <d8corp@mail.ru>",
@@ -21,9 +21,10 @@
     "start": "npm run build && cd release && npm link",
     "stop": "npm unlink innetjs -g",
     "restart": "npm run stop && npm start",
-    "patch": "innetjs release -n -p -r patch",
-    "minor": "innetjs release -n -p -r minor",
-    "major": "innetjs release -n -p -r major"
+    "release": "innetjs release -n -p",
+    "patch": "innetjs patch",
+    "minor": "innetjs minor",
+    "major": "innetjs major"
   },
   "repository": {
     "type": "git",

package/updateDotenv.d.ts

@@ -0,0 +1 @@
+export declare function updateDotenv(): void;

package/updateDotenv.js

@@ -0,0 +1,16 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+require('./_virtual/_rollup-plugin-inject-process-env.js');
+
+function updateDotenv() {
+    const { INNETJS_INNETJS_PACKAGE_VERSION } = process.env;
+    delete process.env.INNETJS_INNETJS_PACKAGE_VERSION;
+    require('dotenv-expand').expand(require('dotenv').config());
+    if (!('INNETJS_INNETJS_PACKAGE_VERSION' in process.env)) {
+        process.env.INNETJS_INNETJS_PACKAGE_VERSION = INNETJS_INNETJS_PACKAGE_VERSION;
+    }
+}
+
+exports.updateDotenv = updateDotenv;

package/updateDotenv.mjs

@@ -0,0 +1,12 @@
+import './_virtual/_rollup-plugin-inject-process-env.mjs';
+
+function updateDotenv() {
+    const { INNETJS_INNETJS_PACKAGE_VERSION } = process.env;
+    delete process.env.INNETJS_INNETJS_PACKAGE_VERSION;
+    require('dotenv-expand').expand(require('dotenv').config());
+    if (!('INNETJS_INNETJS_PACKAGE_VERSION' in process.env)) {
+        process.env.INNETJS_INNETJS_PACKAGE_VERSION = INNETJS_INNETJS_PACKAGE_VERSION;
+    }
+}
+
+export { updateDotenv };