@umijs/preset-umi 4.0.49 → 4.0.51

package/dist/commands/generators/tailwindcss.js

@@ -56,8 +56,8 @@ var tailwindcss_default = (api) => {
 module.exports = {
   content: [
     './${srcPrefix}pages/**/*.tsx',
-    './${srcPrefix}components/**.tsx',
-    './${srcPrefix}layouts/**.tsx',
+    './${srcPrefix}components/**/*.tsx',
+    './${srcPrefix}layouts/**/*.tsx',
   ],
 }
 `.trimStart()

package/dist/commands/verify-commit.js

@@ -45,6 +45,7 @@ var verify_commit_default = (api) => {
   });
   api.registerCommand({
     name: "verify-commit",
+    description: "verify the commit message, which is usually used with husky.",
     configResolveMode: "loose",
     fn({ args }) {
       var _a, _b;

package/dist/features/apiRoute/apiRoute.js

@@ -128,6 +128,9 @@ var apiRoute_default = (api) => {
     const middlewares = await api.applyPlugins({
       key: "addApiMiddlewares"
     });
+    middlewares.forEach((middleware) => {
+      middleware.path = (0, import_utils.winPath)(middleware.path);
+    });
     api.writeTmpFile({
       noPluginDir: true,
       path: "api/_middlewares.ts",

package/dist/features/check/check.js

@@ -28,8 +28,8 @@ __export(check_exports, {
   default: () => check_default
 });
 module.exports = __toCommonJS(check_exports);
-var import_assert = __toESM(require("assert"));
 var import_utils = require("@umijs/utils");
+var import_assert = __toESM(require("assert"));
 var check_default = (api) => {
   api.onCheck(async () => {
     (0, import_assert.default)(
@@ -86,6 +86,19 @@ ${import_utils.chalk.red(
       );
     }
   });
+  api.onPrepareBuildSuccess(({ result }) => {
+    var _a;
+    const imps = Object.keys(((_a = result.metafile) == null ? void 0 : _a.inputs) || {}).filter(
+      (f) => f.startsWith("mock/")
+    );
+    if (imps.length) {
+      throw new Error(
+        `Detected mock imports from src: ${imps.join(
+          ", "
+        )}. \`mock/**\` is not allowed to import.`
+      );
+    }
+  });
   function isAbsolutePath(path) {
     return path.startsWith("/") || path.startsWith("@fs/");
   }

package/dist/features/clientLoader/clientLoader.js

@@ -108,7 +108,10 @@ var loader = {
   ".eot": "file",
   ".flac": "file",
   ".gif": "file",
+  ".htm": "file",
+  ".html": "file",
   ".ico": "file",
+  ".icon": "file",
   ".jpeg": "file",
   ".jpg": "file",
   ".js": "jsx",

package/dist/features/depsOnDemand/depsOnDemand.d.ts

@@ -1,3 +1,13 @@
 import { IApi } from '../../types';
+export interface IOnDemandInstallDep {
+    name: string;
+    version: string;
+    reason?: string;
+    /**
+     * install dev dep by default
+     * @default true
+     */
+    dev?: boolean;
+}
 declare const _default: (api: IApi) => void;
 export default _default;

package/dist/features/depsOnDemand/depsOnDemand.js

@@ -26,26 +26,29 @@ var import_utils = require("@umijs/utils");
 var import_fs = require("fs");
 var import_path = require("path");
 var depsOnDemand_default = (api) => {
-  const bundlerWebpackPkg = require("@umijs/bundler-webpack/package.json");
-  api.onStart(() => {
-    const hasSwcConfig = api.config.srcTranspiler === "swc" || api.config.depTranspiler === "swc";
-    const swcDeps = [
-      {
-        name: "@swc/core",
-        version: `^${bundlerWebpackPkg.devDependencies["@swc/core"]}`
-      },
-      {
-        name: "swc-plugin-auto-css-modules",
-        version: `^${bundlerWebpackPkg.devDependencies["swc-plugin-auto-css-modules"]}`
+  api.onStart(async () => {
+    const deps = import_utils.lodash.uniqBy(
+      await api.applyPlugins({
+        key: "addOnDemandDeps",
+        initialValue: []
+      }),
+      (dep) => {
+        return dep.name;
       }
-    ];
-    const { missingDeps } = checkDeps({
-      deps: swcDeps
-    });
-    if (hasSwcConfig && missingDeps.length) {
-      api.logger.info(
-        `Since swc is used, install swc dependencies ${missingDeps.map(({ name }) => import_utils.chalk.green(name)).join(", ")} on demand.`
-      );
+    );
+    const { missingDeps } = checkDeps({ deps });
+    if (missingDeps.length) {
+      const hasReason = missingDeps.some((dep) => dep.reason);
+      const loggerText = [
+        `Install dependencies ${missingDeps.map(({ name }) => import_utils.chalk.green(name)).join(", ")} on demand.`,
+        ...hasReason ? [
+          `        ${import_utils.chalk.bold.bgBlue(" REASONS ")}`,
+          ...missingDeps.filter((dep) => dep.reason).map(
+            (dep) => `         · ${import_utils.chalk.cyan(dep.name)}${dep.outdated ? import_utils.chalk.gray("(outdated)") : ""}: ${dep.reason}`
+          )
+        ] : []
+      ].join("\n");
+      import_utils.logger.info(loggerText);
       addDeps({
         pkgPath: api.pkgPath || (0, import_path.join)(api.cwd, "package.json"),
         deps: missingDeps
@@ -69,7 +72,10 @@ var depsOnDemand_default = (api) => {
         const userVersion = import_utils.semver.minVersion(installed);
         const isOutdated = !userVersion || import_utils.semver.ltr(userVersion, dep.version);
         if (isOutdated) {
-          missingDeps.push(dep);
+          missingDeps.push({
+            ...dep,
+            outdated: true
+          });
         }
       }
     });
@@ -79,12 +85,30 @@ var depsOnDemand_default = (api) => {
   }
 };
 function addDeps(opts) {
-  const pkg = (0, import_fs.existsSync)(opts.pkgPath) ? import_utils.fsExtra.readJSONSync(opts.pkgPath) : {};
-  pkg.devDependencies = pkg.devDependencies || {};
-  opts.deps.forEach((dep) => {
-    pkg.devDependencies[dep.name] = dep.version;
-  });
-  import_utils.fsExtra.writeJSONSync(opts.pkgPath, pkg, { spaces: 2 });
+  const { pkgPath, deps } = opts;
+  const pkg = (0, import_fs.existsSync)(pkgPath) ? import_utils.fsExtra.readJSONSync(pkgPath) : {};
+  const [devDependencies, dependencies] = [
+    deps.filter((dep) => dep.dev !== false),
+    deps.filter((dep) => dep.dev === false)
+  ];
+  if (devDependencies.length) {
+    pkg.devDependencies || (pkg.devDependencies = {});
+    devDependencies.forEach((dep) => {
+      pkg.devDependencies[dep.name] = dep.version;
+    });
+  }
+  if (dependencies.length) {
+    pkg.dependencies || (pkg.dependencies = {});
+    dependencies.forEach((dep) => {
+      pkg.dependencies[dep.name] = dep.version;
+    });
+  }
+  import_utils.fsExtra.writeFileSync(
+    opts.pkgPath,
+    `${JSON.stringify(pkg, null, 2)}
+`,
+    "utf-8"
+  );
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {});

package/dist/features/legacy/legacy.js

@@ -123,6 +123,7 @@ function useBabelTransformSvgr(memo, api) {
     sourceType: "unambiguous",
     babelrc: false,
     cacheDirectory: false,
+    browserslistConfigFile: false,
     targets: api.config.targets,
     presets: [
       [

package/dist/features/monorepo/redirect.js

@@ -43,7 +43,8 @@ var redirect_default = (api) => {
           Joi.boolean(),
           Joi.object({
             srcDir: Joi.array().items(Joi.string()),
-            exclude: Joi.array().items(Joi.object().instance(RegExp))
+            exclude: Joi.array().items(Joi.object().instance(RegExp)),
+            peerDeps: Joi.boolean()
           })
         );
       }
@@ -51,8 +52,9 @@ var redirect_default = (api) => {
     enableBy: api.EnableBy.config
   });
   api.modifyConfig(async (memo) => {
+    const currentProjectRoot = process.env.APP_ROOT ? process.cwd() : api.cwd;
     const rootPkg = await (0, import_pkg_up.pkgUp)({
-      cwd: (0, import_path.dirname)(process.env.APP_ROOT ? process.cwd() : api.cwd)
+      cwd: (0, import_path.dirname)(currentProjectRoot)
     });
     if (!rootPkg)
       return memo;
@@ -62,7 +64,7 @@ var redirect_default = (api) => {
       `The 'monorepoRedirect' option can only be used in monorepo, you don't need configure.`
     );
     const config = memo.monorepoRedirect || {};
-    const { exclude = [], srcDir = ["src"] } = config;
+    const { exclude = [], srcDir = ["src"], peerDeps = false } = config;
     if ((0, import_utils.isLocalDev)()) {
       import_utils.logger.info(
         `[monorepoRedirect]: Auto excluded 'umi' package in local dev scene`
@@ -76,12 +78,12 @@ var redirect_default = (api) => {
       return memo;
     const projects = await collectAllProjects({ root });
     const alias = usingDeps.reduce((obj, name) => {
-      const root2 = projects[name];
-      if (!root2) {
+      const pkgInfo = projects[name];
+      if (!pkgInfo) {
         return obj;
       }
       srcDir.some((dirName) => {
-        const dirPath = (0, import_path.join)(root2, dirName);
+        const dirPath = (0, import_path.join)(pkgInfo.dir, dirName);
         if ((0, import_fs.existsSync)(dirPath) && (0, import_fs.statSync)(dirPath).isDirectory()) {
           obj[name] = dirPath;
           return true;
@@ -89,8 +91,44 @@ var redirect_default = (api) => {
       });
       return obj;
     }, {});
+    const peerDepsAliasMap = {};
+    if (peerDeps) {
+      Object.entries(projects).forEach(([_name, pkgInfo]) => {
+        var _a;
+        const willResolveDeps = ((_a = pkgInfo.packageJson) == null ? void 0 : _a.peerDependencies) || {};
+        Object.keys(willResolveDeps).forEach((depName) => {
+          if (peerDepsAliasMap[depName]) {
+            return;
+          }
+          if (projects[depName]) {
+            return;
+          }
+          const resolved = tryResolveDep({
+            name: depName,
+            from: currentProjectRoot
+          });
+          if (resolved) {
+            peerDepsAliasMap[depName] = resolved;
+            return;
+          }
+          const resolvedFromOtherProject = tryResolveDep({
+            name: depName,
+            from: pkgInfo.dir
+          });
+          if (resolvedFromOtherProject) {
+            peerDepsAliasMap[depName] = resolvedFromOtherProject;
+          }
+        });
+        import_utils.logger.debug(
+          `[monorepoRedirect]: resolved peer deps ${Object.keys(
+            peerDepsAliasMap
+          ).map((i) => import_utils.chalk.green(i)).join(", ")} from ${(0, import_path.basename)(pkgInfo.dir)}`
+        );
+      });
+    }
     memo.alias = {
       ...memo.alias,
+      ...peerDepsAliasMap,
       ...alias
     };
     return memo;
@@ -106,17 +144,25 @@ function collectPkgDeps(pkg) {
 }
 async function collectAllProjects(opts) {
   const workspaces = await (0, import_get_packages.getPackages)(opts.root);
-  return workspaces.packages.reduce(
-    (obj, pkg) => {
-      var _a;
-      const name = (_a = pkg.packageJson) == null ? void 0 : _a.name;
-      if (name) {
-        obj[name] = pkg.dir;
-      }
-      return obj;
-    },
-    {}
-  );
+  return workspaces.packages.reduce((obj, pkg) => {
+    var _a;
+    const name = (_a = pkg.packageJson) == null ? void 0 : _a.name;
+    if (name) {
+      obj[name] = pkg;
+    }
+    return obj;
+  }, {});
+}
+function tryResolveDep(opts) {
+  const { name, from } = opts;
+  try {
+    return (0, import_path.dirname)(
+      import_utils.resolve.sync(`${name}/package.json`, {
+        basedir: from
+      })
+    );
+  } catch {
+  }
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {});

package/dist/features/mpa/extractExports.js

@@ -30,6 +30,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");
+var import_path = require("path");
 async function extractExports(opts) {
   const res = await import_esbuild.default.build({
     format: "cjs",
@@ -44,7 +45,10 @@ async function extractExports(opts) {
       ".eot": "text",
       ".flac": "text",
       ".gif": "text",
+      ".htm": "text",
+      ".html": "text",
       ".ico": "text",
+      ".icon": "text",
       ".jpeg": "text",
       ".jpg": "text",
       ".js": "jsx",
@@ -98,7 +102,8 @@ async function extractExports(opts) {
 import * as x from "${(0, import_utils.winPath)(args.path)}";
 ret = x.${opts.exportName} || {};
               `,
-              loader: "ts"
+              loader: "ts",
+              resolveDir: (0, import_path.dirname)(args.path)
             };
           });
         }

package/dist/features/polyfill/polyfill.js

@@ -70,7 +70,8 @@ export {};
                 (0, import_path.join)(__dirname, "../../../package.json")
               ),
               modules: false,
-              targets: api.config.targets
+              targets: api.config.targets,
+              ignoreBrowserslistConfig: true
             }
           ]
         ],
@@ -78,7 +79,8 @@ export {};
           require.resolve("@umijs/babel-preset-umi/dist/plugins/lockCoreJS")
         ],
         babelrc: false,
-        configFile: false
+        configFile: false,
+        browserslistConfigFile: false
       }
     );
     api.writeTmpFile({

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

@@ -10,6 +10,7 @@ export declare function build(opts: {
         alias?: any;
     };
     plugins?: esbuild.Plugin[];
+    write?: boolean;
 }): Promise<esbuild.BuildResult & {
-    outputFiles: esbuild.OutputFile[];
+    metafile: esbuild.Metafile;
 }>;

package/dist/features/prepare/build.js

@@ -35,6 +35,7 @@ var import_esbuildAliasPlugin = require("./esbuildPlugins/esbuildAliasPlugin");
 var import_esbuildExternalPlugin = require("./esbuildPlugins/esbuildExternalPlugin");
 async function build(opts) {
   var _a;
+  const outdir = import_path.default.join(import_path.default.dirname(opts.entryPoints[0]), "out");
   return await import_esbuild.default.build({
     format: "esm",
     platform: "browser",
@@ -59,8 +60,8 @@ async function build(opts) {
     bundle: true,
     logLevel: "error",
     entryPoints: opts.entryPoints,
-    write: false,
-    outdir: import_path.default.join(import_path.default.dirname(opts.entryPoints[0]), "out"),
+    write: opts.write || false,
+    outdir,
     metafile: true,
     plugins: [
       (0, import_esbuildExternalPlugin.esbuildExternalPlugin)(),

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

@@ -34,15 +34,12 @@ function esbuildExternalPlugin() {
   return {
     name: "esbuildExternalPlugin",
     setup(build) {
-      externalsExtensions.forEach((ext) => {
-        const filter = new RegExp(`.${ext}(\\?.*)?$`);
-        build.onResolve({ filter }, () => {
+      build.onResolve({ filter: /.*/ }, (args) => {
+        if (!isSource(args.path)) {
           return {
             external: true
           };
-        });
-      });
-      build.onResolve({ filter: /.*/ }, (args) => {
+        }
         if (args.path.startsWith(".")) {
           return null;
         }
@@ -65,37 +62,22 @@ function esbuildExternalPlugin() {
     }
   };
 }
-var externalsExtensions = [
-  "aac",
-  "css",
-  "less",
-  "sass",
-  "scss",
-  "eot",
-  "flac",
-  "gif",
-  "html",
-  "htm",
-  "ico",
-  "icon",
-  "jpeg",
-  "jpg",
-  "json",
-  "md",
-  "mdx",
-  "mp3",
-  "mp4",
-  "ogg",
-  "otf",
-  "png",
-  "svg",
-  "ttf",
-  "wav",
-  "webm",
-  "webp",
-  "woff",
-  "woff2"
-];
+function parseExt(file) {
+  const ext = import_path.default.extname(file);
+  const idx = ext.indexOf("?");
+  if (idx > 0) {
+    return ext.slice(0, idx);
+  }
+  return ext;
+}
+var SOURCE_REG = /\.(t|j)sx?$/;
+function isSource(file) {
+  if (SOURCE_REG.test(file)) {
+    return true;
+  }
+  const ext = parseExt(file);
+  return !ext;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   esbuildExternalPlugin

package/dist/features/prepare/prepare.js

@@ -48,6 +48,9 @@ var prepare_default = (api) => {
         key: "addPrepareBuildPlugins",
         initialValue: []
       });
+      const unwrappedAlias = import_utils.aliasUtils.parseCircleAlias({
+        alias: api.config.alias
+      });
       const buildResult = await build({
         entryPoints: [entryFile],
         watch: watch && {
@@ -62,7 +65,7 @@ var prepare_default = (api) => {
           }
         },
         config: {
-          alias: api.config.alias
+          alias: unwrappedAlias
         },
         plugins
       });

package/dist/features/ssr/builder/builder.js

@@ -92,7 +92,10 @@ var loader = {
   ".eot": "file",
   ".flac": "file",
   ".gif": "file",
+  ".htm": "file",
+  ".html": "file",
   ".ico": "file",
+  ".icon": "file",
   ".jpeg": "file",
   ".jpg": "file",
   ".js": "jsx",

package/dist/features/swc/swc.js

@@ -0,0 +1,47 @@
+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/swc/swc.ts
+var swc_exports = {};
+__export(swc_exports, {
+  default: () => swc_default
+});
+module.exports = __toCommonJS(swc_exports);
+var swc_default = (api) => {
+  api.addOnDemandDeps(() => {
+    const enabled = api.config.srcTranspiler === "swc" || api.userConfig.srcTranspiler === "swc";
+    if (!enabled) {
+      return [];
+    }
+    const bundlerWebpackPkg = require("@umijs/bundler-webpack/package.json");
+    return [
+      {
+        name: "@swc/core",
+        version: `^${bundlerWebpackPkg.devDependencies["@swc/core"]}`,
+        reason: `swc is used, install swc dependencies`
+      },
+      {
+        name: "swc-plugin-auto-css-modules",
+        version: `^${bundlerWebpackPkg.devDependencies["swc-plugin-auto-css-modules"]}`,
+        reason: `swc plugins`
+      }
+    ];
+  });
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});

package/dist/features/tmpFiles/tmpFiles.js

@@ -380,7 +380,8 @@ export default function EmptyRoute() {
           hasDefaultExport: appPluginRegExp.test(plugin),
           path: (0, import_utils.winPath)(plugin)
         })),
-        validKeys
+        validKeys,
+        isViteMode: !!api.config.vite
       }
     });
     if (api.config.ssr) {
@@ -426,6 +427,14 @@ export default function EmptyRoute() {
           historyPath
         }
       });
+      api.writeTmpFile({
+        noPluginDir: true,
+        path: "core/historyIntelli.ts",
+        tplPath: (0, import_path.join)(import_constants.TEMPLATES_DIR, "historyIntelli.tpl"),
+        context: {
+          historyPath
+        }
+      });
     }
   });
   function checkMembers(opts) {
@@ -559,8 +568,10 @@ export default function EmptyRoute() {
           runtimeConfigType
         }
       });
-      exports.push(`export { defineApp } from './core/defineApp'`);
-      exports.push(`export type {  RuntimeConfig } from './core/defineApp'`);
+      exports.unshift(
+        `export { defineApp } from './core/defineApp'`,
+        `export type { RuntimeConfig } from './core/defineApp'`
+      );
       api.writeTmpFile({
         noPluginDir: true,
         path: "exports.ts",

package/dist/index.js

@@ -69,6 +69,7 @@ var src_default = () => {
       require.resolve("./features/legacy/legacy"),
       require.resolve("./features/classPropertiesLoose/classPropertiesLoose"),
       require.resolve("./features/webpack/webpack"),
+      require.resolve("./features/swc/swc"),
       require.resolve("./commands/build"),
       require.resolve("./commands/config/config"),
       require.resolve("./commands/dev/dev"),

package/dist/registerMethods.js

@@ -70,6 +70,7 @@ var registerMethods_default = (api) => {
     "addHTMLHeadScripts",
     "addHTMLScripts",
     "addTmpGenerateWatcherPaths",
+    "addOnDemandDeps",
     "chainWebpack",
     "modifyEntry",
     "modifyHTMLFavicon",

package/dist/types.d.ts

@@ -9,6 +9,7 @@ import type { getMarkup } from '@umijs/server';
 import type { CheerioAPI } from '@umijs/utils/compiled/cheerio';
 import type { InlineConfig as ViteInlineConfig } from 'vite';
 import type { getMarkupArgs } from './commands/dev/getMarkupArgs';
+import type { IOnDemandInstallDep } from './features/depsOnDemand/depsOnDemand';
 import type CodeFrameError from './features/transform/CodeFrameError';
 export { UmiApiRequest, UmiApiResponse } from './features/apiRoute';
 export { webpack, IConfig };
@@ -89,6 +90,7 @@ export declare type IApi = PluginAPI & IServicePluginAPI & {
         id: string;
     }>;
     addMiddlewares: IAdd<null, RequestHandler>;
+    addOnDemandDeps: IAdd<null, IOnDemandInstallDep>;
     addPolyfillImports: IAdd<null, {
         source: string;
         specifier?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/preset-umi",
-  "version": "4.0.49",
+  "version": "4.0.51",
   "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.49",
-    "@umijs/babel-preset-umi": "4.0.49",
-    "@umijs/bundler-utils": "4.0.49",
-    "@umijs/bundler-vite": "4.0.49",
-    "@umijs/bundler-webpack": "4.0.49",
-    "@umijs/core": "4.0.49",
+    "@umijs/ast": "4.0.51",
+    "@umijs/babel-preset-umi": "4.0.51",
+    "@umijs/bundler-utils": "4.0.51",
+    "@umijs/bundler-vite": "4.0.51",
+    "@umijs/bundler-webpack": "4.0.51",
+    "@umijs/core": "4.0.51",
     "@umijs/did-you-know": "^1.0.0",
     "@umijs/history": "5.3.1",
-    "@umijs/mfsu": "4.0.49",
-    "@umijs/plugin-run": "4.0.49",
-    "@umijs/renderer-react": "4.0.49",
-    "@umijs/server": "4.0.49",
-    "@umijs/utils": "4.0.49",
+    "@umijs/mfsu": "4.0.51",
+    "@umijs/plugin-run": "4.0.51",
+    "@umijs/renderer-react": "4.0.51",
+    "@umijs/server": "4.0.51",
+    "@umijs/utils": "4.0.51",
     "babel-plugin-dynamic-import-node": "2.3.3",
     "click-to-react-component": "^1.0.8",
     "core-js": "3.27.1",

package/templates/history.tpl

@@ -1,6 +1,7 @@
-import { createHashHistory, createMemoryHistory, createBrowserHistory, History } from '{{{ historyPath }}}';
+import { createHashHistory, createMemoryHistory, createBrowserHistory } from '{{{ historyPath }}}';
+import type { UmiHistory } from './historyIntelli';
 
-let history: History;
+let history: UmiHistory;
 let basename: string = '/';
 export function createHistory(opts: any) {
   let h;

package/templates/historyIntelli.tpl

@@ -0,0 +1,127 @@
+import { getRoutes } from './route'
+import type { History } from '{{{ historyPath }}}'
+
+type Routes = Awaited<ReturnType<typeof getRoutes>>['routes']
+type AllRoute = Routes[keyof Routes]
+type IsRoot<T extends any> = 'parentId' extends keyof T ? false : true
+
+// show `/` in not `layout / wrapper` only
+type GetAllRouteWithoutLayout<Item extends AllRoute> = Item extends any
+  ? 'isWrapper' extends keyof Item
+    ? never
+    : 'isLayout' extends keyof Item
+    ? never
+    : Item
+  : never
+type AllRouteWithoutLayout = GetAllRouteWithoutLayout<AllRoute>
+type IndexRoutePathname = '/' extends AllRouteWithoutLayout['path']
+  ? '/'
+  : never
+
+type GetChildrens<T extends any> = T extends any
+  ? IsRoot<T> extends true
+    ? never
+    : T
+  : never
+type Childrens = GetChildrens<AllRoute>
+type Root = Exclude<AllRoute, Childrens>
+type AllIds = AllRoute['id']
+
+type GetChildrensByParentId<
+  Id extends AllIds,
+  Item = AllRoute
+> = Item extends any
+  ? 'parentId' extends keyof Item
+    ? Item['parentId'] extends Id
+      ? Item
+      : never
+    : never
+  : never
+
+type RouteObject<
+  Id extends AllIds,
+  Item = GetChildrensByParentId<Id>
+> = IsNever<Item> extends true
+  ? ''
+  : Item extends AllRoute
+  ? {
+      [Key in Item['path'] as TrimSlash<Key>]: UnionMerge<
+        RouteObject<Item['id']>
+      >
+    }
+  : never
+
+type GetRootRouteObject<Item extends Root> = Item extends Root
+  ? {
+      [K in Item['path'] as TrimSlash<K>]: UnionMerge<RouteObject<Item['id']>>
+    }
+  : never
+type MergedResult = UnionMerge<GetRootRouteObject<Root>>
+
+// --- patch history types ---
+
+type HistoryTo = Parameters<History['push']>['0']
+type HistoryPath = Exclude<HistoryTo, string>
+
+type UmiPathname = Path<MergedResult> | (string & {})
+interface UmiPath extends HistoryPath {
+  pathname: UmiPathname
+}
+type UmiTo = UmiPathname | UmiPath
+
+type UmiPush = (to: UmiTo, state?: any) => void
+type UmiReplace = (to: UmiTo, state?: any) => void
+export interface UmiHistory extends History {
+  push: UmiPush
+  replace: UmiReplace
+}
+
+// --- type utils ---
+type TrimLeftSlash<T extends string> = T extends `/${infer R}`
+  ? TrimLeftSlash<R>
+  : T
+type TrimRightSlash<T extends string> = T extends `${infer R}/`
+  ? TrimRightSlash<R>
+  : T
+type TrimSlash<T extends string> = TrimLeftSlash<TrimRightSlash<T>>
+
+type IsNever<T> = [T] extends [never] ? true : false
+type IsEqual<A, B> = (<G>() => G extends A ? 1 : 2) extends <G>() => G extends B
+  ? 1
+  : 2
+  ? true
+  : false
+
+type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (
+  k: infer I
+) => void
+  ? I
+  : never
+type UnionMerge<U> = UnionToIntersection<U> extends infer O
+  ? { [K in keyof O]: O[K] }
+  : never
+
+type ExcludeEmptyKey<T> = IsEqual<T, ''> extends true ? never : T
+
+type PathConcat<
+  TKey extends string,
+  TValue,
+  N = TrimSlash<TKey>
+> = TValue extends string
+  ? ExcludeEmptyKey<N>
+  :
+      | ExcludeEmptyKey<N>
+      | `${N & string}${IsNever<ExcludeEmptyKey<N>> extends true
+          ? ''
+          : '/'}${UnionPath<TValue>}`
+
+type UnionPath<T> = {
+  [K in keyof T]-?: PathConcat<K & string, T[K]>
+}[keyof T]
+
+type MakeSureLeftSlash<T> = T extends any
+  ? `/${TrimRightSlash<T & string>}`
+  : never
+
+// exclude `/*`, because it always at the top of the IDE tip list
+type Path<T, K = UnionPath<T>> = Exclude<MakeSureLeftSlash<K>, '/*'> | IndexRoutePathname

package/templates/plugin.tpl

@@ -26,27 +26,29 @@ export function getValidKeys() {
 
 let pluginManager = null;
 
-// 确保 webpack 模式 import.meta.hot 代码被 tree shaking 掉
-const isDev = process.env.NODE_ENV === 'development';
-
 export function createPluginManager() {
   pluginManager = PluginManager.create({
     plugins: getPlugins(),
     validKeys: getValidKeys(),
   });
 
+{{#isViteMode}}
   // fix https://github.com/umijs/umi/issues/10047
   // https://vitejs.dev/guide/api-hmr.html#hot-data 通过 hot data 持久化 pluginManager 解决 vite 热更时 getPluginManager 获取到 null 的情况
-  if (isDev && import.meta.hot) {
+  if (process.env.NODE_ENV === 'development' && import.meta.hot) {
     import.meta.hot.data.pluginManager = pluginManager
   }
+{{/isViteMode}}
+
   return pluginManager;
 }
 
 export function getPluginManager() {
+{{#isViteMode}}
   // vite 热更模式优先从 hot data 中获取 pluginManager
-  if (isDev && import.meta.hot) {
+  if (process.env.NODE_ENV === 'development' && import.meta.hot) {
     return import.meta.hot.data.pluginManager || pluginManager
   }
+{{/isViteMode}}
   return pluginManager;
 }

package/templates/route.tpl

@@ -6,8 +6,9 @@ import React from 'react';
 {{/isReact}}
 
 export async function getRoutes() {
+  const routes = {{{ routes }}} as const;
   return {
-    routes: {{{ routes }}},
+    routes,
     routeComponents: {{{ routeComponents }}},
   };
 }

package/dist/features/polyfill/swcPolyfill.js

@@ -1,49 +0,0 @@
-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/polyfill/swcPolyfill.ts
-var swcPolyfill_exports = {};
-__export(swcPolyfill_exports, {
-  default: () => swcPolyfill_default
-});
-module.exports = __toCommonJS(swcPolyfill_exports);
-var import_types = require("@umijs/bundler-webpack/dist/types");
-var import_path = require("path");
-var swcPolyfill_default = (api) => {
-  api.describe({
-    enableBy: ({ userConfig }) => {
-      const isSwcTranspiler = userConfig.srcTranspiler === import_types.Transpiler.swc;
-      return isSwcTranspiler;
-    }
-  });
-  api.modifyConfig((memo) => {
-    memo.alias["regenerator-runtime"] = (0, import_path.dirname)(
-      require.resolve("regenerator-runtime/package")
-    );
-    memo.alias["core-js"] = (0, import_path.dirname)(require.resolve("core-js/package"));
-    return memo;
-  });
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});