innetjs 2.0.1 → 2.0.4

package/bin/innet

@@ -21,9 +21,12 @@ var json = require('@rollup/plugin-json');
 var tmp = require('tmp');
 var proxy = require('express-http-proxy');
 var selector = require('cli-select');
+var prompt = require('prompts');
 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 linesAndColumns = require('lines-and-columns');
 var unzipper = require('unzipper');
 var commander = require('commander');
 
@@ -46,9 +49,11 @@ var json__default = /*#__PURE__*/_interopDefaultLegacy(json);
 var tmp__default = /*#__PURE__*/_interopDefaultLegacy(tmp);
 var proxy__default = /*#__PURE__*/_interopDefaultLegacy(proxy);
 var selector__default = /*#__PURE__*/_interopDefaultLegacy(selector);
+var prompt__default = /*#__PURE__*/_interopDefaultLegacy(prompt);
 var jsx__default = /*#__PURE__*/_interopDefaultLegacy(jsx);
 var filesize__default = /*#__PURE__*/_interopDefaultLegacy(filesize);
 var image__default = /*#__PURE__*/_interopDefaultLegacy(image);
+var eslint__default = /*#__PURE__*/_interopDefaultLegacy(eslint);
 
 /******************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -117,13 +122,35 @@ function Extract(opts, template) {
     return extract;
 }
 
-const livereload = require('rollup-plugin-livereload');
-const { string } = require('rollup-plugin-string');
-const { exec, spawn } = require('child_process');
-const readline = require('readline');
-const execAsync = util.promisify(exec);
-const copyFiles = util.promisify(fs__default["default"].copy);
-require('dotenv').config();
+const lintIncludeDom = [
+    '**/*.ts',
+    '**/*.tsx',
+    '**/*.js',
+    '**/*.jsx',
+];
+const stringExcludeDom = [
+    '**/*.ts',
+    '**/*.tsx',
+    '**/*.js',
+    '**/*.jsx',
+    '**/*.json',
+    '**/*.css',
+    '**/*.scss',
+    '**/*.webp',
+    '**/*.gif',
+    '**/*.png',
+    '**/*.jpeg',
+    '**/*.jpg',
+    '**/*.svg',
+];
+const stringExcludeNode = [
+    '**/*.ts',
+    '**/*.tsx',
+    '**/*.js',
+    '**/*.jsx',
+    '**/*.json',
+];
+
 function getFile(file) {
     file = path__default["default"].resolve(file);
     if (!fs__default["default"].existsSync(file)) {
@@ -156,31 +183,17 @@ function convertIndexFile(data, version) {
 const reporter = (options, outputOptions, info) => {
     logger__default["default"].log(`${chalk__default["default"].yellow(info.fileName)} ${chalk__default["default"].green(info.bundleSize)} [ gzip: ${chalk__default["default"].green(info.gzipSize)} ]`);
     return '';
-};
-const stringExcludeDom = [
-    '**/*.ts',
-    '**/*.tsx',
-    '**/*.js',
-    '**/*.jsx',
-    '**/*.json',
-    '**/*.css',
-    '**/*.scss',
-    '**/*.webp',
-    '**/*.gif',
-    '**/*.png',
-    '**/*.jpeg',
-    '**/*.jpg',
-    '**/*.svg',
-];
-const stringExcludeNode = [
-    '**/*.ts',
-    '**/*.tsx',
-    '**/*.js',
-    '**/*.jsx',
-    '**/*.json',
-];
+};
+
+const livereload = require('rollup-plugin-livereload');
+const { string } = require('rollup-plugin-string');
+const { exec, spawn } = require('child_process');
+const readline = require('readline');
+const execAsync = util.promisify(exec);
+const copyFiles = util.promisify(fs__default["default"].copy);
+require('dotenv').config();
 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 || '*', } = {}) {
+    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/?*', } = {}) {
         this.projectFolder = path__default["default"].resolve(projectFolder);
         this.publicFolder = path__default["default"].resolve(publicFolder);
         this.buildFolder = path__default["default"].resolve(buildFolder);
@@ -276,17 +289,26 @@ class InnetJS {
                 }));
             }
             else {
-                inputOptions.plugins.push(pluginNodeResolve.nodeResolve(), image__default["default"](), string({
-                    include: '**/*.*',
-                    exclude: stringExcludeDom,
-                }), styles__default["default"]({
-                    mode: this.cssInJs ? 'inject' : 'extract',
-                    url: true,
-                    plugins: [autoprefixer__default["default"]()],
-                    modules: this.cssModules,
-                    sourceMap: this.sourcemap,
-                    minimize: true,
-                }));
+                inputOptions.plugins = [
+                    eslint__default["default"]({
+                        include: lintIncludeDom,
+                    }),
+                    ...inputOptions.plugins,
+                    pluginNodeResolve.nodeResolve(),
+                    image__default["default"](),
+                    styles__default["default"]({
+                        mode: this.cssInJs ? 'inject' : 'extract',
+                        url: true,
+                        plugins: [autoprefixer__default["default"]()],
+                        modules: this.cssModules,
+                        sourceMap: this.sourcemap,
+                        minimize: true,
+                    }),
+                    string({
+                        include: '**/*.*',
+                        exclude: stringExcludeDom,
+                    }),
+                ];
                 outputOptions.format = 'es';
                 outputOptions.plugins = [
                     rollupPluginTerser.terser(),
@@ -369,21 +391,49 @@ class InnetJS {
                         ? fs__default["default"].readFileSync(this.sslCrt)
                         : undefined;
                 options.output.format = 'es';
-                options.plugins.push(pluginNodeResolve.nodeResolve(), image__default["default"](), string({
-                    include: '**/*.*',
-                    exclude: stringExcludeDom,
-                }), styles__default["default"]({
-                    mode: this.cssInJs ? 'inject' : 'extract',
-                    url: true,
-                    plugins: [autoprefixer__default["default"]()],
-                    modules: this.cssModules,
-                    sourceMap: true,
-                }), this.createClient(key, cert, pkg), livereload(Object.assign({ watch: this.publicFolder, verbose: false }, (key && cert ? { https: { key, cert } } : {}))));
+                options.plugins = [
+                    eslint__default["default"]({
+                        include: lintIncludeDom,
+                    }),
+                    ...options.plugins,
+                    pluginNodeResolve.nodeResolve(),
+                    image__default["default"](),
+                    styles__default["default"]({
+                        mode: this.cssInJs ? 'inject' : 'extract',
+                        url: true,
+                        plugins: [autoprefixer__default["default"]()],
+                        modules: this.cssModules,
+                        sourceMap: true,
+                    }),
+                    string({
+                        include: '**/*.*',
+                        exclude: stringExcludeDom,
+                    }),
+                    this.createClient(key, cert, pkg),
+                    livereload(Object.assign({ watch: this.publicFolder, verbose: false }, (key && cert ? { https: { key, cert } } : {})))
+                ];
             }
             const watcher = rollup__default["default"].watch(options);
             watcher.on('event', (e) => __awaiter(this, void 0, void 0, function* () {
                 if (e.code == 'ERROR') {
-                    logger__default["default"].end('Bundling', error ? e.error.stack : e.error.message);
+                    if (e.error.code === 'UNRESOLVED_IMPORT') {
+                        const [, importer, file] = e.error.message.match(/^Could not resolve '(.+)' from (.+)$/) || [];
+                        const text = (yield fs__default["default"].readFile(file)).toString();
+                        const lines = new linesAndColumns.LinesAndColumns(text);
+                        const { line, column } = lines.locationForIndex(text.indexOf(importer));
+                        logger__default["default"].end('Bundling', e.error.message);
+                        console.log(`ERROR in ${file}:${line + 1}:${column + 1}`);
+                    }
+                    else if (e.error.code === 'PLUGIN_ERROR' && ['rpt2', 'commonjs'].includes(e.error.plugin)) {
+                        const [, file, line, column] = e.error.message.match(/^[^(]+(src[^(]+)\((\d+),(\d+)\)/) || [];
+                        logger__default["default"].end('Bundling', e.error.message);
+                        if (file) {
+                            console.log(`ERROR in ${file}:${line}:${column}`);
+                        }
+                    }
+                    else {
+                        logger__default["default"].end('Bundling', error ? e.error.stack : e.error.message);
+                    }
                 }
                 else if (e.code === 'BUNDLE_START') {
                     logger__default["default"].start('Bundling');
@@ -509,9 +559,28 @@ class InnetJS {
                         res.sendFile(this.devBuildFolder + '/index.html');
                     });
                     const server = httpsUsing ? https__default["default"].createServer({ key, cert }, app) : http__default["default"].createServer(app);
-                    server.listen(this.port, () => {
-                        console.log(`${chalk__default["default"].green('➤')} Server started on http${httpsUsing ? 's' : ''}://localhost:${this.port}`);
-                    });
+                    let port = this.port;
+                    const listener = () => {
+                        console.log(`${chalk__default["default"].green('➤')} Server started on http${httpsUsing ? 's' : ''}://localhost:${port}`);
+                    };
+                    server.listen(port, listener);
+                    server.on('error', (e) => __awaiter(this, void 0, void 0, function* () {
+                        if (e.code === 'EADDRINUSE') {
+                            port++;
+                            const { userPort } = yield prompt__default["default"]({
+                                name: 'userPort',
+                                type: 'number',
+                                message: `Port ${e.port} is reserved, please enter another one [${port}]:`
+                            });
+                            if (userPort) {
+                                port = userPort;
+                            }
+                            server.listen(port);
+                        }
+                        else {
+                            throw e;
+                        }
+                    }));
                 }
             })
         };
@@ -532,7 +601,7 @@ class InnetJS {
     }
 }
 
-var version = "2.0.1";
+var version = "2.0.4";
 
 require('dotenv').config();
 const innetJS = new InnetJS();

package/constants.d.ts

@@ -0,0 +1,3 @@
+export declare const lintIncludeDom: string[];
+export declare const stringExcludeDom: string[];
+export declare const stringExcludeNode: string[];

package/helpers.d.ts

@@ -0,0 +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 const reporter: FileSizeRender<string | Promise<string>>;

package/index.es6.js

@@ -18,9 +18,12 @@ import json from '@rollup/plugin-json';
 import tmp from 'tmp';
 import proxy from 'express-http-proxy';
 import selector from 'cli-select';
+import prompt from 'prompts';
 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 { LinesAndColumns } from 'lines-and-columns';
 import { Parse } from 'unzipper';
 
 /******************************************************************************
@@ -90,13 +93,35 @@ function Extract(opts, template) {
     return extract;
 }
 
-const livereload = require('rollup-plugin-livereload');
-const { string } = require('rollup-plugin-string');
-const { exec, spawn } = require('child_process');
-const readline = require('readline');
-const execAsync = promisify(exec);
-const copyFiles = promisify(fs.copy);
-require('dotenv').config();
+const lintIncludeDom = [
+    '**/*.ts',
+    '**/*.tsx',
+    '**/*.js',
+    '**/*.jsx',
+];
+const stringExcludeDom = [
+    '**/*.ts',
+    '**/*.tsx',
+    '**/*.js',
+    '**/*.jsx',
+    '**/*.json',
+    '**/*.css',
+    '**/*.scss',
+    '**/*.webp',
+    '**/*.gif',
+    '**/*.png',
+    '**/*.jpeg',
+    '**/*.jpg',
+    '**/*.svg',
+];
+const stringExcludeNode = [
+    '**/*.ts',
+    '**/*.tsx',
+    '**/*.js',
+    '**/*.jsx',
+    '**/*.json',
+];
+
 function getFile(file) {
     file = path$1.resolve(file);
     if (!fs.existsSync(file)) {
@@ -129,31 +154,17 @@ function convertIndexFile(data, version) {
 const reporter = (options, outputOptions, info) => {
     logger.log(`${chalk.yellow(info.fileName)} ${chalk.green(info.bundleSize)} [ gzip: ${chalk.green(info.gzipSize)} ]`);
     return '';
-};
-const stringExcludeDom = [
-    '**/*.ts',
-    '**/*.tsx',
-    '**/*.js',
-    '**/*.jsx',
-    '**/*.json',
-    '**/*.css',
-    '**/*.scss',
-    '**/*.webp',
-    '**/*.gif',
-    '**/*.png',
-    '**/*.jpeg',
-    '**/*.jpg',
-    '**/*.svg',
-];
-const stringExcludeNode = [
-    '**/*.ts',
-    '**/*.tsx',
-    '**/*.js',
-    '**/*.jsx',
-    '**/*.json',
-];
+};
+
+const livereload = require('rollup-plugin-livereload');
+const { string } = require('rollup-plugin-string');
+const { exec, spawn } = require('child_process');
+const readline = require('readline');
+const execAsync = promisify(exec);
+const copyFiles = promisify(fs.copy);
+require('dotenv').config();
 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 || '*', } = {}) {
+    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/?*', } = {}) {
         this.projectFolder = path$1.resolve(projectFolder);
         this.publicFolder = path$1.resolve(publicFolder);
         this.buildFolder = path$1.resolve(buildFolder);
@@ -249,17 +260,26 @@ class InnetJS {
                 }));
             }
             else {
-                inputOptions.plugins.push(nodeResolve(), image(), string({
-                    include: '**/*.*',
-                    exclude: stringExcludeDom,
-                }), styles({
-                    mode: this.cssInJs ? 'inject' : 'extract',
-                    url: true,
-                    plugins: [autoprefixer()],
-                    modules: this.cssModules,
-                    sourceMap: this.sourcemap,
-                    minimize: true,
-                }));
+                inputOptions.plugins = [
+                    eslint({
+                        include: lintIncludeDom,
+                    }),
+                    ...inputOptions.plugins,
+                    nodeResolve(),
+                    image(),
+                    styles({
+                        mode: this.cssInJs ? 'inject' : 'extract',
+                        url: true,
+                        plugins: [autoprefixer()],
+                        modules: this.cssModules,
+                        sourceMap: this.sourcemap,
+                        minimize: true,
+                    }),
+                    string({
+                        include: '**/*.*',
+                        exclude: stringExcludeDom,
+                    }),
+                ];
                 outputOptions.format = 'es';
                 outputOptions.plugins = [
                     terser(),
@@ -342,21 +362,49 @@ class InnetJS {
                         ? fs.readFileSync(this.sslCrt)
                         : undefined;
                 options.output.format = 'es';
-                options.plugins.push(nodeResolve(), image(), string({
-                    include: '**/*.*',
-                    exclude: stringExcludeDom,
-                }), styles({
-                    mode: this.cssInJs ? 'inject' : 'extract',
-                    url: true,
-                    plugins: [autoprefixer()],
-                    modules: this.cssModules,
-                    sourceMap: true,
-                }), this.createClient(key, cert, pkg), livereload(Object.assign({ watch: this.publicFolder, verbose: false }, (key && cert ? { https: { key, cert } } : {}))));
+                options.plugins = [
+                    eslint({
+                        include: lintIncludeDom,
+                    }),
+                    ...options.plugins,
+                    nodeResolve(),
+                    image(),
+                    styles({
+                        mode: this.cssInJs ? 'inject' : 'extract',
+                        url: true,
+                        plugins: [autoprefixer()],
+                        modules: this.cssModules,
+                        sourceMap: true,
+                    }),
+                    string({
+                        include: '**/*.*',
+                        exclude: stringExcludeDom,
+                    }),
+                    this.createClient(key, cert, pkg),
+                    livereload(Object.assign({ watch: this.publicFolder, verbose: false }, (key && cert ? { https: { key, cert } } : {})))
+                ];
             }
             const watcher = rollup.watch(options);
             watcher.on('event', (e) => __awaiter(this, void 0, void 0, function* () {
                 if (e.code == 'ERROR') {
-                    logger.end('Bundling', error ? e.error.stack : e.error.message);
+                    if (e.error.code === 'UNRESOLVED_IMPORT') {
+                        const [, importer, file] = e.error.message.match(/^Could not resolve '(.+)' from (.+)$/) || [];
+                        const text = (yield fs.readFile(file)).toString();
+                        const lines = new LinesAndColumns(text);
+                        const { line, column } = lines.locationForIndex(text.indexOf(importer));
+                        logger.end('Bundling', e.error.message);
+                        console.log(`ERROR in ${file}:${line + 1}:${column + 1}`);
+                    }
+                    else if (e.error.code === 'PLUGIN_ERROR' && ['rpt2', 'commonjs'].includes(e.error.plugin)) {
+                        const [, file, line, column] = e.error.message.match(/^[^(]+(src[^(]+)\((\d+),(\d+)\)/) || [];
+                        logger.end('Bundling', e.error.message);
+                        if (file) {
+                            console.log(`ERROR in ${file}:${line}:${column}`);
+                        }
+                    }
+                    else {
+                        logger.end('Bundling', error ? e.error.stack : e.error.message);
+                    }
                 }
                 else if (e.code === 'BUNDLE_START') {
                     logger.start('Bundling');
@@ -482,9 +530,28 @@ class InnetJS {
                         res.sendFile(this.devBuildFolder + '/index.html');
                     });
                     const server = httpsUsing ? https.createServer({ key, cert }, app) : http.createServer(app);
-                    server.listen(this.port, () => {
-                        console.log(`${chalk.green('➤')} Server started on http${httpsUsing ? 's' : ''}://localhost:${this.port}`);
-                    });
+                    let port = this.port;
+                    const listener = () => {
+                        console.log(`${chalk.green('➤')} Server started on http${httpsUsing ? 's' : ''}://localhost:${port}`);
+                    };
+                    server.listen(port, listener);
+                    server.on('error', (e) => __awaiter(this, void 0, void 0, function* () {
+                        if (e.code === 'EADDRINUSE') {
+                            port++;
+                            const { userPort } = yield prompt({
+                                name: 'userPort',
+                                type: 'number',
+                                message: `Port ${e.port} is reserved, please enter another one [${port}]:`
+                            });
+                            if (userPort) {
+                                port = userPort;
+                            }
+                            server.listen(port);
+                        }
+                        else {
+                            throw e;
+                        }
+                    }));
                 }
             })
         };

package/index.js

@@ -20,9 +20,12 @@ var json = require('@rollup/plugin-json');
 var tmp = require('tmp');
 var proxy = require('express-http-proxy');
 var selector = require('cli-select');
+var prompt = require('prompts');
 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 linesAndColumns = require('lines-and-columns');
 var unzipper = require('unzipper');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -44,9 +47,11 @@ var json__default = /*#__PURE__*/_interopDefaultLegacy(json);
 var tmp__default = /*#__PURE__*/_interopDefaultLegacy(tmp);
 var proxy__default = /*#__PURE__*/_interopDefaultLegacy(proxy);
 var selector__default = /*#__PURE__*/_interopDefaultLegacy(selector);
+var prompt__default = /*#__PURE__*/_interopDefaultLegacy(prompt);
 var jsx__default = /*#__PURE__*/_interopDefaultLegacy(jsx);
 var filesize__default = /*#__PURE__*/_interopDefaultLegacy(filesize);
 var image__default = /*#__PURE__*/_interopDefaultLegacy(image);
+var eslint__default = /*#__PURE__*/_interopDefaultLegacy(eslint);
 
 /******************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -115,13 +120,35 @@ function Extract(opts, template) {
     return extract;
 }
 
-const livereload = require('rollup-plugin-livereload');
-const { string } = require('rollup-plugin-string');
-const { exec, spawn } = require('child_process');
-const readline = require('readline');
-const execAsync = util.promisify(exec);
-const copyFiles = util.promisify(fs__default["default"].copy);
-require('dotenv').config();
+const lintIncludeDom = [
+    '**/*.ts',
+    '**/*.tsx',
+    '**/*.js',
+    '**/*.jsx',
+];
+const stringExcludeDom = [
+    '**/*.ts',
+    '**/*.tsx',
+    '**/*.js',
+    '**/*.jsx',
+    '**/*.json',
+    '**/*.css',
+    '**/*.scss',
+    '**/*.webp',
+    '**/*.gif',
+    '**/*.png',
+    '**/*.jpeg',
+    '**/*.jpg',
+    '**/*.svg',
+];
+const stringExcludeNode = [
+    '**/*.ts',
+    '**/*.tsx',
+    '**/*.js',
+    '**/*.jsx',
+    '**/*.json',
+];
+
 function getFile(file) {
     file = path__default["default"].resolve(file);
     if (!fs__default["default"].existsSync(file)) {
@@ -154,31 +181,17 @@ function convertIndexFile(data, version) {
 const reporter = (options, outputOptions, info) => {
     logger__default["default"].log(`${chalk__default["default"].yellow(info.fileName)} ${chalk__default["default"].green(info.bundleSize)} [ gzip: ${chalk__default["default"].green(info.gzipSize)} ]`);
     return '';
-};
-const stringExcludeDom = [
-    '**/*.ts',
-    '**/*.tsx',
-    '**/*.js',
-    '**/*.jsx',
-    '**/*.json',
-    '**/*.css',
-    '**/*.scss',
-    '**/*.webp',
-    '**/*.gif',
-    '**/*.png',
-    '**/*.jpeg',
-    '**/*.jpg',
-    '**/*.svg',
-];
-const stringExcludeNode = [
-    '**/*.ts',
-    '**/*.tsx',
-    '**/*.js',
-    '**/*.jsx',
-    '**/*.json',
-];
+};
+
+const livereload = require('rollup-plugin-livereload');
+const { string } = require('rollup-plugin-string');
+const { exec, spawn } = require('child_process');
+const readline = require('readline');
+const execAsync = util.promisify(exec);
+const copyFiles = util.promisify(fs__default["default"].copy);
+require('dotenv').config();
 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 || '*', } = {}) {
+    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/?*', } = {}) {
         this.projectFolder = path__default["default"].resolve(projectFolder);
         this.publicFolder = path__default["default"].resolve(publicFolder);
         this.buildFolder = path__default["default"].resolve(buildFolder);
@@ -274,17 +287,26 @@ class InnetJS {
                 }));
             }
             else {
-                inputOptions.plugins.push(pluginNodeResolve.nodeResolve(), image__default["default"](), string({
-                    include: '**/*.*',
-                    exclude: stringExcludeDom,
-                }), styles__default["default"]({
-                    mode: this.cssInJs ? 'inject' : 'extract',
-                    url: true,
-                    plugins: [autoprefixer__default["default"]()],
-                    modules: this.cssModules,
-                    sourceMap: this.sourcemap,
-                    minimize: true,
-                }));
+                inputOptions.plugins = [
+                    eslint__default["default"]({
+                        include: lintIncludeDom,
+                    }),
+                    ...inputOptions.plugins,
+                    pluginNodeResolve.nodeResolve(),
+                    image__default["default"](),
+                    styles__default["default"]({
+                        mode: this.cssInJs ? 'inject' : 'extract',
+                        url: true,
+                        plugins: [autoprefixer__default["default"]()],
+                        modules: this.cssModules,
+                        sourceMap: this.sourcemap,
+                        minimize: true,
+                    }),
+                    string({
+                        include: '**/*.*',
+                        exclude: stringExcludeDom,
+                    }),
+                ];
                 outputOptions.format = 'es';
                 outputOptions.plugins = [
                     rollupPluginTerser.terser(),
@@ -367,21 +389,49 @@ class InnetJS {
                         ? fs__default["default"].readFileSync(this.sslCrt)
                         : undefined;
                 options.output.format = 'es';
-                options.plugins.push(pluginNodeResolve.nodeResolve(), image__default["default"](), string({
-                    include: '**/*.*',
-                    exclude: stringExcludeDom,
-                }), styles__default["default"]({
-                    mode: this.cssInJs ? 'inject' : 'extract',
-                    url: true,
-                    plugins: [autoprefixer__default["default"]()],
-                    modules: this.cssModules,
-                    sourceMap: true,
-                }), this.createClient(key, cert, pkg), livereload(Object.assign({ watch: this.publicFolder, verbose: false }, (key && cert ? { https: { key, cert } } : {}))));
+                options.plugins = [
+                    eslint__default["default"]({
+                        include: lintIncludeDom,
+                    }),
+                    ...options.plugins,
+                    pluginNodeResolve.nodeResolve(),
+                    image__default["default"](),
+                    styles__default["default"]({
+                        mode: this.cssInJs ? 'inject' : 'extract',
+                        url: true,
+                        plugins: [autoprefixer__default["default"]()],
+                        modules: this.cssModules,
+                        sourceMap: true,
+                    }),
+                    string({
+                        include: '**/*.*',
+                        exclude: stringExcludeDom,
+                    }),
+                    this.createClient(key, cert, pkg),
+                    livereload(Object.assign({ watch: this.publicFolder, verbose: false }, (key && cert ? { https: { key, cert } } : {})))
+                ];
             }
             const watcher = rollup__default["default"].watch(options);
             watcher.on('event', (e) => __awaiter(this, void 0, void 0, function* () {
                 if (e.code == 'ERROR') {
-                    logger__default["default"].end('Bundling', error ? e.error.stack : e.error.message);
+                    if (e.error.code === 'UNRESOLVED_IMPORT') {
+                        const [, importer, file] = e.error.message.match(/^Could not resolve '(.+)' from (.+)$/) || [];
+                        const text = (yield fs__default["default"].readFile(file)).toString();
+                        const lines = new linesAndColumns.LinesAndColumns(text);
+                        const { line, column } = lines.locationForIndex(text.indexOf(importer));
+                        logger__default["default"].end('Bundling', e.error.message);
+                        console.log(`ERROR in ${file}:${line + 1}:${column + 1}`);
+                    }
+                    else if (e.error.code === 'PLUGIN_ERROR' && ['rpt2', 'commonjs'].includes(e.error.plugin)) {
+                        const [, file, line, column] = e.error.message.match(/^[^(]+(src[^(]+)\((\d+),(\d+)\)/) || [];
+                        logger__default["default"].end('Bundling', e.error.message);
+                        if (file) {
+                            console.log(`ERROR in ${file}:${line}:${column}`);
+                        }
+                    }
+                    else {
+                        logger__default["default"].end('Bundling', error ? e.error.stack : e.error.message);
+                    }
                 }
                 else if (e.code === 'BUNDLE_START') {
                     logger__default["default"].start('Bundling');
@@ -507,9 +557,28 @@ class InnetJS {
                         res.sendFile(this.devBuildFolder + '/index.html');
                     });
                     const server = httpsUsing ? https__default["default"].createServer({ key, cert }, app) : http__default["default"].createServer(app);
-                    server.listen(this.port, () => {
-                        console.log(`${chalk__default["default"].green('➤')} Server started on http${httpsUsing ? 's' : ''}://localhost:${this.port}`);
-                    });
+                    let port = this.port;
+                    const listener = () => {
+                        console.log(`${chalk__default["default"].green('➤')} Server started on http${httpsUsing ? 's' : ''}://localhost:${port}`);
+                    };
+                    server.listen(port, listener);
+                    server.on('error', (e) => __awaiter(this, void 0, void 0, function* () {
+                        if (e.code === 'EADDRINUSE') {
+                            port++;
+                            const { userPort } = yield prompt__default["default"]({
+                                name: 'userPort',
+                                type: 'number',
+                                message: `Port ${e.port} is reserved, please enter another one [${port}]:`
+                            });
+                            if (userPort) {
+                                port = userPort;
+                            }
+                            server.listen(port);
+                        }
+                        else {
+                            throw e;
+                        }
+                    }));
                 }
             })
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "innetjs",
-  "version": "2.0.1",
+  "version": "2.0.4",
   "description": "CLI for innet boilerplate",
   "homepage": "https://github.com/d8corp/innetjs",
   "author": "Mikhail Lysikov <d8corp@mail.ru>",
@@ -33,6 +33,7 @@
   "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",
@@ -45,8 +46,10 @@
     "express": "^4.18.1",
     "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",
+    "prompts": "^2.4.2",
     "rollup": "^2.77.2",
     "rollup-plugin-filesize": "^9.1.2",
     "rollup-plugin-innet-jsx": "^1.3.0",