@umijs/plugins 4.0.0-rc.14 → 4.0.0-rc.17

package/dist/access.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -24,7 +15,7 @@ exports.default = (api) => {
         },
         enableBy: api.EnableBy.config,
     });
-    api.onGenerateFiles(() => __awaiter(void 0, void 0, void 0, function* () {
+    api.onGenerateFiles(async () => {
         // allow enable access without access file
         const hasAccessFile = ['js', 'jsx', 'ts', 'tsx'].some((ext) => fs_1.default.existsSync((0, path_1.join)(api.paths.absSrcPath, `access.${ext}`)));
         // runtime.tsx
@@ -137,7 +128,7 @@ import React from 'react';
 export const AccessContext = React.createContext<any>(null);
       `,
         });
-    }));
+    });
     api.addRuntimePlugin(() => {
         return [(0, withTmpPath_1.withTmpPath)({ api, path: 'runtime.tsx' })];
     });

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,21 +53,31 @@ 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
-        if (memo.antd.dayjs) {
+        if (antd.dayjs) {
             memo.alias.moment = (0, path_1.dirname)(require.resolve('dayjs/package.json'));
         }
         // dark mode & compact mode
-        if (memo.antd.dark || memo.antd.compact) {
+        if (antd.dark || antd.compact) {
             const { getThemeVariables } = require('antd/dist/theme');
-            memo.theme = Object.assign(Object.assign({}, getThemeVariables(memo.antd)), memo.theme);
+            memo.theme = {
+                ...getThemeVariables(antd),
+                ...memo.theme,
+            };
         }
-        return memo;
-    });
-    api.modifyConfig((memo) => {
-        memo.theme = Object.assign({ 'root-entry-name': 'default' }, memo.theme);
+        // antd theme
+        memo.theme = {
+            'root-entry-name': 'default',
+            ...memo.theme,
+        };
         return memo;
     });
     // babel-plugin-import

package/dist/layout.js

@@ -39,7 +39,7 @@ exports.default = (api) => {
             schema(joi) {
                 return joi.object();
             },
-            // onChange: api.ConfigChangeType.regenerateTmpFiles,
+            onChange: api.ConfigChangeType.regenerateTmpFiles,
         },
         enableBy: api.EnableBy.config,
     });
@@ -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/locale.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.packageNormalize = void 0;
 const fs_1 = require("fs");
@@ -58,9 +49,9 @@ exports.default = (api) => {
             },
         ]
         : []);
-    const addAntdLocales = (args) => __awaiter(void 0, void 0, void 0, function* () {
+    const addAntdLocales = async (args) => {
         var _a;
-        return yield api.applyPlugins({
+        return await api.applyPlugins({
             key: 'addAntdLocales',
             type: api.ApplyPluginsType.add,
             initialValue: [
@@ -68,29 +59,32 @@ exports.default = (api) => {
             ],
             args,
         });
-    });
-    const getList = (resolveKey) => __awaiter(void 0, void 0, void 0, function* () {
-        var _b;
+    };
+    const getList = async (resolveKey) => {
+        var _a;
         const { paths } = api;
         return (0, localeUtils_1.getLocaleList)({
             localeFolder: 'locales',
-            separator: (_b = api.config.locale) === null || _b === void 0 ? void 0 : _b.baseSeparator,
+            separator: (_a = api.config.locale) === null || _a === void 0 ? void 0 : _a.baseSeparator,
             absSrcPath: paths.absSrcPath,
             absPagesPath: paths.absPagesPath,
             addAntdLocales,
             resolveKey,
         });
-    });
-    api.onGenerateFiles(() => __awaiter(void 0, void 0, void 0, function* () {
-        var _c, _d, _e, _f;
+    };
+    api.onGenerateFiles(async () => {
+        var _a, _b, _c, _d;
         const localeTpl = (0, fs_1.readFileSync)((0, path_1.join)(__dirname, '../libs/locale/locale.tpl'), 'utf-8');
         // moment2dayjs
         const resolveKey = api.config.moment2dayjs ? 'dayjs' : 'moment';
         const momentPkgPath = (0, plugin_utils_1.winPath)((0, path_1.dirname)(require.resolve(`${resolveKey}/package.json`)));
         const EventEmitterPkg = (0, plugin_utils_1.winPath)((0, path_1.dirname)(require.resolve('event-emitter/package')));
-        const { baseSeparator, baseNavigator, antd, title, useLocalStorage } = Object.assign(Object.assign({}, defaultConfig), api.config.locale);
-        const defaultLocale = ((_c = api.config.locale) === null || _c === void 0 ? void 0 : _c.default) || `zh${baseSeparator}CN`;
-        const localeList = yield getList(resolveKey);
+        const { baseSeparator, baseNavigator, antd, title, useLocalStorage } = {
+            ...defaultConfig,
+            ...api.config.locale,
+        };
+        const defaultLocale = ((_a = api.config.locale) === null || _a === void 0 ? void 0 : _a.default) || `zh${baseSeparator}CN`;
+        const localeList = await getList(resolveKey);
         const momentLocales = localeList
             .map(({ momentLocale }) => momentLocale)
             .filter((locale) => locale);
@@ -100,7 +94,7 @@ exports.default = (api) => {
         let MomentLocales = momentLocales;
         let DefaultMomentLocale = '';
         // set moment default accounding to locale.default
-        if (!MomentLocales.length && ((_d = api.config.locale) === null || _d === void 0 ? void 0 : _d.default)) {
+        if (!MomentLocales.length && ((_b = api.config.locale) === null || _b === void 0 ? void 0 : _b.default)) {
             const [lang, country = ''] = defaultLocale.split(baseSeparator);
             const { momentLocale } = (0, localeUtils_1.getMomentLocale)(lang, country, resolveKey);
             if (momentLocale) {
@@ -110,9 +104,9 @@ exports.default = (api) => {
         }
         let DefaultAntdLocales = [];
         // set antd default locale
-        if (!antdLocales.length && ((_e = api.config.locale) === null || _e === void 0 ? void 0 : _e.antd)) {
+        if (!antdLocales.length && ((_c = api.config.locale) === null || _c === void 0 ? void 0 : _c.antd)) {
             const [lang, country = ''] = defaultLocale.split(baseSeparator);
-            DefaultAntdLocales = plugin_utils_1.lodash.uniq(yield addAntdLocales({
+            DefaultAntdLocales = plugin_utils_1.lodash.uniq(await addAntdLocales({
                 lang,
                 country,
             }));
@@ -148,13 +142,17 @@ exports.default = (api) => {
                 UseLocalStorage: !!useLocalStorage,
                 LocaleDir: localeDirName,
                 ExistLocaleDir: (0, fs_1.existsSync)(localeDirPath),
-                LocaleList: localeList.map((locale) => (Object.assign(Object.assign({}, locale), { antdLocale: locale.antdLocale.map((antdLocale, index) => ({
+                LocaleList: localeList.map((locale) => ({
+                    ...locale,
+                    antdLocale: locale.antdLocale.map((antdLocale, index) => ({
                         locale: antdLocale,
                         index: index,
-                    })), paths: locale.paths.map((path, index) => ({
+                    })),
+                    paths: locale.paths.map((path, index) => ({
                         path,
                         index,
-                    })) }))),
+                    })),
+                })),
                 Antd: !!antd,
                 DefaultLocale: JSON.stringify(defaultLocale),
                 warningPkgPath: (0, plugin_utils_1.winPath)((0, path_1.dirname)(require.resolve('warning/package'))),
@@ -177,7 +175,7 @@ exports.default = (api) => {
                 Antd: !!antd,
                 LocaleList: localeList,
                 ShowSelectLang: localeList.length > 1 && !!antd,
-                antdFiles: ((_f = api.config) === null || _f === void 0 ? void 0 : _f.ssr) ? 'lib' : 'es',
+                antdFiles: ((_d = api.config) === null || _d === void 0 ? void 0 : _d.ssr) ? 'lib' : 'es',
             }),
         });
         // index.ts
@@ -188,14 +186,14 @@ export { setLocale, getLocale, useIntl, injectIntl, formatMessage, FormattedMess
 export { SelectLang } from './SelectLang.tsx';
 `,
         });
-    }));
+    });
     // Runtime Plugin
     api.addRuntimePlugin(() => [(0, withTmpPath_1.withTmpPath)({ api, path: 'runtime.tsx' })]);
     api.addRuntimePluginKey(() => ['locale']);
     // watch locale files
-    api.addTmpGenerateWatcherPaths(() => __awaiter(void 0, void 0, void 0, function* () {
+    api.addTmpGenerateWatcherPaths(async () => {
         const resolveKey = api.config.moment2dayjs ? 'dayjs' : 'moment';
-        const localeList = yield getList(resolveKey);
+        const localeList = await getList(resolveKey);
         return (0, localeUtils_1.exactLocalePaths)(localeList);
-    }));
+    });
 };

package/dist/model.js

@@ -22,15 +22,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const t = __importStar(require("@umijs/bundler-utils/compiled/babel/types"));
 const fs_1 = require("fs");
@@ -49,17 +40,8 @@ exports.default = (api) => {
         },
         enableBy: api.EnableBy.config,
     });
-    api.modifyAppData((memo) => __awaiter(void 0, void 0, void 0, function* () {
-        const models = yield getAllModels(api);
-        memo.pluginModel = {
-            models,
-        };
-        return memo;
-    }));
-    api.onGenerateFiles((args) => __awaiter(void 0, void 0, void 0, function* () {
-        const models = args.isFirstTime
-            ? api.appData.pluginModel.models
-            : yield getAllModels(api);
+    api.onGenerateFiles(async () => {
+        const models = await getAllModels(api);
         // model.ts
         api.writeTmpFile({
             path: 'model.ts',
@@ -94,7 +76,7 @@ export function dataflowProvider(container, opts) {
 }
       `,
         });
-    }));
+    });
     api.addTmpGenerateWatcherPaths(() => {
         return [(0, path_1.join)(api.paths.absSrcPath, 'models')];
     });
@@ -102,19 +84,18 @@ export function dataflowProvider(container, opts) {
         return [(0, withTmpPath_1.withTmpPath)({ api, path: 'runtime.tsx' })];
     });
 };
-function getAllModels(api) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const extraModels = yield api.applyPlugins({
-            key: 'addExtraModels',
-            type: api.ApplyPluginsType.add,
-            initialValue: [],
-        });
-        return new modelUtils_1.ModelUtils(api, {
-            astTest({ node }) {
-                return t.isArrowFunctionExpression(node) || t.isFunctionDeclaration(node);
-            },
-        }).getAllModels({
-            extraModels: [...extraModels, ...(api.config.model.extraModels || [])],
-        });
+async function getAllModels(api) {
+    const extraModels = await api.applyPlugins({
+        key: 'addExtraModels',
+        type: api.ApplyPluginsType.add,
+        initialValue: [],
+    });
+    return new modelUtils_1.ModelUtils(api, {
+        astTest({ node }) {
+            return t.isArrowFunctionExpression(node) || t.isFunctionDeclaration(node);
+        },
+    }).getAllModels({
+        sort: {},
+        extraModels: [...extraModels, ...(api.config.model.extraModels || [])],
     });
 }

package/dist/qiankun/master.js

@@ -23,7 +23,17 @@ exports.default = (api) => {
     api.addRuntimePlugin(() => {
         return [(0, withTmpPath_1.withTmpPath)({ api, path: 'masterRuntimePlugin.tsx' })];
     });
-    api.modifyDefaultConfig((config) => (Object.assign(Object.assign({}, config), { mountElementId: constants_1.defaultMasterRootId, qiankun: Object.assign(Object.assign({}, config.qiankun), { master: Object.assign(Object.assign({}, JSON.parse(process.env.INITIAL_QIANKUN_MASTER_OPTIONS || '{}')), (config.qiankun || {}).master) }) })));
+    api.modifyDefaultConfig((config) => ({
+        ...config,
+        mountElementId: constants_1.defaultMasterRootId,
+        qiankun: {
+            ...config.qiankun,
+            master: {
+                ...JSON.parse(process.env.INITIAL_QIANKUN_MASTER_OPTIONS || '{}'),
+                ...(config.qiankun || {}).master,
+            },
+        },
+    }));
     // TODO: modify routes
     api.modifyRoutes((memo) => {
         Object.keys(memo).forEach((id) => {
@@ -38,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} })
         })()`;
             }
         });
@@ -65,7 +75,11 @@ exports.default = (api) => {
         api.writeTmpFile({
             path: 'masterOptions.ts',
             content: `
-let options = ${JSON.stringify(Object.assign({ masterHistoryType: ((_a = api.config.history) === null || _a === void 0 ? void 0 : _a.type) || constants_1.defaultHistoryType, base: api.config.base || '/' }, api.config.qiankun.master))};
+let options = ${JSON.stringify({
+                masterHistoryType: ((_a = api.config.history) === null || _a === void 0 ? void 0 : _a.type) || constants_1.defaultHistoryType,
+                base: api.config.base || '/',
+                ...api.config.qiankun.master,
+            })};
 export const getMasterOptions = () => options;
 export const setMasterOptions = (newOpts) => options = ({ ...options, ...newOpts });
       `,
@@ -99,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,16 +30,29 @@ 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}"}`,
+                }),
             ];
         },
     });
     api.modifyDefaultConfig((memo) => {
         var _a, _b, _c, _d;
-        const initialSlaveOptions = Object.assign(Object.assign({ devSourceMap: true }, JSON.parse(process.env.INITIAL_QIANKUN_SLAVE_OPTIONS || '{}')), (memo.qiankun || {}).slave);
-        const modifiedDefaultConfig = Object.assign(Object.assign({}, memo), { 
+        const initialSlaveOptions = {
+            devSourceMap: true,
+            ...JSON.parse(process.env.INITIAL_QIANKUN_SLAVE_OPTIONS || '{}'),
+            ...(memo.qiankun || {}).slave,
+        };
+        const modifiedDefaultConfig = {
+            ...memo,
             // 默认开启 runtimePublicPath，避免出现 dynamic import 场景子应用资源地址出问题
-            runtimePublicPath: true, qiankun: Object.assign(Object.assign({}, memo.qiankun), { slave: initialSlaveOptions }) });
+            runtimePublicPath: true,
+            qiankun: {
+                ...memo.qiankun,
+                slave: initialSlaveOptions,
+            },
+        };
         const shouldNotModifyDefaultBase = (_c = (_b = (_a = api.userConfig.qiankun) === null || _a === void 0 ? void 0 : _a.slave) === null || _b === void 0 ? void 0 : _b.shouldNotModifyDefaultBase) !== null && _c !== void 0 ? _c : initialSlaveOptions.shouldNotModifyDefaultBase;
         const historyType = ((_d = api.userConfig.history) === null || _d === void 0 ? void 0 : _d.type) || 'browser';
         if (!shouldNotModifyDefaultBase && historyType !== 'hash') {
@@ -52,8 +65,11 @@ exports.default = (api) => {
         var _a, _b;
         // mfsu 场景默认给子应用增加 mfName 配置，从而避免冲突
         if (config.mfsu !== false) {
-            config.mfsu = Object.assign(Object.assign({}, config.mfsu), { mfName: ((_a = config.mfsu) === null || _a === void 0 ? void 0 : _a.mfName) ||
-                    `mf_${(_b = api.pkg.name) === null || _b === void 0 ? void 0 : _b.replace(/^@/, '').replace(/\W/g, '_')}` });
+            config.mfsu = {
+                ...config.mfsu,
+                mfName: ((_a = config.mfsu) === null || _a === void 0 ? void 0 : _a.mfName) ||
+                    `mf_${(_b = api.pkg.name) === null || _b === void 0 ? void 0 : _b.replace(/^@/, '').replace(/\W/g, '_')}`,
+            };
         }
         return config;
     });
@@ -110,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);
     });
@@ -291,6 +291,12 @@ export type {
                 formatResult,
             }),
         });
+        api.writeTmpFile({
+            path: 'types.d.ts',
+            content: `
+export type { RequestConfig } from './request';
+`,
+        });
         api.writeTmpFile({
             path: 'index.ts',
             content: `
@@ -299,10 +305,6 @@ export {
   UseRequestProvider,
   request,
 } from './request';
-
-export type {
-  RequestConfig
-} from './request';
 `,
         });
     });

package/dist/utils/localeUtils.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isNeedPolyfill = exports.exactLocalePaths = exports.getLocaleList = exports.getAntdLocale = exports.getMomentLocale = void 0;
 const fs_1 = require("fs");
@@ -55,7 +46,7 @@ const modulesHasLocale = (localePath) => {
         return false;
     }
 };
-const getLocaleList = (opts) => __awaiter(void 0, void 0, void 0, function* () {
+const getLocaleList = async (opts) => {
     const { localeFolder, separator = '-', absSrcPath = '', absPagesPath = '', addAntdLocales, resolveKey = 'moment', } = opts;
     const localeFileMath = new RegExp(`^([a-z]{2})${separator}?([A-Z]{2})?\.(js|json|ts)$`);
     const localeFiles = plugin_utils_1.glob
@@ -80,11 +71,11 @@ const getLocaleList = (opts) => __awaiter(void 0, void 0, void 0, function* () {
         };
     });
     const groups = plugin_utils_1.lodash.groupBy(localeFiles, 'name');
-    const promises = Object.keys(groups).map((name) => __awaiter(void 0, void 0, void 0, function* () {
+    const promises = Object.keys(groups).map(async (name) => {
         const [lang, country = ''] = name.split(separator);
         const { momentLocale } = (0, exports.getMomentLocale)(lang, country, resolveKey);
         const antdLocale = plugin_utils_1.lodash
-            .uniq(yield addAntdLocales({ lang, country }))
+            .uniq(await addAntdLocales({ lang, country }))
             .filter((localePath) => modulesHasLocale(localePath));
         return {
             lang,
@@ -97,9 +88,9 @@ const getLocaleList = (opts) => __awaiter(void 0, void 0, void 0, function* () {
             paths: groups[name].map((item) => (0, plugin_utils_1.winPath)(item.path)),
             momentLocale,
         };
-    }));
+    });
     return Promise.all(promises);
-});
+};
 exports.getLocaleList = getLocaleList;
 const exactLocalePaths = (data) => {
     return plugin_utils_1.lodash.flatten(data.map((item) => item.paths));

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,8 +22,10 @@ export declare class ModelUtils {
     count: number;
     constructor(api: IApi | null, opts: IOpts);
     getAllModels(opts: {
+        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,7 +92,7 @@ class ModelUtils {
     getAllModels(opts) {
         // reset count
         this.count = 1;
-        return [
+        const models = [
             ...this.getModels({
                 base: (0, path_1.join)(this.api.paths.absSrcPath, 'models'),
                 pattern: '**/*.{ts,tsx,js,jsx}',
@@ -76,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/MicroApp.tsx

@@ -139,6 +139,13 @@ export const MicroApp = forwardRef(
       setComponentError(null);
       setLoading(true);
       const configuration = {
+        fetch(url) {
+          return window.fetch(url, {
+            headers: {
+              accept: 'text/html',
+            },
+          });
+        },
         globalContext: window,
         ...globalSettings,
         ...settingsFromProps,

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/connectMaster.tsx

@@ -1,5 +1,4 @@
 // @ts-nocheck
-/* eslint-disable */
 __USE_MODEL__;
 import React from 'react';
 

package/libs/qiankun/slave/lifecycles.ts

@@ -1,5 +1,4 @@
 // @ts-nocheck
-/* eslint-disable */
 import { getPluginManager } from '@@/core/plugin';
 import ReactDOM from 'react-dom';
 import { ApplyPluginsType } from 'umi';
@@ -22,7 +21,7 @@ let render = noop;
 let hasMountedAtLeastOnce = false;
 
 export default () => defer.promise;
-export const clientRenderOptsStack: any[] = [];
+export const contextOptsStack: any[] = [];
 
 // function normalizeHistory(
 //   history?: 'string' | Record<string, any>,
@@ -79,10 +78,7 @@ export function genMount(mountElementId: string) {
         // 默认开启
         // 如果需要手动控制 loading，通过主应用配置 props.autoSetLoading false 可以关闭
         callback: () => {
-          if (
-            props?.autoSetLoading &&
-            typeof props?.setLoading === 'function'
-          ) {
+          if (props.autoSetLoading && typeof props.setLoading === 'function') {
             props.setLoading(false);
           }
 
@@ -94,9 +90,11 @@ export function genMount(mountElementId: string) {
         // 支持通过 props 注入 container 来限定子应用 mountElementId 的查找范围
         // 避免多个子应用出现在同一主应用时出现 mount 冲突
         rootElement:
-          props?.container?.querySelector(`#${mountElementId}`) ||
+          props.container?.querySelector(`#${mountElementId}`) ||
           mountElementId,
 
+        basename: props.base,
+
         // 当存在同一个 umi 子应用在同一个页面被多实例渲染的场景时（比如一个页面里，同时展示了这个子应用的多个路由页面）
         // mount 钩子会被调用多次，但是具体什么时候对应的实例开始 render 则是不定的，即它调用 applyPlugins('modifyClientRenderOpts') 的时机是不确定的
         // 为了保证每次 applyPlugins('modifyClientRenderOpts') 调用是生成正确的 history，我们需要这里通过闭包上下文维持 mount 调用时的一些配置信息
@@ -111,7 +109,7 @@ export function genMount(mountElementId: string) {
         // },
       };
 
-      clientRenderOptsStack.push(clientRenderOpts);
+      contextOptsStack.push(clientRenderOpts);
     }
 
     // 第一次 mount defer 被 resolve 后umi 会自动触发 render，非第一次 mount 则需手动触发
@@ -121,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/libs/qiankun/slave/qiankunModel.ts

@@ -1,5 +1,4 @@
 // @ts-nocheck
-/* eslint-disable */
 import { useState } from 'react';
 
 let initState: any;

package/libs/qiankun/slave/slaveRuntimePlugin.ts

@@ -1,21 +1,15 @@
 // @ts-nocheck
-/* eslint-disable */
-import qiankunRender from './lifecycles';
+import qiankunRender, { contextOptsStack } from './lifecycles';
 
 export function render(oldRender: any) {
   return qiankunRender().then(oldRender);
 }
 
-// export function modifyClientRenderOpts(memo: any) {
-//   // 每次应用 render 的时候会调 modifyClientRenderOpts，这时尝试从队列中取 render 的配置
-//   const clientRenderOpts = clientRenderOptsStack.shift();
-//   if (clientRenderOpts) {
-//     const history = clientRenderOpts.getHistory();
-//     delete clientRenderOpts.getHistory;
-//     clientRenderOpts.history = history;
-//   }
-//   return {
-//     ...memo,
-//     ...clientRenderOpts,
-//   };
-// }
+export function modifyContextOpts(memo: any) {
+  // 每次应用 render 的时候会调 modifyClientRenderOpts，这时尝试从队列中取 render 的配置
+  const clientRenderOpts = contextOptsStack.shift();
+  return {
+    ...memo,
+    ...clientRenderOpts,
+  };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.0.0-rc.14",
+  "version": "4.0.0-rc.17",
   "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.14",
+    "@ant-design/pro-layout": "^6.38.0",
+    "@umijs/bundler-utils": "4.0.0-rc.17",
     "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.14"
+    "umi": "4.0.0-rc.17"
   },
   "publishConfig": {
     "access": "public"