@yannick-z/modulo 0.3.0 → 0.3.2

package/dist/bin/modulo.js

@@ -0,0 +1,93 @@
+#! /usr/bin/env node
+var __webpack_modules__ = {};
+var __webpack_module_cache__ = {};
+function __webpack_require__(moduleId) {
+    var cachedModule = __webpack_module_cache__[moduleId];
+    if (void 0 !== cachedModule) return cachedModule.exports;
+    var module = __webpack_module_cache__[moduleId] = {
+        exports: {}
+    };
+    __webpack_modules__[moduleId](module, module.exports, __webpack_require__);
+    return module.exports;
+}
+__webpack_require__.m = __webpack_modules__;
+(()=>{
+    __webpack_require__.d = (exports, definition)=>{
+        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) Object.defineProperty(exports, key, {
+            enumerable: true,
+            get: definition[key]
+        });
+    };
+})();
+(()=>{
+    __webpack_require__.f = {};
+    __webpack_require__.e = (chunkId)=>Promise.all(Object.keys(__webpack_require__.f).reduce((promises, key)=>{
+            __webpack_require__.f[key](chunkId, promises);
+            return promises;
+        }, []));
+})();
+(()=>{
+    __webpack_require__.u = (chunkId)=>"" + chunkId + ".js";
+})();
+(()=>{
+    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
+})();
+(()=>{
+    __webpack_require__.r = (exports)=>{
+        if ('undefined' != typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports, Symbol.toStringTag, {
+            value: 'Module'
+        });
+        Object.defineProperty(exports, '__esModule', {
+            value: true
+        });
+    };
+})();
+(()=>{
+    var installedChunks = {
+        660: 0
+    };
+    var installChunk = (data)=>{
+        var __webpack_ids__ = data.__webpack_ids__;
+        var __webpack_modules__ = data.__webpack_modules__;
+        var __webpack_runtime__ = data.__webpack_runtime__;
+        var moduleId, chunkId, i = 0;
+        for(moduleId in __webpack_modules__)if (__webpack_require__.o(__webpack_modules__, moduleId)) __webpack_require__.m[moduleId] = __webpack_modules__[moduleId];
+        if (__webpack_runtime__) __webpack_runtime__(__webpack_require__);
+        for(; i < __webpack_ids__.length; i++){
+            chunkId = __webpack_ids__[i];
+            if (__webpack_require__.o(installedChunks, chunkId) && installedChunks[chunkId]) installedChunks[chunkId][0]();
+            installedChunks[__webpack_ids__[i]] = 0;
+        }
+    };
+    __webpack_require__.f.j = function(chunkId, promises) {
+        var installedChunkData = __webpack_require__.o(installedChunks, chunkId) ? installedChunks[chunkId] : void 0;
+        if (0 !== installedChunkData) if (installedChunkData) promises.push(installedChunkData[1]);
+        else {
+            var promise = import("../" + __webpack_require__.u(chunkId)).then(installChunk, (e)=>{
+                if (0 !== installedChunks[chunkId]) installedChunks[chunkId] = void 0;
+                throw e;
+            });
+            var promise = Promise.race([
+                promise,
+                new Promise((resolve)=>{
+                    installedChunkData = installedChunks[chunkId] = [
+                        resolve
+                    ];
+                })
+            ]);
+            promises.push(installedChunkData[1] = promise);
+        }
+    };
+})();
+__webpack_require__.e("183").then(__webpack_require__.bind(__webpack_require__, "./src/index.ts?fb01")).then((module)=>{
+    try {
+        module.exec();
+    } catch (e) {
+        console.error(e);
+        process.exit(1);
+    }
+}).catch((e)=>{
+    console.error("\x1b[31mError: Failed to load modulo.\x1b[0m");
+    console.error(e);
+    process.exit(1);
+});

package/dist/index.js

@@ -0,0 +1,200 @@
+import * as __WEBPACK_EXTERNAL_MODULE_node_fs_5ea92f0c__ from "node:fs";
+import * as __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__ from "node:path";
+import * as __WEBPACK_EXTERNAL_MODULE_picocolors__ from "picocolors";
+import { cac } from "cac";
+var __webpack_modules__ = {
+    "./src/tools/log.ts": function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
+        __webpack_require__.d(__webpack_exports__, {
+            n: ()=>debug_log,
+            v: ()=>logger
+        });
+        var node_fs__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("node:fs");
+        var node_path__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("node:path");
+        var picocolors__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("picocolors");
+        const logFile = node_path__WEBPACK_IMPORTED_MODULE_1__.join(process.cwd(), "modulo.debug.log");
+        let index = 0;
+        function debug_log(hint, ...params) {
+            const argv_debug = process.env.DEBUG || process.argv.includes("--debug");
+            const argv_verbose = process.argv.includes("--verbose") || process.argv.includes("-v");
+            if (!argv_debug && !argv_verbose) return;
+            const timestamp = new Date().toISOString();
+            const sn = String(index++).padStart(3, "0");
+            const logEntry = `--------------\n${sn} [${timestamp}] ${hint}\n${params.map((p)=>"object" == typeof p ? JSON.stringify(p, null, 2) : String(p)).join("\n")}\n---------------\n\n`;
+            if (argv_verbose) console.log(logEntry);
+            if (argv_debug) {
+                console.log(picocolors__WEBPACK_IMPORTED_MODULE_2__["default"].blue(`\ndebug log ${sn}`));
+                node_fs__WEBPACK_IMPORTED_MODULE_0__.appendFileSync(logFile, logEntry);
+            }
+        }
+        const logger = {
+            info: (msg)=>console.log(picocolors__WEBPACK_IMPORTED_MODULE_2__["default"].cyan(msg)),
+            success: (msg)=>console.log(picocolors__WEBPACK_IMPORTED_MODULE_2__["default"].green(msg)),
+            warn: (msg)=>console.log(picocolors__WEBPACK_IMPORTED_MODULE_2__["default"].yellow(msg)),
+            error: (msg)=>console.log(picocolors__WEBPACK_IMPORTED_MODULE_2__["default"].red(msg)),
+            debug: (msg)=>{
+                if (process.env.DEBUG) console.log(picocolors__WEBPACK_IMPORTED_MODULE_2__["default"].gray(`[DEBUG] ${msg}`));
+            }
+        };
+    },
+    "node:fs": function(module) {
+        module.exports = __WEBPACK_EXTERNAL_MODULE_node_fs_5ea92f0c__;
+    },
+    "node:path": function(module) {
+        module.exports = __WEBPACK_EXTERNAL_MODULE_node_path_c5b9b54f__;
+    },
+    picocolors: function(module) {
+        module.exports = __WEBPACK_EXTERNAL_MODULE_picocolors__;
+    }
+};
+var __webpack_module_cache__ = {};
+function __webpack_require__(moduleId) {
+    var cachedModule = __webpack_module_cache__[moduleId];
+    if (void 0 !== cachedModule) return cachedModule.exports;
+    var module = __webpack_module_cache__[moduleId] = {
+        exports: {}
+    };
+    __webpack_modules__[moduleId](module, module.exports, __webpack_require__);
+    return module.exports;
+}
+__webpack_require__.m = __webpack_modules__;
+(()=>{
+    __webpack_require__.d = (exports, definition)=>{
+        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) Object.defineProperty(exports, key, {
+            enumerable: true,
+            get: definition[key]
+        });
+    };
+})();
+(()=>{
+    __webpack_require__.f = {};
+    __webpack_require__.e = (chunkId)=>Promise.all(Object.keys(__webpack_require__.f).reduce((promises, key)=>{
+            __webpack_require__.f[key](chunkId, promises);
+            return promises;
+        }, []));
+})();
+(()=>{
+    __webpack_require__.u = (chunkId)=>"" + chunkId + ".js";
+})();
+(()=>{
+    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
+})();
+(()=>{
+    __webpack_require__.r = (exports)=>{
+        if ('undefined' != typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports, Symbol.toStringTag, {
+            value: 'Module'
+        });
+        Object.defineProperty(exports, '__esModule', {
+            value: true
+        });
+    };
+})();
+(()=>{
+    var installedChunks = {
+        410: 0
+    };
+    var installChunk = (data)=>{
+        var __webpack_ids__ = data.__webpack_ids__;
+        var __webpack_modules__ = data.__webpack_modules__;
+        var __webpack_runtime__ = data.__webpack_runtime__;
+        var moduleId, chunkId, i = 0;
+        for(moduleId in __webpack_modules__)if (__webpack_require__.o(__webpack_modules__, moduleId)) __webpack_require__.m[moduleId] = __webpack_modules__[moduleId];
+        if (__webpack_runtime__) __webpack_runtime__(__webpack_require__);
+        for(; i < __webpack_ids__.length; i++){
+            chunkId = __webpack_ids__[i];
+            if (__webpack_require__.o(installedChunks, chunkId) && installedChunks[chunkId]) installedChunks[chunkId][0]();
+            installedChunks[__webpack_ids__[i]] = 0;
+        }
+    };
+    __webpack_require__.f.j = function(chunkId, promises) {
+        var installedChunkData = __webpack_require__.o(installedChunks, chunkId) ? installedChunks[chunkId] : void 0;
+        if (0 !== installedChunkData) if (installedChunkData) promises.push(installedChunkData[1]);
+        else {
+            var promise = import("./" + __webpack_require__.u(chunkId)).then(installChunk, (e)=>{
+                if (0 !== installedChunks[chunkId]) installedChunks[chunkId] = void 0;
+                throw e;
+            });
+            var promise = Promise.race([
+                promise,
+                new Promise((resolve)=>{
+                    installedChunkData = installedChunks[chunkId] = [
+                        resolve
+                    ];
+                })
+            ]);
+            promises.push(installedChunkData[1] = promise);
+        }
+    };
+})();
+var log = __webpack_require__("./src/tools/log.ts");
+var package_namespaceObject = {
+    rE: "0.3.2"
+};
+const cli = cac("modulo");
+cli.command("init <target>", "Initialize modulo configuration or scripts").option("-f, --force", "Force overwrite existing files").option("--path <path>", "Specify the path to initialize").option("--preset <preset>", "Specify the preset to use").action((target, options)=>{
+    __webpack_require__.e("882").then(__webpack_require__.bind(__webpack_require__, "./src/cli/init.ts")).then(({ init_tool })=>{
+        init_tool({
+            cmd: "init",
+            target: target,
+            init: {
+                path: options.path,
+                force: options.force,
+                preset: options.preset
+            }
+        });
+    });
+});
+cli.command("build <target>", "Build the project for production").option("-c, --config <file>", "Use specified config file").option("-w, --watch", "Watch for changes").option("--env <env>", "Specify the environment (dev/prd)").action((target, options)=>{
+    __webpack_require__.e("740").then(__webpack_require__.bind(__webpack_require__, "./src/cli/pack-code.ts")).then(({ pack_code })=>{
+        pack_code({
+            cmd: "build",
+            target: target,
+            pack: {
+                config: options.config,
+                env: options.env || "prd",
+                watch: options.watch,
+                esm: true
+            }
+        });
+    });
+});
+cli.command("dev <target>", "Start development server").option("-c, --config <file>", "Use specified config file").option("--env <env>", "Specify the environment (dev/prd)").option("--debug", "Enable debug mode").action((target, options)=>{
+    if (options.debug) process.env.DEBUG = "true";
+    __webpack_require__.e("740").then(__webpack_require__.bind(__webpack_require__, "./src/cli/pack-code.ts")).then(({ pack_code })=>{
+        pack_code({
+            cmd: "dev",
+            target: target,
+            pack: {
+                config: options.config,
+                env: options.env || "dev",
+                watch: true,
+                esm: true
+            }
+        });
+    });
+});
+cli.command("preview <target>", "Preview the production build").option("-c, --config <file>", "Use specified config file").action((target, options)=>{
+    __webpack_require__.e("740").then(__webpack_require__.bind(__webpack_require__, "./src/cli/pack-code.ts")).then(({ pack_code })=>{
+        pack_code({
+            cmd: "preview",
+            target: target,
+            pack: {
+                config: options.config,
+                env: "prd",
+                watch: false,
+                esm: true
+            }
+        });
+    });
+});
+cli.help();
+cli.version(package_namespaceObject.rE);
+function exec() {
+    try {
+        cli.parse();
+    } catch (error) {
+        log.v.error(`Error: ${error.message}`);
+        cli.outputHelp();
+        process.exit(1);
+    }
+}
+export { exec };

package/package.json

@@ -2,17 +2,25 @@
 	"name": "@yannick-z/modulo",
 	"description": "",
 	"type": "module",
-	"version": "0.3.0",
-	"main": "./src/index.ts",
+	"version": "0.3.2",
+	"main": "./dist/index.js",
 	"author": "oyangxiao",
 	"scripts": {
-		"lint": "biome lint .",
-		"format": "biome format --write .",
-		"check": "biome check --write ."
+		"build": "rslib build",
+		"lint": "biome lint src bin rslib.config.ts",
+		"format": "biome format --write src bin rslib.config.ts package.json biome.json",
+		"check": "biome check --write src bin rslib.config.ts package.json biome.json"
 	},
 	"bin": {
-		"modulo": "./bin/modulo.js"
+		"modulo": "./dist/bin/modulo.js"
 	},
+	"files": [
+		"dist",
+		"bin",
+		"src",
+		"README.md",
+		"LICENSE"
+	],
 	"dependencies": {
 		"@rsbuild/core": "^1.7.3",
 		"@rsbuild/plugin-less": "^1.6.0",

package/src/bin/modulo.ts

@@ -0,0 +1,16 @@
+#! /usr/bin/env node
+
+import("../index.js")
+	.then((module) => {
+		try {
+			module.exec();
+		} catch (e) {
+			console.error(e);
+			process.exit(1);
+		}
+	})
+	.catch((e) => {
+		console.error("\x1b[31mError: Failed to load modulo.\x1b[0m");
+		console.error(e);
+		process.exit(1);
+	});

package/src/config/presets.ts

@@ -10,7 +10,7 @@ export const preset_dev_server_config = {
 	port: 8080, // 开发页面时, dev-server服务器端口
 	proxy: {} as Record<
 		string,
-		string | { target: string; pathRewrite?: Record<string, string> }
+		string | { target: string; pathRewrite?: Record<string, string>; changeOrigin?: boolean; secure?: boolean }
 	>, // dev时的代理配置
 };
 export type DEV_SERVER_CONFIG = typeof preset_dev_server_config;

package/src/index.ts

@@ -90,8 +90,10 @@ cli
 		});
 	});
 
+import packagejson from "../package.json" with { type: "json" };
+
 cli.help();
-cli.version("0.2.0");
+cli.version(packagejson.version);
 
 export function exec() {
 	try {

package/src/packer/auto-external-plugin.ts

@@ -1,4 +1,5 @@
-import type { Compiler, Compilation } from "@rspack/core";
+import { createRequire } from 'node:module';
+const require = createRequire(import.meta.url);
 import type { ModuloArgs_Pack } from "../args/index.ts";
 import type { GLOBAL_CONFIG } from "../config/type.ts";
 import { getExternalsAndImportMap } from "./get-externals-and-tags.ts";
@@ -23,21 +24,39 @@ export class AutoExternalPlugin {
 		this.usedExternals = new Set<string>();
 	}
 
-	apply(compiler: Compiler) {
+	apply(compiler: any) {
 		compiler.hooks.compilation.tap(
 			"AutoExternalPlugin",
-			(compilation: Compilation) => {
+			(compilation: any) => {
 				// 1. 扫描模块依赖
-				compilation.hooks.finishModules.tap("AutoExternalPlugin", (modules) => {
+				compilation.hooks.finishModules.tap("AutoExternalPlugin", (modules: any[]) => {
+					// ... (省略模块扫描逻辑，这里没有问题) ...
 					for (const module of modules) {
-						// 检查 module.resource 是否包含 node_modules
-						// 并且属于我们在 config.externals 中定义的包
-						const resource = (module as any).resource;
+						// @ts-ignore
+						const constructorName = module.constructor.name;
+						// @ts-ignore
+						const request = module.request;
+						// @ts-ignore
+						const userRequest = module.userRequest;
+						// @ts-ignore
+						const resource = module.resource;
+						// @ts-ignore
+						const externalType = module.externalType;
+
+						// 策略 A: 检查 ExternalModule
+						// Rspack 中 ExternalModule 的 userRequest 通常是 import 的路径 (例如 'vue')
+						if (constructorName === 'ExternalModule' || externalType) {
+							const libName = request || userRequest; // 通常 request 是 'vue'
+							if (libName && this.externalLibNames.includes(libName)) {
+								this.usedExternals.add(libName);
+								continue;
+							}
+						}
+
+						// 策略 B: 检查 module.resource 是否包含 node_modules (针对未被 external 但我们想知道是否被引用的情况 - 但这通常意味着它被打包了)
+						// 之前的逻辑保留，作为兜底，或者针对未正确 external 的情况
 						if (resource && resource.includes("node_modules")) {
 							for (const libName of this.externalLibNames) {
-								// 简单的包含匹配，更严谨的可以使用路径解析
-								// 例如: /node_modules/vue/
-								// 这里简化处理，匹配 /node_modules/<libName>/
 								if (
 									resource.includes(`/node_modules/${libName}/`) ||
 									resource.includes(`\\node_modules\\${libName}\\`)
@@ -45,66 +64,141 @@ export class AutoExternalPlugin {
 									this.usedExternals.add(libName);
 								}
 							}
+						} else if (resource && resource.includes("/node_modules/.pnpm/")) {
+							// 兼容 pnpm
+							for (const libName of this.externalLibNames) {
+								if (
+									resource.includes(`/node_modules/.pnpm/${libName}@`) ||
+									resource.includes(`/node_modules/.pnpm/${libName}+`) ||
+									// 某些情况下 pnpm 可能会直接链接
+									resource.includes(`/node_modules/${libName}/`)
+								) {
+									this.usedExternals.add(libName);
+								}
+							}
 						}
 					}
 				});
 
+				// 尝试通过 compilation.hooks 访问 HtmlWebpackPlugin hooks
+				// Rsbuild 可能通过 mixin 或者其他方式将 hooks 注入到了 compilation 上
+				// 或者我们可以尝试直接使用 tapAsync 到 HtmlWebpackPlugin 的实例上，如果我们能找到它
+
+				// 终极 Hook 调试: 使用 compiler.hooks.emit 来检查 assets，看是否包含 index.html，以及内容
+				compiler.hooks.emit.tapAsync("AutoExternalPlugin", (compilation: any, cb: any) => {
+					if (process.env.DEBUG) console.log('[AutoExternalPlugin] emit hook triggered');
+					// 检查 compilation.assets
+					const assetNames = Object.keys(compilation.assets);
+					if (process.env.DEBUG) console.log('[AutoExternalPlugin] Assets:', assetNames);
+					cb();
+				});
+
 				// 2. 注入 HTML
-				const HtmlWebpackPlugin =
-					compiler.webpack.HtmlWebpackPlugin ||
-					compiler.options.plugins.find(
-						(p: any) => p.constructor.name === "HtmlWebpackPlugin",
-					)?.constructor;
+				let HtmlWebpackPlugin: any;
 
-				if (!HtmlWebpackPlugin) return;
+				// 优先从 compiler.options.plugins 中查找实例并获取其构造函数
+				// 这是最稳妥的方式，确保我们获取的是同一个类的构造函数
+				const htmlPluginInstance = compiler.options.plugins.find(
+					(p: any) => p && (p.constructor.name === "HtmlWebpackPlugin" || p.constructor.name === "HtmlRspackPlugin")
+				);
 
-				const hooks = (HtmlWebpackPlugin as any).getHooks(compilation);
-				hooks.alterAssetTags.tap("AutoExternalPlugin", (data: any) => {
-					if (!this.config.autoExternal) return data;
-
-					// 重新计算 importmaps
-					const { importMap } = getExternalsAndImportMap(
-						this.args,
-						this.config.externals,
-						this.config.externalsType,
-					);
-
-					// 过滤未使用的依赖
-					const filteredImportMap = Object.fromEntries(
-						Object.entries(importMap).filter(([key]) =>
-							this.usedExternals.has(key),
-						),
-					);
-
-					if (Object.keys(filteredImportMap).length === 0) return data;
-
-					let tags: any[] = [];
-					if (this.config.externalsType === "script") {
-						tags = Object.values(filteredImportMap).map((url) => ({
-							tagName: "script",
-							voidTag: false,
-							attributes: { src: url },
-						}));
-					} else {
-						tags = [
-							{
-								tagName: "script",
-								voidTag: false,
-								attributes: { type: "importmap" },
-								innerHTML: JSON.stringify(
-									{ imports: filteredImportMap },
-									null,
-									2,
-								),
-							},
-						];
+				if (htmlPluginInstance) {
+					HtmlWebpackPlugin = htmlPluginInstance.constructor;
+				}
+
+				// Fallback: 如果没找到实例（可能被封装了），尝试从 compiler.webpack 中获取
+				if (!HtmlWebpackPlugin) {
+					HtmlWebpackPlugin =
+						compiler.webpack.HtmlRspackPlugin ||
+						(compiler.webpack as any).HtmlWebpackPlugin;
+				}
+
+				if (!HtmlWebpackPlugin) {
+					// Try to import from @rspack/plugin-html
+					try {
+						HtmlWebpackPlugin = require('@rspack/plugin-html').HtmlRspackPlugin;
+					} catch (e) {
+						// ignore
 					}
+				}
 
-					// 插入到 head 的最前面
-					data.assetTags.scripts.unshift(...tags);
-					return data;
+				if (!HtmlWebpackPlugin) {
+					return;
+				}
+
+				// 确保我们拿到的确实是 HtmlWebpackPlugin 构造函数，并且它有 getHooks 方法
+				if (typeof (HtmlWebpackPlugin as any).getHooks !== 'function') {
+					return;
+				}
+
+				const hooks = (HtmlWebpackPlugin as any).getHooks(compilation);
+
+				hooks.alterAssetTags.tapAsync("AutoExternalPlugin", (data: any, cb: any) => {
+					if (data.assetTags && data.assetTags.scripts) {
+						this.processTags(data, 'assetTags.scripts');
+					}
+					cb(null, data);
 				});
 			},
 		);
 	}
+
+	private processTags(data: any, targetProp: string) {
+		if (!this.config.autoExternal) {
+			return data;
+		}
+
+		// 重新计算 importmaps
+		const { importMap } = getExternalsAndImportMap(
+			this.args,
+			this.config.externals,
+			this.config.externalsType,
+		);
+
+		// 过滤未使用的依赖
+		const filteredImportMap = Object.fromEntries(
+			Object.entries(importMap).filter(([key]) =>
+				this.usedExternals.has(key),
+			),
+		);
+
+		if (Object.keys(filteredImportMap).length === 0) {
+			return data;
+		}
+
+		let tags: any[] = [];
+		if (this.config.externalsType === "script") {
+			tags = Object.values(filteredImportMap).map((url) => ({
+				tagName: "script",
+				voidTag: false,
+				attributes: {
+					src: url,
+				},
+			}));
+		} else {
+			tags = [
+				{
+					tagName: "script",
+					voidTag: false,
+					attributes: { type: "importmap" },
+					innerHTML: JSON.stringify(
+						{ imports: filteredImportMap },
+						null,
+						2,
+					),
+				},
+			];
+		}
+
+		// 插入到 head 的最前面
+		if (targetProp === 'headTags') {
+			data.headTags.unshift(...tags);
+		} else if (targetProp === 'assetTags.scripts') {
+			data.assetTags.scripts.unshift(...tags);
+		} else if (targetProp === 'head') {
+			data.head.unshift(...tags);
+		}
+
+		return data;
+	}
 }

package/src/packer/get-externals-and-tags.ts

@@ -7,7 +7,6 @@ import {
 import {
 	is_env_external,
 	is_string,
-	is_import_external,
 } from "../type/guard.ts";
 
 function getExternalUrl(args: ModuloArgs_Pack, url: ConfigExternalUrl) {
@@ -39,17 +38,21 @@ export function getExternalsAndImportMap(
 	return Object.entries(externalLibs).reduce(
 		({ externals, importMap }, [libName, data]) => {
 			// 归一化为GlobalExternal或者ImportExternal
-			const externalData = is_env_external(data) ? data[args.pack.env] : data;
-
+			// 1. data 是 string -> { url: data }
+			// 2. data 是 EnvExternalUrl (dev/prd) -> { url: data }
+			// 3. data 是 ImportExternal -> data
+			
 			let externalLib: ImportExternal;
-
-			if (typeof externalData === "string") {
-				externalLib = { url: externalData };
+			
+			if (is_string(data)) {
+				externalLib = { url: data };
+			} else if (is_env_external(data)) {
+				externalLib = { url: data };
 			} else {
-				// 此时 externalData 已经是 ImportExternal 类型
-				externalLib = externalData as ImportExternal;
+				externalLib = data as ImportExternal;
 			}
-
+			
+			// 解析 url (处理 EnvExternalUrl)
 			const url = getExternalUrl(args, externalLib.url);
 
 			if (externalsType === "script") {
@@ -57,7 +60,9 @@ export function getExternalsAndImportMap(
 				const globalVar = externalLib.global || libName;
 				const importName = externalLib.importName || libName;
 				(Array.isArray(importName) ? importName : [importName]).forEach(
-					(name) => (externals[name] = globalVar),
+					(name) => {
+						externals[name] = globalVar;
+					},
 				);
 
 				if (url) {
@@ -67,7 +72,9 @@ export function getExternalsAndImportMap(
 				// Importmap 模式：external 映射为包名（由 importmap 解析）
 				const importName = externalLib.importName || libName;
 				(Array.isArray(importName) ? importName : [importName]).forEach(
-					(name) => (externals[name] = libName),
+					(name) => {
+						externals[name] = libName;
+					},
 				);
 
 				if (url) {