@umijs/bundler-utoopack 4.6.8 → 4.6.10

package/dist/config.js

@@ -27,6 +27,27 @@ 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 = {};
+  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;
+        }
+      }
+    }
+  }
+  return processEnvForUtoopack;
+}
 function getModularizeImports(extraBabelPlugins) {
   return extraBabelPlugins.filter((p) => /^import$|babel-plugin-import/.test(p[0])).reduce(
     (acc, [_, v]) => {
@@ -133,6 +154,7 @@ async function getProdUtooPackConfig(opts) {
     ...opts.config.extraBabelPlugins || []
   ];
   const modularizeImports = getModularizeImports(extraBabelPlugins);
+  const processEnvForUtoopack = convertProcessEnvForUtoopack(webpackConfig);
   const {
     publicPath,
     runtimePublicPath,
@@ -167,6 +189,10 @@ async function getProdUtooPackConfig(opts) {
           },
           sass: opts.config.sassLoader ?? void 0
         },
+        // Override process.env for utoopack format
+        define: {
+          "process.env": JSON.stringify(processEnvForUtoopack)
+        },
         nodePolyfill: true,
         externals: getNormalizedExternals(userExternals)
       },
@@ -208,6 +234,7 @@ async function getDevUtooPackConfig(opts) {
     ...opts.config.extraBabelPlugins || []
   ];
   const modularizeImports = getModularizeImports(extraBabelPlugins);
+  const processEnvForUtoopack = convertProcessEnvForUtoopack(webpackConfig);
   const {
     publicPath,
     runtimePublicPath,
@@ -242,6 +269,10 @@ async function getDevUtooPackConfig(opts) {
           },
           sass: opts.config.sassLoader ?? void 0
         },
+        // Override process.env for utoopack format
+        define: {
+          "process.env": JSON.stringify(processEnvForUtoopack)
+        },
         nodePolyfill: true,
         externals: getNormalizedExternals(userExternals)
       },

package/package.json

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