npm - innetjs - Versions diffs - 2.0.6 → 2.0.9 - Mend

innetjs 2.0.6 → 2.0.9

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 (6) hide show

package/bin/innet CHANGED Viewed

@@ -26,6 +26,7 @@ var jsx = require('rollup-plugin-innet-jsx');
 var filesize = require('rollup-plugin-filesize');
 var image = require('@rollup/plugin-image');
 var eslint = require('@rollup/plugin-eslint');
+var injectEnv = require('rollup-plugin-inject-process-env');
 var linesAndColumns = require('lines-and-columns');
 var unzipper = require('unzipper');
 var commander = require('commander');
@@ -54,6 +55,7 @@ var jsx__default = /*#__PURE__*/_interopDefaultLegacy(jsx);
 var filesize__default = /*#__PURE__*/_interopDefaultLegacy(filesize);
 var image__default = /*#__PURE__*/_interopDefaultLegacy(image);
 var eslint__default = /*#__PURE__*/_interopDefaultLegacy(eslint);
+var injectEnv__default = /*#__PURE__*/_interopDefaultLegacy(injectEnv);
 /******************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -173,11 +175,11 @@ function getFile(file) {
     }
     return file;
 }
-function convertIndexFile(data, version) {
+function convertIndexFile(data, version, baseUrl) {
     return __awaiter(this, void 0, void 0, function* () {
         return data
             .toString()
-            .replace('</head>', `<script type="module" defer src="index.js${version ? `?v=${version}` : ''}"></script></head>`);
+            .replace('</head>', `<script type="module" defer src="${baseUrl}index.js${version ? `?v=${version}` : ''}"></script></head>`);
     });
 }
 const reporter = (options, outputOptions, info) => {
@@ -192,8 +194,14 @@ const readline = require('readline');
 const execAsync = util.promisify(exec);
 const copyFiles = util.promisify(fs__default["default"].copy);
 require('dotenv').config();
+const innetEnv = Object.keys(process.env).reduce((result, key) => {
+    if (key.startsWith('INNETJS_')) {
+        result[key] = process.env[key];
+    }
+    return result;
+}, {});
 class InnetJS {
-    constructor({ projectFolder = process.env.PROJECT_FOLDER || '', publicFolder = process.env.PUBLIC_FOLDER || 'public', buildFolder = process.env.BUILD_FOLDER || 'build', srcFolder = process.env.SRC_FOLDER || 'src', sourcemap = process.env.SOURCEMAP ? process.env.SOURCEMAP === 'true' : false, cssModules = process.env.CSS_MODULES ? process.env.CSS_MODULES === 'true' : true, cssInJs = process.env.CSS_IN_JS ? process.env.CSS_IN_JS === 'true' : true, sslKey = process.env.SSL_KEY || 'localhost.key', sslCrt = process.env.SSL_CRT || 'localhost.crt', proxy = process.env.PROXY || '', port = process.env.PORT ? +process.env.PORT : 3000, api = process.env.API || '/api/?*', } = {}) {
+    constructor({ projectFolder = process.env.PROJECT_FOLDER || '', baseUrl = process.env.BASE_URL || '/', publicFolder = process.env.PUBLIC_FOLDER || 'public', buildFolder = process.env.BUILD_FOLDER || 'build', srcFolder = process.env.SRC_FOLDER || 'src', sourcemap = process.env.SOURCEMAP ? process.env.SOURCEMAP === 'true' : false, cssModules = process.env.CSS_MODULES ? process.env.CSS_MODULES === 'true' : true, cssInJs = process.env.CSS_IN_JS ? process.env.CSS_IN_JS === 'true' : true, sslKey = process.env.SSL_KEY || 'localhost.key', sslCrt = process.env.SSL_CRT || 'localhost.crt', proxy = process.env.PROXY || '', port = process.env.PORT ? +process.env.PORT : 3000, api = process.env.API || '/api/?*', } = {}) {
         this.projectFolder = path__default["default"].resolve(projectFolder);
         this.publicFolder = path__default["default"].resolve(publicFolder);
         this.buildFolder = path__default["default"].resolve(buildFolder);
@@ -210,6 +218,7 @@ class InnetJS {
         this.port = port;
         this.proxy = proxy;
         this.api = api;
+        this.baseUrl = baseUrl;
     }
     // Methods
     init(appName, { template, force = false } = {}) {
@@ -294,7 +303,9 @@ class InnetJS {
                         include: lintIncludeDom,
                     }),
                     ...inputOptions.plugins,
-                    pluginNodeResolve.nodeResolve(),
+                    pluginNodeResolve.nodeResolve({
+                        browser: true,
+                    }),
                     image__default["default"](),
                     styles__default["default"]({
                         mode: this.cssInJs ? 'inject' : 'extract',
@@ -308,6 +319,7 @@ class InnetJS {
                         include: '**/*.*',
                         exclude: stringExcludeDom,
                     }),
+                    injectEnv__default["default"](innetEnv),
                 ];
                 outputOptions.format = 'es';
                 outputOptions.plugins = [
@@ -325,7 +337,7 @@ class InnetJS {
                     yield copyFiles(this.publicFolder, this.buildFolder);
                     const data = yield fs.promises.readFile(this.publicIndexFile);
                     const pkg = yield this.getPackage();
-                    yield fs.promises.writeFile(this.buildIndexFile, yield convertIndexFile(data, pkg.version));
+                    yield fs.promises.writeFile(this.buildIndexFile, yield convertIndexFile(data, pkg.version, this.baseUrl));
                 }
             }));
             if (pkg) {
@@ -354,7 +366,7 @@ class InnetJS {
                 preserveEntrySignatures: 'strict',
                 output: {
                     dir: this.devBuildFolder,
-                    sourcemap: true
+                    sourcemap: true,
                 },
                 plugins: [
                     commonjs__default["default"](),
@@ -396,7 +408,9 @@ class InnetJS {
                         include: lintIncludeDom,
                     }),
                     ...options.plugins,
-                    pluginNodeResolve.nodeResolve(),
+                    pluginNodeResolve.nodeResolve({
+                        browser: true,
+                    }),
                     image__default["default"](),
                     styles__default["default"]({
                         mode: this.cssInJs ? 'inject' : 'extract',
@@ -410,7 +424,8 @@ class InnetJS {
                         exclude: stringExcludeDom,
                     }),
                     this.createClient(key, cert, pkg),
-                    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 } } : {})))
+                    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 } } : {}))),
+                    injectEnv__default["default"](innetEnv),
                 ];
             }
             const watcher = rollup__default["default"].watch(options);
@@ -542,7 +557,7 @@ class InnetJS {
                     app = express__default["default"]();
                     const update = () => __awaiter(this, void 0, void 0, function* () {
                         const data = yield fs.promises.readFile(this.publicIndexFile);
-                        yield fs.promises.writeFile(this.devBuildIndexFile, yield convertIndexFile(data, pkg.version));
+                        yield fs.promises.writeFile(this.devBuildIndexFile, yield convertIndexFile(data, pkg.version, this.baseUrl));
                     });
                     fs__default["default"].watch(this.publicIndexFile, update);
                     yield update();
@@ -601,7 +616,7 @@ class InnetJS {
     }
 }
-var version = "2.0.6";
+var version = "2.0.9";
 require('dotenv').config();
 const innetJS = new InnetJS();

package/helpers.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 /// <reference types="node" />
 import { FileSizeRender } from 'rollup-plugin-filesize';
 export declare function getFile(file: any): any;
-export declare function convertIndexFile(data: Buffer, version: string): Promise<string>;
+export declare function convertIndexFile(data: Buffer, version: string, baseUrl: string): Promise<string>;
 export declare const reporter: FileSizeRender<string | Promise<string>>;

package/index.d.ts CHANGED Viewed

@@ -1,5 +1,6 @@
 declare type Extensions = 'js' | 'ts' | 'tsx' | 'jsx';
 export default class InnetJS {
+    baseUrl: string;
     projectFolder: string;
     publicFolder: string;
     buildFolder: string;
@@ -18,8 +19,9 @@ export default class InnetJS {
     api: string;
     private projectExtension;
     private package;
-    constructor({ projectFolder, publicFolder, buildFolder, srcFolder, sourcemap, cssModules, cssInJs, sslKey, sslCrt, proxy, port, api, }?: {
+    constructor({ projectFolder, baseUrl, publicFolder, buildFolder, srcFolder, sourcemap, cssModules, cssInJs, sslKey, sslCrt, proxy, port, api, }?: {
         projectFolder?: string;
+        baseUrl?: string;
         publicFolder?: string;
         buildFolder?: string;
         srcFolder?: string;

package/index.es6.js CHANGED Viewed

@@ -23,6 +23,7 @@ import jsx from 'rollup-plugin-innet-jsx';
 import filesize from 'rollup-plugin-filesize';
 import image from '@rollup/plugin-image';
 import eslint from '@rollup/plugin-eslint';
+import injectEnv from 'rollup-plugin-inject-process-env';
 import { LinesAndColumns } from 'lines-and-columns';
 import { Parse } from 'unzipper';
@@ -144,11 +145,11 @@ function getFile(file) {
     }
     return file;
 }
-function convertIndexFile(data, version) {
+function convertIndexFile(data, version, baseUrl) {
     return __awaiter(this, void 0, void 0, function* () {
         return data
             .toString()
-            .replace('</head>', `<script type="module" defer src="index.js${version ? `?v=${version}` : ''}"></script></head>`);
+            .replace('</head>', `<script type="module" defer src="${baseUrl}index.js${version ? `?v=${version}` : ''}"></script></head>`);
     });
 }
 const reporter = (options, outputOptions, info) => {
@@ -163,8 +164,14 @@ const readline = require('readline');
 const execAsync = promisify(exec);
 const copyFiles = promisify(fs.copy);
 require('dotenv').config();
+const innetEnv = Object.keys(process.env).reduce((result, key) => {
+    if (key.startsWith('INNETJS_')) {
+        result[key] = process.env[key];
+    }
+    return result;
+}, {});
 class InnetJS {
-    constructor({ projectFolder = process.env.PROJECT_FOLDER || '', publicFolder = process.env.PUBLIC_FOLDER || 'public', buildFolder = process.env.BUILD_FOLDER || 'build', srcFolder = process.env.SRC_FOLDER || 'src', sourcemap = process.env.SOURCEMAP ? process.env.SOURCEMAP === 'true' : false, cssModules = process.env.CSS_MODULES ? process.env.CSS_MODULES === 'true' : true, cssInJs = process.env.CSS_IN_JS ? process.env.CSS_IN_JS === 'true' : true, sslKey = process.env.SSL_KEY || 'localhost.key', sslCrt = process.env.SSL_CRT || 'localhost.crt', proxy = process.env.PROXY || '', port = process.env.PORT ? +process.env.PORT : 3000, api = process.env.API || '/api/?*', } = {}) {
+    constructor({ projectFolder = process.env.PROJECT_FOLDER || '', baseUrl = process.env.BASE_URL || '/', publicFolder = process.env.PUBLIC_FOLDER || 'public', buildFolder = process.env.BUILD_FOLDER || 'build', srcFolder = process.env.SRC_FOLDER || 'src', sourcemap = process.env.SOURCEMAP ? process.env.SOURCEMAP === 'true' : false, cssModules = process.env.CSS_MODULES ? process.env.CSS_MODULES === 'true' : true, cssInJs = process.env.CSS_IN_JS ? process.env.CSS_IN_JS === 'true' : true, sslKey = process.env.SSL_KEY || 'localhost.key', sslCrt = process.env.SSL_CRT || 'localhost.crt', proxy = process.env.PROXY || '', port = process.env.PORT ? +process.env.PORT : 3000, api = process.env.API || '/api/?*', } = {}) {
         this.projectFolder = path$1.resolve(projectFolder);
         this.publicFolder = path$1.resolve(publicFolder);
         this.buildFolder = path$1.resolve(buildFolder);
@@ -181,6 +188,7 @@ class InnetJS {
         this.port = port;
         this.proxy = proxy;
         this.api = api;
+        this.baseUrl = baseUrl;
     }
     // Methods
     init(appName, { template, force = false } = {}) {
@@ -265,7 +273,9 @@ class InnetJS {
                         include: lintIncludeDom,
                     }),
                     ...inputOptions.plugins,
-                    nodeResolve(),
+                    nodeResolve({
+                        browser: true,
+                    }),
                     image(),
                     styles({
                         mode: this.cssInJs ? 'inject' : 'extract',
@@ -279,6 +289,7 @@ class InnetJS {
                         include: '**/*.*',
                         exclude: stringExcludeDom,
                     }),
+                    injectEnv(innetEnv),
                 ];
                 outputOptions.format = 'es';
                 outputOptions.plugins = [
@@ -296,7 +307,7 @@ class InnetJS {
                     yield copyFiles(this.publicFolder, this.buildFolder);
                     const data = yield promises.readFile(this.publicIndexFile);
                     const pkg = yield this.getPackage();
-                    yield promises.writeFile(this.buildIndexFile, yield convertIndexFile(data, pkg.version));
+                    yield promises.writeFile(this.buildIndexFile, yield convertIndexFile(data, pkg.version, this.baseUrl));
                 }
             }));
             if (pkg) {
@@ -325,7 +336,7 @@ class InnetJS {
                 preserveEntrySignatures: 'strict',
                 output: {
                     dir: this.devBuildFolder,
-                    sourcemap: true
+                    sourcemap: true,
                 },
                 plugins: [
                     commonjs(),
@@ -367,7 +378,9 @@ class InnetJS {
                         include: lintIncludeDom,
                     }),
                     ...options.plugins,
-                    nodeResolve(),
+                    nodeResolve({
+                        browser: true,
+                    }),
                     image(),
                     styles({
                         mode: this.cssInJs ? 'inject' : 'extract',
@@ -381,7 +394,8 @@ class InnetJS {
                         exclude: stringExcludeDom,
                     }),
                     this.createClient(key, cert, pkg),
-                    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 } } : {})))
+                    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 } } : {}))),
+                    injectEnv(innetEnv),
                 ];
             }
             const watcher = rollup.watch(options);
@@ -513,7 +527,7 @@ class InnetJS {
                     app = express();
                     const update = () => __awaiter(this, void 0, void 0, function* () {
                         const data = yield promises.readFile(this.publicIndexFile);
-                        yield promises.writeFile(this.devBuildIndexFile, yield convertIndexFile(data, pkg.version));
+                        yield promises.writeFile(this.devBuildIndexFile, yield convertIndexFile(data, pkg.version, this.baseUrl));
                     });
                     fs.watch(this.publicIndexFile, update);
                     yield update();

package/index.js CHANGED Viewed

@@ -25,6 +25,7 @@ var jsx = require('rollup-plugin-innet-jsx');
 var filesize = require('rollup-plugin-filesize');
 var image = require('@rollup/plugin-image');
 var eslint = require('@rollup/plugin-eslint');
+var injectEnv = require('rollup-plugin-inject-process-env');
 var linesAndColumns = require('lines-and-columns');
 var unzipper = require('unzipper');
@@ -52,6 +53,7 @@ var jsx__default = /*#__PURE__*/_interopDefaultLegacy(jsx);
 var filesize__default = /*#__PURE__*/_interopDefaultLegacy(filesize);
 var image__default = /*#__PURE__*/_interopDefaultLegacy(image);
 var eslint__default = /*#__PURE__*/_interopDefaultLegacy(eslint);
+var injectEnv__default = /*#__PURE__*/_interopDefaultLegacy(injectEnv);
 /******************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -171,11 +173,11 @@ function getFile(file) {
     }
     return file;
 }
-function convertIndexFile(data, version) {
+function convertIndexFile(data, version, baseUrl) {
     return __awaiter(this, void 0, void 0, function* () {
         return data
             .toString()
-            .replace('</head>', `<script type="module" defer src="index.js${version ? `?v=${version}` : ''}"></script></head>`);
+            .replace('</head>', `<script type="module" defer src="${baseUrl}index.js${version ? `?v=${version}` : ''}"></script></head>`);
     });
 }
 const reporter = (options, outputOptions, info) => {
@@ -190,8 +192,14 @@ const readline = require('readline');
 const execAsync = util.promisify(exec);
 const copyFiles = util.promisify(fs__default["default"].copy);
 require('dotenv').config();
+const innetEnv = Object.keys(process.env).reduce((result, key) => {
+    if (key.startsWith('INNETJS_')) {
+        result[key] = process.env[key];
+    }
+    return result;
+}, {});
 class InnetJS {
-    constructor({ projectFolder = process.env.PROJECT_FOLDER || '', publicFolder = process.env.PUBLIC_FOLDER || 'public', buildFolder = process.env.BUILD_FOLDER || 'build', srcFolder = process.env.SRC_FOLDER || 'src', sourcemap = process.env.SOURCEMAP ? process.env.SOURCEMAP === 'true' : false, cssModules = process.env.CSS_MODULES ? process.env.CSS_MODULES === 'true' : true, cssInJs = process.env.CSS_IN_JS ? process.env.CSS_IN_JS === 'true' : true, sslKey = process.env.SSL_KEY || 'localhost.key', sslCrt = process.env.SSL_CRT || 'localhost.crt', proxy = process.env.PROXY || '', port = process.env.PORT ? +process.env.PORT : 3000, api = process.env.API || '/api/?*', } = {}) {
+    constructor({ projectFolder = process.env.PROJECT_FOLDER || '', baseUrl = process.env.BASE_URL || '/', publicFolder = process.env.PUBLIC_FOLDER || 'public', buildFolder = process.env.BUILD_FOLDER || 'build', srcFolder = process.env.SRC_FOLDER || 'src', sourcemap = process.env.SOURCEMAP ? process.env.SOURCEMAP === 'true' : false, cssModules = process.env.CSS_MODULES ? process.env.CSS_MODULES === 'true' : true, cssInJs = process.env.CSS_IN_JS ? process.env.CSS_IN_JS === 'true' : true, sslKey = process.env.SSL_KEY || 'localhost.key', sslCrt = process.env.SSL_CRT || 'localhost.crt', proxy = process.env.PROXY || '', port = process.env.PORT ? +process.env.PORT : 3000, api = process.env.API || '/api/?*', } = {}) {
         this.projectFolder = path__default["default"].resolve(projectFolder);
         this.publicFolder = path__default["default"].resolve(publicFolder);
         this.buildFolder = path__default["default"].resolve(buildFolder);
@@ -208,6 +216,7 @@ class InnetJS {
         this.port = port;
         this.proxy = proxy;
         this.api = api;
+        this.baseUrl = baseUrl;
     }
     // Methods
     init(appName, { template, force = false } = {}) {
@@ -292,7 +301,9 @@ class InnetJS {
                         include: lintIncludeDom,
                     }),
                     ...inputOptions.plugins,
-                    pluginNodeResolve.nodeResolve(),
+                    pluginNodeResolve.nodeResolve({
+                        browser: true,
+                    }),
                     image__default["default"](),
                     styles__default["default"]({
                         mode: this.cssInJs ? 'inject' : 'extract',
@@ -306,6 +317,7 @@ class InnetJS {
                         include: '**/*.*',
                         exclude: stringExcludeDom,
                     }),
+                    injectEnv__default["default"](innetEnv),
                 ];
                 outputOptions.format = 'es';
                 outputOptions.plugins = [
@@ -323,7 +335,7 @@ class InnetJS {
                     yield copyFiles(this.publicFolder, this.buildFolder);
                     const data = yield fs.promises.readFile(this.publicIndexFile);
                     const pkg = yield this.getPackage();
-                    yield fs.promises.writeFile(this.buildIndexFile, yield convertIndexFile(data, pkg.version));
+                    yield fs.promises.writeFile(this.buildIndexFile, yield convertIndexFile(data, pkg.version, this.baseUrl));
                 }
             }));
             if (pkg) {
@@ -352,7 +364,7 @@ class InnetJS {
                 preserveEntrySignatures: 'strict',
                 output: {
                     dir: this.devBuildFolder,
-                    sourcemap: true
+                    sourcemap: true,
                 },
                 plugins: [
                     commonjs__default["default"](),
@@ -394,7 +406,9 @@ class InnetJS {
                         include: lintIncludeDom,
                     }),
                     ...options.plugins,
-                    pluginNodeResolve.nodeResolve(),
+                    pluginNodeResolve.nodeResolve({
+                        browser: true,
+                    }),
                     image__default["default"](),
                     styles__default["default"]({
                         mode: this.cssInJs ? 'inject' : 'extract',
@@ -408,7 +422,8 @@ class InnetJS {
                         exclude: stringExcludeDom,
                     }),
                     this.createClient(key, cert, pkg),
-                    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 } } : {})))
+                    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 } } : {}))),
+                    injectEnv__default["default"](innetEnv),
                 ];
             }
             const watcher = rollup__default["default"].watch(options);
@@ -540,7 +555,7 @@ class InnetJS {
                     app = express__default["default"]();
                     const update = () => __awaiter(this, void 0, void 0, function* () {
                         const data = yield fs.promises.readFile(this.publicIndexFile);
-                        yield fs.promises.writeFile(this.devBuildIndexFile, yield convertIndexFile(data, pkg.version));
+                        yield fs.promises.writeFile(this.devBuildIndexFile, yield convertIndexFile(data, pkg.version, this.baseUrl));
                     });
                     fs__default["default"].watch(this.publicIndexFile, update);
                     yield update();

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "innetjs",
-  "version": "2.0.6",
+  "version": "2.0.9",
   "description": "CLI for innet boilerplate",
   "homepage": "https://github.com/d8corp/innetjs",
   "author": "Mikhail Lysikov <d8corp@mail.ru>",
@@ -52,6 +52,7 @@
     "prompts": "^2.4.2",
     "rollup": "^2.77.2",
     "rollup-plugin-filesize": "^9.1.2",
+    "rollup-plugin-inject-process-env": "^1.3.1",
     "rollup-plugin-innet-jsx": "^1.3.0",
     "rollup-plugin-livereload": "^2.0.5",
     "rollup-plugin-string": "^3.0.0",