@umijs/plugins 4.0.0-rc.15 → 4.0.0-rc.16

package/dist/antd.js

@@ -30,7 +30,12 @@ exports.default = (api) => {
                 });
             },
         },
-        enableBy: api.EnableBy.config,
+        enableBy({ userConfig }) {
+            // 由于本插件有 api.modifyConfig 的调用，以及 Umi 框架的限制
+            // 在其他插件中通过 api.modifyDefaultConfig 设置 antd 并不能让 api.modifyConfig 生效
+            // 所以这里通过环境变量来判断是否启用
+            return process.env.UMI_PLUGIN_ANTD_ENABLE || userConfig.antd;
+        },
     });
     function checkPkgPath() {
         if (!pkgPath) {
@@ -48,6 +53,12 @@ exports.default = (api) => {
     });
     api.modifyConfig((memo) => {
         checkPkgPath();
+        const antd = memo.antd || {};
+        // defaultConfig 的取值在 config 之后，所以改用环境变量传默认值
+        if (process.env.UMI_PLUGIN_ANTD_ENABLE) {
+            const { defaultConfig } = JSON.parse(process.env.UMI_PLUGIN_ANTD_ENABLE);
+            Object.assign(antd, defaultConfig);
+        }
         // antd import
         memo.alias.antd = pkgPath;
         // moment > dayjs
@@ -62,9 +73,7 @@ exports.default = (api) => {
                 ...memo.theme,
             };
         }
-        return memo;
-    });
-    api.modifyConfig((memo) => {
+        // antd theme
         memo.theme = {
             'root-entry-name': 'default',
             ...memo.theme,

package/dist/dva.js

@@ -180,7 +180,6 @@ function getModelUtil(api) {
 exports.getModelUtil = getModelUtil;
 function getAllModels(api) {
     return getModelUtil(api).getAllModels({
-        extraModelsPre: [],
         extraModels: [...(api.config.dva.extraModels || [])],
     });
 }

package/dist/initial-state.js

@@ -13,7 +13,7 @@ exports.default = (api) => {
         enableBy: api.EnableBy.config,
     });
     api.register({
-        key: 'addExtraModelsPre',
+        key: 'addExtraModels',
         fn: () => [(0, withTmpPath_1.withTmpPath)({ api, path: '@@initialState.ts' })],
     });
     api.addRuntimePluginKey(() => ['getInitialState']);

package/dist/layout.js

@@ -137,7 +137,8 @@ const { formatMessage } = useIntl();
         }
         if (menuItemProps.path && location.pathname !== menuItemProps.path) {
           return (
-            <Link to={menuItemProps.path} target={menuItemProps.target}>
+            // handle wildcard route path, for example /slave/* from qiankun
+            <Link to={menuItemProps.path.replace('/*', '')} target={menuItemProps.target}>
               {defaultDom}
             </Link>
           );

package/dist/model.js

@@ -40,17 +40,8 @@ exports.default = (api) => {
         },
         enableBy: api.EnableBy.config,
     });
-    api.modifyAppData(async (memo) => {
+    api.onGenerateFiles(async () => {
         const models = await getAllModels(api);
-        memo.pluginModel = {
-            models,
-        };
-        return memo;
-    });
-    api.onGenerateFiles(async (args) => {
-        const models = args.isFirstTime
-            ? api.appData.pluginModel.models
-            : await getAllModels(api);
         // model.ts
         api.writeTmpFile({
             path: 'model.ts',
@@ -94,11 +85,6 @@ export function dataflowProvider(container, opts) {
     });
 };
 async function getAllModels(api) {
-    const extraModelsPre = await api.applyPlugins({
-        key: 'addExtraModelsPre',
-        type: api.ApplyPluginsType.add,
-        initialValue: [],
-    });
     const extraModels = await api.applyPlugins({
         key: 'addExtraModels',
         type: api.ApplyPluginsType.add,
@@ -109,10 +95,7 @@ async function getAllModels(api) {
             return t.isArrowFunctionExpression(node) || t.isFunctionDeclaration(node);
         },
     }).getAllModels({
-        extraModelsPre: [
-            ...extraModelsPre,
-            ...(api.config.model.extraModelsPre || []),
-        ],
+        sort: {},
         extraModels: [...extraModels, ...(api.config.model.extraModels || [])],
     });
 }

package/dist/qiankun/master.js

@@ -48,7 +48,7 @@ exports.default = (api) => {
                 const normalizedRouteProps = JSON.stringify(routeProps).replace(/"/g, "'");
                 route.file = `(async () => {
           const { getMicroAppRouteComponent } = await import('@@/plugin-qiankun-master/getMicroAppRouteComponent');
-          return getMicroAppRouteComponent({ appName: '${appName}', base: '${base}', masterHistoryType: '${masterHistoryType}', routeProps: ${normalizedRouteProps} })
+          return getMicroAppRouteComponent({ appName: '${appName}', base: '${base}', routePath: '${route.path}', masterHistoryType: '${masterHistoryType}', routeProps: ${normalizedRouteProps} })
         })()`;
             }
         });
@@ -113,13 +113,16 @@ export const setMasterOptions = (newOpts) => options = ({ ...options, ...newOpts
                 });
             }
             else {
+                let content = getFileContent(file);
+                if (!api.config.qiankun.externalQiankun) {
+                    content = content.replace(/from 'qiankun'/g, `from '${(0, plugin_utils_1.winPath)((0, path_1.dirname)(require.resolve('qiankun/package')))}'`);
+                }
                 api.writeTmpFile({
                     path: file.replace(/\.tpl$/, ''),
-                    content: getFileContent(file)
+                    content: content
                         .replace('__USE_MODEL__', api.isPluginEnable('model')
                         ? `import { useModel } from '@@/plugin-model'`
                         : `const useModel = null;`)
-                        .replace(/from 'qiankun'/g, `from '${(0, plugin_utils_1.winPath)((0, path_1.dirname)(require.resolve('qiankun/package')))}'`)
                         .replace(/from 'lodash\//g, `from '${(0, plugin_utils_1.winPath)((0, path_1.dirname)(require.resolve('lodash/package')))}/`),
                 });
             }

package/dist/qiankun/slave.js

@@ -30,7 +30,10 @@ exports.default = (api) => {
         key: 'addExtraModels',
         fn() {
             return [
-                `@@/plugin-qiankun-slave/qiankunModel#{"namespace":"${constants_1.qiankunStateFromMasterModelNamespace}"}`,
+                (0, withTmpPath_1.withTmpPath)({
+                    api,
+                    path: `qiankunModel.ts#{"namespace":"${constants_1.qiankunStateFromMasterModelNamespace}"}`,
+                }),
             ];
         },
     });
@@ -123,36 +126,39 @@ if (!window.__POWERED_BY_QIANKUN__) {
     function getFileContent(file) {
         return (0, fs_1.readFileSync)((0, path_1.join)(__dirname, '../../libs/qiankun/slave', file), 'utf-8');
     }
-    api.onGenerateFiles(() => {
-        //     api.writeTmpFile({
-        //       path: 'slaveOptions.ts',
-        //       content: `
-        // let options = ${JSON.stringify((api.config.qiankun || {}).slave || {})};
-        // export const getSlaveOptions = () => options;
-        // export const setSlaveOptions = (newOpts) => options = ({ ...options, ...newOpts });
-        //       `,
-        //     });
-        [
-            'qiankunModel.ts',
-            'connectMaster.tsx',
-            'slaveRuntimePlugin.ts',
-            'lifecycles.ts',
-        ].forEach((file) => {
-            api.writeTmpFile({
-                path: file.replace(/\.tpl$/, ''),
-                content: getFileContent(file)
-                    .replace('__USE_MODEL__', api.isPluginEnable('model')
-                    ? `import { useModel } from '@@/plugin-model'`
-                    : `const useModel = null;`)
-                    .replace(/from 'qiankun'/g, `from '${(0, plugin_utils_1.winPath)((0, path_1.dirname)(require.resolve('qiankun/package')))}'`)
-                    .replace(/from 'lodash\//g, `from '${(0, plugin_utils_1.winPath)((0, path_1.dirname)(require.resolve('lodash/package')))}/`),
+    api.onGenerateFiles({
+        fn() {
+            //     api.writeTmpFile({
+            //       path: 'slaveOptions.ts',
+            //       content: `
+            // let options = ${JSON.stringify((api.config.qiankun || {}).slave || {})};
+            // export const getSlaveOptions = () => options;
+            // export const setSlaveOptions = (newOpts) => options = ({ ...options, ...newOpts });
+            //       `,
+            //     });
+            [
+                'qiankunModel.ts',
+                'connectMaster.tsx',
+                'slaveRuntimePlugin.ts',
+                'lifecycles.ts',
+            ].forEach((file) => {
+                api.writeTmpFile({
+                    path: file.replace(/\.tpl$/, ''),
+                    content: getFileContent(file)
+                        .replace('__USE_MODEL__', api.isPluginEnable('model')
+                        ? `import { useModel } from '@@/plugin-model'`
+                        : `const useModel = null;`)
+                        .replace(/from 'qiankun'/g, `from '${(0, plugin_utils_1.winPath)((0, path_1.dirname)(require.resolve('qiankun/package')))}'`)
+                        .replace(/from 'lodash\//g, `from '${(0, plugin_utils_1.winPath)((0, path_1.dirname)(require.resolve('lodash/package')))}/`),
+                });
             });
-        });
-        api.writeTmpFile({
-            path: 'index.ts',
-            content: `
+            api.writeTmpFile({
+                path: 'index.ts',
+                content: `
 export { connectMaster } from './connectMaster';
       `,
-        });
+            });
+        },
+        before: 'model',
     });
 };

package/dist/qiankun.js

@@ -7,6 +7,7 @@ exports.default = (api) => {
                 return joi.object().keys({
                     slave: joi.object(),
                     master: joi.object(),
+                    externalQiankun: joi.boolean(),
                 });
             },
         },

package/dist/request.js

@@ -160,12 +160,12 @@ const getRequestInstance = (): AxiosInstance => {
   const config = getConfig();
   requestInstance = axios.create(config);
 
-  config?.requestInterceptors?.forEach((interceptor) => { 
+  config?.requestInterceptors?.forEach((interceptor) => {
     if(interceptor instanceof Array){
       requestInstance.interceptors.request.use((config) => {
         const { url } = config;
         if(interceptor[0].length === 2){
-          const { url: newUrl, options } = interceptor[0](url, config);  
+          const { url: newUrl, options } = interceptor[0](url, config);
           return { ...options, url: newUrl };
         }
         return interceptor[0](config);
@@ -182,16 +182,16 @@ const getRequestInstance = (): AxiosInstance => {
     }
   });
 
-  config?.responseInterceptors?.forEach((interceptor) => { 
-    interceptor instanceof Array ? 
+  config?.responseInterceptors?.forEach((interceptor) => {
+    interceptor instanceof Array ?
       requestInstance.interceptors.response.use(interceptor[0], interceptor[1]):
        requestInstance.interceptors.response.use(interceptor);
   });
 
   // 当响应的数据 success 是 false 的时候，抛出 error 以供 errorHandler 处理。
-  requestInstance.interceptors.response.use((response)=>{
+  requestInstance.interceptors.response.use((response) => {
     const { data } = response;
-    if(config?.errorConfig?.errorThrower){
+    if(data?.success === false && config?.errorConfig?.errorThrower){
       config.errorConfig.errorThrower(data);
     }
     return response;
@@ -199,16 +199,16 @@ const getRequestInstance = (): AxiosInstance => {
   return requestInstance;
 };
 
-const request: IRequest = (url: string, opts: any = { method: 'GET' }) => {   
+const request: IRequest = (url: string, opts: any = { method: 'GET' }) => {
   const requestInstance = getRequestInstance();
   const config = getConfig();
   const { getResponse = false, requestInterceptors, responseInterceptors } = opts;
-  const requestInterceptorsToEject = requestInterceptors?.map((interceptor) => { 
+  const requestInterceptorsToEject = requestInterceptors?.map((interceptor) => {
     if(interceptor instanceof Array){
       return requestInstance.interceptors.request.use((config) => {
         const { url } = config;
         if(interceptor[0].length === 2){
-          const { url: newUrl, options } = interceptor[0](url, config);  
+          const { url: newUrl, options } = interceptor[0](url, config);
           return { ...options, url: newUrl };
         }
         return interceptor[0](config);
@@ -224,8 +224,8 @@ const request: IRequest = (url: string, opts: any = { method: 'GET' }) => {
       })
     }
     });
-  const responseInterceptorsToEject = responseInterceptors?.map((interceptor) => { 
-    return interceptor instanceof Array ? 
+  const responseInterceptorsToEject = responseInterceptors?.map((interceptor) => {
+    return interceptor instanceof Array ?
       requestInstance.interceptors.response.use(interceptor[0], interceptor[1]):
        requestInstance.interceptors.response.use(interceptor);
     });

package/dist/utils/modelUtils.d.ts

@@ -12,7 +12,9 @@ export declare class Model {
     namespace: string;
     id: string;
     exportName: string;
-    constructor(file: string, id: number);
+    deps: string[];
+    constructor(file: string, sort: {} | undefined, id: number);
+    findDeps(sort: object): string[];
 }
 export declare class ModelUtils {
     api: IApi;
@@ -20,9 +22,10 @@ export declare class ModelUtils {
     count: number;
     constructor(api: IApi | null, opts: IOpts);
     getAllModels(opts: {
-        extraModelsPre: string[];
+        sort?: object;
         extraModels: string[];
     }): Model[];
+    getSortedNamespaces(models: Model[]): string[];
     getModels(opts: {
         base: string;
         pattern?: string;

package/dist/utils/modelUtils.js

@@ -29,13 +29,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ModelUtils = exports.Model = void 0;
 const parser = __importStar(require("@umijs/bundler-utils/compiled/babel/parser"));
 const traverse_1 = __importDefault(require("@umijs/bundler-utils/compiled/babel/traverse"));
+const t = __importStar(require("@umijs/bundler-utils/compiled/babel/types"));
 const esbuild_1 = require("@umijs/bundler-utils/compiled/esbuild");
 const fs_1 = require("fs");
 const path_1 = require("path");
 const plugin_utils_1 = require("umi/plugin-utils");
 const astUtils_1 = require("./astUtils");
 class Model {
-    constructor(file, id) {
+    constructor(file, sort, id) {
         let namespace;
         let exportName;
         const [_file, meta] = file.split('#');
@@ -48,6 +49,36 @@ class Model {
         this.id = `model_${id}`;
         this.namespace = namespace || (0, path_1.basename)(file, (0, path_1.extname)(file));
         this.exportName = exportName || 'default';
+        this.deps = sort ? this.findDeps(sort) : [];
+    }
+    findDeps(sort) {
+        const content = (0, fs_1.readFileSync)(this.file, 'utf-8');
+        // transform with esbuild first
+        // to reduce unexpected ast problem
+        const loader = (0, path_1.extname)(this.file).slice(1);
+        const result = (0, esbuild_1.transformSync)(content, {
+            loader,
+            sourcemap: false,
+            minify: false,
+        });
+        // transform with babel
+        const deps = new Set();
+        const ast = parser.parse(result.code, {
+            sourceType: 'module',
+            sourceFilename: this.file,
+            plugins: [],
+        });
+        // TODO: use sort
+        sort;
+        (0, traverse_1.default)(ast, {
+            CallExpression: (path) => {
+                if (t.isIdentifier(path.node.callee, { name: 'useModel' }) &&
+                    t.isStringLiteral(path.node.arguments[0])) {
+                    deps.add(path.node.arguments[0].value);
+                }
+            },
+        });
+        return [...deps];
     }
 }
 exports.Model = Model;
@@ -61,8 +92,7 @@ class ModelUtils {
     getAllModels(opts) {
         // reset count
         this.count = 1;
-        return [
-            ...opts.extraModelsPre,
+        const models = [
             ...this.getModels({
                 base: (0, path_1.join)(this.api.paths.absSrcPath, 'models'),
                 pattern: '**/*.{ts,tsx,js,jsx}',
@@ -77,8 +107,59 @@ class ModelUtils {
             }),
             ...opts.extraModels,
         ].map((file) => {
-            return new Model(file, this.count++);
+            return new Model(file, opts.sort, this.count++);
+        });
+        // 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(', ')}`);
+        }
+        // sort models by deps
+        if (opts.sort) {
+            const namespaces = this.getSortedNamespaces(models);
+            models.sort((a, b) => namespaces.indexOf(a.namespace) - namespaces.indexOf(b.namespace));
+        }
+        return models;
+    }
+    getSortedNamespaces(models) {
+        let final = [];
+        models.forEach((model, index) => {
+            const { deps, namespace } = model;
+            if (deps && deps.length) {
+                const itemGroup = [...deps, namespace];
+                const cannotUse = [namespace];
+                for (let i = 0; i <= index; i += 1) {
+                    if (models[i].deps.filter((v) => cannotUse.includes(v)).length) {
+                        if (!cannotUse.includes(models[i].namespace)) {
+                            cannotUse.push(models[i].namespace);
+                            i = -1;
+                        }
+                    }
+                }
+                const errorList = deps.filter((v) => cannotUse.includes(v));
+                if (errorList.length) {
+                    throw Error(`Circular dependencies: ${namespace} can't use ${errorList.join(', ')}`);
+                }
+                const intersection = final.filter((v) => itemGroup.includes(v));
+                if (intersection.length) {
+                    // first intersection
+                    const finalIndex = final.indexOf(intersection[0]);
+                    // replace with groupItem
+                    final = final
+                        .slice(0, finalIndex)
+                        .concat(itemGroup)
+                        .concat(final.slice(finalIndex + 1));
+                }
+                else {
+                    final.push(...itemGroup);
+                }
+            }
+            if (!final.includes(namespace)) {
+                // first occurrence append to the end
+                final.push(namespace);
+            }
         });
+        return [...new Set(final)];
     }
     getModels(opts) {
         return plugin_utils_1.glob

package/libs/qiankun/master/common.ts

@@ -5,7 +5,7 @@
  * @since 2019-06-20
  */
 
-import { ReactComponentElement } from 'react';
+import React, { ReactComponentElement } from 'react';
 import type { IRouteProps } from 'umi';
 
 export const defaultMountContainerId = 'root-subapp';
@@ -48,6 +48,7 @@ export function patchMicroAppRoute(
   getMicroAppRouteComponent: (opts: {
     appName: string;
     base: string;
+    routePath: string;
     masterHistoryType: string;
     routeProps?: any;
   }) => string | ReactComponentElement<any>,
@@ -63,9 +64,9 @@ export function patchMicroAppRoute(
   const microAppProps =
     route[`${routeBindingAlias}Props`] || route.microAppProps || {};
   if (microAppName) {
-    if (route.routes?.length) {
-      const childrenRouteHasComponent = route.routes.some(
-        (r: any) => r.component,
+    if (route.children?.length) {
+      const childrenRouteHasComponent = route.children.some(
+        (r: any) => r.element,
       );
       if (childrenRouteHasComponent) {
         throw new Error(
@@ -74,7 +75,10 @@ export function patchMicroAppRoute(
       }
     }
 
-    route.exact = false;
+    // 自动追加通配符，匹配子应用的路由
+    if (!route.path.endsWith('/*')) {
+      route.path = route.path.replace(/\/?$/, '/*');
+    }
 
     const { settings = {}, ...componentProps } = microAppProps;
     const routeProps = {
@@ -85,10 +89,11 @@ export function patchMicroAppRoute(
     const opts = {
       appName: microAppName,
       base,
+      routePath: route.path,
       masterHistoryType,
       routeProps,
     };
-    route.component = getMicroAppRouteComponent(opts);
+    route.element = React.createElement(getMicroAppRouteComponent(opts), null);
   }
 }
 
@@ -100,8 +105,8 @@ const recursiveSearch = (
     if (routes[i].path === path) {
       return routes[i];
     }
-    if (routes[i].routes && routes[i].routes?.length) {
-      const found = recursiveSearch(routes[i].routes || [], path);
+    if (routes[i].children && routes[i].children?.length) {
+      const found = recursiveSearch(routes[i].children || [], path);
       if (found) {
         return found;
       }
@@ -123,8 +128,8 @@ export function insertRoute(routes: IRouteProps[], microAppRoute: IRouteProps) {
       );
     }
     found.exact = false;
-    found.routes = found.routes || [];
-    found.routes.push(microAppRoute);
+    found.children = found.children || [];
+    found.children.push(microAppRoute);
   } else {
     throw new Error(
       `[plugin-qiankun]: path "${microAppRoute.insert}" not found`,

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

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

package/libs/qiankun/master/masterRuntimePlugin.tsx

@@ -34,10 +34,10 @@ function patchMicroAppRouteComponent(routes: any[]) {
     const rootRoute = routes.find((route) => route.path === '/');
     if (rootRoute) {
       // 如果根路由是叶子节点，则直接返回其父节点
-      if (!rootRoute.routes) {
+      if (!rootRoute.children) {
         return routes;
       }
-      return getRootRoutes(rootRoute.routes);
+      return getRootRoutes(rootRoute.children);
     }
     return routes;
   };
@@ -50,11 +50,12 @@ function patchMicroAppRouteComponent(routes: any[]) {
       const patchRoute = (route: any) => {
         patchMicroAppRoute(route, getMicroAppRouteComponent, {
           base,
+          routePath: route.path,
           masterHistoryType,
           routeBindingAlias,
         });
-        if (route.routes?.length) {
-          route.routes.forEach(patchRoute);
+        if (route.children?.length) {
+          route.children.forEach(patchRoute);
         }
       };
 
@@ -123,7 +124,7 @@ export async function render(oldRender: typeof noop) {
   }
 }
 
-export function patchRoutes({ routes }: { routes: any[] }) {
+export function patchClientRoutes({ routes }: { routes: any[] }) {
   if (microAppRuntimeRoutes) {
     patchMicroAppRouteComponent(routes);
   }

package/libs/qiankun/slave/lifecycles.ts

@@ -119,6 +119,12 @@ export function genMount(mountElementId: string) {
       defer.resolve();
     }
 
+    // 如果需要手动控制 loading，通过主应用配置 props.autoSetLoading false 可以关闭
+    // 考虑到 react 18 之后 callback 不再准
+    // 所以在这里直接返回，而不使用 ReactDOM.render 的第三个参数
+    if (props.autoSetLoading && typeof props.setLoading === 'function') {
+      props.setLoading(false);
+    }
     hasMountedAtLeastOnce = true;
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.0.0-rc.15",
+  "version": "4.0.0-rc.16",
   "description": "@umijs/plugins",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/plugins#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
@@ -24,12 +24,12 @@
   "dependencies": {
     "@ahooksjs/use-request": "^2.0.0",
     "@ant-design/icons": "^4.7.0",
-    "@ant-design/pro-layout": "^6.35.1",
-    "@umijs/bundler-utils": "4.0.0-rc.15",
+    "@ant-design/pro-layout": "^6.38.0",
+    "@umijs/bundler-utils": "4.0.0-rc.16",
     "antd-dayjs-webpack-plugin": "^1.0.6",
-    "axios": "^0.26.1",
+    "axios": "^0.27.2",
     "babel-plugin-import": "^1.13.3",
-    "dayjs": "^1.11.0",
+    "dayjs": "^1.11.2",
     "dva-core": "^2.0.4",
     "dva-immer": "^1.0.0",
     "dva-loading": "^3.0.22",
@@ -39,12 +39,12 @@
     "moment": "^2.29.3",
     "qiankun": "^2.7.0",
     "react-intl": "3.12.1",
-    "react-redux": "^8.0.0",
+    "react-redux": "^8.0.1",
     "redux": "^4.2.0",
     "warning": "^4.0.3"
   },
   "devDependencies": {
-    "umi": "4.0.0-rc.15"
+    "umi": "4.0.0-rc.16"
   },
   "publishConfig": {
     "access": "public"