@umijs/plugins 4.0.23 → 4.0.25

package/dist/access.js

@@ -50,7 +50,7 @@ import { AccessContext } from './context';
 
 function Provider(props) {${hasAccessFile ? `
   const { initialState } = useModel('@@initialState');
-  const access = accessFactory(initialState);
+  const access = React.useMemo(() => accessFactory(initialState), [initialState]);
 ` : `
   const access = {};
 `}
@@ -91,7 +91,8 @@ export const Access: React.FC<PropsWithChildren<AccessProps>> = (props) => {
 
 export const useAccessMarkedRoutes = (routes: IRoute[]) => {
   const access = useAccess();
-  const process = (route, parentAccessCode, parentRoute) => {
+  const markdedRoutes: IRoute[] = React.useMemo(() => {
+    const process = (route, parentAccessCode, parentRoute) => {
       let accessCode = route.access;
       // \u7528\u7236\u7EA7\u7684\u8DEF\u7531\u68C0\u6D4B\u7236\u7EA7\u7684 accessCode
       let detectorRoute = route;
@@ -100,50 +101,44 @@ export const useAccessMarkedRoutes = (routes: IRoute[]) => {
         detectorRoute = parentRoute;
       }
 
-    // set default status
-    route.unaccessible = ${api.config.access.strictMode ? "true" : "false"};
+      // set default status
+      route.unaccessible = ${api.config.access.strictMode ? "true" : "false"};
 
-    // check access code
-    if (typeof accessCode === "string") {
-      const detector = access[accessCode];
+      // check access code
+      if (typeof accessCode === 'string') {
+        const detector = access[accessCode];
 
-      if (typeof detector === "function") {
-        route.unaccessible = !detector(detectorRoute);
-      } else if (typeof detector === "boolean") {
-        route.unaccessible = !detector;
-      } else if (typeof detector === "undefined") {
-        route.unaccessible = true;
+        if (typeof detector === 'function') {
+          route.unaccessible = !detector(detectorRoute);
+        } else if (typeof detector === 'boolean') {
+          route.unaccessible = !detector;
+        } else if (typeof detector === 'undefined') {
+          route.unaccessible = true;
+        }
       }
-    }
 
-    // check children access code
-    if (route.children?.length) {
-      const isNoAccessibleChild = !route.children.reduce(
-        (hasAccessibleChild, child) => {
+      // check children access code
+      if (route.children?.length) {
+        const isNoAccessibleChild = !route.children.reduce((hasAccessibleChild, child) => {
           process(child, accessCode, route);
 
           return hasAccessibleChild || !child.unaccessible;
-        },
-        false
-      );
+        }, false);
 
-      // make sure parent route is unaccessible if all children are unaccessible
-      if (isNoAccessibleChild) {
-        route.unaccessible = true;
+        // make sure parent route is unaccessible if all children are unaccessible
+        if (isNoAccessibleChild) {
+          route.unaccessible = true;
+        }
       }
-    }
-
-    // \u4E3A\u4E86\u517C\u5BB9\u65E7\u7248\u672C\u7684layout\uFF0C<= 7.1.0
-    // \u5982\u679C\u662F 7.1.0 \u4EE5\u4E0B\u7684layout\u53EF\u80FD\u4F1A\u51FA\u73B0\u6570\u636E\u5F02\u5E38\u3002
-    delete route.routes;
-    route.routes = route.children;
 
-    return route;
-  };
+      return route;
+    }
 
-  return routes.map((route) => process(route));
-};
+    return routes.map(route => process(route));
+  }, [routes.length, access]);
 
+  return markdedRoutes;
+}
       `
     });
     api.writeTmpFile({

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

@@ -124,13 +124,13 @@ const filterRoutes = (routes: IRoute[], filterFn: (route: IRoute) => boolean) =>
   let newRoutes = []
   for (const route of routes) {
     if (filterFn(route)) {
-      if (Array.isArray(route.children)) {
-        newRoutes.push(...filterRoutes(route.children, filterFn))
+      if (Array.isArray(route.routes)) {
+        newRoutes.push(...filterRoutes(route.routes, filterFn))
       }
     } else {
       newRoutes.push(route);
-      if (Array.isArray(route.children)) {
-        route.children = filterRoutes(route.children, filterFn);
+      if (Array.isArray(route.routes)) {
+        route.routes = filterRoutes(route.routes, filterFn);
       }
     }
   }
@@ -150,11 +150,11 @@ const mapRoutes = (routes: IRoute[]) => {
       newRoute.path = route.originPath
     }
 
-    if (Array.isArray(route.children)) {
-      newRoute.children = mapRoutes(route.children);
+    if (Array.isArray(route.routes)) {
+      newRoute.routes = mapRoutes(route.routes);
     }
 
-    return newRoute;
+    return newRoute
   })
 }
 
@@ -180,13 +180,13 @@ const { formatMessage } = useIntl();
     },
   });
 
-  const matchedRouteNoAccess = useMemo(() => matchRoutes(clientRoutes, location.pathname)?.pop()?.route||[], [location.pathname]);
+  const matchedRoute = useMemo(() => matchRoutes(clientRoutes, location.pathname).pop()?.route, [location.pathname]);
   // \u73B0\u5728\u7684 layout \u53CA wrapper \u5B9E\u73B0\u662F\u901A\u8FC7\u7236\u8DEF\u7531\u7684\u5F62\u5F0F\u5B9E\u73B0\u7684, \u4F1A\u5BFC\u81F4\u8DEF\u7531\u6570\u636E\u591A\u4E86\u5197\u4F59\u5C42\u7EA7, proLayout \u6D88\u8D39\u65F6, \u65E0\u6CD5\u6B63\u786E\u5C55\u793A\u83DC\u5355, \u8FD9\u91CC\u5BF9\u5197\u4F59\u6570\u636E\u8FDB\u884C\u8FC7\u6EE4\u64CD\u4F5C
   const newRoutes = filterRoutes(clientRoutes.filter(route => route.id === 'ant-design-pro-layout'), (route) => {
     return (!!route.isLayout && route.id !== 'ant-design-pro-layout') || !!route.isWrapper;
   })
   const [route] = useAccessMarkedRoutes(mapRoutes(newRoutes));
-  const [matchedRoute] = useAccessMarkedRoutes([matchedRouteNoAccess]);
+
   return (
     <ProLayout
       route={route}

package/libs/locale/runtime.tpl

@@ -16,13 +16,15 @@ 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;
       }
-      if (route.children) {
-        traverseRoute(route.children);
+      if (route.routes) {
+        traverseRoute(route.routes);
+      }
+      if (route.routes) {
+        traverseRoute(route.routes);
       }
     })
   }

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.0.23",
+  "version": "4.0.25",
   "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.23",
+    "@umijs/bundler-utils": "4.0.25",
     "@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.23"
+    "umi": "4.0.25"
   },
   "publishConfig": {
     "access": "public"