@umijs/bundler-utoopack 4.0.0-canary.20251120.1 → 4.0.0-canary.20251209.1

package/dist/config.js

@@ -26,27 +26,7 @@ module.exports = __toCommonJS(config_exports);
 var import_bundler_webpack = require("@umijs/bundler-webpack");
 var import_utils = require("@umijs/utils");
 var import_pack = require("@utoo/pack");
-function convertProcessEnvForUtoopack(webpackConfig) {
-  var _a;
-  let processEnvForUtoopack = {};
-  if (webpackConfig.plugins) {
-    const definePlugin = webpackConfig.plugins.find(
-      (plugin) => plugin.constructor.name === "DefinePlugin"
-    );
-    if ((_a = definePlugin == null ? void 0 : definePlugin.definitions) == null ? void 0 : _a["process.env"]) {
-      for (const [key, value] of Object.entries(
-        definePlugin.definitions["process.env"]
-      )) {
-        if (typeof value === "string" && value.startsWith('"') && value.endsWith('"')) {
-          processEnvForUtoopack[key] = JSON.parse(value);
-        } else {
-          processEnvForUtoopack[key] = value;
-        }
-      }
-    }
-  }
-  return processEnvForUtoopack;
-}
+var import_path = require("path");
 function getModularizeImports(extraBabelPlugins) {
   return extraBabelPlugins.filter((p) => /^import$|babel-plugin-import/.test(p[0])).reduce(
     (acc, [_, v]) => {
@@ -88,11 +68,14 @@ function getModularizeImports(extraBabelPlugins) {
 }
 function getNormalizedAlias(alias, rootDir) {
   const newAlias = { ...alias };
-  const keysToExpand = ["react", "react-dom", "@", "@@"];
-  for (const key of keysToExpand) {
-    if (newAlias[key]) {
-      newAlias[`${key}/*`] = `${newAlias[key]}/*`;
+  for (const [key, value] of Object.entries(newAlias)) {
+    if (key.endsWith("/*") || value.endsWith("/*") || key.endsWith("/") || value.endsWith("/") || key.endsWith("$")) {
+      continue;
+    }
+    if ((0, import_path.extname)(value)) {
+      continue;
     }
+    newAlias[`${key}/*`] = `${value}/*`;
   }
   newAlias[`${rootDir}/*`] = `${rootDir}/*`;
   return newAlias;
@@ -150,11 +133,11 @@ async function getProdUtooPackConfig(opts) {
     ...opts.config.extraBabelPlugins || []
   ];
   const modularizeImports = getModularizeImports(extraBabelPlugins);
-  const processEnvForUtoopack = convertProcessEnvForUtoopack(webpackConfig);
   const {
     publicPath,
     runtimePublicPath,
-    externals: userExternals
+    externals: userExternals,
+    copy = []
   } = opts.config;
   utooBundlerOpts = {
     ...utooBundlerOpts,
@@ -163,7 +146,8 @@ async function getProdUtooPackConfig(opts) {
       {
         output: {
           clean: opts.clean,
-          publicPath: runtimePublicPath ? "runtime" : publicPath || "/"
+          publicPath: runtimePublicPath ? "runtime" : publicPath || "/",
+          ...opts.disableCopy ? { copy: [] } : { copy: ["public"].concat(copy) }
         },
         optimization: {
           modularizeImports,
@@ -183,10 +167,6 @@ async function getProdUtooPackConfig(opts) {
           },
           sass: opts.config.sassLoader ?? void 0
         },
-        // Override process.env for utoopack format
-        define: {
-          "process.env": JSON.stringify(processEnvForUtoopack)
-        },
         nodePolyfill: true,
         externals: getNormalizedExternals(userExternals)
       },
@@ -228,11 +208,11 @@ async function getDevUtooPackConfig(opts) {
     ...opts.config.extraBabelPlugins || []
   ];
   const modularizeImports = getModularizeImports(extraBabelPlugins);
-  const processEnvForUtoopack = convertProcessEnvForUtoopack(webpackConfig);
   const {
     publicPath,
     runtimePublicPath,
-    externals: userExternals
+    externals: userExternals,
+    copy = []
   } = opts.config;
   utooBundlerOpts = {
     ...utooBundlerOpts,
@@ -242,7 +222,8 @@ async function getDevUtooPackConfig(opts) {
         output: {
           // utoopack 的 dev 需要默认清空产物目录
           clean: opts.clean === void 0 ? true : opts.clean,
-          publicPath: runtimePublicPath ? "runtime" : publicPath || "/"
+          publicPath: runtimePublicPath ? "runtime" : publicPath || "/",
+          ...opts.disableCopy ? { copy: [] } : { copy: ["public"].concat(copy) }
         },
         resolve: {
           alias: getNormalizedAlias(
@@ -261,10 +242,6 @@ async function getDevUtooPackConfig(opts) {
           },
           sass: opts.config.sassLoader ?? void 0
         },
-        // Override process.env for utoopack format
-        define: {
-          "process.env": JSON.stringify(processEnvForUtoopack)
-        },
         nodePolyfill: true,
         externals: getNormalizedExternals(userExternals)
       },

package/dist/index.js

@@ -186,7 +186,7 @@ async function dev(opts) {
       );
       stats = JSON.parse(import_fs.default.readFileSync(statsPath, "utf-8"));
     } catch (e) {
-      throw new Error("Stats.json not found by utoopack dev");
+      throw new Error("File stats.json not found by utoopack dev");
     }
     stats.hasErrors = () => false;
     stats.toJson = () => stats;
@@ -204,7 +204,7 @@ async function dev(opts) {
   try {
     await utooPackServe(utooPackConfig, cwd, rootDir, {
       port: utooServePort,
-      hostname: opts.host
+      hostname: "127.0.0.1"
     });
     const stats = createStatsObject();
     await (onDevCompileDone == null ? void 0 : onDevCompileDone({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-utoopack",
-  "version": "4.0.0-canary.20251120.1",
+  "version": "4.0.0-canary.20251209.1",
   "description": "@umijs/bundler-utoopack",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -8,21 +8,18 @@
     "dist"
   ],
   "dependencies": {
+    "@utoo/pack": "1.0.5",
     "compression": "^1.7.4",
     "connect-history-api-fallback": "^2.0.0",
     "cors": "^2.8.5",
     "express": "^4.18.2",
     "express-http-proxy": "^2.1.1",
-    "@umijs/bundler-utils": "4.0.0-canary.20251120.1",
-    "@umijs/bundler-webpack": "4.0.0-canary.20251120.1"
+    "@umijs/bundler-utils": "4.0.0-canary.20251209.1",
+    "@umijs/bundler-webpack": "4.0.0-canary.20251209.1"
   },
   "devDependencies": {
-    "@utoo/pack": "^0.0.1-alpha.69",
     "father": "4.1.5"
   },
-  "peerDependencies": {
-    "@utoo/pack": "^0.0.1-alpha.69"
-  },
   "publishConfig": {
     "access": "public"
   },