@cmmn/tools 1.6.19 → 1.6.25

package/bundle/rollup.config.js

@@ -6,8 +6,9 @@ import {string} from "rollup-plugin-string";
 import serve from 'rollup-plugin-serve';
 import builtins from 'rollup-plugin-node-builtins';
 import livereload from 'rollup-plugin-livereload';
+import copy from 'rollup-plugin-copy';
 import fs from "fs";
-import path from "path";
+import path, {join} from "path";
 import html from '@open-wc/rollup-plugin-html';
 import json from '@rollup/plugin-json';
 import alias from '@rollup/plugin-alias';
@@ -103,18 +104,21 @@ export class ConfigCreator {
             template: (x) => {
                 let inject = Object.keys(x.bundle.bundle).map(key => {
                     if (key.endsWith('css'))
-                        return `<link rel="stylesheet" href="/${key}" >`;
+                        return `<link rel="stylesheet" href="${this.options.base ?? ''}/${key}" >`;
                     if (key.endsWith('js'))
-                        return `<script type="module" defer src="/${key}"></script>`;
+                        return `<script type="module" defer src="${this.options.base ?? ''}/${key}"></script>`;
                 }).join('\n');
                 if (!this.options.minify) {
                     const importMaps = Object.fromEntries(this.options.external
                         .map(key => key.replace('.*', '/'))
-                        .map(key => [key, `/external/${this.options.alias[key] ?? key}`]));
+                        .map(key => [key, `/external/${this.options.alias?.[key] ?? key}`]));
                     inject = `<script type="importmap" >${JSON.stringify({
                         imports: importMaps
                     })}</script>` + inject;
                 }
+                if (this.options.base){
+                    inject = `<base href="${this.options.base}">` + inject;
+                }
                 const html = fs.readFileSync(path.join(this.root, this.options.html), 'utf8')
                 return html.replace('</head>', inject + '</head>');
             }
@@ -202,6 +206,14 @@ export class ConfigCreator {
                 }))
             }));
         }
+        if (this.options.minify && this.options.mount){
+            const toCopy = Object.entries(this.options.mount).map(([to, from]) => {
+                return {src: from, dest: join(this.outDir, to)}
+            });
+            result.push(copy({
+                targets: toCopy
+            }));
+        }
         if (this.options.html || this.options.input.endsWith('.html')) {
             result.push(this.html);
             result.push(watcher([path.join(this.root, this.options.html)]))
@@ -268,7 +280,7 @@ export class ConfigCreator {
 
             },
             plugins: this.plugins,
-            treeshake: this.options.minify ? "smallest" : "safest",
+            treeshake: this.options.minify ? "recommended" : "safest",
             watch: {
                 buildDelay: 300,
                 clearScreen: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmmn/tools",
-  "version": "1.6.19",
+  "version": "1.6.25",
   "description": "Compilation, bundling, code generator, testing.",
   "main": "dist/rollup.config.js",
   "type": "module",
@@ -63,6 +63,7 @@
     "postcss-import": "14",
     "postcss-modules": "*",
     "rollup": "^2",
+    "rollup-plugin-copy": "3",
     "rollup-plugin-livereload": "^2.0.5",
     "rollup-plugin-node-builtins": "^2.1.2",
     "rollup-plugin-node-globals": "^1.4.0",
@@ -81,5 +82,5 @@
   },
   "author": "",
   "license": "ISC",
-  "gitHead": "e12a01ab5ebaaff2c4558405d24549650d5ff2d3"
+  "gitHead": "69a1243e5836906a3e6e89ed0bfd7543f5a380a8"
 }