@umijs/plugins 4.0.74 → 4.0.76

package/dist/antd.js

@@ -54,6 +54,7 @@ var antd_default = (api) => {
   } catch (e) {
   }
   const isV5 = antdVersion.startsWith("5");
+  const isV4 = antdVersion.startsWith("4");
   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");
@@ -106,7 +107,7 @@ var antd_default = (api) => {
       memo.antd = antd = Object.assign(defaultConfig, antd);
     }
     memo.alias.antd = pkgPath;
-    if (antdVersion.startsWith("5")) {
+    if (isV5) {
       const theme = require("@ant-design/antd-theme-variable");
       memo.theme = {
         ...theme,
@@ -120,22 +121,21 @@ var antd_default = (api) => {
         throw Error(errorMessage);
       }
     }
-    if (antd.dark || antd.compact) {
-      const { getThemeVariables } = require("antd/dist/theme");
+    if (isV4) {
+      if (antd.dark || antd.compact) {
+        const { getThemeVariables } = require("antd/dist/theme");
+        memo.theme = {
+          ...getThemeVariables(antd),
+          ...memo.theme
+        };
+      }
       memo.theme = {
-        ...getThemeVariables(antd),
+        "root-entry-name": "default",
         ...memo.theme
       };
     }
-    memo.theme = {
-      "root-entry-name": "default",
-      ...memo.theme
-    };
     if (antd.theme) {
-      (0, import_assert.default)(
-        antdVersion.startsWith("5"),
-        `antd.theme is only valid when antd is 5`
-      );
+      (0, import_assert.default)(isV5, `antd.theme is only valid when antd is 5`);
       antd.configProvider ?? (antd.configProvider = {});
       antd.configProvider.theme = (0, import_plugin_utils.deepmerge)(
         antd.configProvider.theme || {},
@@ -169,26 +169,29 @@ var antd_default = (api) => {
     return memo;
   });
   api.addExtraBabelPlugins(() => {
-    const style = isV5 ? false : api.config.antd.style || "less";
-    return api.config.antd.import && !api.appData.vite ? [
-      [
-        require.resolve("babel-plugin-import"),
-        {
-          libraryName: "antd",
-          libraryDirectory: "es",
-          ...style ? {
-            style: style === "less" || "css"
-          } : {}
-        },
-        "antd"
-      ]
-    ] : [];
+    const style = api.config.antd.style || "less";
+    if (api.config.antd.import && !api.appData.vite) {
+      return [
+        [
+          require.resolve("babel-plugin-import"),
+          {
+            libraryName: "antd",
+            libraryDirectory: "es",
+            ...isV5 ? {} : { style: style === "less" || "css" }
+          },
+          "antd"
+        ]
+      ];
+    }
+    return [];
   });
   api.onGenerateFiles(() => {
     var _a;
     const withConfigProvider = !!api.config.antd.configProvider;
     const withAppConfig = appConfigAvailable && !!api.config.antd.appConfig;
     const styleProvider = api.config.antd.styleProvider;
+    const userInputCompact = api.config.antd.compact;
+    const userInputDark = api.config.antd.dark;
     const ieTarget = !!((_a = api.config.targets) == null ? void 0 : _a.ie) || !!api.config.legacy;
     let styleProviderConfig = false;
     if (isV5 && (ieTarget || styleProvider)) {
@@ -216,7 +219,9 @@ var antd_default = (api) => {
       context: {
         configProvider: withConfigProvider && JSON.stringify(api.config.antd.configProvider),
         appConfig: appComponentAvailable && JSON.stringify(api.config.antd.appConfig),
-        styleProvider: styleProviderConfig
+        styleProvider: styleProviderConfig,
+        // 是否启用了 v5 的 theme algorithm
+        enableV5ThemeAlgorithm: isV5 && (userInputCompact || userInputDark) ? { compact: userInputCompact, dark: userInputDark } : false
       },
       tplPath: (0, import_plugin_utils.winPath)((0, import_path.join)(ANTD_TEMPLATES_DIR, "runtime.ts.tpl"))
     });
@@ -265,10 +270,9 @@ export type IRuntimeConfig = {
     return [];
   });
   api.addEntryImportsAhead(() => {
-    const isAntd5 = antdVersion.startsWith("5");
     const style = api.config.antd.style || "less";
     const imports = [];
-    if (isAntd5) {
+    if (isV5) {
       imports.push({ source: "antd/dist/reset.css" });
     } else if (!api.config.antd.import || api.appData.vite) {
       imports.push({

package/dist/qiankun/master.js

@@ -33,6 +33,7 @@ __export(master_exports, {
   isMasterEnable: () => isMasterEnable
 });
 module.exports = __toCommonJS(master_exports);
+var import_assert = __toESM(require("assert"));
 var import_fs = require("fs");
 var import_path = require("path");
 var import_umi = require("umi");
@@ -47,6 +48,15 @@ function isMasterEnable(opts) {
   }
   return !!process.env.INITIAL_QIANKUN_MASTER_OPTIONS;
 }
+function getCustomLoader(api) {
+  var _a, _b, _c;
+  const loader = (_b = (_a = api.config.qiankun) == null ? void 0 : _a.master) == null ? void 0 : _b.loader;
+  (0, import_assert.default)(
+    !loader || ((_c = loader.startsWith) == null ? void 0 : _c.call(loader, "@/")),
+    "[@umijs/plugin-qiankun]: loader only support root path, eg: @/loading"
+  );
+  return loader;
+}
 var master_default = (api) => {
   api.describe({
     key: "qiankun-master",
@@ -134,8 +144,13 @@ export const setMasterOptions = (newOpts) => options = ({ ...options, ...newOpts
     });
     api.writeTmpFile({
       path: "MicroAppLoader.tsx",
-      // 开启了 antd 插件的时候，使用 antd 的 loader 组件，否则提示用户必须设置一个自定义的 loader 组件
-      content: api.isPluginEnable("antd") ? getFileContent("AntdLoader.tsx") : `export default function Loader() { console.warn(\`[plugins/qiankun]: Seems like you'r not using @umijs/plugin-antd, you need to provide a custom loader or set autoSetLoading false to shut down this warning!\`); return null; }`
+      content: getCustomLoader(api) ? (
+        // 用户自定义的 loading 优先级最高
+        `export { default } from '${getCustomLoader(api)}';`
+      ) : api.isPluginEnable("antd") ? getFileContent("AntdLoader.tsx") : (
+        // 开启了 antd 插件的时候，使用 antd 的 loader 组件，否则提示用户必须设置一个自定义的 loader 组件
+        `export default function Loader() { console.warn(\`[plugins/qiankun]: Seems like you'r not using @umijs/plugin-antd, you need to provide a custom loader or set autoSetLoading false to shut down this warning!\`); return null; }`
+      )
     });
     [
       "common.ts",

package/libs/qiankun/master/types.ts

@@ -24,6 +24,7 @@ export type MicroAppRoute = {
 
 export type MasterOptions = {
   enable?: boolean;
+  loader?: string;
   apps?: App[];
   routes?: MicroAppRoute[];
   lifeCycles?: FrameworkLifeCycles<object>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.0.74",
+  "version": "4.0.76",
   "description": "@umijs/plugins",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/plugins#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -44,12 +44,12 @@
     "styled-components": "6.0.0-rc.0",
     "tslib": "^2",
     "warning": "^4.0.3",
-    "@umijs/valtio": "1.0.3",
-    "@umijs/bundler-utils": "4.0.74"
+    "@umijs/bundler-utils": "4.0.76",
+    "@umijs/valtio": "1.0.3"
   },
   "devDependencies": {
     "antd": "^4.24.1",
-    "umi": "4.0.74"
+    "umi": "4.0.76"
   },
   "publishConfig": {
     "access": "public"

package/templates/antd/runtime.ts.tpl

@@ -1,14 +1,15 @@
 import React from 'react';
 import {
   Modal,
-{{#configProvider}}
   ConfigProvider,
-{{/configProvider}}
 {{#appConfig}}
   App,
 {{/appConfig}}
   message,
   notification,
+{{#enableV5ThemeAlgorithm}}
+  theme,
+{{/enableV5ThemeAlgorithm}}
 } from 'antd';
 import { ApplyPluginsType } from 'umi';
 {{#styleProvider}}
@@ -47,6 +48,7 @@ export function rootContainer(rawContainer) {
     ...finalConfigProvider
   } = getAntdConfig();
   let container = rawContainer;
+
 {{#configProvider}}
   if (finalConfigProvider.prefixCls) {
     Modal.config({
@@ -77,6 +79,26 @@ export function rootContainer(rawContainer) {
   container = <ConfigProvider {...finalConfigProvider}>{container}</ConfigProvider>;
 {{/configProvider}}
 
+{{#enableV5ThemeAlgorithm}}
+  // Add token algorithm for antd5 only
+  container = (
+    <ConfigProvider
+      theme={({
+        algorithm: [
+          {{#enableV5ThemeAlgorithm.compact}}
+          theme.compactAlgorithm,
+          {{/enableV5ThemeAlgorithm.compact}}
+          {{#enableV5ThemeAlgorithm.dark}}
+          theme.darkAlgorithm,
+          {{/enableV5ThemeAlgorithm.dark}}
+        ],
+      })}
+    >
+      {container}
+    </ConfigProvider>
+  );
+{{/enableV5ThemeAlgorithm}}
+
 {{#styleProvider}}
   container = (
     <StyleProvider