@cmmn/tools 1.4.13 → 1.5.0

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,
@@ -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);

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,7 +13,10 @@ 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';
+import postCSS from "rollup-plugin-postcss"
 
+import flexbugs from 'postcss-flexbugs-fixes';
 /**
  * @typedef {import(rollup).RollupOptions} RollupOptions
  * @typedef {import(rollup).OutputOptions} OutputOptions
@@ -29,6 +33,7 @@ export class ConfigCreator {
      *     external: string[],
      *     stats: boolean,
      *     name: string,
+     *     styles: 'modules' | null,
      *     outDir: string,
      *     html: string,
      *     browser: boolean,
@@ -80,7 +85,7 @@ export class ConfigCreator {
             dir: this.outDir,
             sourcemap: true,
             format: module,
-            globals: Object.fromEntries(this.options.external.map(x => [x,x])),
+            globals: Array.isArray(this.options.external) ? Object.fromEntries(this.options.external.map(x => [x, x])) : this.options.external,
             name: this.options.global ?? 'global',
         }));
     }
@@ -125,6 +130,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 || []
@@ -136,11 +145,31 @@ export class ConfigCreator {
                 ]
             }),
             builtins(),
-            styles({
-                mode: "emit",
+            this.options.styles === 'modules' ? postCSS({
+                mode: [
+                    "inject",
+                    {container: "head", prepend: true, attributes: {id: "global"}},
+                ],
+                plugins: [
+                    flexbugs,
+                ],
+                modules: {
+                    root: ''
+                },
+                namedExports: false,
+                autoModules: true,
+            }) : styles({
+                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(),
 
@@ -176,6 +205,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[]}
      */
@@ -188,23 +225,27 @@ 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 || []),
+            external: this.getExternals(),
             onwarn(warning) {
-                switch (warning.code){
+                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.message}`)
+                        console.warn(`\t${warning.code}(!) ${warning.message}`)
                 }
 
             },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmmn/tools",
-  "version": "1.4.13",
+  "version": "1.5.0",
   "description": "Compilation, bundling, code generator, testing.",
   "main": "dist/rollup.config.js",
   "type": "module",
@@ -36,28 +36,37 @@
   ],
   "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",
     "@types/jest": "27.x.x",
+    "@types/sinon": "10.x.x",
     "@web/rollup-plugin-html": "^1.10.1",
     "fast-glob": "^3.2.11",
     "jest": "27.x.x",
     "less": "^4",
+    "postcss-composes": "^0.1.0",
+    "postcss-flexbugs-fixes": "5.x.x",
+    "postcss-normalize": "10.x.x",
     "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",
     "rollup-plugin-terser": "^7",
     "rollup-plugin-visualizer": "^5.5.4",
+    "sinon": "10.x.x",
     "ts-jest": "27.x.x",
     "ttypescript": "1.5.13",
     "typescript": "4.x.x",
@@ -65,5 +74,5 @@
   },
   "author": "",
   "license": "ISC",
-  "gitHead": "2dc32e552dd5877be0ceb18f64cb896f13f15303"
+  "gitHead": "ffece352d3254302cfa09233b54d93dc73b839d5"
 }

package/test/index.d.ts

@@ -1,2 +1,3 @@
 export {suite, test, timeout,} from "@testdeck/jest";
-export {expect,} from "@jest/globals";
+export {expect,} from "@jest/globals";
+export * as sinon from "sinon";

package/test/index.js

@@ -1,5 +1,6 @@
 export {suite, test, timeout,} from "@testdeck/jest";
 import * as globals from "@jest/globals";
-
+import * as sinon1 from "sinon/pkg/sinon.js";
+export const sinon = sinon1.default;
 const {expect} = globals;
 export {expect};