@umijs/bundler-utoopack 4.6.36 → 4.6.38

package/dist/config.js

@@ -36,6 +36,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_fs = __toESM(require("fs"));
 var import_path = require("path");
 function convertProcessEnvForUtoopack(webpackConfig) {
   var _a;
@@ -103,8 +104,21 @@ function getNormalizedAlias(alias, rootDir) {
     if (key.endsWith("/*") || value.endsWith("/*") || key.endsWith("/") || value.endsWith("/") || key.endsWith("$")) {
       continue;
     }
-    if ((0, import_path.extname)(value)) {
-      continue;
+    const ext = (0, import_path.extname)(value);
+    if (ext) {
+      let isDirectory = false;
+      const candidates = [.../* @__PURE__ */ new Set([value, (0, import_path.resolve)(rootDir, value)])];
+      for (const candidate of candidates) {
+        try {
+          const stat = import_fs.default.statSync(candidate);
+          if (stat.isDirectory()) {
+            isDirectory = true;
+            break;
+          }
+        } catch (e) {
+        }
+      }
+      if (!isDirectory) continue;
     }
     newAlias[`${key}/*`] = `${value}/*`;
   }
@@ -183,7 +197,7 @@ function getSvgModuleRules(opts) {
   };
 }
 async function getProdUtooPackConfig(opts) {
-  var _a, _b;
+  var _a;
   const webpackConfig = await (0, import_bundler_webpack.getConfig)({
     cwd: opts.cwd,
     rootDir: opts.rootDir,
@@ -228,10 +242,6 @@ async function getProdUtooPackConfig(opts) {
     svgo = {},
     inlineLimit
   } = opts.config;
-  let crossOriginLoading = false;
-  if ((_a = webpackConfig.output) == null ? void 0 : _a.crossOriginLoading) {
-    crossOriginLoading = webpackConfig.output.crossOriginLoading;
-  }
   utooBundlerOpts = {
     ...utooBundlerOpts,
     config: import_utils.lodash.merge(
@@ -240,8 +250,7 @@ async function getProdUtooPackConfig(opts) {
         output: {
           clean: opts.clean,
           publicPath: runtimePublicPath ? "runtime" : publicPath || "/",
-          ...opts.disableCopy ? { copy: [] } : { copy: ["public"].concat(copy) },
-          crossOriginLoading
+          ...opts.disableCopy ? { copy: [] } : { copy: ["public"].concat(copy) }
         },
         optimization: {
           modularizeImports,
@@ -249,7 +258,7 @@ async function getProdUtooPackConfig(opts) {
         },
         resolve: {
           alias: getNormalizedAlias(
-            (_b = utooBundlerOpts.config.resolve) == null ? void 0 : _b.alias,
+            (_a = utooBundlerOpts.config.resolve) == null ? void 0 : _a.alias,
             opts.rootDir
           )
         },
@@ -276,7 +285,7 @@ async function getProdUtooPackConfig(opts) {
   return utooBundlerOpts;
 }
 async function getDevUtooPackConfig(opts) {
-  var _a, _b;
+  var _a;
   let webpackConfig = await (0, import_bundler_webpack.getConfig)({
     cwd: opts.cwd,
     rootDir: opts.rootDir,
@@ -321,10 +330,6 @@ async function getDevUtooPackConfig(opts) {
     svgo = {},
     inlineLimit
   } = opts.config;
-  let crossOriginLoading = false;
-  if ((_a = webpackConfig.output) == null ? void 0 : _a.crossOriginLoading) {
-    crossOriginLoading = webpackConfig.output.crossOriginLoading;
-  }
   utooBundlerOpts = {
     ...utooBundlerOpts,
     config: import_utils.lodash.merge(
@@ -334,12 +339,11 @@ async function getDevUtooPackConfig(opts) {
           // utoopack 的 dev 需要默认清空产物目录
           clean: opts.clean === void 0 ? true : opts.clean,
           publicPath: runtimePublicPath ? "runtime" : publicPath || "/",
-          ...opts.disableCopy ? { copy: [] } : { copy: ["public"].concat(copy) },
-          crossOriginLoading
+          ...opts.disableCopy ? { copy: [] } : { copy: ["public"].concat(copy) }
         },
         resolve: {
           alias: getNormalizedAlias(
-            (_b = utooBundlerOpts.config.resolve) == null ? void 0 : _b.alias,
+            (_a = utooBundlerOpts.config.resolve) == null ? void 0 : _a.alias,
             opts.rootDir
           )
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-utoopack",
-  "version": "4.6.36",
+  "version": "4.6.38",
   "description": "@umijs/bundler-utoopack",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -8,7 +8,7 @@
     "dist"
   ],
   "dependencies": {
-    "@utoo/pack": "1.3.6",
+    "@utoo/pack": "1.3.7",
     "compression": "^1.7.4",
     "connect-history-api-fallback": "^2.0.0",
     "cors": "^2.8.5",
@@ -19,8 +19,8 @@
     "postcss": "^8.4.21",
     "sass": "1.54.0",
     "sass-loader": "13.2.0",
-    "@umijs/bundler-utils": "4.6.36",
-    "@umijs/bundler-webpack": "4.6.36"
+    "@umijs/bundler-utils": "4.6.38",
+    "@umijs/bundler-webpack": "4.6.38"
   },
   "devDependencies": {
     "father": "4.1.5"