@umijs/bundler-utoopack 4.6.35 → 4.6.36

package/dist/config.js

@@ -183,7 +183,7 @@ function getSvgModuleRules(opts) {
   };
 }
 async function getProdUtooPackConfig(opts) {
-  var _a;
+  var _a, _b;
   const webpackConfig = await (0, import_bundler_webpack.getConfig)({
     cwd: opts.cwd,
     rootDir: opts.rootDir,
@@ -228,6 +228,10 @@ 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(
@@ -236,7 +240,8 @@ async function getProdUtooPackConfig(opts) {
         output: {
           clean: opts.clean,
           publicPath: runtimePublicPath ? "runtime" : publicPath || "/",
-          ...opts.disableCopy ? { copy: [] } : { copy: ["public"].concat(copy) }
+          ...opts.disableCopy ? { copy: [] } : { copy: ["public"].concat(copy) },
+          crossOriginLoading
         },
         optimization: {
           modularizeImports,
@@ -244,7 +249,7 @@ async function getProdUtooPackConfig(opts) {
         },
         resolve: {
           alias: getNormalizedAlias(
-            (_a = utooBundlerOpts.config.resolve) == null ? void 0 : _a.alias,
+            (_b = utooBundlerOpts.config.resolve) == null ? void 0 : _b.alias,
             opts.rootDir
           )
         },
@@ -271,7 +276,7 @@ async function getProdUtooPackConfig(opts) {
   return utooBundlerOpts;
 }
 async function getDevUtooPackConfig(opts) {
-  var _a;
+  var _a, _b;
   let webpackConfig = await (0, import_bundler_webpack.getConfig)({
     cwd: opts.cwd,
     rootDir: opts.rootDir,
@@ -316,7 +321,10 @@ async function getDevUtooPackConfig(opts) {
     svgo = {},
     inlineLimit
   } = opts.config;
-  const normalizedExternals = getNormalizedExternals(userExternals);
+  let crossOriginLoading = false;
+  if ((_a = webpackConfig.output) == null ? void 0 : _a.crossOriginLoading) {
+    crossOriginLoading = webpackConfig.output.crossOriginLoading;
+  }
   utooBundlerOpts = {
     ...utooBundlerOpts,
     config: import_utils.lodash.merge(
@@ -326,11 +334,12 @@ 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) }
+          ...opts.disableCopy ? { copy: [] } : { copy: ["public"].concat(copy) },
+          crossOriginLoading
         },
         resolve: {
           alias: getNormalizedAlias(
-            (_a = utooBundlerOpts.config.resolve) == null ? void 0 : _a.alias,
+            (_b = utooBundlerOpts.config.resolve) == null ? void 0 : _b.alias,
             opts.rootDir
           )
         },
@@ -350,8 +359,10 @@ async function getDevUtooPackConfig(opts) {
         define: {
           "process.env": JSON.stringify(processEnvForUtoopack)
         },
+        // dev enable persistent cache by default
+        persistentCaching: true,
         nodePolyfill: true,
-        externals: normalizedExternals,
+        externals: getNormalizedExternals(userExternals),
         ...getSvgModuleRules({ svgr, svgo, inlineLimit })
       },
       opts.config.utoopack || {}

package/package.json

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