@umijs/plugins 4.0.1 → 4.0.4

package/dist/layout.js

@@ -91,6 +91,7 @@ exports.default = (api) => {
             path: 'Layout.tsx',
             content: `
 import { Link, useLocation, useNavigate, Outlet, useAppData, useRouteData, matchRoutes } from 'umi';
+import type { IRoute } from 'umi';
 import React, { useMemo } from 'react';
 import {
   ProLayout,
@@ -113,6 +114,28 @@ import { useIntl } from '@@/plugin-locale';
     `.trim()
                 : ''}
 
+// 过滤出需要显示的路由, 这里的filterFn 指 不希望显示的层级
+const filterRoutes = (routes: IRoute[], filterFn: (route: IRoute) => boolean) => {
+  if (routes.length === 0) {
+    return []
+  }
+
+  let newRoutes = []
+  for (const route of routes) {
+    if (filterFn(route)) {
+      if (Array.isArray(route.routes)) {
+        newRoutes.push(...filterRoutes(route.routes, filterFn))
+      }
+    } else {
+      newRoutes.push(route);
+      if (Array.isArray(route.routes)) {
+        route.routes = filterRoutes(route.routes, filterFn);
+      }
+    }
+  }
+
+  return newRoutes;
+}
 
 export default (props: any) => {
   const location = useLocation();
@@ -137,8 +160,13 @@ const { formatMessage } = useIntl();
       ...initialInfo
     },
   });
+
   const matchedRoute = useMemo(() => matchRoutes(clientRoutes, location.pathname).pop()?.route, [location.pathname]);
-  const [route] = useAccessMarkedRoutes(clientRoutes.filter(({ id }) => id === 'ant-design-pro-layout'));
+  const newRoutes = filterRoutes(clientRoutes.filter(route => route.id === 'ant-design-pro-layout'), (route) => {
+    return !!route.isLayout && route.id !== 'ant-design-pro-layout';
+  })
+  const [route] = useAccessMarkedRoutes(newRoutes);
+
   return (
     <ProLayout
       route={route}

package/dist/locale.js

@@ -182,7 +182,7 @@ exports.default = (api) => {
         api.writeTmpFile({
             path: 'index.ts',
             content: `
-export { setLocale, getLocale, useIntl, injectIntl, formatMessage, FormattedMessage } from './localeExports.ts';
+export { setLocale, getLocale, getIntl, useIntl, injectIntl, formatMessage, FormattedMessage } from './localeExports.ts';
 export { SelectLang } from './SelectLang.tsx';
 `,
         });

package/dist/qiankun/master.js

@@ -97,6 +97,7 @@ export const setMasterOptions = (newOpts) => options = ({ ...options, ...newOpts
             'getMicroAppRouteComponent.tsx.tpl',
             'ErrorBoundary.tsx',
             'MicroApp.tsx',
+            'MicroAppWithMemoHistory.tsx',
         ].forEach((file) => {
             if (file.endsWith('.tpl')) {
                 api.writeTmpFile({
@@ -129,6 +130,7 @@ export const setMasterOptions = (newOpts) => options = ({ ...options, ...newOpts
             path: 'index.ts',
             content: `
 export { MicroApp } from './MicroApp';
+export { MicroAppWithMemoHistory } from './MicroAppWithMemoHistory';
       `,
         });
     });

package/dist/tailwindcss.js

@@ -18,18 +18,30 @@ exports.default = (api) => {
         const inputPath = (0, path_1.join)(api.cwd, 'tailwind.css');
         const generatedPath = (0, path_1.join)(api.paths.absTmpPath, outputPath);
         const binPath = (0, path_1.join)(api.cwd, 'node_modules/.bin/tailwind');
-        /** 透过子进程建立 tailwindcss 服务，将生成的 css 写入 generatedPath */
-        tailwind = (0, plugin_utils_1.crossSpawn)(`${binPath}`, [
-            '-i',
-            inputPath,
-            '-o',
-            generatedPath,
-            api.env === 'development' ? '--watch' : '',
-        ], {
-            stdio: 'inherit',
-        });
-        tailwind.on('error', (m) => {
-            api.logger.error('tailwindcss service encounter an error: ' + m);
+        return new Promise((resolve) => {
+            /** 透过子进程建立 tailwindcss 服务，将生成的 css 写入 generatedPath */
+            tailwind = (0, plugin_utils_1.crossSpawn)(`${binPath}`, [
+                '-i',
+                inputPath,
+                '-o',
+                generatedPath,
+                api.env === 'development' ? '--watch' : '',
+            ], {
+                stdio: 'inherit',
+            });
+            tailwind.on('error', (m) => {
+                api.logger.error('tailwindcss service encounter an error: ' + m);
+            });
+            if (api.env === 'production') {
+                tailwind.on('exit', () => {
+                    api.logger.info('tailwindcss service exited');
+                    resolve();
+                });
+            }
+            else {
+                api.logger.info('tailwindcss service started');
+                resolve();
+            }
         });
     });
     /** 将生成的 css 文件加入到 import 中 */

package/dist/utils/modelUtils.js

@@ -128,7 +128,7 @@ class ModelUtils {
         // check duplicate
         const namespaces = models.map((model) => model.namespace);
         if (new Set(namespaces).size !== namespaces.length) {
-            throw new Error(`Duplicate namespace in models: ${namespaces.join(', ')}`);
+            throw new Error(`Duplicate namespace in models: ${namespaces.sort().join(', ')}`);
         }
         // sort models by deps
         if (opts.sort) {

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.0.1",
+  "version": "4.0.4",
   "description": "@umijs/plugins",
-  "homepage": "https://github.com/umijs/umi-next/tree/master/packages/plugins#readme",
-  "bugs": "https://github.com/umijs/umi-next/issues",
+  "homepage": "https://github.com/umijs/umi/tree/master/packages/plugins#readme",
+  "bugs": "https://github.com/umijs/umi/issues",
   "repository": {
     "type": "git",
-    "url": "https://github.com/umijs/umi-next"
+    "url": "https://github.com/umijs/umi"
   },
   "license": "MIT",
   "main": "dist/index.js",
@@ -18,14 +18,14 @@
   "scripts": {
     "build": "pnpm tsc",
     "build:deps": "umi-scripts bundleDeps",
-    "dev": "pnpm build -- --watch",
+    "dev": "pnpm build --watch",
     "test": "umi-scripts jest-turbo"
   },
   "dependencies": {
     "@ahooksjs/use-request": "^2.0.0",
     "@ant-design/icons": "^4.7.0",
     "@ant-design/pro-layout": "^7.0.1-beta.20",
-    "@umijs/bundler-utils": "4.0.1",
+    "@umijs/bundler-utils": "4.0.4",
     "antd-dayjs-webpack-plugin": "^1.0.6",
     "axios": "^0.27.2",
     "babel-plugin-import": "^1.13.5",
@@ -44,7 +44,7 @@
     "warning": "^4.0.3"
   },
   "devDependencies": {
-    "umi": "4.0.1"
+    "umi": "4.0.4"
   },
   "publishConfig": {
     "access": "public"