@umijs/plugins 4.0.90 → 4.1.1

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

@@ -64,6 +64,7 @@ var layout_default = (api) => {
     antdVersion = require(`${pkgPath2}/package.json`).version;
   } catch (e) {
   }
+  const packageName = api.pkg.name || "plugin-layout";
   const isAntd5 = antdVersion.startsWith("5");
   const layoutFile = isAntd5 ? "Layout.css" : "Layout.less";
   api.describe({
@@ -129,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,
@@ -231,7 +234,7 @@ const { formatMessage } = useIntl();
     <ProLayout
       route={route}
       location={location}
-      title={userConfig.title || 'plugin-layout'}
+      title={userConfig.title || '${packageName}'}
       navTheme="dark"
       siderWidth={256}
       onMenuHeaderClick={(e) => {
@@ -435,21 +438,28 @@ export function getRightRenderContent (opts: {
     );
   }
 
-
-  const avatar = (
-    <span className="umi-plugin-layout-action">
-        <Avatar
-          size="small"
-          className="umi-plugin-layout-avatar"
-          src={
-            opts.initialState?.avatar ||
-            'https://gw.alipayobjects.com/zos/antfincdn/XAosXuNZyF/BiazfanxmamNRoxxVxka.png'
-          }
-          alt="avatar"
-        />
-        <span className="umi-plugin-layout-name">{opts.initialState?.name}</span>
+  const showAvatar = opts.initialState?.avatar || opts.initialState?.name || opts.runtimeConfig.logout;
+  const disableAvatarImg = opts.initialState?.avatar === false;
+  const nameClassName = disableAvatarImg ? 'umi-plugin-layout-name umi-plugin-layout-hide-avatar-img' : 'umi-plugin-layout-name';
+  const avatar =
+    showAvatar ? (
+      <span className="umi-plugin-layout-action">
+        {!disableAvatarImg ?
+          (
+            <Avatar
+              size="small"
+              className="umi-plugin-layout-avatar"
+              src={
+                opts.initialState?.avatar ||
+                "https://gw.alipayobjects.com/zos/antfincdn/XAosXuNZyF/BiazfanxmamNRoxxVxka.png"
+              }
+              alt="avatar"
+            />
+          ) : null}
+        <span className={nameClassName}>{opts.initialState?.name}</span>
       </span>
-  );
+    ) : null;
+
 
   if (opts.loading) {
     return (
@@ -459,6 +469,11 @@ export function getRightRenderContent (opts: {
     );
   }
 
+  // 如果没有打开Locale，并且头像为空就取消掉这个返回的内容
+  {{^Locale}}
+    if(!avatar) return null;
+  {{/Locale}}
+
   const langMenu = {
     className: "umi-plugin-layout-menu",
     selectedKeys: [],
@@ -498,6 +513,7 @@ export function getRightRenderContent (opts: {
   }
 
 
+
   return (
     <div className="umi-plugin-layout-right anticon">
       {opts.runtimeConfig.logout ? (
@@ -575,6 +591,9 @@ ${// antd@5里面没有这个样式了
 .umi-plugin-layout-name {
   margin-left: 8px;
 }
+.umi-plugin-layout-name.umi-plugin-layout-hide-avatar-img {
+  margin-left: 0;
+}
 `
     });
     api.writeTmpFile({
@@ -677,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.0.90",
+  "version": "4.1.1",
   "description": "@umijs/plugins",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/plugins#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -27,7 +27,7 @@
     "@tanstack/react-query-devtools": "^4.24.10",
     "antd-dayjs-webpack-plugin": "^1.0.6",
     "axios": "^0.27.2",
-    "babel-plugin-import": "^1.13.6",
+    "babel-plugin-import": "^1.13.8",
     "babel-plugin-styled-components": "2.1.4",
     "dayjs": "^1.11.7",
     "dva-core": "^2.0.4",
@@ -45,12 +45,12 @@
     "styled-components": "6.1.1",
     "tslib": "^2",
     "warning": "^4.0.3",
-    "@umijs/bundler-utils": "4.0.90",
+    "@umijs/bundler-utils": "4.1.1",
     "@umijs/valtio": "1.0.4"
   },
   "devDependencies": {
     "antd": "^4.24.1",
-    "umi": "4.0.90"
+    "umi": "4.1.1"
   },
   "publishConfig": {
     "access": "public"