@umijs/preset-umi 4.4.12 → 4.4.13-canary.20250911.3

package/dist/commands/dev/createRouteMiddleware.js

@@ -34,7 +34,7 @@ function createRouteMiddleware(opts) {
       onStats == null ? void 0 : onStats(stats);
     });
     async function getStats(api) {
-      if (!compiler && api.config.mako) {
+      if (!compiler && (api.config.mako || api.config.utoopack)) {
         return {
           compilation: { assets: { "umi.js": "umi.js", "umi.css": "umi.css" } },
           hasErrors: () => false

package/dist/commands/dev/dev.js

@@ -58,8 +58,8 @@ var dev_default = (api) => {
     }
   });
   api.onStart(() => {
-    var _a;
-    if ((_a = api.config) == null ? void 0 : _a.mako)
+    var _a, _b;
+    if (((_a = api.config) == null ? void 0 : _a.mako) || ((_b = api.config) == null ? void 0 : _b.utoopack))
       return;
     if (process.env.BIGFISH_INFO)
       return;

package/dist/features/aiDev/aiDev.js

@@ -51,7 +51,7 @@ var aiDev_default = (api) => {
   });
   api.onDevCompileDone((args) => {
     var _a, _b;
-    if (api.config.mako) {
+    if (api.config.mako || api.config.utoopack) {
       return;
     }
     if (!process.env.UMI_AI_COMMAND || !process.env.UMI_AI_PACKAGE)

package/dist/features/bundler/bundler.js

@@ -35,6 +35,10 @@ var bundler_default = (api) => {
       require("@umijs/bundler-webpack/dist/requireHook");
       return require(process.env.OKAM);
     }
+    if (bundler === "utoopack") {
+      require("@umijs/bundler-webpack/dist/requireHook");
+      return require(process.env.UTOOPACK);
+    }
     if (bundler === "vite") {
       return bundlerVite;
     }

package/dist/features/esbuildHelperChecker/esbuildHelperChecker.js

@@ -109,7 +109,7 @@ var esbuildHelperChecker_default = (api) => {
     }
   });
   api.onBuildComplete(async ({ err }) => {
-    if (api.config.vite || api.config.mako)
+    if (api.config.vite || api.config.mako || api.config.utoopack)
       return;
     if (err)
       return;

package/dist/features/forget/forget.js

@@ -47,6 +47,11 @@ var forget_default = (api) => {
         `forget is not compatible with mako, please disable mako first.`
       );
     }
+    if (api.config.utoopack) {
+      throw new Error(
+        `forget is not compatible with utoopack, please disable utoopack first.`
+      );
+    }
   });
   api.onCheck(() => {
     let reactMajorVersion = api.appData.react.version.split(".")[0];

package/dist/features/routePreloadOnLoad/routePreloadOnLoad.js

@@ -64,7 +64,7 @@ async function getRouteChunkFilesMap(chunks, opts) {
     if (chunk.entry)
       continue;
     const pickedFiles = pickPreloadFiles(chunk.files);
-    const routeOrigins = chunk.origins.filter(
+    const routeOrigins = (chunk.origins || []).filter(
       (origin) => {
         var _a2;
         return (_a2 = origin.moduleName) == null ? void 0 : _a2.endsWith(routeModuleName);

package/dist/features/tmpFiles/tmpFiles.js

@@ -674,8 +674,8 @@ if (process.env.NODE_ENV === 'development') {
       for (const plugin of allPlugins) {
         const file = (0, import_utils.winPath)((0, import_path.join)(api.paths.absTmpPath, plugin, "types.d.ts"));
         if ((0, import_fs.existsSync)(file)) {
-          const noSuffixFile = file.replace(/\.ts$/, "");
-          beforeExports.push(`export * from '${noSuffixFile}';`);
+          const noSuffixFile = file.replace(/\.d\.ts$/, "");
+          beforeExports.push(`export type * from '${noSuffixFile}';`);
         }
       }
       let pluginIndex = 0;
@@ -687,7 +687,7 @@ if (process.env.NODE_ENV === 'development') {
         );
         if ((0, import_fs.existsSync)(runtimeConfigFile)) {
           const noSuffixRuntimeConfigFile = runtimeConfigFile.replace(
-            /\.ts$/,
+            /\.d\.ts$/,
             ""
           );
           beforeImport.push(

package/dist/features/utoopack/utoopack.d.ts

@@ -0,0 +1,3 @@
+import { IApi } from '../../types';
+declare const _default: (api: IApi) => void;
+export default _default;

package/dist/features/utoopack/utoopack.js

@@ -0,0 +1,143 @@
+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)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  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/features/utoopack/utoopack.ts
+var utoopack_exports = {};
+__export(utoopack_exports, {
+  default: () => utoopack_default
+});
+module.exports = __toCommonJS(utoopack_exports);
+var import_bundler_utoopack = require("@umijs/bundler-utoopack");
+var import_path = require("path");
+var import_extractEntryAssets = require("../../utils/extractEntryAssets");
+var utoopack_default = (api) => {
+  api.describe({
+    key: "utoopack",
+    config: {
+      schema({ zod }) {
+        return zod.object({}).partial();
+      }
+    },
+    enableBy: api.EnableBy.config
+  });
+  const assets = {
+    // Will contain all js and mjs files
+    js: [],
+    // Will contain all css files
+    css: []
+  };
+  api.modifyAppData((memo) => {
+    memo.bundler = "utoopack";
+    return memo;
+  });
+  api.modifyConfig((memo, args) => {
+    const rootDir = memo.rootDir ? (0, import_path.join)(args.paths.cwd, memo.rootDir).replace(/\/$/, "") : (0, import_bundler_utoopack.findRootDir)(args.paths.cwd).replace(/\/$/, "");
+    memo.alias = {
+      ...memo.alias,
+      "@/*": `${args.paths.absSrcPath}/*`,
+      "@@/*": `${args.paths.absTmpPath}/*`,
+      [`${rootDir}/*`]: `${rootDir}/*`
+    };
+    return {
+      ...memo,
+      mfsu: false,
+      hmrGuardian: false,
+      utoopack: {
+        ...memo.utoopack
+      }
+    };
+  });
+  api.onStart(() => {
+    process.env.UTOOPACK = process.env.UTOOPACK || require.resolve("@umijs/bundler-utoopack");
+    try {
+      const pkg = require((0, import_path.join)(
+        require.resolve(process.env.UTOOPACK),
+        "../../package.json"
+      ));
+      api.logger.info(`Using @utoo/pack@${pkg.dependencies["@utoo/pack"]}`);
+    } catch (e) {
+      console.error(e);
+    }
+  });
+  api.onDevCompileDone(({ stats }) => {
+    var _a, _b, _c;
+    const entryPointFiles = /* @__PURE__ */ new Set();
+    for (const chunk of ((_b = (_a = stats.entrypoints) == null ? void 0 : _a["umi"]) == null ? void 0 : _b.chunks) || []) {
+      const files = ((_c = ((stats == null ? void 0 : stats.chunks) || []).find((c) => (c == null ? void 0 : c.id) === chunk)) == null ? void 0 : _c.files) || [];
+      for (const file of files) {
+        entryPointFiles.add(file);
+      }
+    }
+    const entryAssets = (0, import_extractEntryAssets.extractEntryAssets)(Array.from(entryPointFiles));
+    Object.entries(entryAssets).forEach(([ext, files]) => {
+      if (!Array.isArray(assets[ext])) {
+        assets[ext] = [];
+      }
+      assets[ext].push(...files);
+    });
+    const allAssets = (stats.assets || []).map((asset) => asset.name);
+    for (const asset of allAssets) {
+      if (asset.endsWith(".js") && !assets.js.includes(asset) && !asset.includes("umi.js")) {
+        assets.js.push(asset);
+      } else if (asset.endsWith(".css") && !assets.css.includes(asset)) {
+        assets.css.push(asset);
+      }
+    }
+  });
+  api.onBuildComplete(({ stats }) => {
+    var _a, _b, _c;
+    const entryPointFiles = /* @__PURE__ */ new Set();
+    for (const chunk of ((_b = (_a = stats.entrypoints) == null ? void 0 : _a["umi"]) == null ? void 0 : _b.chunks) || []) {
+      const files = ((_c = ((stats == null ? void 0 : stats.chunks) || []).find((c) => (c == null ? void 0 : c.id) === chunk)) == null ? void 0 : _c.files) || [];
+      for (const file of files) {
+        entryPointFiles.add(file);
+      }
+    }
+    const entryAssets = (0, import_extractEntryAssets.extractEntryAssets)(Array.from(entryPointFiles));
+    Object.entries(entryAssets).forEach(([ext, files]) => {
+      if (!Array.isArray(assets[ext])) {
+        assets[ext] = [];
+      }
+      assets[ext].push(...files);
+    });
+  });
+  api.addHTMLStyles(() => {
+    const { publicPath } = api.config;
+    const displayPublicPath = publicPath === "auto" ? "/" : publicPath;
+    return assets.css.map((css) => {
+      return `${displayPublicPath}${css}`;
+    });
+  });
+  api.addHTMLHeadScripts(() => {
+    const { publicPath } = api.config;
+    const displayPublicPath = publicPath === "auto" ? "/" : publicPath;
+    return assets.js.map((js) => {
+      return `${displayPublicPath}${js}`;
+    });
+  });
+};

package/dist/index.js

@@ -88,6 +88,7 @@ var src_default = () => {
       require.resolve("./features/swc/swc"),
       require.resolve("./features/ui/ui"),
       require.resolve("./features/mako/mako"),
+      require.resolve("./features/utoopack/utoopack"),
       require.resolve("./features/hmrGuardian/hmrGuardian"),
       require.resolve("./features/routePreloadOnLoad/routePreloadOnLoad"),
       require.resolve("./features/forget/forget"),

package/dist/utils/transformIEAR.d.ts

@@ -19,4 +19,4 @@ export declare const IEAR_REG_EXP: RegExp;
 export default function transformIEAR({ content, path }: {
     content: string;
     path: string;
-}, api: IApi): string;
+}, api: IApi, isUtoopack?: boolean): string;

package/dist/utils/transformIEAR.js

@@ -24,6 +24,7 @@ __export(transformIEAR_exports, {
 });
 module.exports = __toCommonJS(transformIEAR_exports);
 var import_bundler_utils = require("@umijs/bundler-utils");
+var import_bundler_utoopack = require("@umijs/bundler-utoopack");
 var import_utils = require("@umijs/utils");
 var import_path = require("path");
 var IEAR_REG_EXP = new RegExp(
@@ -89,7 +90,11 @@ var IEAR_REG_EXP = new RegExp(
   // match full-content
   "g"
 );
-function transformIEAR({ content, path }, api) {
+function transformIEAR({ content, path }, api, isUtoopack = false) {
+  let rootPath = api.cwd;
+  if (isUtoopack) {
+    rootPath = (0, import_bundler_utoopack.findRootDir)(api.cwd);
+  }
   return content.replace(IEAR_REG_EXP, (_, prefix, quote, absPath) => {
     if (absPath.startsWith(api.paths.absTmpPath)) {
       absPath = (0, import_utils.winPath)((0, import_path.relative)((0, import_path.dirname)(path), absPath)).replace(
@@ -99,6 +104,12 @@ function transformIEAR({ content, path }, api) {
       );
     } else if ((0, import_bundler_utils.isDepPath)(absPath)) {
       absPath = `@fs/${(0, import_utils.winPath)((0, import_path.relative)(api.cwd, absPath))}`;
+    } else if (absPath.startsWith(rootPath) && isUtoopack) {
+      absPath = (0, import_utils.winPath)((0, import_path.relative)((0, import_path.dirname)(path), absPath)).replace(
+        // prepend ./ for same or sub level imports
+        /^(?!\.\.\/)/,
+        "./"
+      );
     }
     return `${prefix}${quote}${absPath}${quote}`;
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/preset-umi",
-  "version": "4.4.12",
+  "version": "4.4.13-canary.20250911.3",
   "description": "@umijs/preset-umi",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/preset-umi#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -43,20 +43,21 @@
     "react-router": "6.3.0",
     "react-router-dom": "6.3.0",
     "regenerator-runtime": "0.13.11",
-    "@umijs/ast": "4.4.12",
-    "@umijs/babel-preset-umi": "4.4.12",
-    "@umijs/bundler-utils": "4.4.12",
-    "@umijs/bundler-vite": "4.4.12",
-    "@umijs/bundler-webpack": "4.4.12",
-    "@umijs/bundler-esbuild": "4.4.12",
-    "@umijs/plugin-run": "4.4.12",
-    "@umijs/core": "4.4.12",
-    "@umijs/renderer-react": "4.4.12",
-    "@umijs/server": "4.4.12",
-    "@umijs/ui": "3.0.1",
-    "@umijs/utils": "4.4.12",
-    "@umijs/zod2ts": "4.4.12",
-    "@umijs/mfsu": "4.4.12"
+    "@umijs/ast": "4.4.13-canary.20250911.3",
+    "@umijs/bundler-utoopack": "4.4.13-canary.20250911.3",
+    "@umijs/babel-preset-umi": "4.4.13-canary.20250911.3",
+    "@umijs/bundler-vite": "4.4.13-canary.20250911.3",
+    "@umijs/mfsu": "4.4.13-canary.20250911.3",
+    "@umijs/bundler-utils": "4.4.13-canary.20250911.3",
+    "@umijs/bundler-webpack": "4.4.13-canary.20250911.3",
+    "@umijs/plugin-run": "4.4.13-canary.20250911.3",
+    "@umijs/bundler-esbuild": "4.4.13-canary.20250911.3",
+    "@umijs/server": "4.4.13-canary.20250911.3",
+    "@umijs/core": "4.4.13-canary.20250911.3",
+    "@umijs/renderer-react": "4.4.13-canary.20250911.3",
+    "@umijs/zod2ts": "4.4.13-canary.20250911.3",
+    "@umijs/utils": "4.4.13-canary.20250911.3",
+    "@umijs/ui": "3.0.1"
   },
   "devDependencies": {
     "@manypkg/get-packages": "1.1.3",