@umijs/bundler-utoopack 4.4.13-canary.20250915.2 → 4.4.13-canary.20250917.1

package/README.md

@@ -1,3 +1,3 @@
 # @umijs/bundler-utoopack
 
-Bundler [Utoopack](https://github.com/umijs/mako) for [umijs](https://umijs.org).
+Bundler [Utoopack](https://github.com/utooland/utoo) for [umijs](https://umijs.org).

package/dist/config.d.ts

@@ -19,7 +19,7 @@ export declare type IDevOpts = {
     extraBabelPlugins?: any[];
     extraBabelPresets?: any[];
     cwd: string;
-    rootDir?: string;
+    rootDir: string;
     config: Record<string, any>;
     entry: Record<string, string>;
     mfsuStrategy?: 'eager' | 'normal';
@@ -28,5 +28,6 @@ export declare type IDevOpts = {
     startBuildWorker?: (deps: any[]) => Worker;
     onBeforeMiddleware?: Function;
     disableCopy?: boolean;
+    clean?: boolean;
 } & Pick<IConfigOpts, 'cache' | 'pkg'>;
 export declare function getDevUtooPackConfig(opts: IDevOpts): Promise<BundleOptions>;

package/dist/config.js

@@ -26,6 +26,27 @@ module.exports = __toCommonJS(config_exports);
 var import_bundler_webpack = require("@umijs/bundler-webpack");
 var import_utils = require("@umijs/utils");
 var import_pack = require("@utoo/pack");
+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]) => {
@@ -53,11 +74,12 @@ function getModularizeImports(extraBabelPlugins) {
     {}
   );
 }
-function getNormalizedAlias(alias) {
+function getNormalizedAlias(alias, rootDir) {
   const newAlias = { ...alias };
   if (newAlias.react) {
     newAlias["react/*"] = `${newAlias.react}/*`;
   }
+  newAlias[`${rootDir}/*`] = `${rootDir}/*`;
   return newAlias;
 }
 async function getProdUtooPackConfig(opts) {
@@ -93,26 +115,27 @@ async function getProdUtooPackConfig(opts) {
     ...opts.config.extraBabelPlugins || []
   ];
   const modularizeImports = getModularizeImports(extraBabelPlugins);
+  const processEnvForUtoopack = convertProcessEnvForUtoopack(webpackConfig);
   utooBundlerOpts = {
     ...utooBundlerOpts,
     config: {
       ...utooBundlerOpts.config,
       output: {
         ...utooBundlerOpts.config.output,
-        // webpack config 没处理 clean 参数
-        clean: true
+        clean: opts.clean
       },
       optimization: {
         ...utooBundlerOpts.config.optimization,
         modularizeImports,
-        concatenateModules: true,
-        minify: false,
-        moduleIds: "named"
+        concatenateModules: true
+        // minify: false,
+        // moduleIds: 'named',
       },
       resolve: {
         ...utooBundlerOpts.config.resolve,
         alias: getNormalizedAlias(
-          (_a = utooBundlerOpts.config.resolve) == null ? void 0 : _a.alias
+          (_a = utooBundlerOpts.config.resolve) == null ? void 0 : _a.alias,
+          opts.rootDir
         )
       },
       styles: {
@@ -122,6 +145,11 @@ async function getProdUtooPackConfig(opts) {
           ...opts.config.lessLoader
         },
         sass: opts.config.sassLoader ?? void 0
+      },
+      // Override process.env for utoopack format
+      define: {
+        ...utooBundlerOpts.config.define,
+        "process.env": JSON.stringify(processEnvForUtoopack)
       }
     }
   };
@@ -160,18 +188,21 @@ async function getDevUtooPackConfig(opts) {
     ...opts.config.extraBabelPlugins || []
   ];
   const modularizeImports = getModularizeImports(extraBabelPlugins);
+  const processEnvForUtoopack = convertProcessEnvForUtoopack(webpackConfig);
   utooBundlerOpts = {
     ...utooBundlerOpts,
     config: {
       ...utooBundlerOpts.config,
       output: {
         ...utooBundlerOpts.config.output,
-        clean: true
+        // 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
+          (_a = utooBundlerOpts.config.resolve) == null ? void 0 : _a.alias,
+          opts.rootDir
         )
       },
       optimization: {
@@ -185,6 +216,11 @@ async function getDevUtooPackConfig(opts) {
           ...opts.config.lessLoader
         },
         sass: opts.config.sassLoader ?? void 0
+      },
+      // Override process.env for utoopack format
+      define: {
+        ...utooBundlerOpts.config.define,
+        "process.env": JSON.stringify(processEnvForUtoopack)
       }
     },
     watch: {

package/dist/index.js

@@ -48,9 +48,12 @@ __reExport(src_exports, require("./config"), module.exports);
 async function build(opts) {
   var _a;
   const { cwd, onBuildComplete } = opts;
-  const utooPackConfig = await (0, import_config.getProdUtooPackConfig)(opts);
   const { build: utooPackBuild, findRootDir: findRootDir2 } = require("@utoo/pack");
   const rootDir = findRootDir2(cwd);
+  const utooPackConfig = await (0, import_config.getProdUtooPackConfig)({
+    ...opts,
+    rootDir
+  });
   try {
     await utooPackBuild(utooPackConfig, cwd, rootDir);
   } catch (e) {
@@ -59,12 +62,11 @@ async function build(opts) {
     err.stack = null;
     throw err;
   }
-  const stats = JSON.parse(
-    import_fs.default.readFileSync(
-      import_path.default.join((_a = utooPackConfig.config.output) == null ? void 0 : _a.path, "stats.json"),
-      "utf-8"
-    )
+  const statsPath = import_path.default.join(
+    ((_a = utooPackConfig.config.output) == null ? void 0 : _a.path) || "dist",
+    "stats.json"
   );
+  const stats = JSON.parse(import_fs.default.readFileSync(statsPath, "utf-8"));
   stats.hasErrors = () => false;
   stats.toJson = () => stats;
   stats.toString = () => {
@@ -86,13 +88,17 @@ async function dev(opts) {
   if (!opts) {
     throw new Error("opts should be supplied");
   }
-  const utooPackConfig = await (0, import_config.getDevUtooPackConfig)(opts);
+  const { findRootDir: findRootDir2, serve: utooPackServe } = require("@utoo/pack");
+  const rootDir = findRootDir2(cwd);
+  const utooPackConfig = await (0, import_config.getDevUtooPackConfig)({
+    ...opts,
+    rootDir
+  });
   const app = (0, import_express.default)();
   const cors = require("cors");
   const proxy = require("express-http-proxy");
   const port = opts.port || 8e3;
   const utooServePort = port + 1;
-  process.env.UTOO_PACK_VERBOSE = "1";
   app.use(
     cors({
       origin: true,
@@ -174,12 +180,11 @@ async function dev(opts) {
     var _a;
     let stats;
     try {
-      stats = JSON.parse(
-        import_fs.default.readFileSync(
-          import_path.default.join((_a = utooPackConfig.config.output) == null ? void 0 : _a.path, "stats.json"),
-          "utf-8"
-        )
+      const statsPath = import_path.default.join(
+        ((_a = utooPackConfig.config.output) == null ? void 0 : _a.path) || "dist",
+        "stats.json"
       );
+      stats = JSON.parse(import_fs.default.readFileSync(statsPath, "utf-8"));
     } catch (e) {
       throw new Error("Stats.json not found by utoopack dev");
     }
@@ -196,8 +201,6 @@ async function dev(opts) {
     };
     return stats;
   };
-  const { serve: utooPackServe, findRootDir: findRootDir2 } = require("@utoo/pack");
-  const rootDir = findRootDir2(cwd);
   try {
     await utooPackServe(utooPackConfig, cwd, rootDir, {
       port: utooServePort,

package/dist/types.d.ts

@@ -1,7 +1,7 @@
 import type { IOpts as IConfigOpts } from '@umijs/bundler-webpack';
 export declare type IOpts = {
     cwd: string;
-    rootDir?: string;
+    rootDir: string;
     entry: Record<string, string>;
     config: Record<string, any>;
     onBuildComplete?: Function;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/bundler-utoopack",
-  "version": "4.4.13-canary.20250915.2",
+  "version": "4.4.13-canary.20250917.1",
   "description": "@umijs/bundler-utoopack",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -8,19 +8,21 @@
     "dist"
   ],
   "dependencies": {
-    "@umijs/bundler-utils": "4.4.13-canary.20250915.2",
-    "@utoo/pack": "0.0.1-alpha.47",
     "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",
-    "find-up": "5.0.0",
-    "@umijs/bundler-webpack": "4.4.13-canary.20250915.2"
+    "@umijs/bundler-utils": "4.4.13-canary.20250917.1",
+    "@umijs/bundler-webpack": "4.4.13-canary.20250917.1"
   },
   "devDependencies": {
+    "@utoo/pack": "0.0.1-alpha.47",
     "father": "4.1.5"
   },
+  "peerDependencies": {
+    "@utoo/pack": "^0.0.1-alpha.47"
+  },
   "publishConfig": {
     "access": "public"
   },