@cmmn/tools 1.6.24 → 1.6.26

package/bundle/rollup.config.js

@@ -104,9 +104,9 @@ 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
@@ -116,6 +116,9 @@ export class ConfigCreator {
                         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>');
             }
@@ -162,11 +165,11 @@ export class ConfigCreator {
             commonjs({
                 requireReturnsDefault: "namespace",
                 transformMixedEsModules: true,
-                defaultIsModuleExports: true
+                defaultIsModuleExports: true,
             }),
             nodeResolve({
                 browser: this.options.browser,
-                dedupe: this.options.dedupe || []
+                dedupe: this.options.dedupe || [],
             }),
             sourcemaps(),
             builtins(),
@@ -277,7 +280,8 @@ export class ConfigCreator {
 
             },
             plugins: this.plugins,
-            treeshake: this.options.minify ? "smallest" : "safest",
+            preserveEntrySignatures: true,
+            treeshake: this.options.minify ? "recommended" : "safest",
             watch: {
                 buildDelay: 300,
                 clearScreen: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmmn/tools",
-  "version": "1.6.24",
+  "version": "1.6.26",
   "description": "Compilation, bundling, code generator, testing.",
   "main": "dist/rollup.config.js",
   "type": "module",
@@ -55,6 +55,7 @@
     "@types/sinon": "10.x.x",
     "@web/rollup-plugin-html": "^1.10.1",
     "fast-glob": "^3.2.11",
+    "file-uri-to-path": "2.x.x",
     "import-meta-resolve": "2",
     "jest": "27.x.x",
     "less": "^4",
@@ -82,5 +83,5 @@
   },
   "author": "",
   "license": "ISC",
-  "gitHead": "0826ee58578f567fc9eec12b9ab2aef9d0b3e8a2"
+  "gitHead": "c817edf78be83ca444f7eb3ba9516f0faf0f40cc"
 }

package/serve/serve.js

@@ -3,6 +3,7 @@ import path from "path";
 import fs from "fs";
 import liveServer from "live-server";
 import {resolve, moduleResolve} from 'import-meta-resolve';
+import uri2path from "file-uri-to-path";
 
 export function serve(...options) {
     const configs = getConfigOptions({
@@ -56,7 +57,7 @@ const resolveESModule = (rootDir, configs) => async function (req, res, next) {
         ? await getFileName(refererModule, 'file://' + rootDir + '/package.json')
         : 'file://' + rootDir + '/package.json';
     try {
-        const file = (await getFileName(name, root)).substring('file:///'.length);
+        const file = uri2path(await getFileName(name, root));
         var stat = fs.statSync(file);
 
         res.writeHead(200, {