@umijs/preset-umi 4.0.46 → 4.0.48

package/dist/commands/dev/depBuildWorker/depBuildWorker.js

@@ -70,6 +70,7 @@ async function start() {
     env: import_types.Env.development,
     entry: opts.entry,
     userConfig: opts.config,
+    disableCopy: true,
     hash: true,
     staticPathPrefix: import_mfsu.MF_DEP_PREFIX,
     name: import_constants.MFSU_NAME,

package/dist/commands/generators/tailwindcss.js

@@ -49,17 +49,18 @@ var tailwindcss_default = (api) => {
       h.setUmirc("tailwindcss", {});
       h.appendInternalPlugin("@umijs/plugins/dist/tailwindcss");
       import_utils.logger.info("Update .umirc.ts");
+      const srcPrefix = api.appData.hasSrcDir ? "src/" : "";
       (0, import_fs.writeFileSync)(
         (0, import_path.join)(api.cwd, "tailwind.config.js"),
         `
 module.exports = {
   content: [
-    './src/pages/**/*.tsx',
-    './src/components/**.tsx',
-    './src/layouts/**.tsx',
+    './${srcPrefix}pages/**/*.tsx',
+    './${srcPrefix}components/**.tsx',
+    './${srcPrefix}layouts/**.tsx',
   ],
 }
-`.trimLeft()
+`.trimStart()
       );
       import_utils.logger.info("Write tailwind.config.js");
       (0, import_fs.writeFileSync)(
@@ -68,7 +69,7 @@ module.exports = {
 @tailwind base;
 @tailwind components;
 @tailwind utilities;
-`.trimLeft()
+`.trimStart()
       );
       import_utils.logger.info("Write tailwind.css");
       h.installDeps();

package/dist/features/appData/appData.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,10 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/features/appData/appData.ts
@@ -22,14 +28,12 @@ __export(appData_exports, {
   default: () => appData_default
 });
 module.exports = __toCommonJS(appData_exports);
-var import_bundler_utils = require("@umijs/bundler-utils");
 var import_utils = require("@umijs/utils");
 var import_fs = require("fs");
 var import_path = require("path");
 var import_ini = require("../../../compiled/ini");
 var import_os_locale = require("../../../compiled/os-locale");
 var import_watch = require("../../commands/dev/watch");
-var import_scan = require("../../libs/scan");
 var import_overrides = require("../overrides/overrides");
 var import_routes = require("../tmpFiles/routes");
 var appData_default = (api) => {
@@ -112,10 +116,11 @@ var appData_default = (api) => {
   api.register({
     key: "updateAppDataDeps",
     async fn() {
-      const resolver = (0, import_scan.createResolver)({
+      const { createResolver, scan } = await import("../../libs/scan.js");
+      const resolver = createResolver({
         alias: api.config.alias
       });
-      api.appData.deps = await (0, import_scan.scan)({
+      api.appData.deps = await scan({
         entry: (0, import_path.join)(api.paths.absTmpPath, "umi.ts"),
         externals: api.config.externals,
         resolver
@@ -133,7 +138,8 @@ var appData_default = (api) => {
   async function getAppJsInfo() {
     for (const path of (0, import_watch.expandJSPaths)((0, import_path.join)(api.paths.absSrcPath, "app"))) {
       if ((0, import_fs.existsSync)(path)) {
-        const [_, exports] = await (0, import_bundler_utils.parseModule)({
+        const { parseModule } = (0, import_utils.importLazy)(require.resolve("@umijs/bundler-utils"));
+        const [_, exports] = await parseModule({
           path,
           content: (0, import_fs.readFileSync)(path, "utf-8")
         });

package/dist/features/exportStatic/exportStatic.js

@@ -28,10 +28,10 @@ __export(exportStatic_exports, {
   default: () => exportStatic_default
 });
 module.exports = __toCommonJS(exportStatic_exports);
-var import_path = require("path");
 var import_server = require("@umijs/server");
 var import_utils = require("@umijs/utils");
 var import_assert = __toESM(require("assert"));
+var import_path = require("path");
 var import_utils2 = require("../ssr/utils");
 var markupRender;
 var IS_WIN = process.platform === "win32";
@@ -46,6 +46,7 @@ function getExportHtmlData(routes) {
           path: is404 ? "/404" : route.absPath,
           redirect: route.redirect
         },
+        prerender: route.prerender !== false,
         file
       });
     }
@@ -75,13 +76,17 @@ async function getPreRenderedHTML(api, htmlTpl, path) {
 var exportStatic_default = (api) => {
   async function getRoutesFromUserExtraPaths(routePaths) {
     const paths = typeof routePaths === "function" ? await routePaths() : routePaths;
-    return paths.reduce(
-      (acc, p) => ({
-        ...acc,
-        [p]: { id: p, absPath: p, path: p.slice(1), file: "" }
-      }),
-      {}
-    );
+    return paths.reduce((acc, item) => {
+      const routePath = typeof item === "string" ? item : item.path;
+      acc[routePath] = {
+        id: routePath,
+        absPath: routePath,
+        path: routePath.slice(1),
+        file: "",
+        ...typeof item === "object" && item.prerender === false ? { prerender: false } : {}
+      };
+      return acc;
+    }, {});
   }
   api.describe({
     config: {
@@ -109,7 +114,7 @@ var exportStatic_default = (api) => {
       extraHtmlData
     );
     const htmlFiles = [];
-    for (const { file, route } of htmlData) {
+    for (const { file, route, prerender } of htmlData) {
       let { markupArgs } = opts;
       if (publicPath.startsWith(".")) {
         (0, import_assert.default)(
@@ -156,7 +161,7 @@ var exportStatic_default = (api) => {
       const htmlContent = await (0, import_server.getMarkup)(markupArgs);
       htmlFiles.push({
         path: file,
-        content: api.config.ssr ? await getPreRenderedHTML(api, htmlContent, route.path) : htmlContent
+        content: api.config.ssr && prerender ? await getPreRenderedHTML(api, htmlContent, route.path) : htmlContent
       });
     }
     return htmlFiles;

package/dist/features/icons/{esbuildPlugins/esbuildCollectIconPlugin.d.ts → esbuildIconPlugin.d.ts}

@@ -1,5 +1,5 @@
 import type { Plugin } from '@umijs/bundler-utils/compiled/esbuild';
-export declare function esbuildCollectIconPlugin(opts: {
+export declare function esbuildIconPlugin(opts: {
     icons: Set<string>;
     alias: Record<string, string>;
 }): Plugin;

package/dist/features/icons/{esbuildPlugins/esbuildCollectIconPlugin.js → esbuildIconPlugin.js}

@@ -22,15 +22,16 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// src/features/icons/esbuildPlugins/esbuildCollectIconPlugin.ts
-var esbuildCollectIconPlugin_exports = {};
-__export(esbuildCollectIconPlugin_exports, {
-  esbuildCollectIconPlugin: () => esbuildCollectIconPlugin
+// src/features/icons/esbuildIconPlugin.ts
+var esbuildIconPlugin_exports = {};
+__export(esbuildIconPlugin_exports, {
+  esbuildIconPlugin: () => esbuildIconPlugin
 });
-module.exports = __toCommonJS(esbuildCollectIconPlugin_exports);
+module.exports = __toCommonJS(esbuildIconPlugin_exports);
+var import_utils = require("@umijs/utils");
 var import_fs = __toESM(require("fs"));
-var import_extract = require("../extract");
-function esbuildCollectIconPlugin(opts) {
+var import_extract = require("./extract");
+function esbuildIconPlugin(opts) {
   return {
     name: "esbuildCollectIconPlugin",
     setup(build) {
@@ -39,7 +40,9 @@ function esbuildCollectIconPlugin(opts) {
         const filter = new RegExp(`\\.(${loader})$`);
         build.onLoad({ filter }, (args) => {
           const contents = import_fs.default.readFileSync(args.path, "utf-8");
-          (0, import_extract.extractIcons)(contents).forEach((icon) => {
+          const icons = (0, import_extract.extractIcons)(contents);
+          import_utils.logger.debug(`[icons] ${args.path} > ${icons}`);
+          icons.forEach((icon) => {
             opts.icons.add(opts.alias[icon] || icon);
           });
           return {
@@ -53,5 +56,5 @@ function esbuildCollectIconPlugin(opts) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  esbuildCollectIconPlugin
+  esbuildIconPlugin
 });

package/dist/features/icons/icons.js

@@ -28,10 +28,8 @@ __export(icons_exports, {
   default: () => icons_default
 });
 module.exports = __toCommonJS(icons_exports);
-var import_path = __toESM(require("path"));
-var import_build = require("./build");
 var import_utils = require("@umijs/utils");
-var import_svgr = require("./svgr");
+var import_path = __toESM(require("path"));
 var icons_default = (api) => {
   api.describe({
     config: {
@@ -52,66 +50,58 @@ var icons_default = (api) => {
       );
     }
   });
-  api.register({
-    key: "onGenerateFiles",
-    async fn({ isFirstTime }) {
-      if (!isFirstTime)
-        return;
-      const entryFile = import_path.default.join(api.paths.absTmpPath, "umi.ts");
-      const iconsSet = /* @__PURE__ */ new Set();
-      const icons = await (0, import_build.build)({
-        entryPoints: [entryFile],
-        watch: api.name === "dev" && {
-          onRebuildSuccess() {
-            generate().catch((e) => {
-              import_utils.logger.error(e);
-            });
-          }
-        },
-        icons: iconsSet,
-        config: {
-          alias: api.config.alias
-        },
-        options: {
-          alias: api.config.icons.alias
-        }
+  const EMPTY_ICONS_FILE = `export const __no_icons = true;`;
+  const icons = /* @__PURE__ */ new Set();
+  api.addPrepareBuildPlugins(() => {
+    const { esbuildIconPlugin } = (0, import_utils.importLazy)(require.resolve("./esbuildIconPlugin"));
+    return [
+      esbuildIconPlugin({
+        icons,
+        alias: api.config.icons.alias || {}
+      })
+    ];
+  });
+  api.onPrepareBuildSuccess(async () => {
+    if (!icons.size) {
+      import_utils.logger.info(`[icons] no icons was found`);
+      return;
+    }
+    import_utils.logger.info(`[icons] generate icons ${Array.from(icons).join(", ")}`);
+    const code = [];
+    const { generateIconName, generateSvgr } = await import("./svgr.js");
+    for (const iconStr of icons) {
+      const [collect, icon] = iconStr.split(":");
+      const iconName = generateIconName({ collect, icon });
+      const svgr = await generateSvgr({
+        collect,
+        icon,
+        iconifyOptions: { autoInstall: api.config.icons.autoInstall },
+        localIconDir: import_path.default.join(api.paths.absSrcPath, "icons")
       });
-      const generate = async () => {
-        import_utils.logger.info(`[icons] generate icons.tsx`);
-        const code = [];
-        for (const iconStr of icons) {
-          const [collect, icon] = iconStr.split(":");
-          const iconName = (0, import_svgr.generateIconName)({ collect, icon });
-          const svgr = await (0, import_svgr.generateSvgr)({
-            collect,
-            icon,
-            iconifyOptions: { autoInstall: api.config.icons.autoInstall },
-            localIconDir: import_path.default.join(api.paths.absSrcPath, "icons")
-          });
-          if (svgr) {
-            code.push(svgr);
-            code.push(`export { ${iconName} };`);
-          } else {
-            if (api.env === "development") {
-              iconsSet.delete(iconStr);
-              import_utils.logger.error(`[icons] Icon ${iconStr} not found`);
-            } else {
-              throw new Error(`[icons] Icon ${iconStr} not found`);
-            }
-          }
+      if (svgr) {
+        code.push(svgr);
+        code.push(`export { ${iconName} };`);
+      } else {
+        if (api.env === "development") {
+          icons.delete(iconStr);
+          import_utils.logger.error(`[icons] Icon ${iconStr} not found`);
+        } else {
+          throw new Error(`[icons] Icon ${iconStr} not found`);
         }
-        api.writeTmpFile({
-          path: "icons.tsx",
-          content: code.join("\n") || `export const __no_icons = true;`
-        });
-      };
-      generate().catch((e) => {
-        import_utils.logger.error(e);
-      });
-    },
-    stage: Infinity
+      }
+    }
+    api.writeTmpFile({
+      path: "icons.tsx",
+      content: code.join("\n") || EMPTY_ICONS_FILE
+    });
   });
-  api.onGenerateFiles(() => {
+  api.onGenerateFiles(({ isFirstTime }) => {
+    if (isFirstTime) {
+      api.writeTmpFile({
+        path: "icons.tsx",
+        content: EMPTY_ICONS_FILE
+      });
+    }
     api.writeTmpFile({
       path: "index.tsx",
       content: `
@@ -122,9 +112,9 @@ import './index.css';
 const alias = ${JSON.stringify(api.config.icons.alias || {})};
 type AliasKeys = keyof typeof alias;
 
-export const Icon = React.forwardRef((props: {
+interface IUmiIconProps extends React.SVGAttributes<SVGElement> {
   icon: AliasKeys | string;
-  hover: AliasKeys | string;
+  hover?: AliasKeys | string;
   className?: string;
   viewBox?: string;
   width?: string;
@@ -133,7 +123,9 @@ export const Icon = React.forwardRef((props: {
   spin?: boolean;
   rotate?: number | string;
   flip?: 'vertical' | 'horizontal' | 'horizontal,vertical' | 'vertical,horizontal';
-}, ref) => {
+}
+
+export const Icon = React.forwardRef((props: IUmiIconProps, ref) => {
   const { icon, hover, style, className, rotate, flip, ...extraProps } = props;
   const iconName = normalizeIconName(alias[icon] || icon);
   const Component = iconsMap[iconName];

package/dist/features/mpa/extractExports.js

@@ -29,6 +29,7 @@ __export(extractExports_exports, {
 });
 module.exports = __toCommonJS(extractExports_exports);
 var import_esbuild = __toESM(require("@umijs/bundler-utils/compiled/esbuild"));
+var import_utils = require("@umijs/utils");
 async function extractExports(opts) {
   const res = await import_esbuild.default.build({
     format: "cjs",
@@ -94,7 +95,7 @@ async function extractExports(opts) {
           build.onLoad({ filter: /.*/, namespace: "entry" }, (args) => {
             return {
               contents: `
-import * as x from "${args.path}";
+import * as x from "${(0, import_utils.winPath)(args.path)}";
 ret = x.${opts.exportName} || {};
               `,
               loader: "ts"

package/dist/features/mpa/mpa.js

@@ -31,9 +31,7 @@ module.exports = __toCommonJS(mpa_exports);
 var import_utils = require("@umijs/utils");
 var import_assert = __toESM(require("assert"));
 var import_fs = require("fs");
-var import_html_webpack_plugin = __toESM(require("html-webpack-plugin"));
 var import_path = require("path");
-var import_extractExports = require("./extractExports");
 var mpa_default = (api) => {
   api.describe({
     key: "mpa",
@@ -112,7 +110,7 @@ ${renderer}
   });
   api.chainWebpack((memo) => {
     api.appData.mpa.entry.forEach((entry) => {
-      memo.plugin(`html-${entry.name}`).use(import_html_webpack_plugin.default, [
+      memo.plugin(`html-${entry.name}`).use(require("html-webpack-plugin"), [
         {
           filename: `${entry.name}.html`,
           minify: false,
@@ -183,7 +181,8 @@ async function getConfig(indexFile) {
   }
 }
 async function getConfigFromEntryFile(indexFile) {
-  const config = await (0, import_extractExports.extractExports)({
+  const { extractExports } = await import("./extractExports.js");
+  const config = await extractExports({
     entry: indexFile,
     exportName: "config"
   });

package/dist/features/phantomDependency/phantomDependency.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,10 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/features/phantomDependency/phantomDependency.ts
@@ -22,6 +28,8 @@ __export(phantomDependency_exports, {
   default: () => phantomDependency_default
 });
 module.exports = __toCommonJS(phantomDependency_exports);
+var import_utils = require("@umijs/utils");
+var import_path = __toESM(require("path"));
 var phantomDependency_default = (api) => {
   api.describe({
     key: "phantomDependency",
@@ -39,38 +47,70 @@ var phantomDependency_default = (api) => {
       api.logger.warn("Phantom dependencies check is not needed in pnpm.");
     }
   });
-  api.onCheckCode((opts) => {
-    if (opts.isFromTmp)
-      return;
-    if (/node_modules/.test(opts.file))
-      return;
-    opts.imports.forEach((imp) => {
-      var _a, _b, _c, _d;
-      const { source, loc } = imp;
+  api.onPrepareBuildSuccess(({ result }) => {
+    var _a, _b, _c, _d;
+    const files = Object.keys(result.metafile.inputs);
+    const importsBySource = /* @__PURE__ */ new Map();
+    for (const file of files) {
+      const winP = (0, import_utils.winPath)(file);
+      if (winP.includes(".umi/"))
+        continue;
+      if (winP.includes("/node_modules/"))
+        continue;
+      if (winP.startsWith("../"))
+        continue;
+      if (import_path.default.isAbsolute(file))
+        continue;
+      const { imports } = result.metafile.inputs[file];
+      for (const imp of imports) {
+        if (imp.kind === "import-statement" && imp.external) {
+          if (!importsBySource.has(imp.path)) {
+            importsBySource.set(imp.path, []);
+          }
+          importsBySource.get(imp.path).push({ file });
+        }
+      }
+    }
+    const phantomDeps = [];
+    for (const [source, files2] of importsBySource) {
+      if (source.startsWith("<"))
+        continue;
       if (source.startsWith("."))
-        return;
+        continue;
       if (source.startsWith("/"))
-        return;
+        continue;
       if (source.startsWith("@/") || source.startsWith("@@/"))
-        return;
+        continue;
       const pkgName = getPkgName(source);
       if ((_a = api.config.phantomDependency.exclude) == null ? void 0 : _a.includes(pkgName))
-        return;
+        continue;
       if ((_b = api.pkg.dependencies) == null ? void 0 : _b[pkgName])
-        return;
+        continue;
       if ((_c = api.pkg.devDependencies) == null ? void 0 : _c[pkgName])
-        return;
+        continue;
       if ((_d = api.pkg.clientDependencies) == null ? void 0 : _d[pkgName])
-        return;
+        continue;
       if (matchAlias(source, api.config.alias || {}))
-        return;
+        continue;
       if (matchExternals(source, api.config.externals || {}))
-        return;
-      throw new opts.CodeFrameError(
-        `${source} is a phantom dependency, please specify it in package.json.`,
-        loc
+        continue;
+      phantomDeps.push(source);
+      import_utils.logger.error(
+        `[phantomDependency] ${import_utils.chalk.red(
+          `${source} is a phantom dependency, please specify it in package.json.`
+        )}`
+      );
+      for (const file of files2) {
+        import_utils.logger.error(`[phantomDependency] ${file.file} imports ${source}`);
+      }
+    }
+    if (phantomDeps.length && api.name !== "dev") {
+      throw new Error(
+        `[phantomDependency] has phantom dependencies ${phantomDeps.join(
+          ", "
+        )}, exit.`
       );
-    });
+    }
   });
   function getPkgName(source) {
     const arr = source.split("/");

package/dist/features/polyfill/polyfill.js

@@ -28,7 +28,6 @@ __export(polyfill_exports, {
   default: () => polyfill_default
 });
 module.exports = __toCommonJS(polyfill_exports);
-var import_core = require("@umijs/bundler-utils/compiled/babel/core");
 var import_constants = require("@umijs/bundler-webpack/dist/constants");
 var import_utils = require("@umijs/utils");
 var import_path = require("path");
@@ -49,7 +48,12 @@ var polyfill_default = (api) => {
   api.onGenerateFiles(() => {
     var _a, _b;
     const coreJsImports = ((_a = api.config.polyfill) == null ? void 0 : _a.imports) ? (_b = api.config.polyfill) == null ? void 0 : _b.imports.map((item) => `import '${item}';`).join("\n") : `import 'core-js';`;
-    const { code } = (0, import_core.transform)(
+    const {
+      transform
+    } = (0, import_utils.importLazy)(
+      require.resolve("@umijs/bundler-utils/compiled/babel/core")
+    );
+    const { code } = transform(
       `
 ${coreJsImports}
 import '${(0, import_utils.winPath)(require.resolve("regenerator-runtime/runtime"))}';

package/dist/features/prepare/build.d.ts

@@ -0,0 +1,15 @@
+import esbuild from '@umijs/bundler-utils/compiled/esbuild';
+export declare function build(opts: {
+    entryPoints: string[];
+    watch?: {
+        onRebuildSuccess({ result }: {
+            result: esbuild.BuildResult;
+        }): void;
+    } | false;
+    config?: {
+        alias?: any;
+    };
+    plugins?: esbuild.Plugin[];
+}): Promise<esbuild.BuildResult & {
+    outputFiles: esbuild.OutputFile[];
+}>;

package/dist/features/{icons → prepare}/build.js

@@ -22,7 +22,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// src/features/icons/build.ts
+// src/features/prepare/build.ts
 var build_exports = {};
 __export(build_exports, {
   build: () => build
@@ -32,28 +32,26 @@ var import_esbuild = __toESM(require("@umijs/bundler-utils/compiled/esbuild"));
 var import_utils = require("@umijs/utils");
 var import_path = __toESM(require("path"));
 var import_esbuildAliasPlugin = require("./esbuildPlugins/esbuildAliasPlugin");
-var import_esbuildCollectIconPlugin = require("./esbuildPlugins/esbuildCollectIconPlugin");
 var import_esbuildExternalPlugin = require("./esbuildPlugins/esbuildExternalPlugin");
 async function build(opts) {
-  var _a, _b;
-  const icons = opts.icons || /* @__PURE__ */ new Set();
-  await import_esbuild.default.build({
+  var _a;
+  return await import_esbuild.default.build({
     format: "esm",
     platform: "browser",
     target: "esnext",
     loader: {
-      ".js": "jsx",
-      ".jsx": "jsx",
+      ".js": "tsx",
+      ".jsx": "tsx",
       ".ts": "ts",
       ".tsx": "tsx"
     },
     watch: !!opts.watch && {
-      onRebuild(err) {
+      onRebuild(err, result) {
         if (err) {
           import_utils.logger.error(`[icons] build failed: ${err}`);
         } else {
           if (opts.watch) {
-            opts.watch.onRebuildSuccess();
+            opts.watch.onRebuildSuccess({ result });
           }
         }
       }
@@ -63,16 +61,13 @@ async function build(opts) {
     entryPoints: opts.entryPoints,
     write: false,
     outdir: import_path.default.join(import_path.default.dirname(opts.entryPoints[0]), "out"),
+    metafile: true,
     plugins: [
       (0, import_esbuildExternalPlugin.esbuildExternalPlugin)(),
       (0, import_esbuildAliasPlugin.esbuildAliasPlugin)({ alias: ((_a = opts.config) == null ? void 0 : _a.alias) || {} }),
-      (0, import_esbuildCollectIconPlugin.esbuildCollectIconPlugin)({
-        icons,
-        alias: ((_b = opts.options) == null ? void 0 : _b.alias) || {}
-      })
+      ...opts.plugins || []
     ]
   });
-  return icons;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/features/{icons → prepare}/esbuildPlugins/esbuildAliasPlugin.js

@@ -22,24 +22,25 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// src/features/icons/esbuildPlugins/esbuildAliasPlugin.ts
+// src/features/prepare/esbuildPlugins/esbuildAliasPlugin.ts
 var esbuildAliasPlugin_exports = {};
 __export(esbuildAliasPlugin_exports, {
   esbuildAliasPlugin: () => esbuildAliasPlugin
 });
 module.exports = __toCommonJS(esbuildAliasPlugin_exports);
-var import_fs = require("fs");
 var import_enhanced_resolve = __toESM(require("enhanced-resolve"));
+var import_fs = __toESM(require("fs"));
+var import_path = __toESM(require("path"));
 var resolver = import_enhanced_resolve.default.create({
   mainFields: ["module", "browser", "main"],
   extensions: [".json", ".js", ".jsx", ".ts", ".tsx", ".cjs", ".mjs"],
   exportsFields: []
 });
-async function resolve(context, path) {
+async function resolve(context, path2) {
   return new Promise((resolve2, reject) => {
     resolver(
       context,
-      path,
+      path2,
       (err, result) => err ? reject(err) : resolve2(result)
     );
   });
@@ -61,31 +62,31 @@ function addSlashAffix(key) {
 }
 function esbuildAliasPlugin(opts) {
   return {
-    name: "esbuildExternalPlugin",
+    name: "esbuildAliasPlugin",
     setup(build) {
       sortByAffix({ keys: Object.keys(opts.alias), affix: "$" }).filter((key) => {
-        return opts.alias[key].startsWith("/") && !opts.alias[key].includes("node_modules");
+        return import_path.default.isAbsolute(opts.alias[key]) && !opts.alias[key].includes("node_modules");
       }).forEach((key) => {
         const value = opts.alias[key];
-        const filter = key.endsWith("$") ? new RegExp(key) : new RegExp(`${key}$`);
+        const filter = key.endsWith("$") ? new RegExp(`^${key}`) : new RegExp(`^${key}$`);
         build.onResolve({ filter }, async (args) => {
-          const path = await resolve(
+          const path2 = await resolve(
             args.importer,
             args.path.replace(filter, value)
           );
           return {
-            path
+            path: path2
           };
         });
-        if (!key.endsWith("/") && (0, import_fs.existsSync)(value) && (0, import_fs.statSync)(value).isDirectory()) {
+        if (!key.endsWith("/") && import_fs.default.existsSync(value) && import_fs.default.statSync(value).isDirectory()) {
           const filter2 = new RegExp(`^${addSlashAffix(key)}`);
           build.onResolve({ filter: filter2 }, async (args) => {
-            const path = await resolve(
+            const path2 = await resolve(
               args.importer,
               args.path.replace(filter2, addSlashAffix(value))
             );
             return {
-              path
+              path: path2
             };
           });
         }

package/dist/features/{icons → prepare}/esbuildPlugins/esbuildExternalPlugin.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,14 +16,20 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// src/features/icons/esbuildPlugins/esbuildExternalPlugin.ts
+// src/features/prepare/esbuildPlugins/esbuildExternalPlugin.ts
 var esbuildExternalPlugin_exports = {};
 __export(esbuildExternalPlugin_exports, {
   esbuildExternalPlugin: () => esbuildExternalPlugin
 });
 module.exports = __toCommonJS(esbuildExternalPlugin_exports);
+var import_utils = require("@umijs/utils");
+var import_path = __toESM(require("path"));
 function esbuildExternalPlugin() {
   return {
     name: "esbuildExternalPlugin",
@@ -41,7 +49,13 @@ function esbuildExternalPlugin() {
         if (args.kind === "entry-point") {
           return null;
         }
-        if (args.path.startsWith("/") && !args.path.includes("node_modules")) {
+        const winP = (0, import_utils.winPath)(args.path);
+        const isAliasImport = winP.startsWith("@/") || winP.startsWith("@@/");
+        if (isAliasImport) {
+          return null;
+        }
+        const isNodeModuleImport = args.path.includes("node_modules");
+        if (import_path.default.isAbsolute(args.path) && !isNodeModuleImport) {
           return null;
         }
         return {

package/dist/features/prepare/prepare.d.ts

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

package/dist/features/prepare/prepare.js

@@ -0,0 +1,86 @@
+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(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/features/prepare/prepare.ts
+var prepare_exports = {};
+__export(prepare_exports, {
+  default: () => prepare_default
+});
+module.exports = __toCommonJS(prepare_exports);
+var import_utils = require("@umijs/utils");
+var import_path = __toESM(require("path"));
+var import_watch = require("../../commands/dev/watch");
+var prepare_default = (api) => {
+  api.register({
+    key: "onGenerateFiles",
+    async fn({ isFirstTime }) {
+      if (api.appData.framework === "vue") {
+        return;
+      }
+      if (!isFirstTime)
+        return;
+      import_utils.logger.info("Preparing...");
+      const entryFile = import_path.default.join(api.paths.absTmpPath, "umi.ts");
+      const { build } = await import("./build.js");
+      const watch = api.name === "dev";
+      const plugins = await api.applyPlugins({
+        key: "addPrepareBuildPlugins",
+        initialValue: []
+      });
+      const buildResult = await build({
+        entryPoints: [entryFile],
+        watch: watch && {
+          onRebuildSuccess({ result }) {
+            api.applyPlugins({
+              key: "onPrepareBuildSuccess",
+              args: {
+                isWatch: true,
+                result
+              }
+            });
+          }
+        },
+        config: {
+          alias: api.config.alias
+        },
+        plugins
+      });
+      if (watch) {
+        (0, import_watch.addUnWatch)(() => {
+          var _a;
+          (_a = buildResult.stop) == null ? void 0 : _a.call(buildResult);
+        });
+      }
+      await api.applyPlugins({
+        key: "onPrepareBuildSuccess",
+        args: {
+          result: buildResult
+        }
+      });
+    },
+    stage: Infinity
+  });
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});

package/dist/index.js

@@ -53,6 +53,7 @@ var src_default = () => {
       require.resolve("./features/phantomDependency/phantomDependency"),
       require.resolve("./features/polyfill/polyfill"),
       require.resolve("./features/polyfill/publicPathPolyfill"),
+      require.resolve("./features/prepare/prepare"),
       require.resolve("./features/routePrefetch/routePrefetch"),
       require.resolve("./features/ssr/ssr"),
       require.resolve("./features/terminal/terminal"),

package/dist/registerMethods.js

@@ -34,7 +34,6 @@ var import_assert = __toESM(require("assert"));
 var import_fs = require("fs");
 var import_path = require("path");
 var import_isTypeScriptFile = require("./utils/isTypeScriptFile");
-var import_transformIEAR = __toESM(require("./utils/transformIEAR"));
 var registerMethods_default = (api) => {
   [
     "onGenerateFiles",
@@ -43,6 +42,7 @@ var registerMethods_default = (api) => {
     "onBuildHtmlComplete",
     "onPatchRoute",
     "onPkgJSONChanged",
+    "onPrepareBuildSuccess",
     "onDevCompileDone",
     "onCheckPkgJSON",
     "onCheckCode",
@@ -55,6 +55,7 @@ var registerMethods_default = (api) => {
     "addRuntimePlugin",
     "addRuntimePluginKey",
     "addPolyfillImports",
+    "addPrepareBuildPlugins",
     "addEntryImportsAhead",
     "addEntryImports",
     "addEntryCodeAhead",
@@ -122,7 +123,10 @@ var registerMethods_default = (api) => {
         ""
       ].filter((text) => text !== false).join("\n");
       if (api.appData.vite && isJsFile) {
-        content = (0, import_transformIEAR.default)({ content, path: absPath }, api);
+        const { default: transformIEAR } = (0, import_utils.importLazy)(
+          require.resolve("./utils/transformIEAR")
+        );
+        content = transformIEAR({ content, path: absPath }, api);
       }
       if (!(0, import_fs.existsSync)(absPath)) {
         (0, import_fs.writeFileSync)(absPath, content, "utf-8");

package/dist/types.d.ts

@@ -1,5 +1,6 @@
 import type { ImportDeclaration } from '@umijs/bundler-utils/compiled/@babel/types';
-import type { RequestHandler, webpack, Express } from '@umijs/bundler-webpack';
+import type { BuildResult as ESBuildBuildResult, Plugin as ESBuildPlugin } from '@umijs/bundler-utils/compiled/esbuild';
+import type { Express, RequestHandler, webpack } from '@umijs/bundler-webpack';
 import type WebpackChain from '@umijs/bundler-webpack/compiled/webpack-5-chain';
 import type { IConfig } from '@umijs/bundler-webpack/dist/types';
 import type { IAdd, IEvent, IModify, IRoute as ICoreRoute, IServicePluginAPI, PluginAPI } from '@umijs/core';
@@ -92,6 +93,7 @@ export declare type IApi = PluginAPI & IServicePluginAPI & {
         source: string;
         specifier?: string;
     }>;
+    addPrepareBuildPlugins: IAdd<null, ESBuildPlugin>;
     addRuntimePlugin: IAdd<null, string>;
     addRuntimePluginKey: IAdd<null, string>;
     addTmpGenerateWatcherPaths: IAdd<null, string>;
@@ -180,6 +182,10 @@ export declare type IApi = PluginAPI & IServicePluginAPI & {
         current: Record<string, any>;
         origin: Record<string, any>;
     }>;
+    onPrepareBuildSuccess: IEvent<{
+        isWatch: boolean;
+        result: ESBuildBuildResult;
+    }>;
     restartServer: () => void;
     writeTmpFile: (opts: {
         content?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/preset-umi",
-  "version": "4.0.46",
+  "version": "4.0.48",
   "description": "@umijs/preset-umi",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/preset-umi#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -27,19 +27,19 @@
   "dependencies": {
     "@iconify/utils": "2.0.9",
     "@svgr/core": "6.2.1",
-    "@umijs/ast": "4.0.46",
-    "@umijs/babel-preset-umi": "4.0.46",
-    "@umijs/bundler-utils": "4.0.46",
-    "@umijs/bundler-vite": "4.0.46",
-    "@umijs/bundler-webpack": "4.0.46",
-    "@umijs/core": "4.0.46",
+    "@umijs/ast": "4.0.48",
+    "@umijs/babel-preset-umi": "4.0.48",
+    "@umijs/bundler-utils": "4.0.48",
+    "@umijs/bundler-vite": "4.0.48",
+    "@umijs/bundler-webpack": "4.0.48",
+    "@umijs/core": "4.0.48",
     "@umijs/did-you-know": "^1.0.0",
     "@umijs/history": "5.3.1",
-    "@umijs/mfsu": "4.0.46",
-    "@umijs/plugin-run": "4.0.46",
-    "@umijs/renderer-react": "4.0.46",
-    "@umijs/server": "4.0.46",
-    "@umijs/utils": "4.0.46",
+    "@umijs/mfsu": "4.0.48",
+    "@umijs/plugin-run": "4.0.48",
+    "@umijs/renderer-react": "4.0.48",
+    "@umijs/server": "4.0.48",
+    "@umijs/utils": "4.0.48",
     "babel-plugin-dynamic-import-node": "2.3.3",
     "click-to-react-component": "^1.0.8",
     "core-js": "3.27.1",

package/dist/features/icons/build.d.ts

@@ -1,13 +0,0 @@
-export declare function build(opts: {
-    entryPoints: string[];
-    watch?: {
-        onRebuildSuccess(): void;
-    } | false;
-    config?: {
-        alias?: any;
-    };
-    options?: {
-        alias?: Record<string, string>;
-    };
-    icons?: Set<string>;
-}): Promise<Set<string>>;