@umijs/plugins 4.0.26 → 4.0.28

package/dist/access.js

@@ -131,6 +131,20 @@ export const useAccessMarkedRoutes = (routes: IRoute[]) => {
         }
       }
 
+      // check children access code
+      if (route.routes?.length) {
+        const isNoAccessibleChild = !route.routes.reduce((hasAccessibleChild, child) => {
+          process(child, accessCode, route);
+
+          return hasAccessibleChild || !child.unaccessible;
+        }, false);
+
+        // make sure parent route is unaccessible if all children are unaccessible
+        if (isNoAccessibleChild) {
+          route.unaccessible = true;
+        }
+      }
+
       return route;
     }
 

package/dist/layout.js

@@ -123,16 +123,17 @@ const filterRoutes = (routes: IRoute[], filterFn: (route: IRoute) => boolean) =>
 
   let newRoutes = []
   for (const route of routes) {
+    const newRoute = {...route };
     if (filterFn(route)) {
-      if (Array.isArray(route.routes)) {
-        newRoutes.push(...filterRoutes(route.routes, filterFn))
+      if (Array.isArray(newRoute.routes)) {
+        newRoutes.push(...filterRoutes(newRoute.routes, filterFn))
       }
     } else {
-      newRoutes.push(route);
-      if (Array.isArray(route.routes)) {
-        route.routes = filterRoutes(route.routes, filterFn);
-        route.children = route.routes;
+      if (Array.isArray(newRoute.children)) {
+        newRoute.children = filterRoutes(newRoute.children, filterFn);
+        newRoute.routes = newRoute.children;
       }
+      newRoutes.push(newRoute);
     }
   }
 
@@ -155,6 +156,10 @@ const mapRoutes = (routes: IRoute[]) => {
       newRoute.routes = mapRoutes(route.routes);
     }
 
+    if (Array.isArray(route.children)) {
+      newRoute.children = mapRoutes(route.children);
+    }
+
     return newRoute
   })
 }
@@ -181,12 +186,14 @@ const { formatMessage } = useIntl();
     },
   });
 
-  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 = useMemo(() => matchRoutes(route.children, location.pathname)?.pop?.()?.route, [location.pathname]);
 
   return (
     <ProLayout
@@ -247,8 +254,8 @@ const { formatMessage } = useIntl();
     >
       <Exception
         route={matchedRoute}
-        notFound={runtimeConfig.notFound}
-        noAccessible={runtimeConfig.noAccessible}
+        notFound={runtimeConfig?.notFound}
+        noAccessible={runtimeConfig?.noAccessible}
       >
         {runtimeConfig.childrenRender
           ? runtimeConfig.childrenRender(<Outlet />, props)
@@ -614,9 +621,9 @@ const Exception: React.FC<{
   // render custom 404
   (!props.route && (props.noFound || props.notFound)) ||
   // render custom 403
-  (props.route.unaccessible && (props.unAccessible || props.noAccessible)) ||
+  (props.route?.unaccessible && (props.unAccessible || props.noAccessible)) ||
   // render default exception
-  ((!props.route || props.route.unaccessible) && (
+  ((!props.route || props.route?.unaccessible) && (
     <Result
       status={props.route ? '403' : '404'}
       title={props.route ? '403' : '404'}

package/dist/tailwindcss.js

@@ -41,6 +41,9 @@ var tailwindcss_default = (api) => {
     const generatedPath = (0, import_path.join)(api.paths.absTmpPath, outputPath);
     const binPath = getTailwindBinPath({ cwd: api.cwd });
     const configPath = (0, import_path.join)(process.env.APP_ROOT || api.cwd, "tailwind.config.js");
+    if (process.env.IS_UMI_BUILD_WORKER) {
+      return;
+    }
     return new Promise((resolve) => {
       tailwind = (0, import_plugin_utils.crossSpawn)(`${binPath}`, [
         "-c",

package/dist/unocss.js

@@ -40,6 +40,8 @@ var unocss_default = (api) => {
   });
   const outputPath = "uno.css";
   api.onBeforeCompiler(() => {
+    if (process.env.IS_UMI_BUILD_WORKER)
+      return;
     if (!(0, import_fs.existsSync)((0, import_path.join)(api.paths.cwd, "unocss.config.ts")))
       api.logger.warn("\u8BF7\u5728\u9879\u76EE\u76EE\u5F55\u4E2D\u6DFB\u52A0 unocss.config.ts \u6587\u4EF6\uFF0C\u5E76\u914D\u7F6E\u9700\u8981\u7684 unocss presets\uFF0C\u5426\u5219\u63D2\u4EF6\u5C06\u6CA1\u6709\u6548\u679C\uFF01");
     const generatedPath = (0, import_path.join)(api.paths.absTmpPath, outputPath);

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

@@ -12,7 +12,7 @@ export function getMicroAppRouteComponent(opts: {
   const { base, masterHistoryType, appName, routeProps, routePath } = opts;
   const RouteComponent = () => {
     const match = useMatch(routePath);
-    const url = match.pathnameBase;
+    const url = match ? match.pathnameBase : '';
     // 默认取静态配置的 base
     let umiConfigBase = base === '/' ? '' : base;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.0.26",
+  "version": "4.0.28",
   "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.26",
+    "@umijs/bundler-utils": "4.0.28",
     "@umijs/valtio": "^1.0.0",
     "antd-dayjs-webpack-plugin": "^1.0.6",
     "axios": "^0.27.2",
@@ -38,6 +38,7 @@
     "dva-loading": "^3.0.22",
     "event-emitter": "~0.3.5",
     "fast-deep-equal": "3.1.3",
+    "intl": "1.2.5",
     "lodash": "^4.17.21",
     "moment": "^2.29.3",
     "qiankun": "^2.7.0",
@@ -47,7 +48,7 @@
     "warning": "^4.0.3"
   },
   "devDependencies": {
-    "umi": "4.0.26"
+    "umi": "4.0.28"
   },
   "publishConfig": {
     "access": "public"