@umijs/bundler-utoopack 4.6.38 → 4.6.40

package/dist/config.js

@@ -38,26 +38,15 @@ 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;
-  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;
-        }
-      }
-    }
+function normalizeDefineValue(val) {
+  if (!import_utils.lodash.isPlainObject(val)) {
+    return JSON.stringify(val);
+  } else {
+    return Object.keys(val).reduce((obj, key) => {
+      obj[key] = normalizeDefineValue(val[key]);
+      return obj;
+    }, {});
   }
-  return processEnvForUtoopack;
 }
 function getModularizeImports(extraBabelPlugins) {
   return extraBabelPlugins.filter((p) => /^import$|babel-plugin-import/.test(p[0])).reduce(
@@ -232,7 +221,17 @@ async function getProdUtooPackConfig(opts) {
   const emotion = extraBabelPlugins.some((p) => {
     return p === "@emotion" || p === "@emotion/babel-plugin";
   });
-  const processEnvForUtoopack = convertProcessEnvForUtoopack(webpackConfig);
+  const define = {};
+  if (opts.config.define) {
+    for (const key of Object.keys(opts.config.define)) {
+      define[key] = normalizeDefineValue(opts.config.define[key]);
+    }
+  }
+  if (process.env.SOCKET_SERVER) {
+    define["process.env.SOCKET_SERVER"] = normalizeDefineValue(
+      process.env.SOCKET_SERVER
+    );
+  }
   const {
     publicPath,
     runtimePublicPath,
@@ -245,7 +244,7 @@ async function getProdUtooPackConfig(opts) {
   utooBundlerOpts = {
     ...utooBundlerOpts,
     config: import_utils.lodash.merge(
-      utooBundlerOpts.config,
+      import_utils.lodash.omit(utooBundlerOpts.config, ["define"]),
       {
         output: {
           clean: opts.clean,
@@ -271,10 +270,7 @@ async function getProdUtooPackConfig(opts) {
           sass: opts.config.sassLoader ?? void 0,
           emotion
         },
-        // Override process.env for utoopack format
-        define: {
-          "process.env": JSON.stringify(processEnvForUtoopack)
-        },
+        define,
         nodePolyfill: true,
         externals: getNormalizedExternals(userExternals),
         ...getSvgModuleRules({ svgr, svgo, inlineLimit })
@@ -320,7 +316,17 @@ async function getDevUtooPackConfig(opts) {
   const emotion = extraBabelPlugins.some((p) => {
     return p === "@emotion" || p === "@emotion/babel-plugin";
   });
-  const processEnvForUtoopack = convertProcessEnvForUtoopack(webpackConfig);
+  const define = {};
+  if (opts.config.define) {
+    for (const key of Object.keys(opts.config.define)) {
+      define[key] = normalizeDefineValue(opts.config.define[key]);
+    }
+  }
+  if (process.env.SOCKET_SERVER) {
+    define["process.env.SOCKET_SERVER"] = normalizeDefineValue(
+      process.env.SOCKET_SERVER
+    );
+  }
   const {
     publicPath,
     runtimePublicPath,
@@ -333,10 +339,9 @@ async function getDevUtooPackConfig(opts) {
   utooBundlerOpts = {
     ...utooBundlerOpts,
     config: import_utils.lodash.merge(
-      utooBundlerOpts.config,
+      import_utils.lodash.omit(utooBundlerOpts.config, ["define"]),
       {
         output: {
-          // utoopack 的 dev 需要默认清空产物目录
           clean: opts.clean === void 0 ? true : opts.clean,
           publicPath: runtimePublicPath ? "runtime" : publicPath || "/",
           ...opts.disableCopy ? { copy: [] } : { copy: ["public"].concat(copy) }
@@ -359,10 +364,7 @@ async function getDevUtooPackConfig(opts) {
           sass: opts.config.sassLoader ?? void 0,
           emotion
         },
-        // Override process.env for utoopack format
-        define: {
-          "process.env": JSON.stringify(processEnvForUtoopack)
-        },
+        define,
         // dev enable persistent cache by default
         persistentCaching: true,
         nodePolyfill: true,

package/package.json

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