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

package/dist/access.js

@@ -1,14 +1,9 @@
 "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 };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const fs_1 = __importDefault(require("fs"));
 const path_1 = require("path");
 const withTmpPath_1 = require("./utils/withTmpPath");
 exports.default = (api) => {
@@ -20,19 +15,29 @@ 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
         api.writeTmpFile({
             path: 'runtime.tsx',
             content: `
-import React from 'react';
-import accessFactory from '@/access';
+import React from 'react';${hasAccessFile
+                ? `
+import accessFactory from '@/access'
 import { useModel } from '@@/plugin-model';
+`
+                : ''}
 import { AccessContext } from './context';
 
-function Provider(props) {
+function Provider(props) {${hasAccessFile
+                ? `
   const { initialState } = useModel('@@initialState');
   const access = React.useMemo(() => accessFactory(initialState), [initialState]);
+`
+                : `
+  const access = {};
+`}
   return (
     <AccessContext.Provider value={access}>
       { props.children }
@@ -123,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

@@ -57,12 +57,18 @@ exports.default = (api) => {
         // dark mode & compact mode
         if (memo.antd.dark || memo.antd.compact) {
             const { getThemeVariables } = require('antd/dist/theme');
-            memo.theme = Object.assign(Object.assign({}, getThemeVariables(memo.antd)), memo.theme);
+            memo.theme = {
+                ...getThemeVariables(memo.antd),
+                ...memo.theme,
+            };
         }
         return memo;
     });
     api.modifyConfig((memo) => {
-        memo.theme = Object.assign({ 'root-entry-name': 'default' }, memo.theme);
+        memo.theme = {
+            'root-entry-name': 'default',
+            ...memo.theme,
+        };
         return memo;
     });
     // babel-plugin-import
@@ -77,6 +83,7 @@ exports.default = (api) => {
                         libraryDirectory: 'es',
                         style: style === 'less' ? true : 'css',
                     },
+                    'antd',
                 ],
             ]
             : [];
@@ -88,6 +95,7 @@ exports.default = (api) => {
         api.writeTmpFile({
             path: `runtime.tsx`,
             content: plugin_utils_1.Mustache.render(`
+import React from 'react';
 import { ConfigProvider, Modal, message, notification } from 'antd';
 
 export function rootContainer(container) {

package/dist/dva.js

@@ -25,11 +25,11 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAllModels = exports.getModelUtil = void 0;
 const t = __importStar(require("@umijs/bundler-utils/compiled/babel/types"));
+const utils_1 = require("@umijs/utils");
 const path_1 = require("path");
 const plugin_utils_1 = require("umi/plugin-utils");
 const modelUtils_1 = require("./utils/modelUtils");
 const withTmpPath_1 = require("./utils/withTmpPath");
-const utils_1 = require("@umijs/utils");
 exports.default = (api) => {
     const pkgPath = (0, path_1.join)(__dirname, '../libs/dva.ts');
     api.describe({
@@ -80,15 +80,22 @@ import dvaImmer, { enableES5, enableAllPlugins } from '${(0, utils_1.winPath)(re
 `
                 : ''}
 import React, { useRef } from 'react';
-import { history } from 'umi';
+import { history, ApplyPluginsType, useAppData } from 'umi';
 import { models } from './models';
 
 export function RootContainer(props: any) {
+  const { pluginManager } = useAppData();
   const app = useRef<any>();
+  const runtimeDva = pluginManager.applyPlugins({
+    key: 'dva',
+    type: ApplyPluginsType.modify,
+    initialValue: {},
+  });
   if (!app.current) {
     app.current = create(
       {
         history,
+        ...(runtimeDva.config || {}),
       },
       {
         initialReducer: {},
@@ -139,6 +146,7 @@ export { connect, useDispatch, useStore, useSelector } from 'dva';`,
     api.addRuntimePlugin(() => {
         return [(0, withTmpPath_1.withTmpPath)({ api, path: 'runtime.tsx' })];
     });
+    api.addRuntimePluginKey(() => ['dva']);
     // dva list model
     api.registerCommand({
         name: 'dva',
@@ -172,6 +180,7 @@ 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: 'addExtraModels',
+        key: 'addExtraModelsPre',
         fn: () => [(0, withTmpPath_1.withTmpPath)({ api, path: '@@initialState.ts' })],
     });
     api.addRuntimePluginKey(() => ['getInitialState']);
@@ -107,7 +107,7 @@ export default () => ({ loading: false, refresh: () => {} })
             content: `
 import React from 'react';
 import Provider from './Provider';
-export function innerProvider(container) {
+export function dataflowProvider(container) {
   return <Provider>{ container }</Provider>;
 }
       `,

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,16 +142,20 @@ 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)(require.resolve('warning/package')),
+                warningPkgPath: (0, plugin_utils_1.winPath)((0, path_1.dirname)(require.resolve('warning/package'))),
                 reactIntlPkgPath,
             }),
         });
@@ -177,25 +175,25 @@ 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
         api.writeTmpFile({
             path: 'index.ts',
             content: `
-export { setLocale, getLocale, useIntl, formatMessage, FormattedMessage } from './localeExports.ts';
+export { setLocale, getLocale, useIntl, injectIntl, formatMessage, FormattedMessage } from './localeExports.ts';
 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,17 @@ exports.default = (api) => {
         },
         enableBy: api.EnableBy.config,
     });
-    api.modifyAppData((memo) => __awaiter(void 0, void 0, void 0, function* () {
-        const models = yield getAllModels(api);
+    api.modifyAppData(async (memo) => {
+        const models = await getAllModels(api);
         memo.pluginModel = {
             models,
         };
         return memo;
-    }));
-    api.onGenerateFiles((args) => __awaiter(void 0, void 0, void 0, function* () {
+    });
+    api.onGenerateFiles(async (args) => {
         const models = args.isFirstTime
             ? api.appData.pluginModel.models
-            : yield getAllModels(api);
+            : await getAllModels(api);
         // model.ts
         api.writeTmpFile({
             path: 'model.ts',
@@ -94,7 +85,7 @@ export function dataflowProvider(container, opts) {
 }
       `,
         });
-    }));
+    });
     api.addTmpGenerateWatcherPaths(() => {
         return [(0, path_1.join)(api.paths.absSrcPath, 'models')];
     });
@@ -102,19 +93,26 @@ 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 extraModelsPre = await api.applyPlugins({
+        key: 'addExtraModelsPre',
+        type: api.ApplyPluginsType.add,
+        initialValue: [],
+    });
+    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({
+        extraModelsPre: [
+            ...extraModelsPre,
+            ...(api.config.model.extraModelsPre || []),
+        ],
+        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) => {
@@ -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 });
       `,
@@ -110,5 +124,11 @@ export const setMasterOptions = (newOpts) => options = ({ ...options, ...newOpts
                 });
             }
         });
+        api.writeTmpFile({
+            path: 'index.ts',
+            content: `
+export { MicroApp } from './MicroApp';
+      `,
+        });
     });
 };

package/dist/qiankun/slave.js

@@ -36,10 +36,20 @@ exports.default = (api) => {
     });
     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 +62,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;
     });
@@ -129,11 +142,17 @@ if (!window.__POWERED_BY_QIANKUN__) {
                 path: file.replace(/\.tpl$/, ''),
                 content: getFileContent(file)
                     .replace('__USE_MODEL__', api.isPluginEnable('model')
-                    ? `import { useModel } from '@@/plugin/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: `
+export { connectMaster } from './connectMaster';
+      `,
+        });
     });
 };

package/dist/request.js

@@ -7,7 +7,12 @@ exports.default = (api) => {
         key: 'request',
         config: {
             schema: (joi) => {
-                return joi.object();
+                return joi.object({
+                    dataField: joi
+                        .string()
+                        .pattern(/^[a-zA-Z]*$/)
+                        .allow(''),
+                });
             },
         },
         enableBy: api.EnableBy.config,
@@ -20,7 +25,6 @@ import axios, {
   type AxiosResponse,
 } from '{{{axiosPath}}}';
 import useUmiRequest, { UseRequestProvider } from '{{{umiRequestPath}}}';
-import { message, notification } from '{{{antdPkg}}}';
 import { ApplyPluginsType } from 'umi';
 import { getPluginManager } from '../core/plugin';
 
@@ -81,7 +85,7 @@ function useRequest<Item = any, U extends Item = any>(
 ): PaginatedResult<Item>;
 function useRequest(service: any, options: any = {}) {
   return useUmiRequest(service, {
-    formatResult: result => result?.data,
+    formatResult: {{{formatResult}}},
     requestMethod: (requestOptions: any) => {
       if (typeof requestOptions === 'string') {
         return request(requestOptions);
@@ -96,114 +100,49 @@ function useRequest(service: any, options: any = {}) {
   });
 }
 
-export interface RequestConfig extends AxiosRequestConfig {
-  errorConfig?: {
-    errorPage?: string;
-    adaptor?: IAdaptor; // adaptor 用以用户将不满足接口的后端数据修改成 errorInfo
-    errorHandler?: IErrorHandler;
-    defaultNoneResponseErrorMessage?: string;
-    defaultRequestErrorMessage?: string;
-  };
-  formatResultAdaptor?: IFormatResultAdaptor;
-}
-
-export enum ErrorShowType {
-  SILENT = 0,
-  WARN_MESSAGE = 1,
-  ERROR_MESSAGE = 2,
-  NOTIFICATION = 3,
-  REDIRECT = 9,
-}
-
-export interface IErrorInfo {
-  success: boolean;
-  data?: any;
-  errorCode?: string;
-  errorMessage?: string;
-  showType?: ErrorShowType;
-  traceId?: string;
-  host?: string;
+// request 方法 opts 参数的接口
+interface IRequestOptions extends AxiosRequestConfig {
+  skipErrorHandler?: boolean;
+  requestInterceptors?: IRequestInterceptorTuple[];
+  responseInterceptors?: IResponseInterceptorTuple[];
   [key: string]: any;
 }
-// resData 其实就是 response.data, response 则是 axios 的响应对象
-interface IAdaptor {
-  (resData: any, response: AxiosResponse): IErrorInfo;
+
+interface IRequestOptionsWithResponse extends IRequestOptions {
+  getResponse: true;
 }
 
-export interface RequestError extends Error {
-  data?: any;
-  info?: IErrorInfo;
+interface IRequestOptionsWithoutResponse extends IRequestOptions{
+  getResponse: false;
 }
 
-interface IRequest {
-  (
-    url: string,
-    opts: AxiosRequestConfig & { skipErrorHandler?: boolean },
-  ): Promise<AxiosResponse<any, any>>;
+interface IRequest{
+   <T = any>(url: string, opts: IRequestOptionsWithResponse): Promise<AxiosResponse<T>>;
+   <T = any>(url: string, opts: IRequestOptionsWithoutResponse): Promise<T>;
+   <T = any>(url: string, opts: IRequestOptions): Promise<T>; // getResponse 默认是 false， 因此不提供该参数时，只返回 data
+   <T = any>(url: string): Promise<T>;  // 不提供 opts 时，默认使用 'GET' method，并且默认返回 data
 }
 
 interface IErrorHandler {
-  (error: RequestError, opts: AxiosRequestConfig & { skipErrorHandler?: boolean }, config: RequestConfig): void;
+  (error: RequestError, opts: IRequestOptions): void;
 }
+type IRequestInterceptorAxios = (config: RequestOptions) => RequestOptions;
+type IRequestInterceptorUmiRequest = (url: string, config : RequestOptions) => { url: string, options: RequestOptions };
+type IRequestInterceptor = IRequestInterceptorAxios;
+type IErrorInterceptor = (error: Error) => Promise<Error>;
+type IResponseInterceptor = <T = any>(response : AxiosResponse<T>) => AxiosResponse<T> ;
+type IRequestInterceptorTuple = [IRequestInterceptor , IErrorInterceptor] | [ IRequestInterceptor ] | IRequestInterceptor
+type IResponseInterceptorTuple = [IResponseInterceptor, IErrorInterceptor] | [IResponseInterceptor] | IResponseInterceptor
 
-interface IFormatResultAdaptor {
-  (res: AxiosResponse): any;
+export interface RequestConfig extends AxiosRequestConfig {
+  errorConfig?: {
+    errorHandler?: IErrorHandler;
+    errorThrower?: <T = any>( res: T ) => void
+  };
+  requestInterceptors?: IRequestInterceptorTuple[];
+  responseInterceptors?: IResponseInterceptorTuple[];
 }
 
-const defaultErrorHandler: IErrorHandler = (error, opts, config) => {
-  if (opts?.skipErrorHandler) throw error;
-  const { errorConfig } = config;
-  if (error.response) {
-    // 请求成功发出且服务器也响应了状态码，但状态代码超出了 2xx 的范围 或者 成功响应，success字段为false 由我们抛出的错误
-    let errorInfo: IErrorInfo | undefined;
-    // 不是我们的错误
-    if(error.name === 'ResponseError'){
-      const adaptor: IAdaptor =
-      errorConfig?.adaptor || ((errorData) => errorData);
-      errorInfo = adaptor(error.response.data, error.response);
-      error.info = errorInfo;
-      error.data = error.response.data;
-    }
-    errorInfo = error.info;
-    if (errorInfo) {
-      const { errorMessage, errorCode } = errorInfo;
-      switch (errorInfo.showType) {
-        case ErrorShowType.SILENT:
-          // do nothong
-          break;
-        case ErrorShowType.WARN_MESSAGE:
-          message.warn(errorMessage);
-          break;
-        case ErrorShowType.ERROR_MESSAGE:
-          message.error(errorMessage);
-          break;
-        case ErrorShowType.NOTIFICATION:
-          notification.open({ description: errorMessage, message: errorCode });
-          break;
-        case ErrorShowType.REDIRECT:
-          // TODO: redirect
-          break;
-        default:
-          message.error(errorMessage);
-      }
-    }
-  } else if (error.request) {
-    // 请求已经成功发起，但没有收到响应
-    // \`error.request\` 在浏览器中是 XMLHttpRequest 的实例，
-    // 而在node.js中是 http.ClientRequest 的实例
-    message.error(
-      errorConfig?.defaultNoneResponseErrorMessage ||
-        'None response! Please retry.',
-    );
-  } else {
-    // 发送请求时出了点问题
-    message.error(
-      errorConfig?.defaultRequestErrorMessage || 'Request error, please retry.',
-    );
-  }
-  throw error;
-};
-
 let requestInstance: AxiosInstance;
 let config: RequestConfig;
 const getConfig = (): RequestConfig => {
@@ -215,51 +154,112 @@ const getConfig = (): RequestConfig => {
   });
   return config;
 };
+
 const getRequestInstance = (): AxiosInstance => {
   if (requestInstance) return requestInstance;
   const config = getConfig();
   requestInstance = axios.create(config);
 
+  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);  
+          return { ...options, url: newUrl };
+        }
+        return interceptor[0](config);
+      }, interceptor[1]);
+    } else {
+      requestInstance.interceptors.request.use((config) => {
+        const { url } = config;
+        if(interceptor.length === 2){
+          const { url: newUrl, options } = interceptor(url, config);
+          return { ...options, url: newUrl };
+        }
+        return interceptor(config);
+      })
+    }
+  });
+
+  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)=>{
-    const {data} = response;
-    const adaptor = config?.errorConfig?.adaptor || ((resData) => resData);
-    const errorInfo = adaptor(data,response);
-    if(errorInfo.success === false){
-      const error: RequestError = new Error(errorInfo.errorMessage);
-      error.name = 'BizError';
-      error.data = data;
-      error.info = errorInfo;
-      error.response = response;
-      throw error;
+    const { data } = response;
+    if(config?.errorConfig?.errorThrower){
+      config.errorConfig.errorThrower(data);
     }
     return response;
   })
   return requestInstance;
 };
 
-const request: IRequest = (url, opts) => {
+const request: IRequest = (url: string, opts: any = { method: 'GET' }) => {   
   const requestInstance = getRequestInstance();
   const config = getConfig();
-  return new Promise((resolve, reject) => {
+  const { getResponse = false, requestInterceptors, responseInterceptors } = opts;
+  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);  
+          return { ...options, url: newUrl };
+        }
+        return interceptor[0](config);
+      }, interceptor[1]);
+    } else {
+      return requestInstance.interceptors.request.use((config) => {
+        const { url } = config;
+        if(interceptor.length === 2){
+          const { url: newUrl, options } = interceptor(url, config);
+          return { ...options, url: newUrl };
+        }
+        return interceptor(config);
+      })
+    }
+    });
+  const responseInterceptorsToEject = responseInterceptors?.map((interceptor) => { 
+    return interceptor instanceof Array ? 
+      requestInstance.interceptors.response.use(interceptor[0], interceptor[1]):
+       requestInstance.interceptors.response.use(interceptor);
+    });
+  return new Promise((resolve, reject)=>{
     requestInstance
-      .request({ ...opts, url })
-      .then((res) => {
-        const formatResultAdaptor =
-          config?.formatResultAdaptor || ((res) => res.data);
-        resolve(formatResultAdaptor(res));
+      .request({...opts, url})
+      .then((res)=>{
+        requestInterceptorsToEject?.forEach((interceptor) => {
+          requestInstance.interceptors.request.eject(interceptor);
+        });
+        responseInterceptorsToEject?.forEach((interceptor) => {
+          requestInstance.interceptors.response.eject(interceptor);
+        });
+        resolve(getResponse ? res : res.data);
       })
-      .catch((error) => {
+      .catch((error)=>{
+        requestInterceptorsToEject?.forEach((interceptor) => {
+          requestInstance.interceptors.request.eject(interceptor);
+        });
+        responseInterceptorsToEject?.forEach((interceptor) => {
+          requestInstance.interceptors.response.eject(interceptor);
+        });
         try {
           const handler =
-            config.errorConfig?.errorHandler || defaultErrorHandler;
-          handler(error, opts, config);
+            config.errorConfig?.errorHandler;
+          if(handler)
+            handler(error, opts, config);
         } catch (e) {
           reject(e);
         }
-      });
-  });
-};
+        reject(error);
+      })
+  })
+}
 
 export {
   useRequest,
@@ -279,18 +279,24 @@ export type {
         var _a;
         const umiRequestPath = (0, plugin_utils_1.winPath)((0, path_1.dirname)(require.resolve('@ahooksjs/use-request/package.json')));
         const axiosPath = (0, plugin_utils_1.winPath)((0, path_1.dirname)(require.resolve('axios/package.json')));
-        const antdPkg = (0, plugin_utils_1.winPath)(
-        // use path from antd plugin first
-        ((_a = api.appData.antd) === null || _a === void 0 ? void 0 : _a.pkgPath) ||
-            (0, path_1.dirname)(require.resolve('antd/package.json')));
+        let dataField = (_a = api.config.request) === null || _a === void 0 ? void 0 : _a.dataField;
+        if (dataField === undefined)
+            dataField = 'data';
+        const formatResult = dataField === '' ? `result => result` : `result => result?.${dataField}`;
         api.writeTmpFile({
             path: 'request.ts',
             content: plugin_utils_1.Mustache.render(requestTpl, {
                 umiRequestPath,
                 axiosPath,
-                antdPkg,
+                formatResult,
             }),
         });
+        api.writeTmpFile({
+            path: 'types.d.ts',
+            content: `
+export type { RequestConfig } from './request';
+`,
+        });
         api.writeTmpFile({
             path: 'index.ts',
             content: `

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

@@ -20,6 +20,7 @@ export declare class ModelUtils {
     count: number;
     constructor(api: IApi | null, opts: IOpts);
     getAllModels(opts: {
+        extraModelsPre: string[];
         extraModels: string[];
     }): Model[];
     getModels(opts: {

package/dist/utils/modelUtils.js

@@ -62,6 +62,7 @@ class ModelUtils {
         // reset count
         this.count = 1;
         return [
+            ...opts.extraModelsPre,
             ...this.getModels({
                 base: (0, path_1.join)(this.api.paths.absSrcPath, 'models'),
                 pattern: '**/*.{ts,tsx,js,jsx}',

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/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 则需手动触发

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.12",
+  "version": "4.0.0-rc.15",
   "description": "@umijs/plugins",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/plugins#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
@@ -17,15 +17,15 @@
   ],
   "scripts": {
     "build": "pnpm tsc",
-    "build:deps": "pnpm esno ../../scripts/bundleDeps.ts",
+    "build:deps": "umi-scripts bundleDeps",
     "dev": "pnpm build -- --watch",
-    "test": "jest -c ../../jest.turbo.config.ts"
+    "test": "umi-scripts jest-turbo"
   },
   "dependencies": {
     "@ahooksjs/use-request": "^2.0.0",
     "@ant-design/icons": "^4.7.0",
-    "@ant-design/pro-layout": "^6.34.9",
-    "@umijs/bundler-utils": "4.0.0-rc.12",
+    "@ant-design/pro-layout": "^6.35.1",
+    "@umijs/bundler-utils": "4.0.0-rc.15",
     "antd-dayjs-webpack-plugin": "^1.0.6",
     "axios": "^0.26.1",
     "babel-plugin-import": "^1.13.3",
@@ -36,15 +36,15 @@
     "event-emitter": "~0.3.5",
     "fast-deep-equal": "3.1.3",
     "lodash": "^4.17.21",
-    "moment": "^2.29.2",
+    "moment": "^2.29.3",
     "qiankun": "^2.7.0",
     "react-intl": "3.12.1",
-    "react-redux": "^7.2.8",
-    "redux": "^4.1.2",
+    "react-redux": "^8.0.0",
+    "redux": "^4.2.0",
     "warning": "^4.0.3"
   },
   "devDependencies": {
-    "umi": "4.0.0-rc.12"
+    "umi": "4.0.0-rc.15"
   },
   "publishConfig": {
     "access": "public"