innetjs 1.9.0 → 1.11.0

package/bin/innet

@@ -21,6 +21,7 @@ var tmp = require('tmp');
 var proxy = require('express-http-proxy');
 var selector = require('cli-select');
 var jsx = require('rollup-plugin-innet-jsx');
+var filesize = require('rollup-plugin-filesize');
 var commander = require('commander');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -42,6 +43,7 @@ var tmp__default = /*#__PURE__*/_interopDefaultLegacy(tmp);
 var proxy__default = /*#__PURE__*/_interopDefaultLegacy(proxy);
 var selector__default = /*#__PURE__*/_interopDefaultLegacy(selector);
 var jsx__default = /*#__PURE__*/_interopDefaultLegacy(jsx);
+var filesize__default = /*#__PURE__*/_interopDefaultLegacy(filesize);
 
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -96,6 +98,10 @@ function getFile(file) {
     }
     return file;
 }
+const reporter = (options, outputOptions, info) => {
+    logger__default["default"].log(`${chalk__default["default"].yellow(info.fileName)} ${chalk__default["default"].green(info.bundleSize)} [ min: ${chalk__default["default"].green(info.minSize)}, gzip: ${chalk__default["default"].green(info.gzipSize)} ]`);
+    return '';
+};
 class InnetJS {
     constructor({ projectFolder = process.env.PROJECT_FOLDER || '', publicFolder = process.env.PUBLIC_FOLDER || 'public', buildFolder = process.env.BUILD_FOLDER || path__default["default"].join('public', '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' : false, cssInJs = process.env.CSS_IN_JS ? process.env.CSS_IN_JS === 'true' : false, 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 || '*', } = {}) {
         this.projectFolder = path__default["default"].resolve(projectFolder);
@@ -165,6 +171,9 @@ class InnetJS {
                     json__default["default"](),
                     typescript__default["default"](),
                     jsx__default["default"](),
+                    filesize__default["default"]({
+                        reporter,
+                    }),
                 ]
             };
             const outputOptions = {
@@ -188,7 +197,7 @@ class InnetJS {
                 }));
             }
             else {
-                inputOptions.plugins.push(string({
+                inputOptions.plugins.push(pluginNodeResolve.nodeResolve(), string({
                     include: '**/*.*',
                     exclude: [
                         '**/*.ts',
@@ -445,7 +454,7 @@ class InnetJS {
     }
 }
 
-var version = "1.9.0";
+var version = "1.11.0";
 
 require('dotenv').config();
 const innetJS = new InnetJS();

package/index.es6.js

@@ -18,6 +18,7 @@ import tmp from 'tmp';
 import proxy from 'express-http-proxy';
 import selector from 'cli-select';
 import jsx from 'rollup-plugin-innet-jsx';
+import filesize from 'rollup-plugin-filesize';
 
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -72,6 +73,10 @@ function getFile(file) {
     }
     return file;
 }
+const reporter = (options, outputOptions, info) => {
+    logger.log(`${chalk.yellow(info.fileName)} ${chalk.green(info.bundleSize)} [ min: ${chalk.green(info.minSize)}, gzip: ${chalk.green(info.gzipSize)} ]`);
+    return '';
+};
 class InnetJS {
     constructor({ projectFolder = process.env.PROJECT_FOLDER || '', publicFolder = process.env.PUBLIC_FOLDER || 'public', buildFolder = process.env.BUILD_FOLDER || path.join('public', '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' : false, cssInJs = process.env.CSS_IN_JS ? process.env.CSS_IN_JS === 'true' : false, 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 || '*', } = {}) {
         this.projectFolder = path.resolve(projectFolder);
@@ -141,6 +146,9 @@ class InnetJS {
                     json(),
                     typescript(),
                     jsx(),
+                    filesize({
+                        reporter,
+                    }),
                 ]
             };
             const outputOptions = {
@@ -164,7 +172,7 @@ class InnetJS {
                 }));
             }
             else {
-                inputOptions.plugins.push(string({
+                inputOptions.plugins.push(nodeResolve(), string({
                     include: '**/*.*',
                     exclude: [
                         '**/*.ts',

package/index.js

@@ -20,6 +20,7 @@ var tmp = require('tmp');
 var proxy = require('express-http-proxy');
 var selector = require('cli-select');
 var jsx = require('rollup-plugin-innet-jsx');
+var filesize = require('rollup-plugin-filesize');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -40,6 +41,7 @@ var tmp__default = /*#__PURE__*/_interopDefaultLegacy(tmp);
 var proxy__default = /*#__PURE__*/_interopDefaultLegacy(proxy);
 var selector__default = /*#__PURE__*/_interopDefaultLegacy(selector);
 var jsx__default = /*#__PURE__*/_interopDefaultLegacy(jsx);
+var filesize__default = /*#__PURE__*/_interopDefaultLegacy(filesize);
 
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -94,6 +96,10 @@ function getFile(file) {
     }
     return file;
 }
+const reporter = (options, outputOptions, info) => {
+    logger__default["default"].log(`${chalk__default["default"].yellow(info.fileName)} ${chalk__default["default"].green(info.bundleSize)} [ min: ${chalk__default["default"].green(info.minSize)}, gzip: ${chalk__default["default"].green(info.gzipSize)} ]`);
+    return '';
+};
 class InnetJS {
     constructor({ projectFolder = process.env.PROJECT_FOLDER || '', publicFolder = process.env.PUBLIC_FOLDER || 'public', buildFolder = process.env.BUILD_FOLDER || path__default["default"].join('public', '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' : false, cssInJs = process.env.CSS_IN_JS ? process.env.CSS_IN_JS === 'true' : false, 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 || '*', } = {}) {
         this.projectFolder = path__default["default"].resolve(projectFolder);
@@ -163,6 +169,9 @@ class InnetJS {
                     json__default["default"](),
                     typescript__default["default"](),
                     jsx__default["default"](),
+                    filesize__default["default"]({
+                        reporter,
+                    }),
                 ]
             };
             const outputOptions = {
@@ -186,7 +195,7 @@ class InnetJS {
                 }));
             }
             else {
-                inputOptions.plugins.push(string({
+                inputOptions.plugins.push(pluginNodeResolve.nodeResolve(), string({
                     include: '**/*.*',
                     exclude: [
                         '**/*.ts',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "innetjs",
-  "version": "1.9.0",
+  "version": "1.11.0",
   "description": "CLI for innet boilerplate",
   "homepage": "https://github.com/d8corp/innetjs",
   "author": "Mikhail Lysikov <d8corp@mail.ru>",
@@ -46,6 +46,7 @@
     "node-sass": "^7.0.1",
     "postcss": "^8.4.12",
     "rollup": "^2.70.1",
+    "rollup-plugin-filesize": "^9.1.2",
     "rollup-plugin-innet-jsx": "^1.2.0",
     "rollup-plugin-livereload": "^2.0.5",
     "rollup-plugin-postcss": "^4.0.2",

package/templates/be/package.json

@@ -8,6 +8,6 @@
     "innet": "^1.0.0"
   },
   "devDependencies": {
-    "innetjs": "^1.9.0"
+    "innetjs": "^1.11.0"
   }
 }

package/templates/fe/README.md

@@ -71,7 +71,9 @@ GENERATE_SOURCEMAP=false
 CSS_IN_JS=false
 
 # import styles from './App.css'
-# you can use css modules with CSS_MODULES=true
+# you can use css modules with CSS_MODULES=true.
+# If CSS_MODULES equals false you still can use css modules,
+# just name the css or scss file like App.module.css
 CSS_MODULES=false
 
 # you can change the public folder

package/templates/fe/package.json

@@ -4,11 +4,11 @@
     "start": "npx innetjs start"
   },
   "dependencies": {
-    "@watch-state/decorators": "^1.1.0",
-    "innet": "^0.2.8",
-    "watch-state": "^3.3.3"
+    "innet": "^1.0.0",
+    "@innet/dom": "^0.1.1",
+    "watch-state": "^3.4.3"
   },
   "devDependencies": {
-    "innetjs": "^1.9.0"
+    "innetjs": "^1.11.0"
   }
 }

package/templates/fe/src/App.scss

@@ -5,6 +5,7 @@ html, body {
   background: #2B2B2B;
   color: #F7B756;
 }
+
 .root {
   position: absolute;
   top: 50%;

package/templates/fe/src/App.tsx

@@ -1,23 +1,18 @@
-import {state} from '@watch-state/decorators'
-import styles from './App.scss'
+import { State } from 'watch-state'
 
-class App {
-  @state name = 'World'
+import styles from './App.scss'
 
-  render () {
-    return (
-      <div class={styles.root}>
-        <h1 class={styles.header}>
-          Hello{() => this.name ? `, ${this.name}` : ''}!
-        </h1>
-        <input
-          class={styles.input}
-          oninput={e => this.name = e.target.value}
-          placeholder='Enter your name'
-        />
-      </div>
-    )
-  }
-}
+const name = new State('World')
 
-export default App
+export const App = () => (
+  <div class={styles.root}>
+    <h1 class={styles.header}>
+      Hello{() => name.value ? `, ${name.value}` : ''}!
+    </h1>
+    <input
+      class={styles.input}
+      oninput={e => name.value = e.target.value}
+      placeholder='Enter your name'
+    />
+  </div>
+)

package/templates/fe/src/index.tsx

@@ -1,4 +1,6 @@
 import innet from 'innet'
-import App from './App'
+import dom from '@innet/dom'
 
-innet(<App />)
+import { App } from '/App'
+
+innet(<App />, dom)