@umijs/plugins 4.1.0 → 4.1.2

package/dist/access.js

@@ -80,7 +80,7 @@ export function accessProvider(container) {
       content: `
 import React, { PropsWithChildren } from 'react';
 import { AccessContext } from './context';
-import type { IRoute } from 'umi';
+import type { IRoute } from '${api.appData.umi.importSource}';
 
 export const useAccess = () => {
   return React.useContext(AccessContext);

package/dist/dva.js

@@ -186,7 +186,7 @@ export { getDvaApp } from './dva';
     api.writeTmpFile({
       path: "types.d.ts",
       tpl: `
-import type { History } from 'umi';
+import type { History } from '${api.appData.umi.importSource}';
 
 export interface ConnectProps {
       dispatch?: Dispatch;

package/dist/layout.js

@@ -130,8 +130,10 @@ ${isFlattedDepsDir ? '/// <reference types="antd" />' : ""}
       path: "Layout.tsx",
       content: `
 ${PKG_TYPE_REFERENCE}
-import { Link, useLocation, useNavigate, Outlet, useAppData, useRouteData, matchRoutes } from 'umi';
-import type { IRoute } from 'umi';
+import {
+  Link, useLocation, useNavigate, Outlet, useAppData, matchRoutes,
+  type IRoute
+} from '${api.appData.umi.importSource}';
 import React, { useMemo } from 'react';
 import {
   ProLayout,
@@ -694,7 +696,7 @@ export default LogoIcon;
       path: "Exception.tsx",
       content: `
 import React from 'react';
-import { history, type IRoute } from 'umi';
+import { history, type IRoute } from '${api.appData.umi.importSource}';
 import { Result, Button } from 'antd';
 
 const Exception: React.FC<{

package/dist/request.js

@@ -160,12 +160,13 @@ type RequestError = AxiosError | Error
 interface IErrorHandler {
   (error: RequestError, opts: IRequestOptions): void;
 }
-type IRequestInterceptorAxios = (config: RequestOptions) => RequestOptions;
-type IRequestInterceptorUmiRequest = (url: string, config : RequestOptions) => { url: string, options: RequestOptions };
+type WithPromise<T> = T | Promise<T>;
+type IRequestInterceptorAxios = (config: IRequestOptions) => WithPromise<IRequestOptions>;
+type IRequestInterceptorUmiRequest = (url: string, config : IRequestOptions) => WithPromise<{ url: string, options: IRequestOptions }>;
 type IRequestInterceptor = IRequestInterceptorAxios | IRequestInterceptorUmiRequest;
 type IErrorInterceptor = (error: Error) => Promise<Error>;
-type IResponseInterceptor = <T = any>(response : AxiosResponse<T>) => AxiosResponse<T> ;
-type IRequestInterceptorTuple = [IRequestInterceptor , IErrorInterceptor] | [ IRequestInterceptor ] | IRequestInterceptor
+type IResponseInterceptor = <T = any>(response : AxiosResponse<T>) => WithPromise<AxiosResponse<T>> ;
+type IRequestInterceptorTuple = [IRequestInterceptor , IErrorInterceptor] | [IRequestInterceptor] | IRequestInterceptor
 type IResponseInterceptorTuple = [IResponseInterceptor, IErrorInterceptor] | [IResponseInterceptor] | IResponseInterceptor
 
 export interface RequestConfig<T = any> extends AxiosRequestConfig {
@@ -196,19 +197,19 @@ const getRequestInstance = (): AxiosInstance => {
 
   config?.requestInterceptors?.forEach((interceptor) => {
     if(interceptor instanceof Array){
-      requestInstance.interceptors.request.use((config) => {
+      requestInstance.interceptors.request.use(async (config) => {
         const { url } = config;
         if(interceptor[0].length === 2){
-          const { url: newUrl, options } = interceptor[0](url, config);
+          const { url: newUrl, options } = await interceptor[0](url, config);
           return { ...options, url: newUrl };
         }
         return interceptor[0](config);
       }, interceptor[1]);
     } else {
-      requestInstance.interceptors.request.use((config) => {
+      requestInstance.interceptors.request.use(async (config) => {
         const { url } = config;
         if(interceptor.length === 2){
-          const { url: newUrl, options } = interceptor(url, config);
+          const { url: newUrl, options } = await interceptor(url, config);
           return { ...options, url: newUrl };
         }
         return interceptor(config);
@@ -239,19 +240,19 @@ const request: IRequest = (url: string, opts: any = { method: 'GET' }) => {
   const { getResponse = false, requestInterceptors, responseInterceptors } = opts;
   const requestInterceptorsToEject = requestInterceptors?.map((interceptor) => {
     if(interceptor instanceof Array){
-      return requestInstance.interceptors.request.use((config) => {
+      return requestInstance.interceptors.request.use(async (config) => {
         const { url } = config;
         if(interceptor[0].length === 2){
-          const { url: newUrl, options } = interceptor[0](url, config);
+          const { url: newUrl, options } = await interceptor[0](url, config);
           return { ...options, url: newUrl };
         }
         return interceptor[0](config);
       }, interceptor[1]);
     } else {
-      return requestInstance.interceptors.request.use((config) => {
+      return requestInstance.interceptors.request.use(async (config) => {
         const { url } = config;
         if(interceptor.length === 2){
-          const { url: newUrl, options } = interceptor(url, config);
+          const { url: newUrl, options } = await interceptor(url, config);
           return { ...options, url: newUrl };
         }
         return interceptor(config);
@@ -308,6 +309,10 @@ export type {
   AxiosResponse,
   AxiosError,
   RequestError,
+  IRequestInterceptorAxios as RequestInterceptorAxios,
+  IRequestInterceptorUmiRequest as RequestInterceptorUmiRequest,
+  IRequestInterceptor as RequestInterceptor,
+  IErrorInterceptor as ErrorInterceptor,
   IResponseInterceptor as ResponseInterceptor,
   IRequestOptions as RequestOptions,
   IRequest as Request,
@@ -347,6 +352,10 @@ export type {
   AxiosResponse,
   AxiosError,
   RequestError,
+  RequestInterceptorAxios,
+  RequestInterceptorUmiRequest,
+  RequestInterceptor,
+  ErrorInterceptor,
   ResponseInterceptor,
   RequestOptions,
   Request } from './request';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.1.0",
+  "version": "4.1.2",
   "description": "@umijs/plugins",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/plugins#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -45,12 +45,12 @@
     "styled-components": "6.1.1",
     "tslib": "^2",
     "warning": "^4.0.3",
-    "@umijs/bundler-utils": "4.1.0",
-    "@umijs/valtio": "1.0.4"
+    "@umijs/valtio": "1.0.4",
+    "@umijs/bundler-utils": "4.1.2"
   },
   "devDependencies": {
     "antd": "^4.24.1",
-    "umi": "4.1.0"
+    "umi": "4.1.2"
   },
   "publishConfig": {
     "access": "public"