@cmmn/tools 1.6.25 → 1.6.27

package/bundle/rollup.config.js

@@ -165,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(),
@@ -280,6 +280,7 @@ export class ConfigCreator {
 
             },
             plugins: this.plugins,
+            preserveEntrySignatures: true,
             treeshake: this.options.minify ? "recommended" : "safest",
             watch: {
                 buildDelay: 300,

package/bundle/styles.js

@@ -1,4 +1,3 @@
-import loader from 'postcss-modules/build/css-loader-core/loader.js';
 import postCssImport from 'postcss-import';
 import postCssAssets from 'postcss-assets';
 import cssModules from '@modular-css/rollup';
@@ -6,22 +5,6 @@ import slug from "unique-slug";
 import styles from "rollup-plugin-styles";
 import {images} from "./images.js";
 
-class Loader extends loader.default {
-    failStart = '/' + process.cwd();
-
-    fetch(_newPath, relativeTo, _trace) {
-        if (relativeTo.startsWith(this.failStart))
-            relativeTo = relativeTo.substring(1);
-        // let newPath = _newPath.replace(/^["']|["']$/g, "");
-        // let relativeDir = path.dirname(relativeTo),
-        //     rootRelativePath = path.resolve(relativeDir, newPath),
-        //     fileRelativePath = path.resolve(path.join(this.root, relativeDir), newPath);
-        // relativeTo = path.relative(process.cwd(), relativeTo);
-        // console.log({root: this.root, newPath, relativeTo, relativeDir, rootRelativePath, fileRelativePath});
-        return super.fetch(_newPath, relativeTo, _trace);
-    }
-}
-
 /**
  *
  * @param {ConfigCreator} config

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmmn/tools",
-  "version": "1.6.25",
+  "version": "1.6.27",
   "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": "69a1243e5836906a3e6e89ed0bfd7543f5a380a8"
+  "gitHead": "e4e3cb40b5249ed8022dbec45db78c2c1a91b6c5"
 }

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({
@@ -14,7 +15,7 @@ export function serve(...options) {
         const server = await liveServer.start({
             root: root,
             file: 'index.html',
-            port: x.port,
+            port: process.env.PORT || x.port,
             open: false,
             mount: x.mount && Object.entries(x.mount)
                 .map(([from, to]) => [from, path.resolve(x.rootDir, to)])
@@ -35,15 +36,23 @@ function getModuleName(path) {
 
 const mappingCache = {};
 
-async function getFileName(moduleName, root){
+// for resolve modules and files inside modules
+async function getFileName(moduleName, root) {
     // console.log(moduleName, root);
     if (moduleName in mappingCache)
         return mappingCache[moduleName];
-    const file = (await moduleResolve(moduleName, root, new Set(['module','import', 'browser', 'node'])));
-    mappingCache[moduleName] = file.href;
-    return file.href;
+    let file;
+    if (moduleName.match('\.[cm]?js')) {
+        const module = moduleName.match(/^(@[^/]+\/)?[^/]+/)[0];
+        const main = (await moduleResolve(module, root, new Set(['module', 'import', 'browser', 'main', 'node'])));
+        const file = main.href.replace(new RegExp('node_modules/' + module + '.*$'), 'node_modules/' + moduleName);
+        console.log(file)
+        return mappingCache[moduleName] = file;
+    } else {
+        const file = (await moduleResolve(moduleName, root, new Set(['module', 'import', 'browser', 'main', 'node'])));
+        return mappingCache[moduleName] = file.href;
+    }
 }
-
 const resolveESModule = (rootDir, configs) => async function (req, res, next) {
     const name = getModuleName(req.url);
     if (!name)
@@ -56,7 +65,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, {
@@ -78,4 +87,4 @@ const resolveESModule = (rootDir, configs) => async function (req, res, next) {
     }
     res.end();
     return;
-}
+}