@cmmn/tools 1.6.11 → 1.6.12

package/bundle/bundle.js

@@ -1,7 +1,8 @@
 import {rollup, watch} from "rollup";
 import {getConfigOptions} from "./getConfigs.js";
 import {ConfigCreator} from "./rollup.config.js";
-
+import fs from "fs";
+import path from "path";
 
 export async function bundle(...options) {
     const configOptions = getConfigOptions({
@@ -19,7 +20,9 @@ export async function bundle(...options) {
             }
             const build = await rollup(config);
             for (let out of config.output){
-                console.log(`SUCCESS: ${out.dir} ${out.entryFileNames.replace('[name]', Object.keys(config.input)[0])}`);
+                const file = path.join(out.dir, out.entryFileNames.replace('[name]', Object.keys(config.input)[0]));
+                const stat = fs.statSync(file);
+                console.log(`SUCCESS: ${file} (${(stat.size/1024/1024).toFixed(3)}Mb)`);
                 await build.write(out);
             }
         }

package/bundle/rollup.config.js

@@ -15,7 +15,6 @@ import replace from '@rollup/plugin-replace';
 import sourcemaps from 'rollup-plugin-sourcemaps';
 import {Styles} from "./styles.js";
 
-// import postcssPresetEnv from 'postcss-preset-env'
 /**
  * @typedef {import(rollup).RollupOptions} RollupOptions
  * @typedef {import(rollup).OutputOptions} OutputOptions
@@ -84,9 +83,9 @@ export class ConfigCreator {
             entryFileNames: this.getOutputFileName(module, this.options.minify),
             // file: output,
             dir: this.outDir,
-            sourcemap: true,
+            sourcemap: this.options.minify ? false : 'inline',
             format: module,
-            globals: Array.isArray(this.options.external) ? Object.fromEntries(this.options.external.map(x => [x, x])) : this.options.external,
+            globals: module === 'umd' ? (Array.isArray(this.options.external) ? Object.fromEntries(this.options.external.map(x => [x, x])) : this.options.external) : [],
             assetFileNames: "assets/[name][extname]",
             name: this.options.global ?? 'global',
         }));
@@ -100,9 +99,9 @@ export class ConfigCreator {
             template: ({bundle}) => {
                 const inject = Object.keys(bundle.bundle).map(key => {
                     if (key.endsWith('css'))
-                        return `<link rel="stylesheet" href="${key}" >`;
+                        return `<link rel="stylesheet" href="/${key}" >`;
                     if (key.endsWith('js'))
-                        return `<script defer src="${key}"></script>`;
+                        return `<script type="module" defer src="/${key}"></script>`;
                 })
                 const html = fs.readFileSync(path.join(this.root, this.options.html), 'utf8')
                 return html.replace('</head>', inject.join('\n') + '</head>');
@@ -147,13 +146,15 @@ export class ConfigCreator {
                 preventAssignment: true
             }),
             ...Styles(this.options),
+            commonjs({
+                requireReturnsDefault: "namespace",
+                transformMixedEsModules: true,
+                defaultIsModuleExports: true
+            }),
             nodeResolve({
                 browser: this.options.browser,
                 dedupe: this.options.dedupe || []
             }),
-            commonjs({
-                requireReturnsDefault: "namespace"
-            }),
             sourcemaps(),
             builtins(),
             /*this.options.styles === 'modules' ? postCSS({
@@ -251,7 +252,7 @@ export class ConfigCreator {
 
             },
             plugins: this.plugins,
-            treeshake: this.options.minify ? "smallest" : "recommended",
+            treeshake: this.options.minify ? "smallest" : "safest",
             watch: {
                 exclude: this.getExternals().concat(path.join(this.root, this.outDir)),
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmmn/tools",
-  "version": "1.6.11",
+  "version": "1.6.12",
   "description": "Compilation, bundling, code generator, testing.",
   "main": "dist/rollup.config.js",
   "type": "module",
@@ -57,7 +57,7 @@
     "fast-glob": "^3.2.11",
     "jest": "27.x.x",
     "less": "^4",
-    "live-server": "1",
+    "live-server": "1.2.2",
     "postcss-import": "14",
     "postcss-modules": "*",
     "rollup": "^2",
@@ -80,5 +80,5 @@
   },
   "author": "",
   "license": "ISC",
-  "gitHead": "2755b333808bf97f1d9454601c2a2c9a88e4a021"
+  "gitHead": "96da82c2b5c2a0c8bead5eeb8005d00261812153"
 }