@umijs/preset-umi 4.0.52 → 4.0.53

package/compiled/ini/package.json

@@ -1 +1 @@
-{"name":"ini","author":"GitHub Inc.","license":"ISC"}
+{"name":"ini","version":"3.0.0","author":"GitHub Inc.","license":"ISC"}

package/dist/commands/dev/dev.js

@@ -175,7 +175,7 @@ PORT=8888 umi dev
               await generate({ isFirstTime: false });
             }
             for await (const fn of data.fns) {
-              await fn({ generate });
+              await fn();
             }
           }
         })

package/dist/features/appData/appData.js

@@ -98,14 +98,6 @@ var appData_default = (api) => {
     memo.framework = "react";
     return memo;
   });
-  api.registerMethod({
-    name: "_refreshRoutes",
-    async fn() {
-      api.appData.routes = await routesApi.getRoutes({
-        api
-      });
-    }
-  });
   api.register({
     key: "onGenerateFiles",
     async fn(args) {

package/dist/features/clientLoader/clientLoader.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/features/clientLoader/clientLoader.ts
@@ -32,8 +22,7 @@ __export(clientLoader_exports, {
   default: () => clientLoader_default
 });
 module.exports = __toCommonJS(clientLoader_exports);
-var import_esbuild = __toESM(require("@umijs/bundler-utils/compiled/esbuild"));
-var import_path = require("path");
+var import_routeExportExtractor = require("../../utils/routeExportExtractor");
 var clientLoader_default = (api) => {
   api.describe({
     config: {
@@ -43,100 +32,14 @@ var clientLoader_default = (api) => {
     },
     enableBy: api.EnableBy.config
   });
-  api.onGenerateFiles(() => {
-    const clientLoaderImports = [];
-    const clientLoaderDefines = [];
-    const routeIds = Object.keys(api.appData.routes);
-    let index = 0;
-    for (const id of routeIds) {
-      const route = api.appData.routes[id];
-      if (route.__hasClientLoader) {
-        index += 1;
-        clientLoaderImports.push(
-          `import { clientLoader as loader_${index} } from '${route.__absFile}';`
-        );
-        clientLoaderDefines.push(`  '${id}': loader_${index},`);
-      }
-    }
-    api.writeTmpFile({
-      noPluginDir: true,
-      path: (0, import_path.join)("core/loaders.ts"),
-      content: `
-${clientLoaderImports.join("\n")}
-export default {
-${clientLoaderDefines.join("\n")}
-};
-      `
-    });
+  const entryFile = "core/loaders.ts";
+  const outFile = "core/loaders.js";
+  (0, import_routeExportExtractor.setupRouteExportExtractor)({
+    api,
+    entryFile,
+    outFile,
+    propertyName: "clientLoader"
   });
-  api.onBeforeCompiler(async () => {
-    await import_esbuild.default.build({
-      format: "esm",
-      platform: "browser",
-      target: "esnext",
-      loader,
-      watch: api.env === "development" && {},
-      bundle: true,
-      logLevel: "error",
-      entryPoints: [(0, import_path.join)(api.paths.absTmpPath, "core/loaders.ts")],
-      outfile: (0, import_path.join)(api.paths.absTmpPath, "core/loaders.js"),
-      plugins: [
-        {
-          name: "imports",
-          setup(build) {
-            let entry;
-            build.onResolve({ filter: /.*/ }, (args) => {
-              if (args.kind === "entry-point")
-                entry = args.path;
-              if (args.kind === "entry-point" || args.importer === entry) {
-                return { path: (0, import_path.resolve)(args.resolveDir, args.path) };
-              }
-              return {
-                path: !args.path.startsWith(".") && !args.path.startsWith("/") ? args.path : (0, import_path.resolve)(args.resolveDir, args.path),
-                external: true,
-                sideEffects: false
-              };
-            });
-          }
-        }
-      ]
-    });
-  });
-};
-var loader = {
-  ".aac": "file",
-  ".css": "text",
-  ".less": "text",
-  ".sass": "text",
-  ".scss": "text",
-  ".eot": "file",
-  ".flac": "file",
-  ".gif": "file",
-  ".htm": "file",
-  ".html": "file",
-  ".ico": "file",
-  ".icon": "file",
-  ".jpeg": "file",
-  ".jpg": "file",
-  ".js": "jsx",
-  ".jsx": "jsx",
-  ".json": "json",
-  ".md": "jsx",
-  ".mdx": "jsx",
-  ".mp3": "file",
-  ".mp4": "file",
-  ".ogg": "file",
-  ".otf": "file",
-  ".png": "file",
-  ".svg": "file",
-  ".ts": "ts",
-  ".tsx": "tsx",
-  ".ttf": "file",
-  ".wav": "file",
-  ".webm": "file",
-  ".webp": "file",
-  ".woff": "file",
-  ".woff2": "file"
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {});

package/dist/features/configPlugins/configPlugins.js

@@ -109,11 +109,7 @@ var configPlugins_default = (api) => {
       config.default = configDefaults[key];
     }
     if (["routes"].includes(key)) {
-      const onRoutesChange = async ({ generate }) => {
-        await api._refreshRoutes();
-        await generate({ isFirstTime: false });
-      };
-      config.onChange = onRoutesChange;
+      config.onChange = api.ConfigChangeType.regenerateTmpFiles;
     }
     api.registerPlugins([
       {

package/dist/features/icons/esbuildIconPlugin.js

@@ -42,8 +42,8 @@ function esbuildIconPlugin(opts) {
       const loaders = ["js", "jsx", "ts", "tsx"];
       loaders.forEach((loader) => {
         const filter = new RegExp(`\\.(${loader})$`);
-        build.onLoad({ filter }, (args) => {
-          const contents = import_fs.default.readFileSync(args.path, "utf-8");
+        build.onLoad({ filter }, async (args) => {
+          const contents = await import_fs.default.promises.readFile(args.path, "utf-8");
           const icons = (0, import_extract.extractIcons)(contents);
           import_utils.logger.debug(`[icons] ${args.path} > ${icons}`);
           icons.forEach((icon) => {

package/dist/features/icons/icons.js

@@ -33,6 +33,7 @@ __export(icons_exports, {
 });
 module.exports = __toCommonJS(icons_exports);
 var import_utils = require("@umijs/utils");
+var import_fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
 var import_depsOnDemand = require("../depsOnDemand/depsOnDemand");
 var icons_default = (api) => {
@@ -44,7 +45,8 @@ var icons_default = (api) => {
           autoInstall: Joi.object(),
           defaultComponentConfig: Joi.object(),
           // e.g. alias: { home: 'fa:home' }
-          alias: Joi.object()
+          alias: Joi.object(),
+          include: Joi.array().items(Joi.string())
         });
       }
     },
@@ -69,14 +71,16 @@ var icons_default = (api) => {
     ];
   });
   api.onPrepareBuildSuccess(async () => {
-    if (!icons.size) {
+    const extraIcons = api.config.icons.include || [];
+    const allIcons = /* @__PURE__ */ new Set([...icons, ...extraIcons]);
+    if (!allIcons.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 } = (0, import_utils.importLazy)(require.resolve("./svgr"));
-    for (const iconStr of icons) {
+    for (const iconStr of allIcons) {
       const [collect, icon] = iconStr.split(":");
       const iconName = generateIconName({ collect, icon });
       let svgr;
@@ -105,7 +109,7 @@ var icons_default = (api) => {
               });
             })
           },
-          localIconDir: import_path.default.join(api.paths.absSrcPath, "icons")
+          localIconDir: getLocalIconDir()
         });
       } catch (e) {
         import_utils.logger.error(e);
@@ -134,6 +138,13 @@ var icons_default = (api) => {
         content: EMPTY_ICONS_FILE
       });
     }
+    const localIconDir = getLocalIconDir();
+    const localIcons = [];
+    if (import_fs.default.existsSync(localIconDir)) {
+      localIcons.push(
+        ...import_fs.default.readdirSync(localIconDir).filter((file) => file.endsWith(".svg")).map((file) => file.replace(/\.svg$/, ""))
+      );
+    }
     api.writeTmpFile({
       path: "index.tsx",
       content: `
@@ -143,9 +154,160 @@ import './index.css';
 
 const alias = ${JSON.stringify(api.config.icons.alias || {})};
 type AliasKeys = keyof typeof alias;
+const localIcons = ${JSON.stringify(localIcons)} as const;
+type LocalIconsKeys = typeof localIcons[number];
+
+type IconCollections = 'academicons' |
+  'akar-icons' |
+  'ant-design' |
+  'arcticons' |
+  'basil' |
+  'bi' |
+  'bpmn' |
+  'brandico' |
+  'bx' |
+  'bxl' |
+  'bxs' |
+  'bytesize' |
+  'carbon' |
+  'charm' |
+  'ci' |
+  'cib' |
+  'cif' |
+  'cil' |
+  'circle-flags' |
+  'circum' |
+  'clarity' |
+  'codicon' |
+  'cryptocurrency-color' |
+  'cryptocurrency' |
+  'dashicons' |
+  'ei' |
+  'el' |
+  'emblemicons' |
+  'emojione-monotone' |
+  'emojione-v1' |
+  'emojione' |
+  'entypo-social' |
+  'entypo' |
+  'eos-icons' |
+  'ep' |
+  'et' |
+  'eva' |
+  'fa-brands' |
+  'fa-regular' |
+  'fa-solid' |
+  'fa' |
+  'fa6-brands' |
+  'fa6-regular' |
+  'fa6-solid' |
+  'fad' |
+  'fe' |
+  'feather' |
+  'file-icons' |
+  'flag' |
+  'flagpack' |
+  'flat-color-icons' |
+  'flat-ui' |
+  'fluent-emoji-flat' |
+  'fluent-emoji-high-contrast' |
+  'fluent-emoji' |
+  'fluent-mdl2' |
+  'fluent' |
+  'fontelico' |
+  'fontisto' |
+  'foundation' |
+  'fxemoji' |
+  'gala' |
+  'game-icons' |
+  'geo' |
+  'gg' |
+  'gis' |
+  'gridicons' |
+  'grommet-icons' |
+  'healthicons' |
+  'heroicons-outline' |
+  'heroicons-solid' |
+  'heroicons' |
+  'humbleicons' |
+  'ic' |
+  'icomoon-free' |
+  'icon-park-outline' |
+  'icon-park-solid' |
+  'icon-park-twotone' |
+  'icon-park' |
+  'iconoir' |
+  'icons8' |
+  'il' |
+  'ion' |
+  'iwwa' |
+  'jam' |
+  'la' |
+  'line-md' |
+  'logos' |
+  'ls' |
+  'lucide' |
+  'majesticons' |
+  'maki' |
+  'map' |
+  'material-symbols' |
+  'mdi-light' |
+  'mdi' |
+  'medical-icon' |
+  'memory' |
+  'mi' |
+  'mingcute' |
+  'mono-icons' |
+  'nimbus' |
+  'nonicons' |
+  'noto-v1' |
+  'noto' |
+  'octicon' |
+  'oi' |
+  'ooui' |
+  'openmoji' |
+  'pajamas' |
+  'pepicons-pop' |
+  'pepicons-print' |
+  'pepicons' |
+  'ph' |
+  'pixelarticons' |
+  'prime' |
+  'ps' |
+  'quill' |
+  'radix-icons' |
+  'raphael' |
+  'ri' |
+  'si-glyph' |
+  'simple-icons' |
+  'simple-line-icons' |
+  'skill-icons' |
+  'subway' |
+  'svg-spinners' |
+  'system-uicons' |
+  'tabler' |
+  'teenyicons' |
+  'topcoat' |
+  'twemoji' |
+  'typcn' |
+  'uil' |
+  'uim' |
+  'uis' |
+  'uit' |
+  'uiw' |
+  'vaadin' |
+  'vs' |
+  'vscode-icons' |
+  'websymbol' |
+  'whh' |
+  'wi' |
+  'wpf' |
+  'zmdi' |
+  'zondicons';
+type Icon = \`\${IconCollections}:\${string}\`;
 
 interface IUmiIconProps extends React.SVGAttributes<SVGElement> {
-  icon: AliasKeys | string;
+  icon: AliasKeys | Icon | \`local:\${LocalIconsKeys}\`;
   hover?: AliasKeys | string;
   className?: string;
   viewBox?: string;
@@ -157,8 +319,8 @@ interface IUmiIconProps extends React.SVGAttributes<SVGElement> {
   flip?: 'vertical' | 'horizontal' | 'horizontal,vertical' | 'vertical,horizontal';
 }
 
-export const Icon = React.forwardRef((props: IUmiIconProps, ref) => {
-  const { icon, hover, style, className, rotate, flip, ...extraProps } = props;
+export const Icon = React.forwardRef<HTMLSpanElement, IUmiIconProps>((props, ref) => {
+  const { icon, hover, style, className = '' , rotate, flip, ...extraProps } = props;
   const iconName = normalizeIconName(alias[icon] || icon);
   const Component = iconsMap[iconName];
   if (!Component) {
@@ -190,8 +352,12 @@ export const Icon = React.forwardRef((props: IUmiIconProps, ref) => {
     svgStyle.msTransform = transformStr;
     svgStyle.transform = transformStr;
   }
+  
+  const spanClassName = HoverComponent ? 'umiIconDoNotUseThis ' : '' + className;
+  const spanClass = spanClassName ? { className: spanClassName } : {};
+  
   return (
-    <span role="img" ref={ref} className={HoverComponent ? 'umiIconDoNotUseThis ' : '' + className} style={style}>
+    <span role="img" ref={ref} {...spanClass} style={style}>
       <Component {...extraProps} className={cls} style={svgStyle} />
       {
         HoverComponent ? <HoverComponent {...extraProps} className={'umiIconDoNotUseThisHover ' + cls} style={svgStyle} /> : null
@@ -257,6 +423,12 @@ function normalizeIconName(name: string) {
       `
     });
   });
+  api.addTmpGenerateWatcherPaths(() => {
+    return [getLocalIconDir()];
+  });
+  function getLocalIconDir() {
+    return import_path.default.join(api.paths.absSrcPath, "icons");
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {});

package/dist/features/prepare/prepare.js

@@ -36,6 +36,15 @@ var import_utils = require("@umijs/utils");
 var import_path = __toESM(require("path"));
 var import_watch = require("../../commands/dev/watch");
 var prepare_default = (api) => {
+  function updateAppdata(_buildResult) {
+    const buildResult = import_utils.lodash.cloneDeep(_buildResult);
+    (buildResult.outputFiles || []).forEach((file) => {
+      file == null ? true : delete file.contents;
+    });
+    api.appData.prepare = {
+      buildResult
+    };
+  }
   api.register({
     key: "onGenerateFiles",
     async fn({ isFirstTime }) {
@@ -59,6 +68,7 @@ var prepare_default = (api) => {
         entryPoints: [entryFile],
         watch: watch && {
           onRebuildSuccess({ result }) {
+            updateAppdata(result);
             api.applyPlugins({
               key: "onPrepareBuildSuccess",
               args: {
@@ -79,6 +89,7 @@ var prepare_default = (api) => {
           (_a = buildResult.stop) == null ? void 0 : _a.call(buildResult);
         });
       }
+      updateAppdata(buildResult);
       await api.applyPlugins({
         key: "onPrepareBuildSuccess",
         args: {

package/dist/features/routeProps/routeProps.d.ts

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

package/dist/features/routeProps/routeProps.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/routeProps/routeProps.ts
+var routeProps_exports = {};
+__export(routeProps_exports, {
+  default: () => routeProps_default
+});
+module.exports = __toCommonJS(routeProps_exports);
+var import_routeExportExtractor = require("../../utils/routeExportExtractor");
+var routeProps_default = (api) => {
+  api.describe({
+    config: {
+      schema(Joi) {
+        return Joi.object({});
+      }
+    },
+    enableBy: () => {
+      return !api.userConfig.routes;
+    }
+  });
+  const entryFile = "core/routeProps.ts";
+  const outFile = "core/routeProps.js";
+  (0, import_routeExportExtractor.setupRouteExportExtractor)({
+    api,
+    entryFile,
+    outFile,
+    propertyName: "routeProps"
+  });
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});

package/dist/features/tmpFiles/getModuleExports.js

@@ -23,11 +23,22 @@ __export(getModuleExports_exports, {
 });
 module.exports = __toCommonJS(getModuleExports_exports);
 var import_bundler_utils = require("@umijs/bundler-utils");
+var import_utils = require("@umijs/utils");
 var import_fs = require("fs");
 async function getModuleExports(opts) {
-  const content = (0, import_fs.readFileSync)(opts.file, "utf-8");
-  const [_, exports] = await (0, import_bundler_utils.parseModule)({ content, path: opts.file });
-  return exports || [];
+  const { file } = opts;
+  const content = (0, import_fs.readFileSync)(file, "utf-8");
+  try {
+    const [_, exports] = await (0, import_bundler_utils.parseModule)({ content, path: file });
+    return exports || [];
+  } catch (e) {
+    console.log(
+      `Parse file ${import_utils.chalk.red(
+        file
+      )} exports error, please check this file esm format.`
+    );
+    return [];
+  }
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/features/tmpFiles/routes.js

@@ -111,17 +111,23 @@ async function getRoutes(opts) {
       routes[id].__content = (0, import_fs.readFileSync)(file, "utf-8");
       routes[id].__absFile = (0, import_utils.winPath)(file);
       routes[id].__isJSFile = isJSFile;
-      if (opts.api.config.ssr || opts.api.config.clientLoader) {
-        routes[id].__exports = isJSFile && (0, import_fs.existsSync)(file) ? await (0, import_getModuleExports.getModuleExports)({
+      const enableSSR = opts.api.config.ssr;
+      const enableClientLoader = opts.api.config.clientLoader;
+      const enableRouteProps = !opts.api.userConfig.routes;
+      const needCollectExports = enableSSR || enableClientLoader || enableRouteProps;
+      if (needCollectExports) {
+        const exports = isJSFile && (0, import_fs.existsSync)(file) ? await (0, import_getModuleExports.getModuleExports)({
           file
         }) : [];
-      }
-      if (opts.api.config.ssr) {
-        routes[id].hasServerLoader = routes[id].__exports.includes("serverLoader");
-      }
-      if (opts.api.config.clientLoader) {
-        routes[id].__hasClientLoader = routes[id].__exports.includes("clientLoader");
-        routes[id].clientLoader = `clientLoaders['${id}']`;
+        if (enableSSR) {
+          routes[id].hasServerLoader = exports.includes("serverLoader");
+        }
+        if (enableClientLoader && exports.includes("clientLoader")) {
+          routes[id].clientLoader = `clientLoaders['${id}']`;
+        }
+        if (enableRouteProps && exports.includes("routeProps")) {
+          routes[id].routeProps = `routeProps['${id}']`;
+        }
       }
     }
   }

package/dist/features/tmpFiles/tmpFiles.js

@@ -39,7 +39,9 @@ var import_umi = require("umi");
 var import_constants = require("../../constants");
 var import_getModuleExports = require("./getModuleExports");
 var import_importsToStr = require("./importsToStr");
-var import_routes = require("./routes");
+var routesApi = (0, import_utils.importLazy)(
+  require.resolve("./routes")
+);
 var tmpFiles_default = (api) => {
   const umiDir = process.env.UMI_DIR;
   api.describe({
@@ -335,9 +337,10 @@ export default function EmptyRoute() {
     if (opts.isFirstTime) {
       routes = api.appData.routes;
     } else {
-      routes = await (0, import_routes.getRoutes)({
+      routes = await routesApi.getRoutes({
         api
       });
+      api.appData.routes = routes;
     }
     const hasSrc = api.appData.hasSrcDir;
     const pages = (0, import_path.basename)(
@@ -353,15 +356,52 @@ export default function EmptyRoute() {
         }
       }
     }
+    const headerImports = [];
+    let routesString = JSON.stringify(clonedRoutes);
+    if (api.config.clientLoader) {
+      routesString = routesString.replace(/"(clientLoaders\[.*?)"/g, "$1");
+      headerImports.push(`import clientLoaders from './loaders.js';`);
+    }
+    if (!api.userConfig.routes) {
+      routesString = routesString.replace(
+        /"routeProps":"(routeProps\[.*?)"/g,
+        "...$1"
+      );
+      if (process.env.NODE_ENV === "test") {
+        headerImports.push(`import routeProps from './routeProps';`);
+      } else {
+        headerImports.push(`import routeProps from './routeProps.js';`);
+      }
+      headerImports.push(`
+if (process.env.NODE_ENV === 'development') {
+  Object.entries(routeProps).forEach(([key, value]) => {
+    const internalProps = ['path', 'id', 'parentId', 'isLayout', 'isWrapper', 'layout', 'clientLoader'];
+    Object.keys(value).forEach((prop) => {
+      if (internalProps.includes(prop)) {
+        throw new Error(
+          \`[UmiJS] route '\${key}' should not have '\${prop}' prop, please remove this property in 'routeProps'.\`
+        )
+      }
+    })
+  })
+}
+`);
+    }
+    if (api.appData.framework === "react") {
+      headerImports.push(`import React from 'react';`);
+    }
     api.writeTmpFile({
       noPluginDir: true,
       path: "core/route.tsx",
       tplPath: (0, import_path.join)(import_constants.TEMPLATES_DIR, "route.tpl"),
       context: {
-        isReact: api.appData.framework === "react",
-        isClientLoaderEnabled: !!api.config.clientLoader,
-        routes: JSON.stringify(clonedRoutes).replace(/"(clientLoaders\[.*?)"/g, "$1"),
-        routeComponents: await (0, import_routes.getRouteComponents)({ routes, prefix, api })
+        headerImports: headerImports.join("\n"),
+        routes: routesString,
+        routeComponents: await routesApi.getRouteComponents({
+          routes,
+          prefix,
+          api
+        })
       }
     });
     const plugins = await api.applyPlugins({

package/dist/features/ui/ui.d.ts

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

package/dist/features/ui/ui.js

@@ -0,0 +1,39 @@
+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/ui/ui.ts
+var ui_exports = {};
+__export(ui_exports, {
+  default: () => ui_default
+});
+module.exports = __toCommonJS(ui_exports);
+var ENTRY_PATH = "/__umi_ui/entry";
+var ui_default = (api) => {
+  api.describe({
+    enableBy() {
+      return api.name === "dev" && api.args.ui;
+    }
+  });
+  api.onBeforeMiddleware(({ app }) => {
+    app.use(ENTRY_PATH, async (req, _res) => {
+      req;
+    });
+  });
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});

package/dist/index.js

@@ -43,7 +43,6 @@ var src_default = () => {
       require.resolve("./features/appData/appData"),
       require.resolve("./features/appData/umiInfo"),
       require.resolve("./features/check/check"),
-      require.resolve("./features/clientLoader/clientLoader"),
       require.resolve("./features/codeSplitting/codeSplitting"),
       require.resolve("./features/configPlugins/configPlugins"),
       require.resolve("./features/crossorigin/crossorigin"),
@@ -64,6 +63,8 @@ var src_default = () => {
       require.resolve("./features/ssr/ssr"),
       require.resolve("./features/terminal/terminal"),
       require.resolve("./features/tmpFiles/tmpFiles"),
+      require.resolve("./features/clientLoader/clientLoader"),
+      require.resolve("./features/routeProps/routeProps"),
       require.resolve("./features/tmpFiles/configTypes"),
       require.resolve("./features/transform/transform"),
       require.resolve("./features/lowImport/lowImport"),
@@ -76,6 +77,7 @@ var src_default = () => {
       require.resolve("./features/classPropertiesLoose/classPropertiesLoose"),
       require.resolve("./features/webpack/webpack"),
       require.resolve("./features/swc/swc"),
+      require.resolve("./features/ui/ui"),
       // commands
       require.resolve("./commands/build"),
       require.resolve("./commands/config/config"),

package/dist/types.d.ts

@@ -199,11 +199,3 @@ export declare type IApi = PluginAPI & IServicePluginAPI & {
         tplPath?: string;
     }) => void;
 };
-export interface IApiInternalProps {
-    /**
-     * 如果不刷新 routes，修改 icon 不会热更新
-     * See https://github.com/umijs/umi/issues/10137
-     * TODO: 不公开这个方法，先解问题，但此问题应该有更好的解法
-     */
-    _refreshRoutes: () => Promise<void>;
-}

package/dist/utils/routeExportExtractor.d.ts

@@ -0,0 +1,14 @@
+import type { IApi } from 'umi';
+interface IRouteExportExtractor {
+    api: IApi;
+    entryFile: string;
+}
+interface IRouteExportExtractorGenTmpFileOpts extends IRouteExportExtractor {
+    propertyName: string;
+}
+interface IRouteExportExtractorSetupBuilderOpts extends IRouteExportExtractor {
+    outFile: string;
+}
+declare type ISetupRouteExportExtractorOpts = IRouteExportExtractorGenTmpFileOpts & IRouteExportExtractorSetupBuilderOpts;
+export declare function setupRouteExportExtractor(opts: ISetupRouteExportExtractorOpts): void;
+export {};

package/dist/utils/routeExportExtractor.js

@@ -0,0 +1,154 @@
+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/utils/routeExportExtractor.ts
+var routeExportExtractor_exports = {};
+__export(routeExportExtractor_exports, {
+  setupRouteExportExtractor: () => setupRouteExportExtractor
+});
+module.exports = __toCommonJS(routeExportExtractor_exports);
+var import_esbuild = __toESM(require("@umijs/bundler-utils/compiled/esbuild"));
+var import_path = require("path");
+function setupRouteExportExtractor(opts) {
+  const { api, entryFile, propertyName, outFile } = opts;
+  api.onGenerateFiles(() => {
+    generateRouteExportTmpFile({
+      api,
+      propertyName,
+      entryFile
+    });
+  });
+  api.onBeforeCompiler(
+    () => setupExportExtractBuilder({
+      api,
+      entryFile,
+      outFile
+    })
+  );
+}
+function generateRouteExportTmpFile(opts) {
+  const { api, entryFile, propertyName } = opts;
+  const imports = [];
+  const defines = [];
+  const routeIds = Object.keys(api.appData.routes);
+  let index = 0;
+  for (const id of routeIds) {
+    const route = api.appData.routes[id];
+    if (route[propertyName]) {
+      index += 1;
+      imports.push(
+        `import { ${propertyName} as ${propertyName}_${index} } from '${route.__absFile}';`
+      );
+      defines.push(`  '${id}': ${propertyName}_${index},`);
+    }
+  }
+  api.writeTmpFile({
+    noPluginDir: true,
+    path: entryFile,
+    content: `
+${imports.join("\n")}
+export default {
+${defines.join("\n")}
+};
+    `
+  });
+}
+async function setupExportExtractBuilder(opts) {
+  const { api, entryFile, outFile } = opts;
+  await import_esbuild.default.build({
+    format: "esm",
+    platform: "browser",
+    target: "esnext",
+    loader,
+    watch: api.env === "development" && {},
+    bundle: true,
+    logLevel: "error",
+    entryPoints: [(0, import_path.join)(api.paths.absTmpPath, entryFile)],
+    outfile: (0, import_path.join)(api.paths.absTmpPath, outFile),
+    absWorkingDir: api.cwd,
+    plugins: [
+      {
+        name: "imports",
+        setup(build) {
+          let entry;
+          build.onResolve({ filter: /.*/ }, (args) => {
+            if (args.kind === "entry-point")
+              entry = args.path;
+            if (args.kind === "entry-point" || args.importer === entry) {
+              return { path: (0, import_path.resolve)(args.resolveDir, args.path) };
+            }
+            return {
+              path: !args.path.startsWith(".") && !args.path.startsWith("/") ? args.path : (0, import_path.resolve)(args.resolveDir, args.path),
+              external: true,
+              sideEffects: false
+            };
+          });
+        }
+      }
+    ]
+  });
+}
+var loader = {
+  ".aac": "file",
+  ".css": "text",
+  ".less": "text",
+  ".sass": "text",
+  ".scss": "text",
+  ".eot": "file",
+  ".flac": "file",
+  ".gif": "file",
+  ".htm": "file",
+  ".html": "file",
+  ".ico": "file",
+  ".icon": "file",
+  ".jpeg": "file",
+  ".jpg": "file",
+  ".js": "jsx",
+  ".jsx": "jsx",
+  ".json": "json",
+  ".md": "jsx",
+  ".mdx": "jsx",
+  ".mp3": "file",
+  ".mp4": "file",
+  ".ogg": "file",
+  ".otf": "file",
+  ".png": "file",
+  ".svg": "file",
+  ".ts": "ts",
+  ".tsx": "tsx",
+  ".ttf": "file",
+  ".wav": "file",
+  ".webm": "file",
+  ".webp": "file",
+  ".woff": "file",
+  ".woff2": "file"
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  setupRouteExportExtractor
+});

package/package.json

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

package/templates/route.tpl

@@ -1,9 +1,4 @@
-{{#isClientLoaderEnabled}}
-import clientLoaders from './loaders.js';
-{{/isClientLoaderEnabled}}
-{{#isReact}}
-import React from 'react';
-{{/isReact}}
+{{{ headerImports }}}
 
 export async function getRoutes() {
   const routes = {{{ routes }}} as const;