innetjs 2.0.11 → 2.1.0

package/bin/innet

@@ -196,9 +196,14 @@ const readline = require('readline');
 const execAsync = util.promisify(exec);
 const copyFiles = util.promisify(fs__default["default"].copy);
 require('dotenv').config();
+function normalizeEnv(value) {
+    if (value) {
+        return value.replace(/\${([a-zA-Z0-9]+)}/g, (placeholder, placeholderId) => { var _a; return (_a = process.env[placeholderId]) !== null && _a !== void 0 ? _a : placeholder; });
+    }
+}
 const innetEnv = Object.keys(process.env).reduce((result, key) => {
     if (key.startsWith('INNETJS_')) {
-        result[key] = process.env[key];
+        result[key] = normalizeEnv(process.env[key]);
     }
     return result;
 }, {});
@@ -387,11 +392,11 @@ class InnetJS {
                 options.output.format = 'cjs';
                 options.external = Object.keys((pkg === null || pkg === void 0 ? void 0 : pkg.dependencies) || {});
                 options.plugins.push(pluginNodeResolve.nodeResolve({
-                    moduleDirectories: [path__default["default"].resolve(this.srcFolder, 'node_modules')]
+                    moduleDirectories: [path__default["default"].resolve(this.srcFolder, 'node_modules')],
                 }), string({
                     include: '**/*.*',
                     exclude: stringExcludeNode,
-                }), this.createServer(options.external));
+                }), this.createServer());
             }
             else {
                 const key = path__default["default"].basename(this.sslKey) !== this.sslKey
@@ -602,23 +607,19 @@ class InnetJS {
             })
         };
     }
-    createServer(external) {
+    createServer() {
         let app;
         return {
             writeBundle: () => __awaiter(this, void 0, void 0, function* () {
                 app === null || app === void 0 ? void 0 : app.kill();
-                const filePath = path__default["default"].resolve(this.buildFolder, 'index.js');
-                let data = yield fs__default["default"].readFile(filePath, 'UTF-8');
-                const regExp = new RegExp(`require\\('(${external.join('|')})'\\)`, 'g');
-                data = data.replace(regExp, `require('${path__default["default"].resolve(this.projectFolder, 'node_modules', '$1')}')`);
-                yield fs__default["default"].writeFile(filePath, data);
+                const filePath = path__default["default"].resolve(this.devBuildFolder, 'index.js');
                 app = spawn('node', ['-r', 'source-map-support/register', filePath], { stdio: 'inherit' });
             })
         };
     }
 }
 
-var version = "2.0.11";
+var version = "2.1.0";
 
 require('dotenv').config();
 const innetJS = new InnetJS();

package/index.d.ts

@@ -48,7 +48,7 @@ export default class InnetJS {
     createClient(key: any, cert: any, pkg: any): {
         writeBundle: () => Promise<void>;
     };
-    createServer(external: string[]): {
+    createServer(): {
         writeBundle: () => Promise<void>;
     };
 }

package/index.es6.js

@@ -165,9 +165,14 @@ const readline = require('readline');
 const execAsync = promisify(exec);
 const copyFiles = promisify(fs.copy);
 require('dotenv').config();
+function normalizeEnv(value) {
+    if (value) {
+        return value.replace(/\${([a-zA-Z0-9]+)}/g, (placeholder, placeholderId) => { var _a; return (_a = process.env[placeholderId]) !== null && _a !== void 0 ? _a : placeholder; });
+    }
+}
 const innetEnv = Object.keys(process.env).reduce((result, key) => {
     if (key.startsWith('INNETJS_')) {
-        result[key] = process.env[key];
+        result[key] = normalizeEnv(process.env[key]);
     }
     return result;
 }, {});
@@ -356,11 +361,11 @@ class InnetJS {
                 options.output.format = 'cjs';
                 options.external = Object.keys((pkg === null || pkg === void 0 ? void 0 : pkg.dependencies) || {});
                 options.plugins.push(nodeResolve({
-                    moduleDirectories: [path$1.resolve(this.srcFolder, 'node_modules')]
+                    moduleDirectories: [path$1.resolve(this.srcFolder, 'node_modules')],
                 }), string({
                     include: '**/*.*',
                     exclude: stringExcludeNode,
-                }), this.createServer(options.external));
+                }), this.createServer());
             }
             else {
                 const key = path$1.basename(this.sslKey) !== this.sslKey
@@ -571,16 +576,12 @@ class InnetJS {
             })
         };
     }
-    createServer(external) {
+    createServer() {
         let app;
         return {
             writeBundle: () => __awaiter(this, void 0, void 0, function* () {
                 app === null || app === void 0 ? void 0 : app.kill();
-                const filePath = path$1.resolve(this.buildFolder, 'index.js');
-                let data = yield fs.readFile(filePath, 'UTF-8');
-                const regExp = new RegExp(`require\\('(${external.join('|')})'\\)`, 'g');
-                data = data.replace(regExp, `require('${path$1.resolve(this.projectFolder, 'node_modules', '$1')}')`);
-                yield fs.writeFile(filePath, data);
+                const filePath = path$1.resolve(this.devBuildFolder, 'index.js');
                 app = spawn('node', ['-r', 'source-map-support/register', filePath], { stdio: 'inherit' });
             })
         };

package/index.js

@@ -194,9 +194,14 @@ const readline = require('readline');
 const execAsync = util.promisify(exec);
 const copyFiles = util.promisify(fs__default["default"].copy);
 require('dotenv').config();
+function normalizeEnv(value) {
+    if (value) {
+        return value.replace(/\${([a-zA-Z0-9]+)}/g, (placeholder, placeholderId) => { var _a; return (_a = process.env[placeholderId]) !== null && _a !== void 0 ? _a : placeholder; });
+    }
+}
 const innetEnv = Object.keys(process.env).reduce((result, key) => {
     if (key.startsWith('INNETJS_')) {
-        result[key] = process.env[key];
+        result[key] = normalizeEnv(process.env[key]);
     }
     return result;
 }, {});
@@ -385,11 +390,11 @@ class InnetJS {
                 options.output.format = 'cjs';
                 options.external = Object.keys((pkg === null || pkg === void 0 ? void 0 : pkg.dependencies) || {});
                 options.plugins.push(pluginNodeResolve.nodeResolve({
-                    moduleDirectories: [path__default["default"].resolve(this.srcFolder, 'node_modules')]
+                    moduleDirectories: [path__default["default"].resolve(this.srcFolder, 'node_modules')],
                 }), string({
                     include: '**/*.*',
                     exclude: stringExcludeNode,
-                }), this.createServer(options.external));
+                }), this.createServer());
             }
             else {
                 const key = path__default["default"].basename(this.sslKey) !== this.sslKey
@@ -600,16 +605,12 @@ class InnetJS {
             })
         };
     }
-    createServer(external) {
+    createServer() {
         let app;
         return {
             writeBundle: () => __awaiter(this, void 0, void 0, function* () {
                 app === null || app === void 0 ? void 0 : app.kill();
-                const filePath = path__default["default"].resolve(this.buildFolder, 'index.js');
-                let data = yield fs__default["default"].readFile(filePath, 'UTF-8');
-                const regExp = new RegExp(`require\\('(${external.join('|')})'\\)`, 'g');
-                data = data.replace(regExp, `require('${path__default["default"].resolve(this.projectFolder, 'node_modules', '$1')}')`);
-                yield fs__default["default"].writeFile(filePath, data);
+                const filePath = path__default["default"].resolve(this.devBuildFolder, 'index.js');
                 app = spawn('node', ['-r', 'source-map-support/register', filePath], { stdio: 'inherit' });
             })
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "innetjs",
-  "version": "2.0.11",
+  "version": "2.1.0",
   "description": "CLI for innet boilerplate",
   "homepage": "https://github.com/d8corp/innetjs",
   "author": "Mikhail Lysikov <d8corp@mail.ru>",
@@ -32,26 +32,26 @@
   },
   "dependencies": {
     "@cantinc/logger": "^1.1.0",
-    "@rollup/plugin-commonjs": "^22.0.2",
-    "@rollup/plugin-eslint": "^8.0.2",
-    "@rollup/plugin-image": "^2.1.1",
-    "@rollup/plugin-json": "^4.1.0",
-    "@rollup/plugin-node-resolve": "^13.3.0",
-    "address": "^1.2.0",
-    "autoprefixer": "^10.4.8",
-    "axios": "^0.27.2",
+    "@rollup/plugin-commonjs": "^23.0.2",
+    "@rollup/plugin-eslint": "^9.0.1",
+    "@rollup/plugin-image": "^3.0.1",
+    "@rollup/plugin-json": "^5.0.1",
+    "@rollup/plugin-node-resolve": "^15.0.1",
+    "address": "^1.2.1",
+    "autoprefixer": "^10.4.13",
+    "axios": "^1.1.3",
     "chalk": "^4.1.2",
     "cli-select": "^1.1.2",
-    "commander": "^9.4.0",
-    "dotenv": "^16.0.1",
-    "express": "^4.18.1",
+    "commander": "^9.4.1",
+    "dotenv": "^16.0.3",
+    "express": "^4.18.2",
     "express-http-proxy": "^1.6.3",
     "fs-extra": "^10.1.0",
     "lines-and-columns": "^2.0.3",
-    "node-sass": "^7.0.1",
-    "postcss": "^8.4.16",
+    "postcss": "^8.4.18",
+    "sass": "^1.55.0",
     "prompts": "^2.4.2",
-    "rollup": "^2.77.2",
+    "rollup": "^2.79.1",
     "rollup-plugin-filesize": "^9.1.2",
     "rollup-plugin-inject-process-env": "^1.3.1",
     "rollup-plugin-innet-jsx": "^1.3.0",
@@ -59,9 +59,9 @@
     "rollup-plugin-string": "^3.0.0",
     "rollup-plugin-styles": "^4.0.0",
     "rollup-plugin-terser": "^7.0.2",
-    "rollup-plugin-typescript2": "^0.32.1",
+    "rollup-plugin-typescript2": "^0.34.1",
     "tmp": "^0.2.1",
-    "typescript": "^4.7.4",
+    "typescript": "^4.8.4",
     "unzipper": "^0.10.11"
   }
 }