@umijs/bundler-utoopack 4.6.0 → 4.6.2

package/dist/config.js

@@ -26,6 +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");
+var import_path = require("path");
 function convertProcessEnvForUtoopack(webpackConfig) {
   var _a;
   let processEnvForUtoopack = {};
@@ -88,11 +89,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;
@@ -154,7 +158,8 @@ async function getProdUtooPackConfig(opts) {
   const {
     publicPath,
     runtimePublicPath,
-    externals: userExternals
+    externals: userExternals,
+    copy = []
   } = opts.config;
   utooBundlerOpts = {
     ...utooBundlerOpts,
@@ -163,7 +168,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,
@@ -232,7 +238,8 @@ async function getDevUtooPackConfig(opts) {
   const {
     publicPath,
     runtimePublicPath,
-    externals: userExternals
+    externals: userExternals,
+    copy = []
   } = opts.config;
   utooBundlerOpts = {
     ...utooBundlerOpts,
@@ -242,7 +249,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(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-utoopack",
-  "version": "4.6.0",
+  "version": "4.6.2",
   "description": "@umijs/bundler-utoopack",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -8,14 +8,14 @@
     "dist"
   ],
   "dependencies": {
-    "@utoo/pack": "1.0.0",
+    "@utoo/pack": "1.0.1",
     "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.6.0",
-    "@umijs/bundler-webpack": "4.6.0"
+    "@umijs/bundler-utils": "4.6.2",
+    "@umijs/bundler-webpack": "4.6.2"
   },
   "devDependencies": {
     "father": "4.1.5"