@umijs/plugins 4.0.0-canary.20220422.1 → 4.0.0-canary.20220424.1

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

@@ -102,7 +102,9 @@ function useRequest(service: any, options: any = {}) {
 
 // request 方法 opts 参数的接口
 interface IRequestOptions extends AxiosRequestConfig {
-  skipErrorHandler?: boolean
+  skipErrorHandler?: boolean;
+  requestInterceptors?: IRequestInterceptorTuple[];
+  responseInterceptors?: IResponseInterceptorTuple[];
 }
 
 interface IRequestOptionsWithResponse extends IRequestOptions {
@@ -123,12 +125,19 @@ interface IRequest{
 interface IErrorHandler {
   (error: RequestError, opts: IRequestOptions): void;
 }
+type IRequestInterceptor = (config : AxiosRequestConfig) => AxiosRequestConfig;
+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
 
 export interface RequestConfig extends AxiosRequestConfig {
   errorConfig?: {
     errorHandler?: IErrorHandler;
     errorThrower?: <T = any>( res: T ) => void
   };
+  requestInterceptors?: IRequestInterceptorTuple[];
+  responseInterceptors?: IResponseInterceptorTuple[];
 }
 
 let requestInstance: AxiosInstance;
@@ -142,11 +151,24 @@ const getConfig = (): RequestConfig => {
   });
   return config;
 };
+
 const getRequestInstance = (): AxiosInstance => {
   if (requestInstance) return requestInstance;
   const config = getConfig();
   requestInstance = axios.create(config);
 
+  config?.requestInterceptors?.forEach((interceptor) => { 
+    return interceptor instanceof Array ? 
+      requestInstance.interceptors.request.use(interceptor[0], interceptor[1]):
+       requestInstance.interceptors.request.use(interceptor);
+    });
+
+  config?.responseInterceptors?.forEach((interceptor) => { 
+    return 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;
@@ -161,14 +183,36 @@ const getRequestInstance = (): AxiosInstance => {
 const request: IRequest = (url: string, opts: any = { method: 'GET' }) => {   
   const requestInstance = getRequestInstance();
   const config = getConfig();
-  const { getResponse = false } = opts;
+  const { getResponse = false, requestInterceptors, responseInterceptors } = opts;
+  const requestInterceptorsToEject = requestInterceptors?.map((interceptor) => { 
+    return interceptor instanceof Array ? 
+      requestInstance.interceptors.request.use(interceptor[0], interceptor[1]):
+       requestInstance.interceptors.request.use(interceptor);
+    });
+  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)=>{
+        requestInterceptorsToEject?.forEach((interceptor) => {
+          requestInstance.interceptors.request.eject(interceptor);
+        });
+        responseInterceptorsToEject?.forEach((interceptor) => {
+          requestInstance.interceptors.response.eject(interceptor);
+        });
         resolve(getResponse ? res : res.data);
       })
       .catch((error)=>{
+        requestInterceptorsToEject?.forEach((interceptor) => {
+          requestInstance.interceptors.request.eject(interceptor);
+        });
+        responseInterceptorsToEject?.forEach((interceptor) => {
+          requestInstance.interceptors.response.eject(interceptor);
+        });
         try {
           const handler =
             config.errorConfig?.errorHandler;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.0.0-canary.20220422.1",
+  "version": "4.0.0-canary.20220424.1",
   "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.35.1",
-    "@umijs/bundler-utils": "4.0.0-canary.20220422.1",
+    "@umijs/bundler-utils": "4.0.0-canary.20220424.1",
     "antd-dayjs-webpack-plugin": "^1.0.6",
     "axios": "^0.26.1",
     "babel-plugin-import": "^1.13.3",
@@ -44,7 +44,7 @@
     "warning": "^4.0.3"
   },
   "devDependencies": {
-    "umi": "4.0.0-canary.20220422.1"
+    "umi": "4.0.0-canary.20220424.1"
   },
   "publishConfig": {
     "access": "public"