@umijs/plugins 4.0.32 → 4.0.34

package/dist/layout.js

@@ -373,7 +373,7 @@ export function patchRoutes({ routes }) {
     });
     const rightRenderContent = `
 import React from 'react';
-import { Avatar, Dropdown, Menu, Spin } from 'antd';
+import { Avatar, version, Dropdown, Menu, Spin } from 'antd';
 import { LogoutOutlined } from '@ant-design/icons';
 {{#Locale}}
 import { SelectLang } from '@@/plugin-locale';
@@ -393,19 +393,7 @@ export function getRightRenderContent (opts: {
     );
   }
 
-  const menu = (
-    <Menu className="umi-plugin-layout-menu">
-      <Menu.Item
-        key="logout"
-        onClick={() =>
-          opts.runtimeConfig.logout && opts.runtimeConfig?.logout(opts.initialState)
-        }
-      >
-        <LogoutOutlined />
-        \u9000\u51FA\u767B\u5F55
-      </Menu.Item>
-    </Menu>
-  );
+ 
 
   const avatar = (
     <span className="umi-plugin-layout-action">
@@ -430,10 +418,35 @@ export function getRightRenderContent (opts: {
     );
   }
 
+  const langMenu = {
+    className: "umi-plugin-layout-menu",
+    selectedKeys: [],
+    items: [
+      {
+        key: "logout",
+        label: (
+          <>
+            <LogoutOutlined />
+            \u9000\u51FA\u767B\u5F55
+          </>
+        ),
+        onClick: () => {
+          opts?.runtimeConfig?.logout?.(opts.initialState);
+        },
+      },
+    ],
+  };
+  
+  // antd@5 \u548C  4.24 \u4E4B\u540E\u63A8\u8350\u4F7F\u7528 menu\uFF0C\u6027\u80FD\u66F4\u597D
+  const dropdownProps =
+    version.startsWith("5.") || version.startsWith("4.24.")
+      ? { menu: langMenu }
+      : { overlay: <Menu {...langMenu} /> };  
+
   return (
     <div className="umi-plugin-layout-right anticon">
       {opts.runtimeConfig.logout ? (
-        <Dropdown overlay={menu} overlayClassName="umi-plugin-layout-container">
+        <Dropdown {...dropdownProps} overlayClassName="umi-plugin-layout-container">
           {avatar}
         </Dropdown>
       ) : (

package/dist/qiankun/slave.js

@@ -218,20 +218,19 @@ export { connectMaster } from './connectMaster';
   });
   api.addMiddlewares(async () => {
     return async (req, res, next) => {
-      var _a, _b;
+      var _a;
       const qiankunConfig = api.config.qiankun || {};
       const masterEntry = (_a = qiankunConfig.slave) == null ? void 0 : _a.masterEntry;
-      const isMasterApp = (_b = qiankunConfig.master) == null ? void 0 : _b.enable;
       const { proxyToMasterEnabled } = await api.applyPlugins({
         key: "shouldProxyToMaster",
         type: api.ApplyPluginsType.modify,
         initialValue: { proxyToMasterEnabled: true, req }
       }) ?? {};
       if (masterEntry && proxyToMasterEnabled) {
-        if (isMasterApp) {
-          api.logger.warn("You should not set masterEntry in master app ");
-          return next();
-        }
+        await api.applyPlugins({
+          key: "onLocalProxyStart",
+          type: api.ApplyPluginsType.event
+        });
         return (0, import_http_proxy_middleware.createProxyMiddleware)((pathname) => pathname !== "/local-dev-server", {
           target: masterEntry,
           secure: false,
@@ -239,6 +238,14 @@ export { connectMaster } from './connectMaster';
           followRedirects: false,
           changeOrigin: true,
           selfHandleResponse: true,
+          onProxyReq(proxyReq) {
+            api.applyPlugins({
+              key: "onLocalProxyReq",
+              type: api.ApplyPluginsType.event,
+              sync: true,
+              args: proxyReq
+            });
+          },
           onProxyRes: (0, import_http_proxy_middleware.responseInterceptor)(async (responseBuffer, proxyRes, req2, res2) => {
             if (proxyRes.statusCode === 302) {
               const hostname = req2.hostname;

package/dist/request.js

@@ -69,7 +69,7 @@ import {
   PaginatedResult,
 } from '{{{umiRequestPath}}}/es/types';
 
-type ResultWithData< T = any > = { data?: T; [key: string]: any };
+type ResultWithData< T = any > = { {{resultDataType}} [key: string]: any };
 
 function useRequest<
   R = any,
@@ -82,8 +82,8 @@ function useRequest<
 ): BaseResult<U, P>;
 function useRequest<R extends ResultWithData = any, P extends any[] = any>(
   service: CombineService<R, P>,
-  options?: BaseOptions<R['data'], P>,
-): BaseResult<R['data'], P>;
+  options?: BaseOptions<R{{{resultDataField}}}, P>,
+): BaseResult<R{{{resultDataField}}}, P>;
 function useRequest<R extends LoadMoreFormatReturn = any, RR = any>(
   service: CombineService<RR, LoadMoreParams<R>>,
   options: LoadMoreOptionsWithFormat<R, RR>,
@@ -92,9 +92,9 @@ function useRequest<
   R extends ResultWithData<LoadMoreFormatReturn | any> = any,
   RR extends R = any,
 >(
-  service: CombineService<R, LoadMoreParams<R['data']>>,
-  options: LoadMoreOptions<RR['data']>,
-): LoadMoreResult<R['data']>;
+  service: CombineService<R, LoadMoreParams<R{{{resultDataField}}}>>,
+  options: LoadMoreOptions<RR{{{resultDataField}}}>,
+): LoadMoreResult<R{{{resultDataField}}}>;
 
 function useRequest<R = any, Item = any, U extends Item = any>(
   service: CombineService<R, PaginatedParams>,
@@ -313,13 +313,18 @@ export type {
     let dataField = (_a = api.config.request) == null ? void 0 : _a.dataField;
     if (dataField === void 0)
       dataField = "data";
-    const formatResult = dataField === "" ? `result => result` : `result => result?.${dataField}`;
+    const isEmpty = dataField === "";
+    const formatResult = isEmpty ? `result => result` : `result => result?.${dataField}`;
+    const resultDataType = isEmpty ? dataField : `${dataField}?: T;`;
+    const resultDataField = isEmpty ? dataField : `['${dataField}']`;
     api.writeTmpFile({
       path: "request.ts",
       content: import_plugin_utils.Mustache.render(requestTpl, {
         umiRequestPath,
         axiosPath,
-        formatResult
+        formatResult,
+        resultDataType,
+        resultDataField
       })
     });
     api.writeTmpFile({

package/libs/locale/SelectLang.tpl

@@ -1,6 +1,6 @@
 import React,{ useState } from 'react';
 {{#Antd}}
-import { Menu, Dropdown } from 'antd';
+import { Menu, version, Dropdown } from 'antd';
 import { ClickParam } from 'antd/{{{antdFiles}}}/menu';
 import { DropDownProps } from 'antd/{{{antdFiles}}}/dropdown';
 {{/Antd}}
@@ -422,20 +422,30 @@ export const SelectLang: React.FC<SelectLangProps> = (props) => {
 
   const menuItemStyle = { minWidth: "160px" };
   const menuItemIconStyle = { marginRight: "8px" };
-  const langMenu = (
-    <Menu selectedKeys={[selectedLang]} onClick={handleClick}>
-      {allLangUIConfig.map((localeObj) => {
-        return (
-          <Menu.Item key={localeObj.lang || localeObj.key} style={menuItemStyle}>
-            <span role="img" aria-label={localeObj?.label || "en-US"} style={menuItemIconStyle}>
-              {localeObj?.icon || "🌐"}
-            </span>
-            {localeObj?.label || "en-US"}
-          </Menu.Item>
-        );
-      })}
-    </Menu>
-  );
+
+  const langMenu = {
+    selectedKeys: [selectedLang],
+    onClick: handleClick,
+    items: allLangUIConfig.map((localeObj) => ({
+      key: localeObj.lang || localeObj.key,
+      style: menuItemStyle,
+      label: (
+        <>
+          <span role="img" aria-label={localeObj?.label || 'en-US'} style={menuItemIconStyle}>
+            {localeObj?.icon || '🌐'}
+          </span>
+          {localeObj?.label || 'en-US'}
+        </>
+      ),
+    })),
+  };
+
+  // antd@5 和  4.24 之后推荐使用 menu，性能更好
+  const dropdownProps =
+    version.startsWith('5.') || version.startsWith('4.24.')
+      ? { menu: langMenu }
+      : { overlay: <Menu {...langMenu} /> };
+
 
   const inlineStyle = {
     cursor: "pointer",
@@ -449,7 +459,7 @@ export const SelectLang: React.FC<SelectLangProps> = (props) => {
   };
 
   return (
-    <HeaderDropdown overlay={langMenu} placement="bottomRight" {...restProps}>
+    <HeaderDropdown {...dropdownProps} placement="bottomRight" {...restProps}>
       <span className={globalIconClassName} style={inlineStyle}>
         <i className="anticon" title={allLangUIConfig[selectedLang]?.title}>
           { icon ?

package/libs/qiankun/master/MicroApp.tsx

@@ -186,9 +186,9 @@ export const MicroApp = forwardRef(
               prefetchApps(specialPrefetchApps, configuration);
             } else {
               // 不能无脑全量 prefetch，需要有一个阈值
-              const otherNotMountedApps = apps.filter(
-                (app) => !isCurrentApp(app),
-              ).slice(0, prefetchThreshold);
+              const otherNotMountedApps = apps
+                .filter((app) => !isCurrentApp(app))
+                .slice(0, prefetchThreshold);
               prefetchApps(otherNotMountedApps, configuration);
             }
             noneMounted = false;

package/libs/qiankun/slave/lifecycles.ts

@@ -23,22 +23,22 @@ let hasMountedAtLeastOnce = false;
 export default () => defer.promise;
 export const contextOptsStack: any[] = [];
 
-// function normalizeHistory(
-//   history?: 'string' | Record<string, any>,
-//   base?: string,
-// ) {
-//   let normalizedHistory: Record<string, any> = {};
-//   if (base) normalizedHistory.basename = base;
-//   if (history) {
-//     if (typeof history === 'string') {
-//       normalizedHistory.type = history;
-//     } else {
-//       normalizedHistory = history;
-//     }
-//   }
-//
-//   return normalizedHistory;
-// }
+function normalizeHistory(
+  history?: 'string' | Record<string, any>,
+  base?: string,
+) {
+  let normalizedHistory: Record<string, any> = {};
+  if (base) normalizedHistory.basename = base;
+  if (history) {
+    if (typeof history === 'string') {
+      normalizedHistory.type = history;
+    } else {
+      normalizedHistory = history;
+    }
+  }
+
+  return normalizedHistory;
+}
 
 async function getSlaveRuntime() {
   const config = await getPluginManager().applyPlugins({
@@ -73,21 +73,24 @@ export function genMount(mountElementId: string) {
         await slaveRuntime.mount(props);
       }
 
-      const { type, ...historyOpts } = props?.history || {};
+      const { type, ...historyOpts } = normalizeHistory(
+        props?.history || {},
+        props?.base,
+      );
 
       // 更新 clientRender 配置
       const clientRenderOpts = {
-        // 默认开启
-        // 如果需要手动控制 loading，通过主应用配置 props.autoSetLoading false 可以关闭
         callback: () => {
+          // 默认开启
+          // 如果需要手动控制 loading，通过主应用配置 props.autoSetLoading false 可以关闭
           if (props.autoSetLoading && typeof props.setLoading === 'function') {
             props.setLoading(false);
           }
 
-          // // 支持将子应用的 history 回传给父应用
-          // if (typeof props?.onHistoryInit === 'function') {
-          //   props.onHistoryInit(history);
-          // }
+          // 支持将子应用的 history 回传给父应用
+          if (typeof props?.onHistoryInit === 'function') {
+            props.onHistoryInit(history);
+          }
         },
         // 支持通过 props 注入 container 来限定子应用 mountElementId 的查找范围
         // 避免多个子应用出现在同一主应用时出现 mount 冲突
@@ -125,14 +128,6 @@ export function genMount(mountElementId: string) {
       defer.resolve();
     }
 
-    // 如果需要手动控制 loading，通过主应用配置 props.autoSetLoading false 可以关闭
-    // 考虑到 react 18 之后 callback 不再准
-    // 所以在这里直接返回，而不使用 ReactDOM.render 的第三个参数
-    if (typeof props !== 'undefined') {
-      if (props.autoSetLoading && typeof props.setLoading === 'function') {
-        props.setLoading(false);
-      }
-    }
     hasMountedAtLeastOnce = true;
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.0.32",
+  "version": "4.0.34",
   "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 @@
     "@ant-design/antd-theme-variable": "^1.0.0",
     "@ant-design/icons": "^4.7.0",
     "@ant-design/pro-components": "^2.0.1",
-    "@umijs/bundler-utils": "4.0.32",
+    "@umijs/bundler-utils": "4.0.34",
     "@umijs/valtio": "^1.0.0",
     "antd-dayjs-webpack-plugin": "^1.0.6",
     "axios": "^0.27.2",
@@ -49,7 +49,7 @@
   },
   "devDependencies": {
     "antd": "^4.24.1",
-    "umi": "4.0.32"
+    "umi": "4.0.34"
   },
   "publishConfig": {
     "access": "public"