@umijs/plugins 4.0.0 → 4.0.3

package/dist/dva.js

@@ -83,6 +83,8 @@ import React, { useRef } from 'react';
 import { history, ApplyPluginsType, useAppData } from 'umi';
 import { models } from './models';
 
+let dvaApp: any;
+
 export function RootContainer(props: any) {
   const { pluginManager } = useAppData();
   const app = useRef<any>();
@@ -107,10 +109,14 @@ export function RootContainer(props: any) {
         },
       },
     );
+    dvaApp = app.current;
     app.current.use(createLoading());
     ${((_b = api.config.dva) === null || _b === void 0 ? void 0 : _b.immer) ? `app.current.use(dvaImmer());` : ''}
     ${((_d = (_c = api.config.dva) === null || _c === void 0 ? void 0 : _c.immer) === null || _d === void 0 ? void 0 : _d.enableES5) ? `enableES5();` : ''}
     ${((_f = (_e = api.config.dva) === null || _e === void 0 ? void 0 : _e.immer) === null || _f === void 0 ? void 0 : _f.enableAllPlugins) ? `enableAllPlugins();` : ''}
+    (runtimeDva.plugins || []).forEach((p) => {
+      app.current.use(p);
+    });
     for (const id of Object.keys(models)) {
       app.current.model({
         namespace: models[id].namespace,
@@ -121,6 +127,10 @@ export function RootContainer(props: any) {
   }
   return <Provider store={app.current!._store}>{props.children}</Provider>;
 }
+
+export function getDvaApp() {
+  return dvaApp;
+}
       `,
             context: {},
         });
@@ -140,7 +150,9 @@ export function dataflowProvider(container, opts) {
         api.writeTmpFile({
             path: 'index.ts',
             content: `
-export { connect, useDispatch, useStore, useSelector } from 'dva';`,
+export { connect, useDispatch, useStore, useSelector } from 'dva';
+export { getDvaApp } from './dva';
+`,
         });
     });
     api.addTmpGenerateWatcherPaths(() => {

package/dist/initial-state.js

@@ -80,14 +80,19 @@ export default () => {
     }
   }, []);
 
-  const setInitialState = useCallback(async (initialState) => {
-    setState((s) => {
-      if (typeof initialState === 'function') {
-        return { ...s, initialState: initialState(s.initialState), loading: false };
-      }
-      return { ...s, initialState, loading: false };
-    });
-  }, []);
+  const setInitialState = useCallback(
+    async (
+      initialState: InitialStateType | ((initialState: InitialStateType) => InitialStateType),
+    ) => {
+      setState((s) => {
+        if (typeof initialState === 'function') {
+          return { ...s, initialState: initialState(s.initialState), loading: false };
+        }
+        return { ...s, initialState, loading: false };
+      });
+    },
+    [],
+  );
 
   useEffect(() => {
     refresh();

package/dist/layout.js

@@ -57,6 +57,13 @@ exports.default = (api) => {
             (0, fs_1.existsSync)((0, path_1.join)(api.cwd, 'node_modules', pkgHasDep, 'package.json'))) {
             return (0, path_1.join)(api.cwd, 'node_modules', pkgHasDep);
         }
+        const cwd = process.cwd();
+        // support APP_ROOT
+        if (pkgHasDep &&
+            api.cwd !== cwd &&
+            (0, fs_1.existsSync)((0, path_1.join)(cwd, 'node_modules', pkgHasDep, 'package.json'))) {
+            return (0, path_1.join)(cwd, 'node_modules', pkgHasDep);
+        }
         // 如果项目中没有去找插件以来的
         return (0, path_1.dirname)(require.resolve('@ant-design/pro-layout/package.json'));
     };
@@ -84,8 +91,9 @@ exports.default = (api) => {
             path: 'Layout.tsx',
             content: `
 import { Link, useLocation, useNavigate, Outlet, useAppData, useRouteData, matchRoutes } from 'umi';
-import { useMemo } from 'react';
-import  {
+import type { IRoute } from 'umi';
+import React, { useMemo } from 'react';
+import {
   ProLayout,
 } from "${pkgPath || '@ant-design/pro-layout'}";
 import './Layout.less';
@@ -106,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();
@@ -130,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}
@@ -203,25 +238,30 @@ const { formatMessage } = useIntl();
 }
       `,
         });
+        api.writeTmpFile({
+            path: 'index.ts',
+            content: `export type TempType = string`,
+        });
         // 写入类型, RunTimeLayoutConfig 是 app.tsx 中 layout 配置的类型
         // 对于动态 layout 配置很有用
         api.writeTmpFile({
-            path: 'index.ts',
+            path: 'types.d.ts',
             content: `
     import type { ProLayoutProps } from "${pkgPath || '@ant-design/pro-layout'}";
     ${hasInitialStatePlugin
-                ? `import { Models } from '@@/plugin-model/useModel';
-           type InitDataType = Models<'@@initialState'>;
+                ? `import type InitialStateType from '@@/plugin-initialState/@@initialState';
+           type InitDataType = ReturnType<typeof InitialStateType>;
         `
                 : 'type InitDataType = any;'}
-    
+
     export type RunTimeLayoutConfig = (
       initData: InitDataType,
-    ) => BasicLayoutProps & {
+    ) => ProLayoutProps & {
       childrenRender?: (dom: JSX.Element, props: ProLayoutProps) => React.ReactNode,
       unAccessible?: JSX.Element,
       noFound?: JSX.Element,
-    };`,
+    };
+    `,
         });
         const iconsMap = Object.keys(api.appData.routes).reduce((memo, id) => {
             const { icon } = api.appData.routes[id];

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/request.js

@@ -272,6 +272,7 @@ export type {
   AxiosInstance,
   AxiosRequestConfig,
   AxiosResponse,
+  IResponseInterceptor as ResponseInterceptor,
   IRequestOptions as RequestOptions,
   IRequest as Request,
 };
@@ -296,7 +297,12 @@ export type {
         api.writeTmpFile({
             path: 'types.d.ts',
             content: `
-export type { RequestConfig } from './request';
+export type { 
+  RequestConfig,  
+  AxiosInstance,
+  AxiosRequestConfig,
+  AxiosResponse, 
+  ResponseInterceptor } from './request';
 `,
         });
         api.writeTmpFile({

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.0",
+  "version": "4.0.3",
   "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.17",
-    "@umijs/bundler-utils": "4.0.0",
+    "@ant-design/pro-layout": "^7.0.1-beta.20",
+    "@umijs/bundler-utils": "4.0.3",
     "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.0"
+    "umi": "4.0.3"
   },
   "publishConfig": {
     "access": "public"