gant-core 2.0.2 → 2.0.4

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # gant-core
 
+## 2.0.4
+
+### Patch Changes
+
+- 修复 Node.js < 21.7.0 下 @rspack/dev-server 报 `styleText is not a function` 的问题。通过自定义 ESM loader hook 在加载时改写模块源码，为 `util.styleText` 提供 fallback polyfill。
+
+## 2.0.3
+
+### Patch Changes
+
+- 修复 CLI CJS 格式 require() ESM-only 模块导致的 ERR_REQUIRE_ESM 错误，CLI 输出改为 ESM (.mjs)
+
 ## 2.0.2
 
 ### Patch Changes

package/bin/index.js

@@ -1,9 +1,29 @@
 #!/usr/bin/env node
+const path = require('path');
 const { performance } = require('perf_hooks');
 
 global.__gant_start_time = performance.now();
 
+// On Node.js < 21.7.0, util.styleText is unavailable but @rspack/dev-server uses it
+// via ESM namespace import (import * as ns from "node:util"). Monkey-patching
+// require("node:util") does NOT propagate to ESM namespace objects on Node 20.
+// We launch a subprocess with a custom ESM --loader that intercepts module loading
+// and rewrites the styleText destructuring to include a fallback polyfill.
+// __GANT_STYLETEXT_POLYFILL env var prevents infinite re-spawn (the loader fixes
+// the issue at source level, so util.styleText remains undefined in the child).
+const util = require('node:util');
+if (!util.styleText && !process.env.__GANT_STYLETEXT_POLYFILL) {
+  const { spawnSync } = require('child_process');
+  const loaderPath = path.join(__dirname, 'styletext-loader.mjs');
+  const args = ['--loader', loaderPath, ...process.argv.slice(1)];
+  const result = spawnSync(process.execPath, args, {
+    stdio: 'inherit',
+    env: { ...process.env, __GANT_STYLETEXT_POLYFILL: '1' },
+  });
+  process.exit(result.status ?? 1);
+}
+
 function start() {
-  return import('../lib/cli/index.js');
+  return import('../lib/cli/index.mjs');
 }
 start();

package/bin/styletext-loader.mjs

@@ -0,0 +1,30 @@
+// ESM loader hook to polyfill util.styleText for Node.js < 21.7.0.
+// @rspack/dev-server uses util.styleText, which is only available since Node.js 21.7.0.
+// This loader intercepts module loading and rewrites the destructuring of styleText
+// from the node:util namespace to use a fallback polyfill when styleText is unavailable.
+
+const STYLE_POLYFILL_FN = `(function(f,t){var c={black:[30,39],red:[31,39],green:[32,39],yellow:[33,39],blue:[34,39],magenta:[35,39],cyan:[36,39],white:[37,39],gray:[90,39],grey:[90,39],redBright:[91,39],greenBright:[92,39],yellowBright:[93,39],blueBright:[94,39],magentaBright:[95,39],cyanBright:[96,39],whiteBright:[97,39],bgBlack:[40,49],bgRed:[41,49],bgGreen:[42,49],bgYellow:[43,49],bgBlue:[44,49],bgMagenta:[45,49],bgCyan:[46,49],bgWhite:[47,49],bold:[1,22],dim:[2,22],italic:[3,23],underline:[4,24],inverse:[7,27],hidden:[8,28],strikethrough:[9,29]};if(!Array.isArray(f))f=[f];var o=[];for(var i=0;i<f.length;i++){if(c[f[i]])o.push(c[f[i]][0])}return o.length?'\\x1b['+o.join(';')+'m'+t+'\\x1b[0m':t})`;
+
+export async function load(url, context, nextLoad) {
+  const result = await nextLoad(url, context);
+
+  if (result.format === 'module' && result.source) {
+    let source = typeof result.source === 'string'
+      ? result.source
+      : Buffer.from(result.source).toString('utf-8');
+
+    // Transform: const { styleText: X } = __rspack_external_node_util_XXXXX;
+    // Into:     var X = typeof NAMESPACE.styleText === 'function'
+    //                ? NAMESPACE.styleText
+    //                : POLYFILL;
+    if (source.includes('__rspack_external_node_util') && source.includes('styleText')) {
+      source = source.replace(
+        /const \{ styleText: (\w+) \} = (__rspack_external_node_util_\w+);/g,
+        `var $1 = typeof $2.styleText === 'function' ? $2.styleText : ${STYLE_POLYFILL_FN};`
+      );
+      return { format: 'module', source };
+    }
+  }
+
+  return result;
+}

package/lib/cli/config/index.js

@@ -1,3 +1,156 @@
-#!/usr/bin/env node
-"use strict";var i=require("path"),e=require("fs"),t=require("../utils/index.js"),s=require("../utils/getJavascriptfile.js");const n=["config/config.ts","config/config.js","config.ts","config.js"],o=["routes","microServiceMap","setting","define","optimization","provide","htmlTemplatePath"];class g{opts;mainConfigFile;configFiles=[];constructor(i){const e=i.defaultConfigFiles?i.defaultConfigFiles:n;this.mainConfigFile=g.getMainConfigFile({cwd:i.cwd,defaultConfigFiles:e}),this.opts={...i,defaultConfigFiles:e}}getMsPagesUserConfig(i){let e={};return("string"==typeof i?[i]:i).map(i=>{const s=g.getMainConfigFile({cwd:i,defaultConfigFiles:this.opts.defaultConfigFiles}),n=g.getUserConfig({cwd:i,mainConfigFile:s});e=t.mergeConfig(e,t.pick(n,o))}),e}getMsUserConfig(){this.configFiles=[];let e=g.getUserConfig({cwd:this.opts.cwd,mainConfigFile:this.mainConfigFile});this.mainConfigFile&&this.configFiles.push(this.mainConfigFile);const s=[this.opts.cwd],n=t.getSrcPath();t.get(e,"mfa.pages",[]);const f=t.get(e,"alias",{}),l=t.get(e,"packages",{}),c={"@gant":i.resolve(this.opts.cwd,n,".gant"),"@@":i.resolve(this.opts.cwd),...f};let a={context:this.opts.cwd,publicPathDir:i.resolve(this.opts.cwd,n,".gant"),resolve:{alias:c}};return t.isPlainObject(l)&&Object.keys(l).map(i=>{const e=l[i];if(s.includes(e))return;s.push(e);const n=g.getMainConfigFile({cwd:e,defaultConfigFiles:this.opts.defaultConfigFiles});n&&this.configFiles.push(n);const f=g.getUserConfig({cwd:e,mainConfigFile:n});a=t.mergeConfig(a,t.pick(f,o))}),{...t.mergeConfig(a,e)}}getUserConfig(){this.configFiles=[];let e=g.getUserConfig({cwd:this.opts.cwd,mainConfigFile:this.mainConfigFile});this.mainConfigFile&&this.configFiles.push(this.mainConfigFile);const s=[this.opts.cwd],n=t.get(e,"packages",{}),f=t.getSrcPath(),l={"@gant":i.resolve(this.opts.cwd,f,".gant"),[e.name||"@@"]:i.resolve(this.opts.cwd),...n};let c={context:this.opts.cwd,resolve:{alias:l}};return t.isPlainObject(n)&&Object.keys(n).map(i=>{const e=n[i];if(s.includes(e))return;s.push(e);const f=g.getMainConfigFile({cwd:e,defaultConfigFiles:this.opts.defaultConfigFiles});f&&this.configFiles.push(f);const l=g.getUserConfig({cwd:e,mainConfigFile:f});c=t.mergeConfig(c,t.pick(l,o))}),{...t.mergeConfig(c,e)}}static getMainConfigFile(t){let s=null;for(const o of t.defaultConfigFiles||n){const n=i.join(t.cwd,o);if(e.existsSync(n)){s=n;break}}return s}static getUserConfig(i){let e={};if(!i.mainConfigFile)return e;try{e=s.getJavascriptfile(t.getAbsFile(i.mainConfigFile,i.cwd))}catch(i){console.log("getUserConfig Error :",i)}return e}}exports.Config=g;
+'use strict';
+
+var path = require('path');
+var fs = require('fs');
+var utils_index = require('../utils/index.js');
+var utils_getJavascriptfile = require('../utils/getJavascriptfile.js');
+
+const DEFAULT_CONFIG_FILES = ['config/config.ts', 'config/config.js', 'config.ts', 'config.js'];
+const pickNames = ['routes', 'microServiceMap', 'setting', 'define', 'optimization', 'provide', 'htmlTemplatePath'];
+class Config {
+    opts;
+    mainConfigFile;
+    configFiles = [];
+    constructor(opts) {
+        const defaultConfigFiles = opts.defaultConfigFiles ? opts.defaultConfigFiles : DEFAULT_CONFIG_FILES;
+        this.mainConfigFile = Config.getMainConfigFile({
+            cwd: opts.cwd,
+            defaultConfigFiles: defaultConfigFiles,
+        });
+        this.opts = {
+            ...opts,
+            defaultConfigFiles: defaultConfigFiles,
+        };
+    }
+    getMsPagesUserConfig(cwd) {
+        const paths = typeof cwd === 'string' ? [cwd] : cwd;
+        let tempConfig = {};
+        paths.map(itemPath => {
+            const mainConfigFile = Config.getMainConfigFile({
+                cwd: itemPath,
+                defaultConfigFiles: this.opts.defaultConfigFiles,
+            });
+            const config = Config.getUserConfig({
+                cwd: itemPath,
+                mainConfigFile: mainConfigFile,
+            });
+            tempConfig = utils_index.mergeConfig(tempConfig, utils_index.pick(config, pickNames));
+        });
+        return tempConfig;
+    }
+    getMsUserConfig() {
+        this.configFiles = [];
+        let userConfig = Config.getUserConfig({
+            cwd: this.opts.cwd,
+            mainConfigFile: this.mainConfigFile,
+        });
+        this.mainConfigFile && this.configFiles.push(this.mainConfigFile);
+        const fileArray = [this.opts.cwd];
+        const srcPath = utils_index.getSrcPath();
+        utils_index.get(userConfig, 'mfa.pages', []);
+        const configAlias = utils_index.get(userConfig, 'alias', {});
+        const packages = utils_index.get(userConfig, 'packages', {});
+        const alias = {
+            '@gant': path.resolve(this.opts.cwd, srcPath, '.gant'),
+            '@@': path.resolve(this.opts.cwd),
+            ...configAlias,
+        };
+        let tempConfig = {
+            context: this.opts.cwd,
+            publicPathDir: path.resolve(this.opts.cwd, srcPath, '.gant'),
+            resolve: {
+                alias: alias,
+            },
+        };
+        if (utils_index.isPlainObject(packages)) {
+            Object.keys(packages).map(name => {
+                const packagePath = packages[name];
+                if (fileArray.includes(packagePath))
+                    return;
+                fileArray.push(packagePath);
+                const configFile = Config.getMainConfigFile({
+                    cwd: packagePath,
+                    defaultConfigFiles: this.opts.defaultConfigFiles,
+                });
+                configFile && this.configFiles.push(configFile);
+                const packageConfig = Config.getUserConfig({
+                    cwd: packagePath,
+                    mainConfigFile: configFile,
+                });
+                tempConfig = utils_index.mergeConfig(tempConfig, utils_index.pick(packageConfig, pickNames));
+            });
+        }
+        return {
+            ...utils_index.mergeConfig(tempConfig, userConfig),
+        };
+    }
+    getUserConfig() {
+        this.configFiles = [];
+        let userConfig = Config.getUserConfig({
+            cwd: this.opts.cwd,
+            mainConfigFile: this.mainConfigFile,
+        });
+        this.mainConfigFile && this.configFiles.push(this.mainConfigFile);
+        const fileArray = [this.opts.cwd];
+        const packages = utils_index.get(userConfig, 'packages', {});
+        const srcPath = utils_index.getSrcPath();
+        const alias = {
+            '@gant': path.resolve(this.opts.cwd, srcPath, '.gant'),
+            [userConfig.name || '@@']: path.resolve(this.opts.cwd),
+            ...packages,
+        };
+        let tempConfig = {
+            context: this.opts.cwd,
+            resolve: {
+                alias: alias,
+            },
+        };
+        if (utils_index.isPlainObject(packages)) {
+            Object.keys(packages).map(name => {
+                const packagePath = packages[name];
+                if (fileArray.includes(packagePath))
+                    return;
+                fileArray.push(packagePath);
+                const configFile = Config.getMainConfigFile({
+                    cwd: packagePath,
+                    defaultConfigFiles: this.opts.defaultConfigFiles,
+                });
+                configFile && this.configFiles.push(configFile);
+                const packageConfig = Config.getUserConfig({
+                    cwd: packagePath,
+                    mainConfigFile: configFile,
+                });
+                tempConfig = utils_index.mergeConfig(tempConfig, utils_index.pick(packageConfig, pickNames));
+            });
+        }
+        return {
+            ...utils_index.mergeConfig(tempConfig, userConfig),
+        };
+    }
+    static getMainConfigFile(opts) {
+        let mainConfigFile = null;
+        for (const configFile of opts.defaultConfigFiles || DEFAULT_CONFIG_FILES) {
+            const absConfigFile = path.join(opts.cwd, configFile);
+            if (fs.existsSync(absConfigFile)) {
+                mainConfigFile = absConfigFile;
+                break;
+            }
+        }
+        return mainConfigFile;
+    }
+    static getUserConfig(opts) {
+        let config = {};
+        if (!opts.mainConfigFile)
+            return config;
+        try {
+            config = utils_getJavascriptfile.getJavascriptfile(utils_index.getAbsFile(opts.mainConfigFile, opts.cwd));
+        }
+        catch (error) {
+            console.log('getUserConfig Error :', error);
+        }
+        return config;
+    }
+}
+
+exports.Config = Config;
 //# sourceMappingURL=index.js.map

package/lib/cli/config/index.mjs

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+import{resolve as i,join as t}from"path";import{existsSync as s}from"fs";import{m as e,p as n,g as o,a as g,i as f,b as a}from"../utils/index.mjs";import{g as l}from"../utils/getJavascriptfile.mjs";const c=["config/config.ts","config/config.js","config.ts","config.js"],r=["routes","microServiceMap","setting","define","optimization","provide","htmlTemplatePath"];class p{opts;mainConfigFile;configFiles=[];constructor(i){const t=i.defaultConfigFiles?i.defaultConfigFiles:c;this.mainConfigFile=p.getMainConfigFile({cwd:i.cwd,defaultConfigFiles:t}),this.opts={...i,defaultConfigFiles:t}}getMsPagesUserConfig(i){let t={};return("string"==typeof i?[i]:i).map(i=>{const s=p.getMainConfigFile({cwd:i,defaultConfigFiles:this.opts.defaultConfigFiles}),o=p.getUserConfig({cwd:i,mainConfigFile:s});t=e(t,n(o,r))}),t}getMsUserConfig(){this.configFiles=[];let t=p.getUserConfig({cwd:this.opts.cwd,mainConfigFile:this.mainConfigFile});this.mainConfigFile&&this.configFiles.push(this.mainConfigFile);const s=[this.opts.cwd],a=o();g(t,"mfa.pages",[]);const l=g(t,"alias",{}),c=g(t,"packages",{}),C={"@gant":i(this.opts.cwd,a,".gant"),"@@":i(this.opts.cwd),...l};let d={context:this.opts.cwd,publicPathDir:i(this.opts.cwd,a,".gant"),resolve:{alias:C}};return f(c)&&Object.keys(c).map(i=>{const t=c[i];if(s.includes(t))return;s.push(t);const o=p.getMainConfigFile({cwd:t,defaultConfigFiles:this.opts.defaultConfigFiles});o&&this.configFiles.push(o);const g=p.getUserConfig({cwd:t,mainConfigFile:o});d=e(d,n(g,r))}),{...e(d,t)}}getUserConfig(){this.configFiles=[];let t=p.getUserConfig({cwd:this.opts.cwd,mainConfigFile:this.mainConfigFile});this.mainConfigFile&&this.configFiles.push(this.mainConfigFile);const s=[this.opts.cwd],a=g(t,"packages",{}),l=o(),c={"@gant":i(this.opts.cwd,l,".gant"),[t.name||"@@"]:i(this.opts.cwd),...a};let C={context:this.opts.cwd,resolve:{alias:c}};return f(a)&&Object.keys(a).map(i=>{const t=a[i];if(s.includes(t))return;s.push(t);const o=p.getMainConfigFile({cwd:t,defaultConfigFiles:this.opts.defaultConfigFiles});o&&this.configFiles.push(o);const g=p.getUserConfig({cwd:t,mainConfigFile:o});C=e(C,n(g,r))}),{...e(C,t)}}static getMainConfigFile(i){let e=null;for(const n of i.defaultConfigFiles||c){const o=t(i.cwd,n);if(s(o)){e=o;break}}return e}static getUserConfig(i){let t={};if(!i.mainConfigFile)return t;try{t=l(a(i.mainConfigFile,i.cwd))}catch(i){console.log("getUserConfig Error :",i)}return t}}export{p as C};
+//# sourceMappingURL=index.mjs.map

package/lib/cli/copyfiles/index.js

@@ -1,3 +1,34 @@
-#!/usr/bin/env node
-"use strict";var s=require("path"),e=require("../utils/index.js"),p=require("fs");exports.copyAppsFiles=(o,t)=>{let r="";const i=["app.ts","app.tsx","app.js"];t.map((e,o)=>{for(const o of i){const t=s.resolve(e,o);if(p.existsSync(t)){const e=t.split(s.sep).join(s.posix.sep);return r+=`import '${e}';\n`}}});const c=s.resolve(o,"app.ts");e.writeFileToJS(c,r)},exports.copyPublicFiles=(p,o)=>{o?.map((o,t)=>{e.copyFolder(o,s.resolve(p,"public"))})};
+'use strict';
+
+var path = require('path');
+var utils_index = require('../utils/index.js');
+var fs = require('fs');
+
+const copyAppsFiles = (tempPath, packagesPaths) => {
+    let AppContent = '';
+    //复制public 并前置项目模块中的app文件
+    const APP_CONFIG_FILES = ['app.ts', 'app.tsx', 'app.js'];
+    packagesPaths.map((packagePath, index) => {
+        for (const fileName of APP_CONFIG_FILES) {
+            const appPath = path.resolve(packagePath, fileName);
+            if (fs.existsSync(appPath)) {
+                // 使用 path.posix 生成一致的路径分隔符
+                const normalizedAppPath = appPath.split(path.sep).join(path.posix.sep);
+                return (AppContent += `import '${normalizedAppPath}';\n`);
+            }
+        }
+    });
+    // 确保 tempPath 已经被正确定义
+    const targetPath = path.resolve(tempPath, 'app.ts');
+    utils_index.writeFileToJS(targetPath, AppContent);
+};
+const copyPublicFiles = (tempPath, publicPaths) => {
+    //复制public 并前置项目模块中的app文件
+    publicPaths?.map((path$1, index) => {
+        utils_index.copyFolder(path$1, path.resolve(tempPath, 'public'));
+    });
+};
+
+exports.copyAppsFiles = copyAppsFiles;
+exports.copyPublicFiles = copyPublicFiles;
 //# sourceMappingURL=index.js.map

package/lib/cli/copyfiles/index.mjs

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+import s,{resolve as p}from"path";import{w as t,c as o}from"../utils/index.mjs";import a from"fs";const i=(o,i)=>{let r="";const n=["app.ts","app.tsx","app.js"];i.map((t,o)=>{for(const o of n){const i=p(t,o);if(a.existsSync(i)){const p=i.split(s.sep).join(s.posix.sep);return r+=`import '${p}';\n`}}});const c=s.resolve(o,"app.ts");t(c,r)},r=(s,t)=>{t?.map((t,a)=>{o(t,p(s,"public"))})};export{r as a,i as c};
+//# sourceMappingURL=index.mjs.map