@cmmn/tools 1.4.8 → 1.4.16

package/bin.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 
 import {bundle} from "./bundle/bundle.js";
 import {compile} from "./compile/compile.js";

package/bundle/bundle.js

@@ -14,8 +14,11 @@ function getProjectConfig(rootDir, cmmn, options) {
 }
 
 function getPackageConfigs(rootDir, options, name = null) {
+    const pckPath = path.join(rootDir, 'package.json');
+    if (!fs.existsSync(pckPath))
+        return [];
     const results = [];
-    const pkg = JSON.parse(fs.readFileSync(path.join(rootDir, 'package.json')));
+    const pkg = JSON.parse(fs.readFileSync(pckPath));
     if (name) {
         results.push(...getProjectConfig(rootDir, pkg.cmmn[name], {
             ...options,
@@ -89,16 +92,16 @@ export async function bundle(...options) {
                 console.log('START BUNDLING');
                 break;
             case 'END':
-                console.log('FINISH');
+                console.log(`FINISH at ${new Date().toTimeString().substring(0,8)}`);
                 break;
             case 'BUNDLE_START':
                 for (let key in event.input){
-                    console.log(`1. ${key} -> ${event.output}`);
+                    console.log(`\t${key} -> ${event.output}`);
                 }
                 break;
             case 'BUNDLE_END':
                 for (let key in event.input){
-                    console.log(`1. ${key} -> ${event.output}, (${event.duration / 1000}s)`);
+                    console.log(`\t${key} -> ${event.output}, (${event.duration / 1000}s)`);
                 }
                 break;
 
@@ -111,7 +114,10 @@ export async function bundle(...options) {
                         console.log(`\tline: ${event.error.frame}`);
                         break;
                     case 'UNRESOLVED_IMPORT':
-                        console.error(event.error.message);
+                        console.warn('UNRESOLVED_IMPORT:\t',event.error.message);
+                        break;
+                    case 'MISSING_EXPORT':
+                        console.warn('MISSING_EXPORT: \t', event.error.message);
                         break;
                     default:
                         console.warn('Unknown error:', event.error.code);
@@ -119,6 +125,8 @@ export async function bundle(...options) {
                         break;
                 }
                 break;
+            default:
+                console.warn('WARNING:', event)
         }
     });
 }

package/bundle/rollup.config.js

@@ -1,5 +1,6 @@
 import commonjs from '@rollup/plugin-commonjs';
 import nodeResolve from '@rollup/plugin-node-resolve';
+import image from "rollup-plugin-img";
 import {terser} from "rollup-plugin-terser"
 import {visualizer} from 'rollup-plugin-visualizer';
 import styles from "rollup-plugin-styles";
@@ -12,6 +13,7 @@ import path from "path";
 import html from '@open-wc/rollup-plugin-html';
 import json from '@rollup/plugin-json';
 import alias from '@rollup/plugin-alias';
+import replace from '@rollup/plugin-replace';
 
 /**
  * @typedef {import(rollup).RollupOptions} RollupOptions
@@ -29,6 +31,7 @@ export class ConfigCreator {
      *     external: string[],
      *     stats: boolean,
      *     name: string,
+     *     styles: 'modules' | null,
      *     outDir: string,
      *     html: string,
      *     browser: boolean,
@@ -80,6 +83,7 @@ export class ConfigCreator {
             dir: this.outDir,
             sourcemap: true,
             format: module,
+            globals: Array.isArray(this.options.external) ? Object.fromEntries(this.options.external.map(x => [x, x])) : this.options.external,
             name: this.options.global ?? 'global',
         }));
     }
@@ -124,6 +128,10 @@ export class ConfigCreator {
 
     get plugins() {
         const result = [
+            replace({
+                'process.env.NODE_ENV': JSON.stringify('development'),
+                preventAssignment: true
+            }),
             nodeResolve({
                 browser: this.options.browser,
                 dedupe: this.options.dedupe || []
@@ -135,11 +143,28 @@ export class ConfigCreator {
                 ]
             }),
             builtins(),
-            styles({
-                mode: "emit",
+            styles(this.options.styles === 'modules' ? {
+                mode: [
+                    "inject",
+                    {container: "head", prepend: true, attributes: {id: "global"}},
+                ],
+                modules: {
+                    failOnWrongOrder: true
+                },
+                namedExports: false,
+                autoModules: true,
+            }: {
+                mode: "emit"
+            }),
+            image({
+                output: `/assets`, // default the root
+                extensions: /\.(png|jpg|jpeg|gif)$/, // support png|jpg|jpeg|gif|svg, and it's alse the default value
+                limit: 8192,  // default 8192(8k)
+                exclude: 'node_modules/**'
             }),
             string({
-                include: /\.(html|svg|less|css)$/,
+                include: /\.(html|svg|less)$/,
+                exclude: /\.module\.css/
             }),
             json(),
 
@@ -175,6 +200,14 @@ export class ConfigCreator {
         return result;
     }
 
+    getExternals() {
+        if (!this.options.external)
+            return [];
+        if (Array.isArray(this.options.external))
+            return this.options.external.map(s => new RegExp(s));
+        return Object.keys(this.options.external).map(s => new RegExp(s));
+    }
+
     /**
      * @returns {RollupOptions[]}
      */
@@ -187,22 +220,29 @@ export class ConfigCreator {
         });
         if (this.options.external && typeof this.options.external === "string")
             this.options.external = [this.options.external]
-        console.log(this.options);
+        console.log(this.options.name, this.options);
         return [{
             input: {
                 [this.options.name]: path.join(this.root, this.options.input)
             },
             output: this.output,
-            external: (this.options.external || []).map(s => new RegExp(s)),
+            external: this.getExternals(),
             onwarn(warning) {
-                // Silence circular dependency warning for moment package
-                if (
-                    warning.code === 'CIRCULAR_DEPENDENCY'
-                ) {
-                    return
+                switch (warning.code) {
+                    case 'CIRCULAR_DEPENDENCY':
+                        return;
+                    case 'THIS_IS_UNDEFINED':
+                        console.log(`${warning.message} at`);
+                        console.log(`\t${warning.id}`);
+                        break;
+                    case 'PLUGIN_WARNING':
+                        console.log(`${warning.message} at`);
+                        console.log(`\t${warning.id}`);
+                        break;
+                    default:
+                        console.warn(`\t${warning.code}(!) ${warning.message}`)
                 }
 
-                console.warn(`(!) ${warning.message}`)
             },
             plugins: this.plugins,
             treeshake: this.options.minify ? "smallest" : "recommended",

package/compile/compile.js

@@ -1,5 +1,5 @@
 import ts from "ttypescript";
-import {resolve} from 'path';
+import {resolve, relative} from 'path';
 
 const rootDir = process.cwd();
 
@@ -16,7 +16,7 @@ export function compile(...flags) {
         incremental: true,
         dry: false
     }, {
-        excludeDirectories: ["node_modules", "dist"]
+        excludeDirectories: ["node_modules", "dist"],
     });
         builder.clean(rootDir);
         builder.build(rootDir);
@@ -26,7 +26,7 @@ function createProgram(rootNames, options, host, oldProgram, configFileParsingDi
     options.outDir = resolve(options.configFilePath, '../dist/esm');
     options.declarationDir = resolve(options.configFilePath, '../dist/typings');
     options.baseUrl = resolve(options.configFilePath, '../');
-    console.log('build', options.configFilePath);
+    console.log('\t', relative(process.cwd(), options.baseUrl));
     return ts.createEmitAndSemanticDiagnosticsBuilderProgram(
         rootNames, options, host, oldProgram, configFileParsingDiagnostics, projectReferences
     )

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmmn/tools",
-  "version": "1.4.8",
+  "version": "1.4.16",
   "description": "Compilation, bundling, code generator, testing.",
   "main": "dist/rollup.config.js",
   "type": "module",
@@ -36,11 +36,13 @@
   ],
   "dependencies": {
     "@jest/globals": "27.x.x",
+    "@modular-css/rollup": "28.x.x",
     "@open-wc/rollup-plugin-html": "^1.2.5",
     "@rollup/plugin-alias": "3",
     "@rollup/plugin-commonjs": "^21",
     "@rollup/plugin-json": "4",
     "@rollup/plugin-node-resolve": "^13",
+    "@rollup/plugin-replace": "4.x.x",
     "@rollup/plugin-typescript": "^8",
     "@swc/jest": "0.2.17",
     "@testdeck/jest": "0.2.0",
@@ -50,9 +52,11 @@
     "jest": "27.x.x",
     "less": "^4",
     "rollup": "^2",
+    "rollup-plugin-img": "1.x.x",
     "rollup-plugin-livereload": "^2.0.5",
     "rollup-plugin-node-builtins": "^2.1.2",
     "rollup-plugin-node-globals": "^1.4.0",
+    "rollup-plugin-postcss": "4.x.x",
     "rollup-plugin-serve": "^1.1.0",
     "rollup-plugin-string": "^3.0.0",
     "rollup-plugin-styles": "^4",
@@ -65,5 +69,5 @@
   },
   "author": "",
   "license": "ISC",
-  "gitHead": "4def42c1fddcef7bd25aa320999631ef582e49e4"
+  "gitHead": "dec0db17451f8b98d7e10abc3221c567bcddc72d"
 }