@umijs/bundler-utoopack 4.0.0-canary.20251209.1 → 4.0.0-canary.20260105.0

package/dist/config.js

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -14,6 +16,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/config.ts
@@ -27,6 +37,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]) => {
@@ -85,12 +116,22 @@ function getNormalizedExternals(externals) {
     (ret, [k, v]) => {
       if (Array.isArray(v)) {
         const [url, ...members] = v;
-        ret[k] = {
-          // ['antd', 'Button'] => `antd.Button`
-          root: members.join("."),
-          // `script https://example.com/lib/script.js` => `https://example.com/lib/script.js`
-          script: url.replace("script ", "")
-        };
+        const containsScript = url.startsWith("script");
+        const script = url.replace("script ", "");
+        if (containsScript) {
+          ret[k] = {
+            // ['antd', 'Button'] => `antd.Button`
+            root: members.join("."),
+            type: "script",
+            // `script https://example.com/lib/script.js` => `https://example.com/lib/script.js`
+            script
+          };
+        } else {
+          ret[k] = {
+            root: members.join("."),
+            script
+          };
+        }
       } else if (typeof v === "string") {
         ret[k] = v.replace(/^window(\s+|\.)/, "");
       } else {
@@ -100,6 +141,58 @@ function getNormalizedExternals(externals) {
     {}
   );
 }
+function getSvgModuleRules(opts) {
+  const { svgr, svgo = {}, inlineLimit } = opts;
+  if (!svgr) {
+    return {};
+  }
+  return {
+    module: {
+      rules: {
+        "*.svg": {
+          loaders: [
+            {
+              loader: require.resolve("@umijs/bundler-webpack/dist/loader/svgr"),
+              options: {
+                svgoConfig: {
+                  plugins: [
+                    {
+                      name: "preset-default",
+                      params: {
+                        overrides: {
+                          removeTitle: false
+                        }
+                      }
+                    },
+                    "prefixIds"
+                  ],
+                  ...typeof svgo === "object" ? svgo : {}
+                },
+                ...svgr,
+                svgo: !!svgo
+              },
+              condition: {
+                all: [
+                  // Exclude node_modules (similar to excluding non-source files)
+                  { not: "foreign" },
+                  { path: /\.[jt]sx?$/ }
+                ]
+              }
+            },
+            {
+              loader: require.resolve("@umijs/bundler-webpack/compiled/url-loader"),
+              options: {
+                limit: inlineLimit,
+                fallback: require.resolve("@umijs/bundler-webpack/compiled/file-loader")
+              }
+            }
+          ],
+          as: "*.js"
+        }
+      }
+    }
+  };
+}
 async function getProdUtooPackConfig(opts) {
   var _a;
   const webpackConfig = await (0, import_bundler_webpack.getConfig)({
@@ -126,18 +219,22 @@ async function getProdUtooPackConfig(opts) {
   });
   let utooBundlerOpts = (0, import_pack.compatOptionsFromWebpack)({
     ...import_utils.lodash.omit(webpackConfig, ["target", "module", "externals"]),
-    compatMode: true
+    webpackMode: true
   });
   const extraBabelPlugins = [
     ...opts.extraBabelPlugins || [],
     ...opts.config.extraBabelPlugins || []
   ];
   const modularizeImports = getModularizeImports(extraBabelPlugins);
+  const processEnvForUtoopack = convertProcessEnvForUtoopack(webpackConfig);
   const {
     publicPath,
     runtimePublicPath,
     externals: userExternals,
-    copy = []
+    copy = [],
+    svgr,
+    svgo = {},
+    inlineLimit
   } = opts.config;
   utooBundlerOpts = {
     ...utooBundlerOpts,
@@ -167,8 +264,13 @@ 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)
+        externals: getNormalizedExternals(userExternals),
+        ...getSvgModuleRules({ svgr, svgo, inlineLimit })
       },
       opts.config.utoopack || {}
     )
@@ -201,19 +303,25 @@ async function getDevUtooPackConfig(opts) {
   });
   let utooBundlerOpts = (0, import_pack.compatOptionsFromWebpack)({
     ...import_utils.lodash.omit(webpackConfig, ["target", "module", "externals"]),
-    compatMode: true
+    webpackMode: true
   });
   const extraBabelPlugins = [
     ...opts.extraBabelPlugins || [],
     ...opts.config.extraBabelPlugins || []
   ];
   const modularizeImports = getModularizeImports(extraBabelPlugins);
+  const processEnvForUtoopack = convertProcessEnvForUtoopack(webpackConfig);
   const {
     publicPath,
     runtimePublicPath,
     externals: userExternals,
-    copy = []
+    copy = [],
+    svgr,
+    svgo = {},
+    inlineLimit
   } = opts.config;
+  const normalizedExternals = getNormalizedExternals(userExternals);
+  debugger;
   utooBundlerOpts = {
     ...utooBundlerOpts,
     config: import_utils.lodash.merge(
@@ -242,8 +350,13 @@ 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)
+        externals: normalizedExternals,
+        ...getSvgModuleRules({ svgr, svgo, inlineLimit })
       },
       opts.config.utoopack || {}
     ),

package/dist/index.js

@@ -204,7 +204,8 @@ async function dev(opts) {
   try {
     await utooPackServe(utooPackConfig, cwd, rootDir, {
       port: utooServePort,
-      hostname: "127.0.0.1"
+      hostname: "127.0.0.1",
+      logServerInfo: false
     });
     const stats = createStatsObject();
     await (onDevCompileDone == null ? void 0 : onDevCompileDone({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-utoopack",
-  "version": "4.0.0-canary.20251209.1",
+  "version": "4.0.0-canary.20260105.0",
   "description": "@umijs/bundler-utoopack",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -8,14 +8,14 @@
     "dist"
   ],
   "dependencies": {
-    "@utoo/pack": "1.0.5",
+    "@utoo/pack": "1.1.16-alpha.0",
     "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.0.0-canary.20251209.1",
-    "@umijs/bundler-webpack": "4.0.0-canary.20251209.1"
+    "@umijs/bundler-utils": "4.0.0-canary.20260105.0",
+    "@umijs/bundler-webpack": "4.0.0-canary.20260105.0"
   },
   "devDependencies": {
     "father": "4.1.5"