@umijs/plugins 4.0.0-canary.20230424.1 → 4.0.0-canary.20230427.1

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.0.0-canary.20230424.1",
+  "version": "4.0.0-canary.20230427.1",
   "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.0-canary.20230424.1",
+    "@umijs/bundler-utils": "4.0.0-canary.20230427.1",
     "@umijs/valtio": "1.0.3"
   },
   "devDependencies": {
     "antd": "^4.24.1",
-    "umi": "4.0.0-canary.20230424.1"
+    "umi": "4.0.0-canary.20230427.1"
   },
   "publishConfig": {
     "access": "public"