@umijs/plugins 4.0.0-canary.20220425.2 → 4.0.0-canary.20220428.1

package/dist/antd.js

@@ -49,8 +49,7 @@ exports.default = (api) => {
     api.modifyConfig((memo) => {
         checkPkgPath();
         // antd import
-        // alias 会导致 antd 不能多实例，故删除
-        // memo.alias.antd = pkgPath;
+        memo.alias.antd = pkgPath;
         // moment > dayjs
         if (memo.antd.dayjs) {
             memo.alias.moment = (0, path_1.dirname)(require.resolve('dayjs/package.json'));
@@ -80,15 +79,6 @@ exports.default = (api) => {
                     },
                     'antd',
                 ],
-                [
-                    require.resolve('babel-plugin-import'),
-                    {
-                        libraryName: 'antd-4',
-                        libraryDirectory: 'es',
-                        style: style === 'less' ? true : 'css',
-                    },
-                    'antd-4',
-                ],
             ]
             : [];
     });

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,
     });
@@ -48,7 +48,6 @@ exports.default = (api) => {
         cwd: api.cwd,
         dep: '@ant-design/pro-layout',
     }) || (0, path_1.dirname)(require.resolve('@ant-design/pro-layout/package.json'));
-    const antdPkgPath = (0, path_1.dirname)(require.resolve('antd/package.json'));
     api.modifyAppData((memo) => {
         const version = require(`${pkgPath}/package.json`).version;
         memo.pluginLayout = {
@@ -60,7 +59,6 @@ exports.default = (api) => {
     api.modifyConfig((memo) => {
         // import from @ant-design/pro-layout
         memo.alias['@ant-design/pro-layout'] = pkgPath;
-        memo.alias['antd-4'] = antdPkgPath;
         return memo;
     });
     api.onGenerateFiles(() => {
@@ -247,7 +245,7 @@ export function patchRoutes({ routes }) {
         });
         const rightRenderContent = `
 import React from 'react';
-import { Avatar, Dropdown, Menu, Spin } from 'antd-4';
+import { Avatar, Dropdown, Menu, Spin } from 'antd';
 import { LogoutOutlined } from '@ant-design/icons';
 {{#Locale}}
 import { SelectLang } from '@@/plugin-locale';
@@ -489,7 +487,7 @@ export default LogoIcon;
             content: `
 import React from 'react';
 import { history, type IRoute } from 'umi';
-import { Result, Button } from 'antd-4';
+import { Result, Button } from 'antd';
 
 const Exception: React.FC<{
   children: React.ReactNode;

package/dist/request.js

@@ -105,6 +105,7 @@ interface IRequestOptions extends AxiosRequestConfig {
   skipErrorHandler?: boolean;
   requestInterceptors?: IRequestInterceptorTuple[];
   responseInterceptors?: IResponseInterceptorTuple[];
+  [key: string]: any;
 }
 
 interface IRequestOptionsWithResponse extends IRequestOptions {
@@ -125,7 +126,9 @@ interface IRequest{
 interface IErrorHandler {
   (error: RequestError, opts: IRequestOptions): void;
 }
-type IRequestInterceptor = (config : AxiosRequestConfig) => AxiosRequestConfig;
+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
@@ -158,16 +161,32 @@ const getRequestInstance = (): AxiosInstance => {
   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);
-    });
+    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) => { 
-    return interceptor instanceof Array ? 
+    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)=>{
@@ -185,9 +204,25 @@ const request: IRequest = (url: string, opts: any = { method: 'GET' }) => {
   const config = getConfig();
   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);
+    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 ? 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.0.0-canary.20220425.2",
+  "version": "4.0.0-canary.20220428.1",
   "description": "@umijs/plugins",
   "homepage": "https://github.com/umijs/umi-next/tree/master/packages/plugins#readme",
   "bugs": "https://github.com/umijs/umi-next/issues",
@@ -25,8 +25,7 @@
     "@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.20220425.2",
-    "antd": "^4.20.0",
+    "@umijs/bundler-utils": "4.0.0-canary.20220428.1",
     "antd-dayjs-webpack-plugin": "^1.0.6",
     "axios": "^0.26.1",
     "babel-plugin-import": "^1.13.3",
@@ -45,7 +44,7 @@
     "warning": "^4.0.3"
   },
   "devDependencies": {
-    "umi": "4.0.0-canary.20220425.2"
+    "umi": "4.0.0-canary.20220428.1"
   },
   "publishConfig": {
     "access": "public"