@umijs/plugins 4.0.24 → 4.0.26

package/dist/antd.js

@@ -26,6 +26,7 @@ __export(antd_exports, {
 });
 module.exports = __toCommonJS(antd_exports);
 var import_path = require("path");
+var import_assert = __toESM(require("assert"));
 var import_plugin_utils = require("umi/plugin-utils");
 var import_resolveProjectDep = require("./utils/resolveProjectDep");
 var import_withTmpPath = require("./utils/withTmpPath");
@@ -49,7 +50,8 @@ var antd_default = (api) => {
           dark: Joi.boolean(),
           compact: Joi.boolean(),
           import: Joi.boolean(),
-          style: Joi.string().allow("less", "css")
+          style: Joi.string().allow("less", "css"),
+          theme: Joi.object()
         }), Joi.boolean().invalid(true));
       }
     },
@@ -76,7 +78,7 @@ var antd_default = (api) => {
     let antd = memo.antd || {};
     if (process.env.UMI_PLUGIN_ANTD_ENABLE) {
       const { defaultConfig } = JSON.parse(process.env.UMI_PLUGIN_ANTD_ENABLE);
-      antd = Object.assign(defaultConfig, antd);
+      memo.antd = antd = Object.assign(defaultConfig, antd);
     }
     memo.alias.antd = pkgPath;
     if (antd.dayjs) {
@@ -100,6 +102,11 @@ var antd_default = (api) => {
       "root-entry-name": "default",
       ...memo.theme
     };
+    if (antd.theme) {
+      (0, import_assert.default)(antdVersion.startsWith("5"), `antd.theme is only valid when antd is 5`);
+      antd.configProvider ?? (antd.configProvider = {});
+      antd.configProvider.theme = (0, import_plugin_utils.deepmerge)(antd.configProvider.theme || {}, antd.theme);
+    }
     return memo;
   });
   api.addExtraBabelPlugins(() => {

package/dist/layout.js

@@ -131,6 +131,7 @@ const filterRoutes = (routes: IRoute[], filterFn: (route: IRoute) => boolean) =>
       newRoutes.push(route);
       if (Array.isArray(route.routes)) {
         route.routes = filterRoutes(route.routes, filterFn);
+        route.children = route.routes;
       }
     }
   }

package/libs/locale/runtime.tpl

@@ -16,6 +16,7 @@ export function patchRoutes({ routes }) {
     Object.keys(routes).forEach((key) => {
       const route = routes[key];
       if (route.title) {
+        route.locale = route.title;
         const newTitle = intl.messages[route.title] ? intl.formatMessage({ id: route.title }, {}) : route.title;
         route.name = intl.messages[route.title] ? intl.formatMessage({ id: route.title }, {}) : route.name;
         route.title = newTitle;
@@ -23,8 +24,8 @@ export function patchRoutes({ routes }) {
       if (route.routes) {
         traverseRoute(route.routes);
       }
-      if (route.routes) {
-        traverseRoute(route.routes);
+      if (route.children) {
+        traverseRoute(route.children);
       }
     })
   }

package/libs/qiankun/master/MicroApp.tsx

@@ -74,6 +74,7 @@ export const MicroApp = forwardRef(
       lifeCycles: globalLifeCycles,
       prefetch = true,
       appNameKeyAlias = 'name',
+      prefetchThreshold = 5,
       ...globalSettings
     } = getMasterOptions() as MasterOptions;
 
@@ -184,9 +185,10 @@ export const MicroApp = forwardRef(
               );
               prefetchApps(specialPrefetchApps, configuration);
             } else {
+              // 不能无脑全量 prefetch，需要有一个阈值
               const otherNotMountedApps = apps.filter(
                 (app) => !isCurrentApp(app),
-              );
+              ).slice(0, prefetchThreshold);
               prefetchApps(otherNotMountedApps, configuration);
             }
             noneMounted = false;

package/libs/qiankun/master/getMicroAppRouteComponent.tsx.tpl

@@ -1,4 +1,5 @@
 import React from 'react';
+import { useMatch } from 'umi';
 import { MicroApp } from './MicroApp';
 
 export function getMicroAppRouteComponent(opts: {
@@ -10,11 +11,13 @@ export function getMicroAppRouteComponent(opts: {
 }) {
   const { base, masterHistoryType, appName, routeProps, routePath } = opts;
   const RouteComponent = () => {
+    const match = useMatch(routePath);
+    const url = match.pathnameBase;
     // 默认取静态配置的 base
     let umiConfigBase = base === '/' ? '' : base;
 
     // 拼接子应用挂载路由
-    let runtimeMatchedBase = umiConfigBase + routePath.replace('/*', '');
+    let runtimeMatchedBase = umiConfigBase + (url.endsWith('/') ? url.substr(0, url.length - 1) : url);
 
     {{#dynamicRoot}}
     // @see https://github.com/umijs/umi/blob/master/packages/preset-built-in/src/plugins/commands/htmlUtils.ts#L102

package/libs/qiankun/master/types.ts

@@ -33,6 +33,8 @@ export type MasterOptions = {
   exportComponentAlias?: string;
   // MicroApp 寻址时使用的应用名唯一键，默认是 name
   appNameKeyAlias?: string;
+  // 预加载应用阈值
+  prefetchThreshold?: number;
 } & FrameworkConfiguration;
 
 export type SlaveOptions = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.0.24",
+  "version": "4.0.26",
   "description": "@umijs/plugins",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/plugins#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -27,7 +27,7 @@
     "@ant-design/antd-theme-variable": "^1.0.0",
     "@ant-design/icons": "^4.7.0",
     "@ant-design/pro-components": "^2.0.1",
-    "@umijs/bundler-utils": "4.0.24",
+    "@umijs/bundler-utils": "4.0.26",
     "@umijs/valtio": "^1.0.0",
     "antd-dayjs-webpack-plugin": "^1.0.6",
     "axios": "^0.27.2",
@@ -47,7 +47,7 @@
     "warning": "^4.0.3"
   },
   "devDependencies": {
-    "umi": "4.0.24"
+    "umi": "4.0.26"
   },
   "publishConfig": {
     "access": "public"