innetjs 2.5.2 → 2.5.3

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

@@ -1,7 +1,7 @@
 'use strict';
 
 ;(function () {
-  const env = {"__INNETJS__PACKAGE_VERSION":"2.5.2"};
+  const env = {"__INNETJS__PACKAGE_VERSION":"2.5.3"};
   if (typeof process === 'undefined') {
     globalThis.process = { env: env };
   } else if (process.env) {

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

@@ -1,5 +1,5 @@
 ;(function () {
-  const env = {"__INNETJS__PACKAGE_VERSION":"2.5.2"};
+  const env = {"__INNETJS__PACKAGE_VERSION":"2.5.3"};
   if (typeof process === 'undefined') {
     globalThis.process = { env: env };
   } else if (process.env) {

package/bin/innet

@@ -163,13 +163,16 @@ function getFile(file) {
     }
     return file;
 }
-function convertIndexFile(data, version, baseUrl, index) {
+function convertIndexFile(data, version, baseUrl, index, inject) {
     return tslib.__awaiter(this, void 0, void 0, function* () {
         const { env } = process;
-        return data
+        const indexString = data
             .toString()
-            .replace('</head>', `<script type="module" defer src="${baseUrl}${index}.js${version ? `?v=${version}` : ''}"></script></head>`)
             .replace(/%([A-Z0-9_]+)%/g, (placeholder, placeholderId) => { var _a; return (_a = env[placeholderId]) !== null && _a !== void 0 ? _a : placeholder; });
+        return inject
+            ? indexString
+                .replace('</head>', `<script type="module" defer src="${baseUrl}${index}.js${version ? `?v=${version}` : ''}"></script></head>`)
+            : indexString;
     });
 }
 const reporter = (options, outputOptions, info) => {
@@ -277,7 +280,7 @@ class InnetJS {
             yield logger__default["default"].start('Install packages', () => execAsync(`cd ${appPath} && npm i`));
         });
     }
-    build({ node = false, index = 'index' } = {}) {
+    build({ node = false, inject = false, index = 'index' } = {}) {
         return tslib.__awaiter(this, void 0, void 0, function* () {
             const input = glob__default["default"].sync(`src/${index}.{${indexExt}}`);
             if (!input.length) {
@@ -355,7 +358,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, this.baseUrl, path__default["default"].parse(input[0]).name));
+                    yield fs.promises.writeFile(this.buildIndexFile, yield convertIndexFile(data, pkg.version, this.baseUrl, path__default["default"].parse(input[0]).name, inject));
                 }
             }));
             if (pkg) {
@@ -374,7 +377,7 @@ class InnetJS {
             }
         });
     }
-    start({ node = false, error = false, index = 'index' } = {}) {
+    start({ node = false, inject = false, error = false, index = 'index' } = {}) {
         return tslib.__awaiter(this, void 0, void 0, function* () {
             const pkg = yield this.getPackage();
             const input = glob__default["default"].sync(`src/${index}.{${indexExt}}`);
@@ -453,7 +456,7 @@ class InnetJS {
                 }), string({
                     include: '**/*.*',
                     exclude: stringExcludeDom,
-                }), this.createClient(key, cert, pkg, path__default["default"].parse(input[0]).name), 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 } } : {}))));
+                }), this.createClient(key, cert, pkg, path__default["default"].parse(input[0]).name, inject), 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 } } : {}))));
             }
             this.withEnv(options, true);
             const watcher = rollup__default["default"].watch(options);
@@ -733,7 +736,7 @@ class InnetJS {
             return this.package;
         });
     }
-    createClient(key, cert, pkg, index) {
+    createClient(key, cert, pkg, index, inject) {
         let app;
         return {
             name: 'client',
@@ -743,7 +746,7 @@ class InnetJS {
                     app = express__default["default"]();
                     const update = () => tslib.__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, this.baseUrl, index));
+                        yield fs.promises.writeFile(this.devBuildIndexFile, yield convertIndexFile(data, pkg.version, this.baseUrl, index, inject));
                     });
                     fs__default["default"].watch(this.publicIndexFile, update);
                     yield update();
@@ -808,7 +811,7 @@ class InnetJS {
 }
 
 (function () {
-  const env = {"__INNETJS__PACKAGE_VERSION":"2.5.2"};
+  const env = {"__INNETJS__PACKAGE_VERSION":"2.5.3"};
   if (typeof process === 'undefined') {
     globalThis.process = { env: env };
   } else if (process.env) {
@@ -851,10 +854,11 @@ commander.program
     .command('start')
     .description('Start development with innet boilerplate')
     .option('-n, --node', 'Start development for Node.js')
+    .option('-in, --inject', 'Injects script element into index.html')
     .option('-i, --index <index>', 'Root index file name', 'index')
     .addOption(errorOption)
-    .action(({ error, node, index }) => {
-    innetJS.start({ node, error, index }).catch(e => {
+    .action(({ error, node, index, inject }) => {
+    innetJS.start({ node, error, index, inject }).catch(e => {
         if (error) {
             console.error(e);
             process.exit(1);
@@ -866,9 +870,10 @@ commander.program
     .description('Build production bundle')
     .addOption(errorOption)
     .option('-n, --node', 'Build for node.js')
+    .option('-in, --inject', 'Injects script element into index.html')
     .option('-i, --index <index>', 'Root index file name', 'index')
-    .action(({ error, node, index }) => {
-    innetJS.build({ node, index }).catch(e => {
+    .action(({ error, node, index, inject }) => {
+    innetJS.build({ node, index, inject }).catch(e => {
         if (error) {
             console.error(e);
             process.exit(1);

package/helpers.d.ts

@@ -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, baseUrl: string, index: string): Promise<string>;
+export declare function convertIndexFile(data: Buffer, version: string, baseUrl: string, index: string, inject: boolean): Promise<string>;
 export declare const reporter: FileSizeRender<string | Promise<string>>;

package/helpers.js

@@ -37,13 +37,16 @@ function getFile(file) {
     }
     return file;
 }
-function convertIndexFile(data, version, baseUrl, index) {
+function convertIndexFile(data, version, baseUrl, index, inject) {
     return tslib.__awaiter(this, void 0, void 0, function* () {
         const { env } = process;
-        return data
+        const indexString = data
             .toString()
-            .replace('</head>', `<script type="module" defer src="${baseUrl}${index}.js${version ? `?v=${version}` : ''}"></script></head>`)
             .replace(/%([A-Z0-9_]+)%/g, (placeholder, placeholderId) => { var _a; return (_a = env[placeholderId]) !== null && _a !== void 0 ? _a : placeholder; });
+        return inject
+            ? indexString
+                .replace('</head>', `<script type="module" defer src="${baseUrl}${index}.js${version ? `?v=${version}` : ''}"></script></head>`)
+            : indexString;
     });
 }
 const reporter = (options, outputOptions, info) => {

package/helpers.mjs

@@ -26,13 +26,16 @@ function getFile(file) {
     }
     return file;
 }
-function convertIndexFile(data, version, baseUrl, index) {
+function convertIndexFile(data, version, baseUrl, index, inject) {
     return __awaiter(this, void 0, void 0, function* () {
         const { env } = process;
-        return data
+        const indexString = data
             .toString()
-            .replace('</head>', `<script type="module" defer src="${baseUrl}${index}.js${version ? `?v=${version}` : ''}"></script></head>`)
             .replace(/%([A-Z0-9_]+)%/g, (placeholder, placeholderId) => { var _a; return (_a = env[placeholderId]) !== null && _a !== void 0 ? _a : placeholder; });
+        return inject
+            ? indexString
+                .replace('</head>', `<script type="module" defer src="${baseUrl}${index}.js${version ? `?v=${version}` : ''}"></script></head>`)
+            : indexString;
     });
 }
 const reporter = (options, outputOptions, info) => {

package/index.d.ts

@@ -53,12 +53,14 @@ export declare class InnetJS {
         api?: string;
     });
     init(appName: string, { template, force }?: any): Promise<void>;
-    build({ node, index }?: {
+    build({ node, inject, index }?: {
         node?: boolean;
+        inject?: boolean;
         index?: string;
     }): Promise<void>;
-    start({ node, error, index }?: {
+    start({ node, inject, error, index }?: {
         node?: boolean;
+        inject?: boolean;
         error?: boolean;
         index?: string;
     }): Promise<void>;
@@ -69,6 +71,6 @@ export declare class InnetJS {
     withEnv(options: rollup.RollupOptions, virtual?: boolean): void;
     increaseVersion(release: string): Promise<void>;
     getPackage(): Promise<Record<string, any>>;
-    createClient(key: any, cert: any, pkg: any, index: string): rollup.Plugin;
+    createClient(key: any, cert: any, pkg: any, index: string, inject: boolean): rollup.Plugin;
     createServer(): rollup.Plugin;
 }

package/index.js

@@ -166,7 +166,7 @@ class InnetJS {
             yield logger__default["default"].start('Install packages', () => execAsync(`cd ${appPath} && npm i`));
         });
     }
-    build({ node = false, index = 'index' } = {}) {
+    build({ node = false, inject = false, index = 'index' } = {}) {
         return tslib.__awaiter(this, void 0, void 0, function* () {
             const input = glob__default["default"].sync(`src/${index}.{${indexExt}}`);
             if (!input.length) {
@@ -244,7 +244,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 helpers.convertIndexFile(data, pkg.version, this.baseUrl, path__default["default"].parse(input[0]).name));
+                    yield fs.promises.writeFile(this.buildIndexFile, yield helpers.convertIndexFile(data, pkg.version, this.baseUrl, path__default["default"].parse(input[0]).name, inject));
                 }
             }));
             if (pkg) {
@@ -263,7 +263,7 @@ class InnetJS {
             }
         });
     }
-    start({ node = false, error = false, index = 'index' } = {}) {
+    start({ node = false, inject = false, error = false, index = 'index' } = {}) {
         return tslib.__awaiter(this, void 0, void 0, function* () {
             const pkg = yield this.getPackage();
             const input = glob__default["default"].sync(`src/${index}.{${indexExt}}`);
@@ -342,7 +342,7 @@ class InnetJS {
                 }), string({
                     include: '**/*.*',
                     exclude: constants.stringExcludeDom,
-                }), this.createClient(key, cert, pkg, path__default["default"].parse(input[0]).name), 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 } } : {}))));
+                }), this.createClient(key, cert, pkg, path__default["default"].parse(input[0]).name, inject), 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 } } : {}))));
             }
             this.withEnv(options, true);
             const watcher = rollup__default["default"].watch(options);
@@ -622,7 +622,7 @@ class InnetJS {
             return this.package;
         });
     }
-    createClient(key, cert, pkg, index) {
+    createClient(key, cert, pkg, index, inject) {
         let app;
         return {
             name: 'client',
@@ -632,7 +632,7 @@ class InnetJS {
                     app = express__default["default"]();
                     const update = () => tslib.__awaiter(this, void 0, void 0, function* () {
                         const data = yield fs.promises.readFile(this.publicIndexFile);
-                        yield fs.promises.writeFile(this.devBuildIndexFile, yield helpers.convertIndexFile(data, pkg.version, this.baseUrl, index));
+                        yield fs.promises.writeFile(this.devBuildIndexFile, yield helpers.convertIndexFile(data, pkg.version, this.baseUrl, index, inject));
                     });
                     fs__default["default"].watch(this.publicIndexFile, update);
                     yield update();

package/index.mjs

@@ -130,7 +130,7 @@ class InnetJS {
             yield logger.start('Install packages', () => execAsync(`cd ${appPath} && npm i`));
         });
     }
-    build({ node = false, index = 'index' } = {}) {
+    build({ node = false, inject = false, index = 'index' } = {}) {
         return __awaiter(this, void 0, void 0, function* () {
             const input = glob.sync(`src/${index}.{${indexExt}}`);
             if (!input.length) {
@@ -208,7 +208,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, this.baseUrl, path.parse(input[0]).name));
+                    yield promises.writeFile(this.buildIndexFile, yield convertIndexFile(data, pkg.version, this.baseUrl, path.parse(input[0]).name, inject));
                 }
             }));
             if (pkg) {
@@ -227,7 +227,7 @@ class InnetJS {
             }
         });
     }
-    start({ node = false, error = false, index = 'index' } = {}) {
+    start({ node = false, inject = false, error = false, index = 'index' } = {}) {
         return __awaiter(this, void 0, void 0, function* () {
             const pkg = yield this.getPackage();
             const input = glob.sync(`src/${index}.{${indexExt}}`);
@@ -306,7 +306,7 @@ class InnetJS {
                 }), string({
                     include: '**/*.*',
                     exclude: stringExcludeDom,
-                }), this.createClient(key, cert, pkg, path.parse(input[0]).name), 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 } } : {}))));
+                }), this.createClient(key, cert, pkg, path.parse(input[0]).name, inject), 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 } } : {}))));
             }
             this.withEnv(options, true);
             const watcher = rollup.watch(options);
@@ -586,7 +586,7 @@ class InnetJS {
             return this.package;
         });
     }
-    createClient(key, cert, pkg, index) {
+    createClient(key, cert, pkg, index, inject) {
         let app;
         return {
             name: 'client',
@@ -596,7 +596,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, this.baseUrl, index));
+                        yield promises.writeFile(this.devBuildIndexFile, yield convertIndexFile(data, pkg.version, this.baseUrl, index, inject));
                     });
                     fs.watch(this.publicIndexFile, update);
                     yield update();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "innetjs",
-  "version": "2.5.2",
+  "version": "2.5.3",
   "description": "CLI for innet boilerplate",
   "homepage": "https://github.com/d8corp/innetjs",
   "author": "Mikhail Lysikov <d8corp@mail.ru>",