@umijs/preset-umi 4.0.53 → 4.0.55

package/dist/commands/build.js

@@ -26,12 +26,12 @@ var import_server = require("@umijs/server");
 var import_utils = require("@umijs/utils");
 var import_fs = require("fs");
 var import_path = require("path");
+var import_fileSizeReporter = require("../utils/fileSizeReporter");
 var import_lazyImportFromCurrentPkg = require("../utils/lazyImportFromCurrentPkg");
 var import_getAssetsMap = require("./dev/getAssetsMap");
 var import_getBabelOpts = require("./dev/getBabelOpts");
 var import_getMarkupArgs = require("./dev/getMarkupArgs");
 var import_printMemoryUsage = require("./dev/printMemoryUsage");
-var import_fileSizeReporter = require("../utils/fileSizeReporter");
 var bundlerWebpack = (0, import_lazyImportFromCurrentPkg.lazyImportFromCurrentPkg)("@umijs/bundler-webpack");
 var bundlerVite = (0, import_lazyImportFromCurrentPkg.lazyImportFromCurrentPkg)("@umijs/bundler-vite");
 var build_default = (api) => {
@@ -113,9 +113,9 @@ umi build --clean
         beforeBabelPresets,
         extraBabelPlugins,
         extraBabelPresets,
-        onBuildComplete(opts2) {
+        async onBuildComplete(opts2) {
           (0, import_printMemoryUsage.printMemoryUsage)();
-          api.applyPlugins({
+          await api.applyPlugins({
             key: "onBuildComplete",
             args: opts2
           });

package/dist/commands/config/remove.js

@@ -1,8 +1,6 @@
-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)
@@ -16,14 +14,6 @@ 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/commands/config/remove.ts
@@ -33,14 +23,14 @@ __export(remove_exports, {
 });
 module.exports = __toCommonJS(remove_exports);
 var import_ast = require("@umijs/ast");
-var import_prettier = __toESM(require("@umijs/utils/compiled/prettier"));
 var import_fs = require("fs");
 function remove(mainConfigFile, name) {
   const ast = (0, import_ast.getASTByFilePath)(mainConfigFile);
   if (!ast)
     return;
   const generateCode = (0, import_ast.generate)((0, import_ast.removeConfigByName)(ast, name));
-  const printStr = import_prettier.default.format(generateCode, {
+  const prettier = require("@umijs/utils/compiled/prettier");
+  const printStr = prettier.format(generateCode, {
     parser: "typescript"
   });
   (0, import_fs.writeFileSync)(mainConfigFile, printStr, "utf-8");

package/dist/commands/config/set.js

@@ -1,8 +1,6 @@
-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)
@@ -16,14 +14,6 @@ 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/commands/config/set.ts
@@ -33,7 +23,6 @@ __export(set_exports, {
 });
 module.exports = __toCommonJS(set_exports);
 var import_ast = require("@umijs/ast");
-var import_prettier = __toESM(require("@umijs/utils/compiled/prettier"));
 var import_fs = require("fs");
 var import_path = require("path");
 function set(api, name, value) {
@@ -49,7 +38,8 @@ function set(api, name, value) {
   if (!ast)
     return;
   const generateCode = (0, import_ast.generate)((0, import_ast.setConfigByName)(ast, name, value));
-  const printStr = import_prettier.default.format(generateCode, {
+  const prettier = require("@umijs/utils/compiled/prettier");
+  const printStr = prettier.format(generateCode, {
     parser: "typescript"
   });
   (0, import_fs.writeFileSync)(mainConfigFile, printStr, "utf-8");

package/dist/commands/deadcode.d.ts

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

package/dist/commands/deadcode.js

@@ -0,0 +1,184 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/commands/deadcode.ts
+var deadcode_exports = {};
+__export(deadcode_exports, {
+  default: () => deadcode_default
+});
+module.exports = __toCommonJS(deadcode_exports);
+var import_utils = require("@umijs/utils");
+var import_path = require("path");
+var outputUnusedFiles = (unusedFiles, fileName) => {
+  if (!(unusedFiles == null ? void 0 : unusedFiles.length)) {
+    return;
+  }
+  const content = unusedFiles.map((file, index) => `
+${index + 1}. ${file}`);
+  const str = `
+    Warning: There are ${unusedFiles.length} unused files:
+    ${content.join("")}
+    
+Please be careful if you want to remove them (¬º-°)¬.
+
+  `;
+  import_utils.fsExtra.writeFileSync(fileName, str, "utf8");
+};
+var deadcode_default = (api) => {
+  api.registerCommand({
+    name: "deadcode",
+    description: "check dead code",
+    async fn() {
+      var _a, _b;
+      const pkg = api.pkg;
+      const userDeps = {
+        ...pkg == null ? void 0 : pkg.dependencies,
+        ...pkg == null ? void 0 : pkg.devDependencies
+      };
+      const MADGE_NAME = "madge";
+      const MADGE_VERSION = "6.0.0";
+      const isInstalled = Object.keys(userDeps).includes(MADGE_NAME);
+      if (!isInstalled) {
+        pkg.devDependencies || (pkg.devDependencies = {});
+        pkg.devDependencies[MADGE_NAME] = MADGE_VERSION;
+        import_utils.fsExtra.writeFileSync(
+          api.pkgPath,
+          `${JSON.stringify(pkg, null, 2)}
+`,
+          "utf-8"
+        );
+        import_utils.logger.info(
+          `Installing ${import_utils.chalk.blue(MADGE_NAME)} (required by deadcode) ...`
+        );
+        (0, import_utils.installWithNpmClient)({
+          cwd: api.cwd,
+          npmClient: api.appData.npmClient
+        });
+      }
+      import_utils.rimraf.sync(api.paths.absTmpPath);
+      await api.applyPlugins({
+        key: "onGenerateFiles",
+        args: {
+          files: null,
+          isFirstTime: true
+        }
+      });
+      import_utils.logger.info("begin check deadCode");
+      const cwd = api.cwd;
+      const tsconfig = await import_utils.tsconfigPaths.loadConfig(cwd);
+      const exclude = [/node_modules/, /\.d\.ts$/, /\.umi/];
+      const isExclude = (path) => {
+        return exclude.some((reg) => reg.test(path));
+      };
+      const userAlias = api.config.alias;
+      const parsedAlias = import_utils.aliasUtils.parseCircleAlias({
+        alias: userAlias
+      });
+      const filteredAlias = Object.keys(parsedAlias).reduce(
+        (acc, key) => {
+          var _a2, _b2;
+          const value = parsedAlias[key];
+          if (isExclude(value)) {
+            return acc;
+          }
+          if ((_a2 = tsconfig.paths) == null ? void 0 : _a2[key]) {
+            return acc;
+          }
+          const tsconfigValue = [(0, import_path.join)((0, import_path.relative)(cwd, value), "/*")];
+          const tsconfigKey = `${key}/*`;
+          if ((_b2 = tsconfig.paths) == null ? void 0 : _b2[tsconfigKey]) {
+            return acc;
+          }
+          acc[tsconfigKey] = tsconfigValue;
+          return acc;
+        },
+        {}
+      );
+      if (!api.appData.hasSrcDir) {
+        throw new Error(`Only supports projects containing "src" folders.`);
+      }
+      const devTmpDir = (0, import_path.join)(api.paths.absSrcPath, ".umi");
+      const entryFile = (0, import_path.join)(devTmpDir, "umi.ts");
+      const exportsFile = (0, import_path.join)(devTmpDir, "exports.ts");
+      const madgePkg = (0, import_path.dirname)(
+        import_utils.resolve.sync(`${MADGE_NAME}/package.json`, {
+          basedir: cwd
+        })
+      );
+      const madge = require(madgePkg);
+      const res = await madge(entryFile, {
+        tsConfig: {
+          compilerOptions: {
+            baseUrl: tsconfig.baseUrl,
+            paths: {
+              ...filteredAlias,
+              ...tsconfig.paths,
+              umi: [exportsFile],
+              "@umijs/max": [exportsFile],
+              // 适配 bigfish
+              ...((_b = (_a = api.appData) == null ? void 0 : _a.umi) == null ? void 0 : _b.importSource) ? {
+                [api.appData.umi.importSource]: [exportsFile]
+              } : {}
+            },
+            target: "esnext",
+            module: "esnext",
+            moduleResolution: "node",
+            importHelpers: true,
+            jsx: "react-jsx",
+            esModuleInterop: true,
+            strict: true,
+            resolveJsonModule: true,
+            allowSyntheticDefaultImports: true
+          }
+        },
+        fileExtensions: ["ts", "tsx", "js", "jsx"],
+        excludeRegExp: exclude,
+        baseDir: cwd
+      });
+      const treeMap = res.tree;
+      const dependenceMap = Object.keys(treeMap).reduce(
+        (acc, key) => {
+          const path = (0, import_utils.winPath)((0, import_path.join)(api.paths.cwd, key));
+          acc[path] = true;
+          return acc;
+        },
+        {}
+      );
+      const unusedFiles = (0, import_utils.readDirFiles)({
+        dir: api.paths.absSrcPath,
+        exclude
+      }).filter(({ filePath: filePath2 }) => !dependenceMap[filePath2]).map((file) => {
+        const relativePath = (0, import_path.relative)(cwd, file.filePath);
+        return relativePath;
+      });
+      if (!unusedFiles.length) {
+        return import_utils.logger.info(`good job, no unusedFiles`);
+      }
+      const filePath = (0, import_utils.winPath)((0, import_path.join)(cwd, `DeadCodeList-${Date.now()}.txt`));
+      import_utils.logger.info(
+        `${unusedFiles.length} unusedFiles, write content to file ${filePath}`
+      );
+      outputUnusedFiles(unusedFiles, filePath);
+      import_utils.logger.info(
+        `check dead code end, please be careful if you want to remove them (¬º-°)¬`
+      );
+    }
+  });
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});

package/dist/commands/dev/dev.js

@@ -39,6 +39,7 @@ var import_worker_threads = require("worker_threads");
 var import_constants = require("../../constants");
 var import_LazySourceCodeCache = require("../../libs/folderCache/LazySourceCodeCache");
 var import_lazyImportFromCurrentPkg = require("../../utils/lazyImportFromCurrentPkg");
+var import_projectFileList = require("../../utils/projectFileList");
 var import_createRouteMiddleware = require("./createRouteMiddleware");
 var import_faviconMiddleware = require("./faviconMiddleware");
 var import_getBabelOpts = require("./getBabelOpts");
@@ -278,7 +279,12 @@ PORT=8888 umi dev
             "mfsu_v4"
           )
         });
-        await srcCodeCache.init();
+        if (api.appData.framework === "vue") {
+          await srcCodeCache.initWithScan();
+        } else {
+          const files = (0, import_projectFileList.getProjectFileList)(api);
+          await srcCodeCache.init(files);
+        }
         (0, import_watch.addUnWatch)(() => {
           srcCodeCache.unwatch();
         });

package/dist/commands/generators/jest.js

@@ -64,7 +64,7 @@ var jest_default = (api) => {
         "jest-environment-jsdom": jestMajorVersion,
         // RTL
         "@testing-library/jest-dom": "^5",
-        "@testing-library/react": "^13"
+        "@testing-library/react": "^14"
       };
       const packageToInstall = res.willUseTLR ? {
         ...basicDeps,

package/dist/commands/mfsu/mfsu.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/commands/mfsu/mfsu.ts
@@ -22,21 +32,26 @@ __export(mfsu_exports, {
   default: () => mfsu_default
 });
 module.exports = __toCommonJS(mfsu_exports);
-var import_util = require("./util");
+var import_utils = require("@umijs/utils");
+var utils = (0, import_utils.importLazy)(require.resolve("./util"));
 var HELP_TEXT = `
 # MFSU CLI util
 # umi mfsu [action]
 
 # Show Help
-$ umi mfsu 
+$ umi mfsu
 
 # Manually build mfsu dependencies
-$ umi mfsu build 
-$ umi mfsu b 
+$ umi mfsu build
+$ umi mfsu b
 
 # list mfsu dependencies
-$ umi mfsu list 
-$ umi mfsu ls 
+$ umi mfsu list
+$ umi mfsu ls
+
+# remove mfsu dependencies
+$ umi mfsu remove
+$ umi mfsu remove --all
 `.trim();
 var mfsu_default = (api) => {
   api.describe({
@@ -44,7 +59,7 @@ var mfsu_default = (api) => {
   });
   api.registerCommand({
     name: "mfsu",
-    description: "umi mfsu CLI util",
+    description: "mfsu CLI util",
     details: HELP_TEXT,
     configResolveMode: "strict",
     async fn({ args }) {
@@ -55,7 +70,8 @@ var mfsu_default = (api) => {
         api.logger.info("MFSU is not enabled");
         return;
       }
-      const util = ((_a = api.config.mfsu) == null ? void 0 : _a.strategy) === "eager" ? new import_util.EagerUtil(api) : new import_util.NormalUtil(api);
+      const { EagerUtil, NormalUtil } = utils;
+      const util = ((_a = api.config.mfsu) == null ? void 0 : _a.strategy) === "eager" ? new EagerUtil(api) : new NormalUtil(api);
       switch (command) {
         case "build":
         case "b":
@@ -82,7 +98,7 @@ var mfsu_default = (api) => {
           }
           break;
         case "help":
-          printHelpInfo();
+          printHelpInfo(api);
           break;
         default:
           throw new Error(`Unsupported mfsu action`);
@@ -90,8 +106,8 @@ var mfsu_default = (api) => {
     }
   });
 };
-function printHelpInfo() {
-  console.log(HELP_TEXT);
+function printHelpInfo(api) {
+  console.log(HELP_TEXT.replace(/umi/g, api.appData.umi.cliName));
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {});

package/dist/commands/mfsu/util.js

@@ -39,6 +39,7 @@ var import_webpack = __toESM(require("@umijs/bundler-webpack/compiled/webpack"))
 var import_utils = require("@umijs/utils");
 var import_path = require("path");
 var import_LazySourceCodeCache = require("../../libs/folderCache/LazySourceCodeCache");
+var import_projectFileList = require("../../utils/projectFileList");
 var import_getBabelOpts = require("../dev/getBabelOpts");
 var MFSUUtilBase = class {
   constructor(api) {
@@ -100,7 +101,8 @@ var MFSUUtilBase = class {
           "mfsu_v4"
         )
       });
-      await srcCodeCache.init();
+      const fileList = (0, import_projectFileList.getProjectFileList)(api);
+      await srcCodeCache.init(fileList);
     }
     const entry = await api.applyPlugins({
       key: "modifyEntry",

package/dist/features/appData/appData.js

@@ -43,6 +43,9 @@ var appData_default = (api) => {
   const routesApi = (0, import_utils.importLazy)(
     require.resolve("../tmpFiles/routes")
   );
+  const bundlerUtils = (0, import_utils.importLazy)(
+    require.resolve("@umijs/bundler-utils")
+  );
   api.modifyAppData(async (memo) => {
     var _a;
     memo.routes = await routesApi.getRoutes({
@@ -78,10 +81,11 @@ var appData_default = (api) => {
     memo.appJS = await getAppJsInfo();
     memo.locale = await (0, import_os_locale.osLocale)();
     memo.vite = api.config.vite ? {} : void 0;
-    const { globalCSS, globalJS, overridesCSS } = getGlobalFiles();
+    const { globalCSS, globalJS, overridesCSS, globalLoading } = getGlobalFiles();
     memo.globalCSS = globalCSS;
     memo.globalJS = globalJS;
     memo.overridesCSS = overridesCSS;
+    memo.globalLoading = globalLoading;
     const gitDir = findGitDir(api.paths.cwd);
     if (gitDir) {
       const git = {};
@@ -103,10 +107,11 @@ var appData_default = (api) => {
     async fn(args) {
       if (!args.isFirstTime) {
         api.appData.appJS = await getAppJsInfo();
-        const { globalCSS, globalJS, overridesCSS } = getGlobalFiles();
+        const { globalCSS, globalJS, overridesCSS, globalLoading } = getGlobalFiles();
         api.appData.globalCSS = globalCSS;
         api.appData.globalJS = globalJS;
         api.appData.overridesCSS = overridesCSS;
+        api.appData.globalLoading = globalLoading;
       }
     },
     stage: Number.NEGATIVE_INFINITY
@@ -136,8 +141,7 @@ 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 { parseModule } = (0, import_utils.importLazy)(require.resolve("@umijs/bundler-utils"));
-        const [_, exports] = await parseModule({
+        const [_, exports] = await bundlerUtils.parseModule({
           path,
           content: (0, import_fs.readFileSync)(path, "utf-8")
         });
@@ -162,13 +166,17 @@ var appData_default = (api) => {
       existsAndPushFile,
       []
     );
+    const globalLoading = (0, import_watch.expandJSPaths)((0, import_path.join)(absSrcPath, "loading")).find(
+      import_fs.existsSync
+    );
     const overridesCSS = [(0, import_overrides.getOverridesCSS)(api.paths.absSrcPath)].filter(
       Boolean
     );
     return {
       globalCSS,
       globalJS,
-      overridesCSS
+      overridesCSS,
+      globalLoading
     };
   }
 };

package/dist/features/configPlugins/schema.js

@@ -31,6 +31,7 @@ function getSchemas() {
       base: Joi.string(),
       exclude: Joi.array().items(Joi.any())
     }),
+    esbuildMinifyIIFE: (Joi) => Joi.boolean(),
     headScripts: (Joi) => Joi.array(),
     history: (Joi) => Joi.object({
       type: Joi.string().valid("browser", "hash", "memory")

package/dist/features/esmi/esmi.js

@@ -33,7 +33,7 @@ __export(esmi_exports, {
 });
 module.exports = __toCommonJS(esmi_exports);
 var import_es_module_lexer = require("@umijs/bundler-utils/compiled/es-module-lexer");
-var import_magic_string = __toESM(require("magic-string"));
+var import_utils = require("@umijs/utils");
 var import_path = require("path");
 var import_scan = require("../../libs/scan");
 var import_requireToImport = __toESM(require("./esbuildPlugins/requireToImport"));
@@ -88,7 +88,7 @@ function esmi(opts) {
               importmap.imports[specifier]
             );
             if (replacement) {
-              s ?? (s = new import_magic_string.default(source));
+              s ?? (s = new import_utils.MagicString(source));
               s.overwrite(start, end, replacement);
             }
           }

package/dist/features/helmet/helmet.d.ts

@@ -0,0 +1,6 @@
+import type { IApi } from '../../types';
+/**
+ * plugin for built-in react-helmet-async
+ */
+declare const _default: (api: IApi) => void;
+export default _default;

package/dist/features/helmet/helmet.js

@@ -0,0 +1,64 @@
+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/helmet/helmet.ts
+var helmet_exports = {};
+__export(helmet_exports, {
+  default: () => helmet_default
+});
+module.exports = __toCommonJS(helmet_exports);
+var import_utils = require("@umijs/utils");
+var import_path = require("path");
+var helmet_default = (api) => {
+  api.describe({
+    config: {
+      schema: (Joi) => Joi.boolean()
+    }
+  });
+  api.onGenerateFiles(() => {
+    if (api.appData.framework === "react") {
+      api.writeTmpFile({
+        noPluginDir: true,
+        path: "core/helmet.ts",
+        content: `import React from 'react';
+import { HelmetProvider } from '${(0, import_utils.winPath)(
+          (0, import_path.dirname)(require.resolve("@umijs/renderer-react/package"))
+        )}';
+
+export const innerProvider = (container) => {
+  return React.createElement(HelmetProvider, { context: {} }, container);
+}`
+      });
+    }
+  });
+  api.addRuntimePlugin(
+    () => api.appData.framework === "react" ? ["@@/core/helmet.ts"] : []
+  );
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});

package/dist/features/icons/esbuildIconPlugin.js

@@ -35,13 +35,18 @@ module.exports = __toCommonJS(esbuildIconPlugin_exports);
 var import_utils = require("@umijs/utils");
 var import_fs = __toESM(require("fs"));
 var import_extract = require("./extract");
+var loaderMap = {
+  js: "tsx",
+  jsx: "tsx",
+  tsx: "tsx",
+  ts: "ts"
+};
 function esbuildIconPlugin(opts) {
   return {
     name: "esbuildCollectIconPlugin",
     setup(build) {
-      const loaders = ["js", "jsx", "ts", "tsx"];
-      loaders.forEach((loader) => {
-        const filter = new RegExp(`\\.(${loader})$`);
+      Object.keys(loaderMap).forEach((extName) => {
+        const filter = new RegExp(`\\.(${extName})$`);
         build.onLoad({ filter }, async (args) => {
           const contents = await import_fs.default.promises.readFile(args.path, "utf-8");
           const icons = (0, import_extract.extractIcons)(contents);
@@ -51,7 +56,7 @@ function esbuildIconPlugin(opts) {
           });
           return {
             contents,
-            loader
+            loader: loaderMap[extName]
           };
         });
       });

package/dist/features/icons/icons.js

@@ -37,6 +37,10 @@ var import_fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
 var import_depsOnDemand = require("../depsOnDemand/depsOnDemand");
 var icons_default = (api) => {
+  const iconPlugin = (0, import_utils.importLazy)(
+    require.resolve("./esbuildIconPlugin")
+  );
+  const svgr = (0, import_utils.importLazy)(require.resolve("./svgr"));
   api.describe({
     config: {
       schema(Joi) {
@@ -62,9 +66,8 @@ var icons_default = (api) => {
   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({
+      iconPlugin.esbuildIconPlugin({
         icons,
         alias: api.config.icons.alias || {}
       })
@@ -79,13 +82,13 @@ var icons_default = (api) => {
     }
     import_utils.logger.info(`[icons] generate icons ${Array.from(icons).join(", ")}`);
     const code = [];
-    const { generateIconName, generateSvgr } = (0, import_utils.importLazy)(require.resolve("./svgr"));
+    const { generateIconName, generateSvgr } = svgr;
     for (const iconStr of allIcons) {
       const [collect, icon] = iconStr.split(":");
       const iconName = generateIconName({ collect, icon });
-      let svgr;
+      let svgr2;
       try {
-        svgr = await generateSvgr({
+        svgr2 = await generateSvgr({
           collect,
           api,
           icon,
@@ -114,8 +117,8 @@ var icons_default = (api) => {
       } catch (e) {
         import_utils.logger.error(e);
       }
-      if (svgr) {
-        code.push(svgr);
+      if (svgr2) {
+        code.push(svgr2);
         code.push(`export { ${iconName} };`);
       } else {
         if (api.env === "development") {
@@ -352,10 +355,10 @@ export const Icon = React.forwardRef<HTMLSpanElement, IUmiIconProps>((props, ref
     svgStyle.msTransform = transformStr;
     svgStyle.transform = transformStr;
   }
-  
+
   const spanClassName = HoverComponent ? 'umiIconDoNotUseThis ' : '' + className;
   const spanClass = spanClassName ? { className: spanClassName } : {};
-  
+
   return (
     <span role="img" ref={ref} {...spanClass} style={style}>
       <Component {...extraProps} className={cls} style={svgStyle} />

package/dist/features/polyfill/polyfill.js

@@ -36,6 +36,7 @@ var import_constants = require("@umijs/bundler-webpack/dist/constants");
 var import_utils = require("@umijs/utils");
 var import_path = require("path");
 var polyfill_default = (api) => {
+  const babelCore = (0, import_utils.importLazy)(require.resolve("@umijs/bundler-utils/compiled/babel/core"));
   api.describe({
     key: "polyfill",
     config: {
@@ -52,11 +53,7 @@ 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 {
-      transform
-    } = (0, import_utils.importLazy)(
-      require.resolve("@umijs/bundler-utils/compiled/babel/core")
-    );
+    const { transform } = babelCore;
     const { code } = transform(
       `
 ${coreJsImports}

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

@@ -6,8 +6,9 @@ export declare function build(opts: {
             result: esbuild.BuildResult;
         }): void;
     } | false;
-    config?: {
+    config: {
         alias?: any;
+        cwd: string;
     };
     plugins?: esbuild.Plugin[];
     write?: boolean;

package/dist/features/prepare/build.js

@@ -40,7 +40,10 @@ var import_esbuildExternalPlugin = require("./esbuildPlugins/esbuildExternalPlug
 async function build(opts) {
   var _a;
   const outdir = import_path.default.join(import_path.default.dirname(opts.entryPoints[0]), "out");
+  const alias = ((_a = opts.config) == null ? void 0 : _a.alias) || {};
   return await import_esbuild.default.build({
+    // 需要指定 absWorkingDir 兼容 APP_ROOT 的情况
+    absWorkingDir: opts.config.cwd,
     format: "esm",
     platform: "browser",
     target: "esnext",
@@ -78,8 +81,8 @@ async function build(opts) {
       // then we import 'foo/bar.less'
       // if we resolve alias first, we will get { path }
       // if we resolve externals first, we will get { external: true }
-      (0, import_esbuildExternalPlugin.esbuildExternalPlugin)(),
-      (0, import_esbuildAliasPlugin.esbuildAliasPlugin)({ alias: ((_a = opts.config) == null ? void 0 : _a.alias) || {} }),
+      (0, import_esbuildExternalPlugin.esbuildExternalPlugin)({ alias }),
+      (0, import_esbuildAliasPlugin.esbuildAliasPlugin)({ alias }),
       ...opts.plugins || []
     ]
   });

package/dist/features/prepare/esbuildPlugins/esbuildAliasPlugin.js

@@ -35,6 +35,7 @@ module.exports = __toCommonJS(esbuildAliasPlugin_exports);
 var import_enhanced_resolve = __toESM(require("enhanced-resolve"));
 var import_fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
+var import_isRelative = require("./isRelative");
 var resolver = import_enhanced_resolve.default.create({
   mainFields: ["module", "browser", "main"],
   extensions: [".json", ".js", ".jsx", ".ts", ".tsx", ".cjs", ".mjs"],
@@ -70,13 +71,13 @@ function esbuildAliasPlugin(opts) {
     name: "esbuildAliasPlugin",
     setup(build) {
       sortByAffix({ keys: Object.keys(opts.alias), affix: "$" }).filter((key) => {
-        return import_path.default.isAbsolute(opts.alias[key]) && !opts.alias[key].includes("node_modules");
+        return import_path.default.isAbsolute(opts.alias[key]) && !opts.alias[key].includes("node_modules") || (0, import_isRelative.isRelativePath)(opts.alias[key]);
       }).forEach((key) => {
         const value = opts.alias[key];
         const filter = key.endsWith("$") ? new RegExp(`^${key}`) : new RegExp(`^${key}$`);
         build.onResolve({ filter }, async (args) => {
           const path2 = await resolve(
-            args.importer,
+            args.resolveDir,
             args.path.replace(filter, value)
           );
           return {
@@ -87,7 +88,7 @@ function esbuildAliasPlugin(opts) {
           const filter2 = new RegExp(`^${addSlashAffix(key)}`);
           build.onResolve({ filter: filter2 }, async (args) => {
             const path2 = await resolve(
-              args.importer,
+              args.resolveDir,
               args.path.replace(filter2, addSlashAffix(value))
             );
             return {

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

@@ -1,2 +1,4 @@
 import type { Plugin } from '@umijs/bundler-utils/compiled/esbuild';
-export declare function esbuildExternalPlugin(): Plugin;
+export declare function esbuildExternalPlugin(opts: {
+    alias: Record<string, string>;
+}): Plugin;

package/dist/features/prepare/esbuildPlugins/esbuildExternalPlugin.js

@@ -34,7 +34,9 @@ __export(esbuildExternalPlugin_exports, {
 module.exports = __toCommonJS(esbuildExternalPlugin_exports);
 var import_utils = require("@umijs/utils");
 var import_path = __toESM(require("path"));
-function esbuildExternalPlugin() {
+var import_isRelative = require("./isRelative");
+function esbuildExternalPlugin(opts) {
+  const { alias } = opts;
   return {
     name: "esbuildExternalPlugin",
     setup(build) {
@@ -50,10 +52,25 @@ function esbuildExternalPlugin() {
         if (args.kind === "entry-point") {
           return null;
         }
-        const winP = (0, import_utils.winPath)(args.path);
-        const isAliasImport = winP.startsWith("@/") || winP.startsWith("@@/");
-        if (isAliasImport) {
-          return null;
+        const isAbsoluteImport = import_path.default.isAbsolute(args.path);
+        if (!isAbsoluteImport) {
+          const winP = (0, import_utils.winPath)(args.path);
+          const aliasImport = import_utils.aliasUtils.getAliasValue({
+            alias,
+            imported: winP
+          });
+          if (aliasImport) {
+            if (aliasImport.includes("node_modules")) {
+              return { external: true };
+            }
+            if (import_path.default.isAbsolute(aliasImport)) {
+              return null;
+            }
+            if ((0, import_isRelative.isRelativePath)(aliasImport)) {
+              return null;
+            }
+            return { external: true };
+          }
         }
         const isNodeModuleImport = args.path.includes("node_modules");
         if (import_path.default.isAbsolute(args.path) && !isNodeModuleImport) {

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

@@ -0,0 +1 @@
+export declare function isRelativePath(p: string): boolean;

package/dist/features/prepare/esbuildPlugins/isRelative.js

@@ -0,0 +1,31 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/features/prepare/esbuildPlugins/isRelative.tsx
+var isRelative_exports = {};
+__export(isRelative_exports, {
+  isRelativePath: () => isRelativePath
+});
+module.exports = __toCommonJS(isRelative_exports);
+function isRelativePath(p) {
+  return p.startsWith("./") || p.startsWith("../");
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  isRelativePath
+});

package/dist/features/prepare/prepare.js

@@ -79,7 +79,8 @@ var prepare_default = (api) => {
           }
         },
         config: {
-          alias: unwrappedAlias
+          alias: unwrappedAlias,
+          cwd: api.paths.cwd
         },
         plugins
       });

package/dist/features/ssr/ssr.js

@@ -39,6 +39,12 @@ var import_fs = require("fs");
 var import_path = require("path");
 var import_utils2 = require("./utils");
 var ssr_default = (api) => {
+  const esbuildBuilder = (0, import_utils.importLazy)(
+    require.resolve("./builder/builder")
+  );
+  const webpackBuilder = (0, import_utils.importLazy)(
+    require.resolve("./webpack/webpack")
+  );
   api.describe({
     key: "ssr",
     config: {
@@ -87,10 +93,7 @@ export { React };
   api.onBeforeCompiler(async ({ opts }) => {
     const { builder = "esbuild" } = api.config.ssr;
     if (builder === "esbuild") {
-      const { build } = (0, import_utils.importLazy)(
-        require.resolve("./builder/builder")
-      );
-      await build({
+      await esbuildBuilder.build({
         api,
         watch: api.env === "development"
       });
@@ -99,10 +102,7 @@ export { React };
         !api.config.vite,
         `The \`vite\` config is now allowed when \`ssr.builder\` is webpack!`
       );
-      const { build } = (0, import_utils.importLazy)(
-        require.resolve("./webpack/webpack")
-      );
-      await build(api, opts);
+      await webpackBuilder.build(api, opts);
     }
   });
   api.onBuildComplete(async ({ err }) => {

package/dist/features/ssr/webpack/webpack.js

@@ -32,10 +32,10 @@ __export(webpack_exports, {
   build: () => build2
 });
 module.exports = __toCommonJS(webpack_exports);
-var import_utils = require("@umijs/utils");
 var bundlerWebpack = __toESM(require("@umijs/bundler-webpack"));
-var import_utils2 = require("../utils");
+var import_utils = require("@umijs/utils");
 var import_path = require("path");
+var import_utils2 = require("../utils");
 var build2 = async (api, opts) => {
   import_utils.logger.wait("[SSR] Compiling...");
   const now = new Date().getTime();
@@ -48,6 +48,7 @@ var build2 = async (api, opts) => {
     "umi-server-dynamic-import-node"
   ]);
   delete bundlerOpts.onBuildComplete;
+  bundlerOpts.watch = api.env === "development";
   bundlerOpts.chainWebpack = async (memo) => {
     const absOutputFile = (0, import_utils2.absServerBuildPath)(api);
     await oChainWebpack(memo);
@@ -59,9 +60,6 @@ var build2 = async (api, opts) => {
     memo.output.path((0, import_path.dirname)(absOutputFile)).filename("umi.server.js").chunkFilename("[name].server.js").libraryTarget("commonjs2");
     memo.plugins.delete("progress-plugin");
     memo.optimization.minimize(false);
-    if (api.env === "development") {
-      memo.watch(true);
-    }
     return memo;
   };
   await bundlerWebpack.build(bundlerOpts);

package/dist/features/tmpFiles/configTypes.js

@@ -33,7 +33,6 @@ __export(configTypes_exports, {
 });
 module.exports = __toCommonJS(configTypes_exports);
 var import_joi = __toESM(require("@umijs/utils/compiled/@hapi/joi"));
-var import_joi2types = __toESM(require("../../../compiled/joi2types"));
 var FILTER_KEYS = ["chainWebpack"];
 var configTypes_default = (api) => {
   api.onGenerateFiles(async () => {
@@ -56,7 +55,8 @@ var configTypes_default = (api) => {
       };
     }, {});
     const interfaceName = "IConfigFromPlugins";
-    const content = await (0, import_joi2types.default)(import_joi.default.object(properties), {
+    const joi2Types = require("../../../compiled/joi2types").default;
+    const content = await joi2Types(import_joi.default.object(properties), {
       interfaceName,
       bannerComment: "// Created by Umi Plugin",
       unknownAny: true

package/dist/features/tmpFiles/tmpFiles.js

@@ -316,7 +316,7 @@ declare module '*.txt' {
         historyType: api.config.history.type,
         hydrate: !!api.config.ssr,
         reactRouter5Compat: !!api.config.reactRouter5Compat,
-        loadingComponent: (0, import_fs.existsSync)((0, import_path.join)(api.paths.absSrcPath, "loading.tsx")) || (0, import_fs.existsSync)((0, import_path.join)(api.paths.absSrcPath, "loading.jsx")) || (0, import_fs.existsSync)((0, import_path.join)(api.paths.absSrcPath, "loading.js"))
+        loadingComponent: api.appData.globalLoading
       }
     });
     api.writeTmpFile({

package/dist/features/transform/transform.js

@@ -32,10 +32,10 @@ __export(transform_exports, {
   default: () => transform_default
 });
 module.exports = __toCommonJS(transform_exports);
-var import_code_frame = require("@umijs/bundler-utils/compiled/babel/code-frame");
 var import_utils = require("@umijs/utils");
 var import_babelPlugin = __toESM(require("./babelPlugin"));
 var import_CodeFrameError = __toESM(require("./CodeFrameError"));
+var babelCodeFrame = (0, import_utils.importLazy)(require.resolve("@umijs/bundler-utils/compiled/babel/code-frame"));
 var transform_default = (api) => {
   api.addBeforeBabelPresets(() => {
     return [
@@ -60,10 +60,14 @@ var transform_default = (api) => {
                   if (err instanceof import_CodeFrameError.default) {
                     throw new Error(
                       `
-${(0, import_code_frame.codeFrameColumns)(args.code, err.location, {
-                        highlightCode: true,
-                        message: err.message
-                      })}
+${babelCodeFrame.codeFrameColumns(
+                        args.code,
+                        err.location,
+                        {
+                          highlightCode: true,
+                          message: err.message
+                        }
+                      )}
 `,
                       { cause: err }
                     );

package/dist/index.js

@@ -51,6 +51,7 @@ var src_default = () => {
       require.resolve("./features/esmi/esmi"),
       require.resolve("./features/exportStatic/exportStatic"),
       require.resolve("./features/favicons/favicons"),
+      require.resolve("./features/helmet/helmet"),
       require.resolve("./features/icons/icons"),
       require.resolve("./features/mock/mock"),
       require.resolve("./features/mpa/mpa"),
@@ -60,11 +61,14 @@ var src_default = () => {
       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"),
+      // 1. generate tmp files
       require.resolve("./features/tmpFiles/tmpFiles"),
+      // 2. `clientLoader` and `routeProps` depends on `tmpFiles` files
       require.resolve("./features/clientLoader/clientLoader"),
       require.resolve("./features/routeProps/routeProps"),
+      // 3. `ssr` needs to be run last
+      require.resolve("./features/ssr/ssr"),
       require.resolve("./features/tmpFiles/configTypes"),
       require.resolve("./features/transform/transform"),
       require.resolve("./features/lowImport/lowImport"),
@@ -85,6 +89,7 @@ var src_default = () => {
       require.resolve("./commands/help"),
       require.resolve("./commands/lint"),
       require.resolve("./commands/setup"),
+      require.resolve("./commands/deadcode"),
       require.resolve("./commands/version"),
       require.resolve("./commands/generators/page"),
       require.resolve("./commands/generators/prettier"),

package/dist/libs/folderCache/LazySourceCodeCache.d.ts

@@ -17,10 +17,11 @@ export declare class LazySourceCodeCache {
         cwd: string;
         cachePath: string;
     });
-    init(): Promise<void>;
+    init(files: string[]): Promise<void>;
+    initWithScan(): Promise<void>;
+    private initFileList;
     getSrcPath(): string;
     loadFiles(files: string[]): Promise<void>;
-    private initFileList;
     getMergedCode(): {
         code: string;
         imports: readonly ImportSpecifier[];

package/dist/libs/folderCache/LazySourceCodeCache.js

@@ -38,8 +38,8 @@ var import_utils = require("@umijs/utils");
 var import_fast_glob = __toESM(require("fast-glob"));
 var import_fs = require("fs");
 var import_path = require("path");
-var import_FolderWatch = require("./FolderWatch");
 var import_constant = require("./constant");
+var import_FolderWatch = require("./FolderWatch");
 var LazySourceCodeCache = class {
   constructor(opts) {
     this.listeners = [];
@@ -58,7 +58,11 @@ var LazySourceCodeCache = class {
       this.pendingFilesEvents.push(e);
     });
   }
-  async init() {
+  async init(files) {
+    await Promise.all([import_es_module_lexer.init, this.folderWatch.init()]);
+    await this.loadFiles(files);
+  }
+  async initWithScan() {
     const [files] = await Promise.all([
       this.initFileList(),
       import_es_module_lexer.init,
@@ -66,15 +70,6 @@ var LazySourceCodeCache = class {
     ]);
     await this.loadFiles(files);
   }
-  getSrcPath() {
-    return this.srcPath;
-  }
-  async loadFiles(files) {
-    const loaded = await this.filesLoader(files);
-    for (const f of Object.keys(loaded)) {
-      this.fileContentCache[f] = loaded[f];
-    }
-  }
   async initFileList() {
     const start = Date.now();
     const files = await (0, import_fast_glob.default)(
@@ -87,6 +82,15 @@ var LazySourceCodeCache = class {
     import_utils.logger.debug("[MFSU][eager] fast-glob costs", Date.now() - start);
     return files;
   }
+  getSrcPath() {
+    return this.srcPath;
+  }
+  async loadFiles(files) {
+    const loaded = await this.filesLoader(files);
+    for (const f of Object.keys(loaded)) {
+      this.fileContentCache[f] = loaded[f];
+    }
+  }
   getMergedCode() {
     const code = Object.values(this.fileContentCache).join("\n");
     const [imports] = (0, import_es_module_lexer.parse)(code);

package/dist/registerMethods.js

@@ -92,6 +92,9 @@ var registerMethods_default = (api) => {
   api.onStart(async () => {
     await import_es_module_lexer.init;
   });
+  const transformModule = (0, import_utils.importLazy)(
+    require.resolve("./utils/transformIEAR")
+  );
   api.registerMethod({
     name: "writeTmpFile",
     fn(opts) {
@@ -129,9 +132,7 @@ var registerMethods_default = (api) => {
         ""
       ].filter((text) => text !== false).join("\n");
       if (api.appData.vite && isJsFile) {
-        const { default: transformIEAR } = (0, import_utils.importLazy)(
-          require.resolve("./utils/transformIEAR")
-        );
+        const transformIEAR = transformModule.default;
         content = transformIEAR({ content, path: absPath }, api);
       }
       if (!(0, import_fs.existsSync)(absPath)) {

package/dist/utils/projectFileList.d.ts

@@ -0,0 +1,2 @@
+import { IApi } from '../types';
+export declare function getProjectFileList(api: IApi): string[];

package/dist/utils/projectFileList.js

@@ -0,0 +1,35 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/utils/projectFileList.ts
+var projectFileList_exports = {};
+__export(projectFileList_exports, {
+  getProjectFileList: () => getProjectFileList
+});
+module.exports = __toCommonJS(projectFileList_exports);
+var import_utils = require("@umijs/utils");
+var import_path = require("path");
+function getProjectFileList(api) {
+  const result = api.appData.prepare.buildResult;
+  const srcPath = (0, import_utils.winPath)((0, import_path.normalize)(api.paths.absSrcPath));
+  return Object.keys(result.metafile.inputs).map((f) => (0, import_utils.winPath)((0, import_path.resolve)(api.paths.cwd, f))).filter((f) => f.startsWith(srcPath));
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getProjectFileList
+});

package/dist/utils/routeExportExtractor.js

@@ -44,7 +44,7 @@ function setupRouteExportExtractor(opts) {
     });
   });
   api.onBeforeCompiler(
-    () => setupExportExtractBuilder({
+    async () => await setupExportExtractBuilder({
       api,
       entryFile,
       outFile

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/preset-umi",
-  "version": "4.0.53",
+  "version": "4.0.55",
   "description": "@umijs/preset-umi",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/preset-umi#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -26,28 +26,27 @@
   },
   "dependencies": {
     "@iconify/utils": "2.1.1",
-    "@svgr/core": "6.2.1",
-    "@umijs/ast": "4.0.53",
-    "@umijs/babel-preset-umi": "4.0.53",
-    "@umijs/bundler-utils": "4.0.53",
-    "@umijs/bundler-vite": "4.0.53",
-    "@umijs/bundler-webpack": "4.0.53",
-    "@umijs/core": "4.0.53",
+    "@svgr/core": "6.5.1",
+    "@umijs/ast": "4.0.55",
+    "@umijs/babel-preset-umi": "4.0.55",
+    "@umijs/bundler-utils": "4.0.55",
+    "@umijs/bundler-vite": "4.0.55",
+    "@umijs/bundler-webpack": "4.0.55",
+    "@umijs/core": "4.0.55",
     "@umijs/did-you-know": "^1.0.0",
     "@umijs/history": "5.3.1",
-    "@umijs/mfsu": "4.0.53",
-    "@umijs/plugin-run": "4.0.53",
-    "@umijs/renderer-react": "4.0.53",
-    "@umijs/server": "4.0.53",
-    "@umijs/utils": "4.0.53",
+    "@umijs/mfsu": "4.0.55",
+    "@umijs/plugin-run": "4.0.55",
+    "@umijs/renderer-react": "4.0.55",
+    "@umijs/server": "4.0.55",
+    "@umijs/utils": "4.0.55",
     "babel-plugin-dynamic-import-node": "2.3.3",
     "click-to-react-component": "^1.0.8",
-    "core-js": "3.27.1",
+    "core-js": "3.28.0",
     "current-script-polyfill": "1.0.0",
     "enhanced-resolve": "5.9.3",
     "fast-glob": "3.2.12",
     "html-webpack-plugin": "5.5.0",
-    "magic-string": "0.27.0",
     "path-to-regexp": "1.7.0",
     "postcss-prefix-selector": "1.16.0",
     "react": "18.1.0",
@@ -60,6 +59,7 @@
     "@manypkg/get-packages": "1.1.3",
     "@types/body-parser": "1.19.2",
     "@types/ini": "1.3.31",
+    "@types/madge": "^5.0.0",
     "@types/multer": "1.4.7",
     "body-parser": "1.20.0",
     "ini": "3.0.0",
@@ -67,7 +67,7 @@
     "multer": "1.4.4",
     "os-locale": "^6.0.2",
     "sirv": "2.0.2",
-    "vite": "4.0.4"
+    "vite": "4.1.4"
   },
   "publishConfig": {
     "access": "public"

package/templates/umi.tpl

@@ -5,7 +5,7 @@ import { getRoutes } from './core/route';
 import { createPluginManager } from './core/plugin';
 import { createHistory } from './core/history';
 {{#loadingComponent}}
-import Loading from '@/loading';
+import Loading from '{{{ loadingComponent }}}';
 {{/loadingComponent}}
 import { ApplyPluginsType } from 'umi';
 {{{ imports }}}