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

package/dist/access.js

@@ -8,7 +8,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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) => {
@@ -21,18 +25,28 @@ exports.default = (api) => {
         enableBy: api.EnableBy.config,
     });
     api.onGenerateFiles(() => __awaiter(void 0, void 0, void 0, function* () {
+        // 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 }
@@ -45,9 +59,9 @@ export function accessProvider(container) {
 }
       `,
         });
-        // index.ts
+        // index.tsx
         api.writeTmpFile({
-            path: 'index.ts',
+            path: 'index.tsx',
             content: `
 import React from 'react';
 import { AccessContext } from './context';
@@ -66,7 +80,7 @@ export const Access: React.FC<AccessProps> = (props) => {
     throw new Error('[access] the \`accessible\` property on <Access /> should be a boolean');
   }
 
-  return props.accessible ? props.children : props.fallback;
+  return <>{ props.accessible ? props.children : props.fallback }</>;
 };
 
 export const useAccessMarkedRoutes = (routes: IRoute[]) => {

package/dist/antd.js

@@ -77,6 +77,7 @@ exports.default = (api) => {
                         libraryDirectory: 'es',
                         style: style === 'less' ? true : 'css',
                     },
+                    'antd',
                 ],
             ]
             : [];
@@ -88,6 +89,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',

package/dist/initial-state.js

@@ -31,7 +31,7 @@ import React from 'react';
 import { useModel } from '@@/plugin-model';
 ${loading
                 ? `import Loading from '${loading}'`
-                : `function Loading() { return <div>loading</div>; }`}
+                : `function Loading() { return <div />; }`}
 export default function InitialStateProvider(props: any) {
   const appLoaded = React.useRef(false);
   const { loading = false } = useModel("@@initialState") || {};
@@ -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/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,
     });

package/dist/locale.js

@@ -157,7 +157,7 @@ exports.default = (api) => {
                     })) }))),
                 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,
             }),
         });
@@ -184,7 +184,7 @@ exports.default = (api) => {
         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';
 `,
         });

package/dist/qiankun/master.js

@@ -110,5 +110,11 @@ export const setMasterOptions = (newOpts) => options = ({ ...options, ...newOpts
                 });
             }
         });
+        api.writeTmpFile({
+            path: 'index.ts',
+            content: `
+export { MicroApp } from './MicroApp';
+      `,
+        });
     });
 };

package/dist/qiankun/slave.js

@@ -129,11 +129,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,16 +279,16 @@ 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({
@@ -299,6 +299,10 @@ export {
   UseRequestProvider,
   request,
 } from './request';
+
+export type {
+  RequestConfig
+} from './request';
 `,
         });
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.0.0-rc.11",
+  "version": "4.0.0-rc.14",
   "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.6",
-    "@umijs/bundler-utils": "4.0.0-rc.11",
+    "@ant-design/pro-layout": "^6.35.1",
+    "@umijs/bundler-utils": "4.0.0-rc.14",
     "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.1",
-    "qiankun": "^2.6.3",
+    "moment": "^2.29.3",
+    "qiankun": "^2.7.0",
     "react-intl": "3.12.1",
-    "react-redux": "^7.2.6",
-    "redux": "^4.1.2",
+    "react-redux": "^8.0.0",
+    "redux": "^4.2.0",
     "warning": "^4.0.3"
   },
   "devDependencies": {
-    "umi": "4.0.0-rc.11"
+    "umi": "4.0.0-rc.14"
   },
   "publishConfig": {
     "access": "public"