@umijs/bundler-utoopack 4.5.1 → 4.5.3

package/dist/config.js

@@ -116,42 +116,43 @@ async function getProdUtooPackConfig(opts) {
   ];
   const modularizeImports = getModularizeImports(extraBabelPlugins);
   const processEnvForUtoopack = convertProcessEnvForUtoopack(webpackConfig);
+  const { publicPath, runtimePublicPath } = opts.config;
   utooBundlerOpts = {
     ...utooBundlerOpts,
-    config: {
-      ...utooBundlerOpts.config,
-      output: {
-        ...utooBundlerOpts.config.output,
-        clean: opts.clean
-      },
-      optimization: {
-        ...utooBundlerOpts.config.optimization,
-        modularizeImports,
-        concatenateModules: true
-        // minify: false,
-        // moduleIds: 'named',
-      },
-      resolve: {
-        ...utooBundlerOpts.config.resolve,
-        alias: getNormalizedAlias(
-          (_a = utooBundlerOpts.config.resolve) == null ? void 0 : _a.alias,
-          opts.rootDir
-        )
-      },
-      styles: {
-        less: {
-          modifyVars: opts.config.theme,
-          javascriptEnabled: true,
-          ...opts.config.lessLoader
+    config: import_utils.lodash.merge(
+      utooBundlerOpts.config,
+      {
+        output: {
+          clean: opts.clean,
+          publicPath: runtimePublicPath ? "runtime" : publicPath || "/"
+        },
+        optimization: {
+          modularizeImports,
+          concatenateModules: true
+          // minify: false,
+          // moduleIds: 'named',
+        },
+        resolve: {
+          alias: getNormalizedAlias(
+            (_a = utooBundlerOpts.config.resolve) == null ? void 0 : _a.alias,
+            opts.rootDir
+          )
         },
-        sass: opts.config.sassLoader ?? void 0
+        styles: {
+          less: {
+            modifyVars: opts.config.theme,
+            javascriptEnabled: true,
+            ...opts.config.lessLoader
+          },
+          sass: opts.config.sassLoader ?? void 0
+        },
+        // Override process.env for utoopack format
+        define: {
+          "process.env": JSON.stringify(processEnvForUtoopack)
+        }
       },
-      // Override process.env for utoopack format
-      define: {
-        ...utooBundlerOpts.config.define,
-        "process.env": JSON.stringify(processEnvForUtoopack)
-      }
-    }
+      opts.config.utoopack || {}
+    )
   };
   return utooBundlerOpts;
 }
@@ -189,40 +190,41 @@ async function getDevUtooPackConfig(opts) {
   ];
   const modularizeImports = getModularizeImports(extraBabelPlugins);
   const processEnvForUtoopack = convertProcessEnvForUtoopack(webpackConfig);
+  const { publicPath, runtimePublicPath } = opts.config;
   utooBundlerOpts = {
     ...utooBundlerOpts,
-    config: {
-      ...utooBundlerOpts.config,
-      output: {
-        ...utooBundlerOpts.config.output,
-        // utoopack 的 dev 需要默认清空产物目录
-        clean: opts.clean === void 0 ? true : opts.clean
-      },
-      resolve: {
-        ...utooBundlerOpts.config.resolve,
-        alias: getNormalizedAlias(
-          (_a = utooBundlerOpts.config.resolve) == null ? void 0 : _a.alias,
-          opts.rootDir
-        )
-      },
-      optimization: {
-        ...utooBundlerOpts.config.optimization,
-        modularizeImports
-      },
-      styles: {
-        less: {
-          modifyVars: opts.config.theme,
-          javascriptEnabled: true,
-          ...opts.config.lessLoader
+    config: import_utils.lodash.merge(
+      utooBundlerOpts.config,
+      {
+        output: {
+          // utoopack 的 dev 需要默认清空产物目录
+          clean: opts.clean === void 0 ? true : opts.clean,
+          publicPath: runtimePublicPath ? "runtime" : publicPath || "/"
+        },
+        resolve: {
+          alias: getNormalizedAlias(
+            (_a = utooBundlerOpts.config.resolve) == null ? void 0 : _a.alias,
+            opts.rootDir
+          )
+        },
+        optimization: {
+          modularizeImports
         },
-        sass: opts.config.sassLoader ?? void 0
+        styles: {
+          less: {
+            modifyVars: opts.config.theme,
+            javascriptEnabled: true,
+            ...opts.config.lessLoader
+          },
+          sass: opts.config.sassLoader ?? void 0
+        },
+        // Override process.env for utoopack format
+        define: {
+          "process.env": JSON.stringify(processEnvForUtoopack)
+        }
       },
-      // Override process.env for utoopack format
-      define: {
-        ...utooBundlerOpts.config.define,
-        "process.env": JSON.stringify(processEnvForUtoopack)
-      }
-    },
+      opts.config.utoopack || {}
+    ),
     watch: {
       enable: true
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-utoopack",
-  "version": "4.5.1",
+  "version": "4.5.3",
   "description": "@umijs/bundler-utoopack",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -13,15 +13,15 @@
     "cors": "^2.8.5",
     "express": "^4.18.2",
     "express-http-proxy": "^2.1.1",
-    "@umijs/bundler-utils": "4.5.1",
-    "@umijs/bundler-webpack": "4.5.1"
+    "@umijs/bundler-utils": "4.5.3",
+    "@umijs/bundler-webpack": "4.5.3"
   },
   "devDependencies": {
-    "@utoo/pack": "^0.0.1-alpha.48",
+    "@utoo/pack": "^0.0.1-alpha.56",
     "father": "4.1.5"
   },
   "peerDependencies": {
-    "@utoo/pack": "^0.0.1-alpha.47"
+    "@utoo/pack": "^0.0.1-alpha.56"
   },
   "publishConfig": {
     "access": "public"