@umijs/plugins 4.6.0 → 4.6.1

package/dist/antd.js

@@ -53,8 +53,13 @@ var antd_default = (api) => {
     antdVersion = require(`${pkgPath}/package.json`).version;
   } catch (e) {
   }
-  const isV5 = antdVersion.startsWith("5");
-  const isV4 = antdVersion.startsWith("4");
+  const isModern = import_plugin_utils.semver.satisfies(
+    antdVersion,
+    "^5.0.0 || ^6.0.0",
+    // 两者都还在维护周期中，允许使用预发布版本. eg. 6.1.0-alpha.0
+    { includePrerelease: true }
+  );
+  const isLegacy = import_plugin_utils.semver.satisfies(antdVersion, "^4.0.0");
   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");
@@ -78,7 +83,7 @@ var antd_default = (api) => {
             })
           ]);
         };
-        const createV5Schema = () => {
+        const createModernSchema = () => {
           const componentNameSchema = zod.string().refine(
             (value) => {
               const firstLetter = value.slice(0, 1);
@@ -103,17 +108,17 @@ var antd_default = (api) => {
             configProvider
           }).deepPartial();
         };
-        const createV4Schema = () => {
+        const createLegacySchema = () => {
           return zod.object({
             ...commonSchema,
             configProvider: zod.record(zod.any())
           }).deepPartial();
         };
-        if (isV5) {
-          return createV5Schema();
+        if (isModern) {
+          return createModernSchema();
         }
-        if (isV4) {
-          return createV4Schema();
+        if (isLegacy) {
+          return createLegacySchema();
         }
         return zod.object({});
       }
@@ -128,6 +133,16 @@ var antd_default = (api) => {
       throw new Error(`Can't find antd package. Please install antd first.`);
     }
   }
+  api.onCheck(() => {
+    if (import_plugin_utils.semver.gte(antdVersion, "6.0.0")) {
+      const reactVersion = api.appData.react.version;
+      if (import_plugin_utils.semver.lt(reactVersion, "18.0.0")) {
+        throw new Error(
+          `antd@6 requires React version >= 18.0.0, but got ${reactVersion}.`
+        );
+      }
+    }
+  });
   api.modifyAppData((memo) => {
     checkPkgPath();
     const version = require(`${pkgPath}/package.json`).version;
@@ -146,21 +161,23 @@ var antd_default = (api) => {
       memo.antd = antd = Object.assign(defaultConfig, antd);
     }
     memo.alias.antd = pkgPath;
-    if (isV5) {
+    if (isModern) {
       const theme = require("@ant-design/antd-theme-variable");
       memo.theme = {
         ...theme,
         ...memo.theme
       };
+    }
+    if (import_plugin_utils.semver.gte(antdVersion, "5.0.0")) {
       if ((_a = memo.antd) == null ? void 0 : _a.import) {
-        const errorMessage = `Can't set antd.import while using antd5 (${antdVersion})`;
+        const errorMessage = `The antd.import option is not supported in antd version 5 and above (${antdVersion}).`;
         api.logger.fatal(
           "please change config antd.import to false, then start server again"
         );
         throw Error(errorMessage);
       }
     }
-    if (isV4) {
+    if (isLegacy) {
       if (antd.dark || antd.compact) {
         const { getThemeVariables } = require("antd/dist/theme");
         memo.theme = {
@@ -174,7 +191,10 @@ var antd_default = (api) => {
       };
     }
     if (antd.theme) {
-      (0, import_assert.default)(isV5, `antd.theme is only valid when antd is 5`);
+      (0, import_assert.default)(
+        isModern,
+        `The 'antd.theme' option is only available for antd version 5 and above.`
+      );
       antd.configProvider ?? (antd.configProvider = {});
       antd.configProvider.theme = (0, import_plugin_utils.deepmerge)(
         antd.configProvider.theme || {},
@@ -223,7 +243,7 @@ var antd_default = (api) => {
           {
             libraryName: "antd",
             libraryDirectory: "es",
-            ...isV5 ? {} : { style: style === "less" || "css" }
+            style: style === "less" || "css"
           },
           "antd"
         ]
@@ -244,7 +264,7 @@ var antd_default = (api) => {
     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)) {
+    if (isModern && (ieTarget || styleProvider)) {
       const cssinjs = (0, import_resolveProjectDep.resolveProjectDep)({
         pkg: api.pkg,
         cwd: api.cwd,
@@ -255,8 +275,14 @@ var antd_default = (api) => {
           cssinjs: (0, import_plugin_utils.winPath)(cssinjs)
         };
         if (ieTarget) {
-          styleProviderConfig.hashPriority = "high";
-          styleProviderConfig.legacyTransformer = true;
+          if (import_plugin_utils.semver.gte(antdVersion, "6.0.0")) {
+            api.logger.warn(
+              `You are using antd version ${antdVersion} which no longer supports IE, but your targets or legacy config indicates IE support. Please adjust your targets or legacy config accordingly.`
+            );
+          } else {
+            styleProviderConfig.hashPriority = "high";
+            styleProviderConfig.legacyTransformer = true;
+          }
         }
         styleProviderConfig = {
           ...styleProviderConfig,
@@ -266,9 +292,9 @@ var antd_default = (api) => {
     }
     const configProvider = withConfigProvider && JSON.stringify(api.config.antd.configProvider);
     const appConfig = appComponentAvailable && JSON.stringify(api.config.antd.appConfig);
-    const enableV5ThemeAlgorithm = isV5 && (userInputCompact || userInputDark) ? { compact: userInputCompact, dark: userInputDark } : false;
-    const hasConfigProvider = configProvider || enableV5ThemeAlgorithm;
-    const antdConfigSetter = isV5 && hasConfigProvider;
+    const enableModernThemeAlgorithm = isModern && (userInputCompact || userInputDark) ? { compact: userInputCompact, dark: userInputDark } : false;
+    const hasConfigProvider = configProvider || enableModernThemeAlgorithm;
+    const antdConfigSetter = isModern && hasConfigProvider;
     const isModelPluginEnabled = api.isPluginEnable("model");
     const modelPluginCompat = isModelPluginEnabled && antdConfigSetter;
     api.writeTmpFile({
@@ -277,8 +303,8 @@ var antd_default = (api) => {
         configProvider,
         appConfig,
         styleProvider: styleProviderConfig,
-        // 是否启用了 v5 的 theme algorithm
-        enableV5ThemeAlgorithm,
+        // 是否启用了 theme algorithm
+        enableModernThemeAlgorithm,
         antdConfigSetter,
         modelPluginCompat,
         lodashPath,
@@ -347,7 +373,7 @@ export const AntdConfigContextSetter = React.createContext<React.Dispatch<React.
   api.addEntryImportsAhead(() => {
     const style = api.config.antd.style || "less";
     const imports = [];
-    if (isV5) {
+    if (isModern) {
       imports.push({ source: "antd/dist/reset.css" });
     } else if (!api.config.antd.import || api.appData.vite) {
       imports.push({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.6.0",
+  "version": "4.6.1",
   "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.6.0",
-    "@umijs/valtio": "1.0.4"
+    "@umijs/valtio": "1.0.4",
+    "@umijs/bundler-utils": "4.6.1"
   },
   "devDependencies": {
     "antd": "^4.24.1",
-    "umi": "4.6.0"
+    "umi": "4.6.1"
   },
   "publishConfig": {
     "access": "public"

package/templates/antd/runtime.ts.tpl

@@ -9,9 +9,9 @@ import {
   message,
   notification,
 {{/disableInternalStatic}}
-{{#enableV5ThemeAlgorithm}}
+{{#enableModernThemeAlgorithm}}
   theme,
-{{/enableV5ThemeAlgorithm}}
+{{/enableModernThemeAlgorithm}}
 } from 'antd';
 import { ApplyPluginsType } from 'umi';
 {{#styleProvider}}
@@ -61,24 +61,24 @@ function AntdProvider({ children }) {
       appConfig: _,
       ...finalConfigProvider
     } = getAntdConfig();
-    {{#enableV5ThemeAlgorithm}}
+    {{#enableModernThemeAlgorithm}}
       finalConfigProvider.theme ??= {};
       finalConfigProvider.theme.algorithm ??= [];
       if (!Array.isArray(finalConfigProvider.theme.algorithm)) {
         finalConfigProvider.theme.algorithm = [finalConfigProvider.theme.algorithm];
       }
       const algorithm = finalConfigProvider.theme.algorithm;
-      {{#enableV5ThemeAlgorithm.compact}}
+      {{#enableModernThemeAlgorithm.compact}}
       if (!algorithm.includes(theme.compactAlgorithm)) {
         algorithm.push(theme.compactAlgorithm);
       }
-      {{/enableV5ThemeAlgorithm.compact}}
-      {{#enableV5ThemeAlgorithm.dark}}
+      {{/enableModernThemeAlgorithm.compact}}
+      {{#enableModernThemeAlgorithm.dark}}
       if (!algorithm.includes(theme.darkAlgorithm)) {
         algorithm.push(theme.darkAlgorithm);
       }
-      {{/enableV5ThemeAlgorithm.dark}}
-    {{/enableV5ThemeAlgorithm}}
+      {{/enableModernThemeAlgorithm.dark}}
+    {{/enableModernThemeAlgorithm}}
     return finalConfigProvider
   });
   const setAntdConfig: typeof _setAntdConfig = (newConfig) => {