@umijs/plugins 4.0.66 → 4.0.67

package/dist/antd.js

@@ -32,6 +32,7 @@ __export(antd_exports, {
   default: () => antd_default
 });
 module.exports = __toCommonJS(antd_exports);
+var import_moment_webpack_plugin = __toESM(require("@ant-design/moment-webpack-plugin"));
 var import_assert = __toESM(require("assert"));
 var import_path = require("path");
 var import_umi = require("umi");
@@ -54,6 +55,7 @@ var antd_default = (api) => {
   }
   const appComponentAvailable = import_plugin_utils.semver.gte(antdVersion, "5.1.0");
   const appConfigAvailable = import_plugin_utils.semver.gte(antdVersion, "5.3.0");
+  const day2MomentAvailable = import_plugin_utils.semver.gte(antdVersion, "5.0.0");
   api.describe({
     config: {
       schema({ zod }) {
@@ -68,7 +70,9 @@ var antd_default = (api) => {
           style: zod.enum(["less", "css"]).describe("less or css, default less"),
           theme: zod.record(zod.any()),
           // Only antd@5.1.0 is supported
-          appConfig: zod.record(zod.any()).describe("Only antd@5.1.0 is supported")
+          appConfig: zod.record(zod.any()).describe("Only antd@5.1.0 is supported"),
+          // DatePicker & Calendar use moment version
+          momentPicker: zod.boolean().describe("Only antd@5.x is supported")
         }).deepPartial();
       }
     },
@@ -100,9 +104,6 @@ var antd_default = (api) => {
       memo.antd = antd = Object.assign(defaultConfig, antd);
     }
     memo.alias.antd = pkgPath;
-    if (antd.dayjs) {
-      memo.alias.moment = (0, import_path.dirname)(require.resolve("dayjs/package.json"));
-    }
     if (antdVersion.startsWith("5")) {
       const theme = require("@ant-design/antd-theme-variable");
       memo.theme = {
@@ -153,6 +154,18 @@ var antd_default = (api) => {
     }
     return memo;
   });
+  api.chainWebpack((memo) => {
+    if (api.config.antd.momentPicker) {
+      if (day2MomentAvailable) {
+        memo.plugin("antd-moment-webpack-plugin").use(import_moment_webpack_plugin.default);
+      } else {
+        api.logger.warn(
+          `MomentPicker is only available in version 5.0.0 and above, but you are using version ${antdVersion}`
+        );
+      }
+    }
+    return memo;
+  });
   api.addExtraBabelPlugins(() => {
     const style = antdVersion.startsWith("5") ? false : api.config.antd.style || "less";
     return api.config.antd.import && !api.appData.vite ? [

package/dist/layout.js

@@ -52,6 +52,7 @@ var getAllIcons = () => {
     {}
   );
 };
+var ANT_PRO_COMPONENT = "@ant-design/pro-components";
 var layout_default = (api) => {
   let antdVersion = "4.0.0";
   try {
@@ -75,7 +76,7 @@ var layout_default = (api) => {
   });
   const depList = [
     "@alipay/tech-ui",
-    "@ant-design/pro-components",
+    ANT_PRO_COMPONENT,
     "@ant-design/pro-layout"
   ];
   const pkgHasDep = depList.find((dep) => {
@@ -94,9 +95,10 @@ var layout_default = (api) => {
     if (pkgHasDep && api.cwd !== cwd && (0, import_fs.existsSync)((0, import_path.join)(cwd, "node_modules", pkgHasDep, "package.json"))) {
       return (0, import_path.join)(cwd, "node_modules", pkgHasDep);
     }
-    return (0, import_path.dirname)(require.resolve("@ant-design/pro-components/package.json"));
+    return (0, import_path.dirname)(require.resolve(`${ANT_PRO_COMPONENT}/package.json`));
   };
   const pkgPath = (0, import_plugin_utils.winPath)(getPkgPath());
+  const resolvedPkgPath = pkgPath || ANT_PRO_COMPONENT;
   api.modifyAppData((memo) => {
     const version = require(`${pkgPath}/package.json`).version;
     memo.pluginLayout = {
@@ -112,8 +114,11 @@ var layout_default = (api) => {
     }
     return memo;
   });
+  const isFlattedDepsDir = [import_plugin_utils.NpmClientEnum.npm, import_plugin_utils.NpmClientEnum.yarn].includes(
+    api.appData.npmClient
+  );
   api.onGenerateFiles(() => {
-    const PKG_TYPE_REFERENCE = `/// <reference types="${pkgPath || "@ant-design/pro-components"}" />`;
+    const PKG_TYPE_REFERENCE = `/// <reference types="${isFlattedDepsDir ? ANT_PRO_COMPONENT : resolvedPkgPath}" />`;
     const hasInitialStatePlugin = api.config.initialState;
     api.writeTmpFile({
       path: "Layout.tsx",
@@ -124,7 +129,7 @@ import type { IRoute } from 'umi';
 import React, { useMemo } from 'react';
 import {
   ProLayout,
-} from "${pkgPath || "@ant-design/pro-components"}";
+} from "${resolvedPkgPath}";
 import './Layout.less';
 import Logo from './Logo';
 import Exception from './Exception';
@@ -299,7 +304,7 @@ const { formatMessage } = useIntl();
       path: "types.d.ts",
       content: `
     ${PKG_TYPE_REFERENCE}
-    import type { ProLayoutProps, HeaderProps } from "${pkgPath || "@ant-design/pro-components"}";
+    import type { ProLayoutProps, HeaderProps } from "${resolvedPkgPath}";
     ${hasInitialStatePlugin ? `import type InitialStateType from '@@/plugin-initialState/@@initialState';
            type InitDataType = ReturnType<typeof InitialStateType>;
         ` : "type InitDataType = any;"}

package/libs/qiankun/master/MicroApp.tsx

@@ -8,7 +8,7 @@ import noop from 'lodash/noop';
 import {
   FrameworkConfiguration,
   loadMicroApp,
-  MicroApp as MicroAppType,
+  MicroApp as MicroAppTypeDefinition,
   prefetchApps,
 } from 'qiankun';
 import React, {
@@ -37,6 +37,12 @@ type MemoryHistory = {
   type?: 'memory';
 } & any;
 
+type MicroAppType = MicroAppTypeDefinition & {
+  _unmounting?: boolean;
+  _updatingPromise?: Promise<void>;
+  _updatingTimestamp?: number;
+};
+
 export type Props = {
   name: string;
   settings?: FrameworkConfiguration;
@@ -59,10 +65,8 @@ export type Props = {
   className?: string;
 } & Record<string, any>;
 
-function unmountMicroApp(microApp?: MicroAppType) {
-  if (microApp) {
-    microApp.mountPromise.then(() => microApp.unmount());
-  }
+function unmountMicroApp(microApp: MicroAppType) {
+  microApp.mountPromise.then(() => microApp.unmount());
 }
 
 function useDeepCompare<T>(value: T): T {
@@ -98,7 +102,6 @@ export const MicroApp = forwardRef(
       ...propsFromParams
     } = componentProps;
 
-    // ref: https://github.com/umijs/plugins/pull/866
     // name 跟 appNameKeyAlias 这两个 key 同时存在时，优先使用 name，避免对存量应用造成 breaking change。
     // 比如 appNameKeyAlias 配置是 id，但之前 id 正好作为普通的 props 使用过，如 <MicroApp name="app" id="123" />
     // 正常场景会优先匹配 appNameKeyAlias 对应的字段，fallback 到 name，避免对已经使用 <MicroApp name="app" /> 的应用造成影响
@@ -133,8 +136,6 @@ export const MicroApp = forwardRef(
 
     const containerRef = useRef<HTMLDivElement>();
     const microAppRef = useRef<MicroAppType>();
-    const updatingPromise = useRef<Promise<any>>();
-    const updatingTimestamp = useRef(Date.now());
 
     useImperativeHandle(componentRef, () => microAppRef.current);
 
@@ -143,8 +144,8 @@ export const MicroApp = forwardRef(
       if (!appConfig) {
         setComponentError(
           new Error(
-            `[@umijs/plugin-qiankun]: Can not find the configuration of ${name} app!`,
-          ),
+            `[@umijs/plugin-qiankun]: Can not find the configuration of ${name} app! Currently, only the following apps are configured:\n${JSON.stringify(apps, null, 2)}`
+          )
         );
       }
       return noop;
@@ -223,36 +224,39 @@ export const MicroApp = forwardRef(
         },
       );
 
-      return () => unmountMicroApp(microAppRef.current, updatingPromise.current);
+      return () => {
+        const microApp = microAppRef.current;
+        if (microApp) {
+          // 微应用 unmount 是异步的，中间的流转状态不能确定，所有需要一个标志位来确保 unmount 开始之后不会再触发 update
+          microApp._unmounting = true;
+          unmountMicroApp(microApp);
+        }
+      };
     }, [name]);
 
     useEffect(() => {
       const microApp = microAppRef.current;
       if (microApp) {
-        if (!updatingPromise.current) {
+        if (!microApp._updatingPromise) {
           // 初始化 updatingPromise 为 microApp.mountPromise，从而确保后续更新是在应用 mount 完成之后
-          updatingPromise.current = microApp.mountPromise;
+          microApp._updatingPromise = microApp.mountPromise;
+          microApp._updatingTimestamp = Date.now();
         } else {
           // 确保 microApp.update 调用是跟组件状态变更顺序一致的，且后一个微应用更新必须等待前一个更新完成
-          updatingPromise.current = updatingPromise.current.then(() => {
+          microApp._updatingPromise = microApp._updatingPromise.then(() => {
             const canUpdate = (microApp?: MicroAppType) =>
-              microApp?.update && microApp.getStatus() === 'MOUNTED';
+              microApp?.update && microApp.getStatus() === 'MOUNTED' && !microApp._unmounting;
             if (canUpdate(microApp)) {
               const props = {
                 ...propsFromConfig,
                 ...stateForSlave,
                 ...propsFromParams,
-                __globalRoutesInfo: {
-                  appNameKeyAlias,
-                  masterHistoryType,
-                  base: globalSettings.base,
-                  microAppRoutes: globalSettings.microAppRoutes,
-                },
                 setLoading,
               };
 
               if (process.env.NODE_ENV === 'development') {
-                if (Date.now() - updatingTimestamp.current < 200) {
+                const updatingTimestamp = microApp._updatingTimestamp!;
+                if (Date.now() - updatingTimestamp < 200) {
                   console.warn(
                     `[@umijs/plugin-qiankun] It seems like microApp ${name} is updating too many times in a short time(200ms), you may need to do some optimization to avoid the unnecessary re-rendering.`,
                   );
@@ -262,7 +266,7 @@ export const MicroApp = forwardRef(
                   `[@umijs/plugin-qiankun] MicroApp ${name} is updating with props: `,
                   props,
                 );
-                updatingTimestamp.current = Date.now();
+                microApp._updatingTimestamp = Date.now();
               }
 
               // 返回 microApp.update 形成链式调用

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.0.66",
+  "version": "4.0.67",
   "description": "@umijs/plugins",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/plugins#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -20,6 +20,7 @@
     "@ahooksjs/use-request": "^2.0.0",
     "@ant-design/antd-theme-variable": "^1.0.0",
     "@ant-design/icons": "^4.7.0",
+    "@ant-design/moment-webpack-plugin": "^0.0.3",
     "@ant-design/pro-components": "^2.0.1",
     "@tanstack/react-query": "^4.24.10",
     "@tanstack/react-query-devtools": "^4.24.10",
@@ -42,12 +43,12 @@
     "styled-components": "6.0.0-beta.9",
     "tslib": "^2",
     "warning": "^4.0.3",
-    "@umijs/bundler-utils": "4.0.66",
+    "@umijs/bundler-utils": "4.0.67",
     "@umijs/valtio": "1.0.3"
   },
   "devDependencies": {
     "antd": "^4.24.1",
-    "umi": "4.0.66"
+    "umi": "4.0.67"
   },
   "publishConfig": {
     "access": "public"