@umijs/plugins 4.0.0-canary.20230210.1 → 4.0.0-canary.20230216.1

package/dist/antd.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
@@ -52,9 +56,12 @@ var antd_default = (api) => {
         return Joi.alternatives().try(
           Joi.object({
             configProvider: Joi.object(),
+            // themes
             dark: Joi.boolean(),
             compact: Joi.boolean(),
+            // babel-plugin-import
             import: Joi.boolean(),
+            // less or css, default less
             style: Joi.string().allow("less", "css"),
             theme: Joi.object()
           }),
@@ -99,10 +106,10 @@ var antd_default = (api) => {
         ...theme,
         ...memo.theme
       };
-      if ((_a = memo.antd) == null ? void 0 : _a.style) {
-        const errorMessage = `Can't set antd.style while using antd5 (${antdVersion})`;
+      if ((_a = memo.antd) == null ? void 0 : _a.import) {
+        const errorMessage = `Can't set antd.import while using antd5 (${antdVersion})`;
         api.logger.fatal(
-          "please remove config antd.style, then start server again"
+          "please change config antd.import to false, then start server again"
         );
         throw Error(errorMessage);
       }

package/dist/layout.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
@@ -28,13 +32,27 @@ __export(layout_exports, {
   default: () => layout_default
 });
 module.exports = __toCommonJS(layout_exports);
-var allIcons = __toESM(require("@ant-design/icons"));
 var import_fs = require("fs");
 var import_path = require("path");
 var import_umi = require("umi");
 var import_plugin_utils = require("umi/plugin-utils");
 var import_resolveProjectDep = require("./utils/resolveProjectDep");
 var import_withTmpPath = require("./utils/withTmpPath");
+var antIconsPath = (0, import_plugin_utils.winPath)(
+  (0, import_path.dirname)(require.resolve("@ant-design/icons/package"))
+);
+var getAllIcons = () => {
+  const iconTypePath = (0, import_path.join)(antIconsPath, "./lib/icons/index.d.ts");
+  const iconTypeContent = (0, import_fs.readFileSync)(iconTypePath, "utf-8");
+  return [...iconTypeContent.matchAll(/default as (\w+)/g)].reduce(
+    (memo, cur) => {
+      memo[cur[1]] = true;
+      return memo;
+    },
+    {}
+  );
+};
+var allIcons = getAllIcons();
 var layout_default = (api) => {
   let antdVersion = "4.0.0";
   try {
@@ -342,9 +360,6 @@ export interface IRuntimeConfig {
       return memo;
     }, {});
     const icons = Object.keys(iconsMap);
-    const antIconsPath = (0, import_plugin_utils.winPath)(
-      (0, import_path.dirname)(require.resolve("@ant-design/icons/package"))
-    );
     api.writeTmpFile({
       path: "icons.tsx",
       content: `
@@ -403,7 +418,6 @@ export function getRightRenderContent (opts: {
     );
   }
 
- 
 
   const avatar = (
     <span className="umi-plugin-layout-action">
@@ -446,12 +460,11 @@ export function getRightRenderContent (opts: {
       },
     ],
   };
-  
   // antd@5 和  4.24 之后推荐使用 menu，性能更好
   const dropdownProps =
     version.startsWith("5.") || version.startsWith("4.24.")
       ? { menu: langMenu }
-      : { overlay: <Menu {...langMenu} /> };  
+      : { overlay: <Menu {...langMenu} /> };
 
   return (
     <div className="umi-plugin-layout-right anticon">
@@ -479,7 +492,8 @@ export function getRightRenderContent (opts: {
     api.writeTmpFile({
       path: "Layout.less",
       content: `
-${antdVersion.startsWith("5") ? "" : "@import '~antd/es/style/themes/default.less';"}
+${// antd@5里面没有这个样式了
+      antdVersion.startsWith("5") ? "" : "@import '~antd/es/style/themes/default.less';"}
 @media screen and (max-width: 480px) {
   // 在小屏幕的时候可以有更好的体验
   .umi-plugin-layout-container {

package/dist/request.js

@@ -17,6 +17,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
@@ -345,7 +349,9 @@ export type {
   AxiosResponse,
   AxiosError,
   RequestError,
-  ResponseInterceptor } from './request';
+  ResponseInterceptor,
+  RequestOptions,
+  Request } from './request';
 `
     });
     api.writeTmpFile({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.0.0-canary.20230210.1",
+  "version": "4.0.0-canary.20230216.1",
   "description": "@umijs/plugins",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/plugins#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -29,7 +29,7 @@
     "@ant-design/pro-components": "^2.0.1",
     "@tanstack/react-query": "^4.22.0",
     "@tanstack/react-query-devtools": "^4.22.0",
-    "@umijs/bundler-utils": "4.0.0-canary.20230210.1",
+    "@umijs/bundler-utils": "4.0.0-canary.20230216.1",
     "@umijs/valtio": "^1.0.3",
     "antd-dayjs-webpack-plugin": "^1.0.6",
     "axios": "^0.27.2",
@@ -53,7 +53,7 @@
   },
   "devDependencies": {
     "antd": "^4.24.1",
-    "umi": "4.0.0-canary.20230210.1"
+    "umi": "4.0.0-canary.20230216.1"
   },
   "publishConfig": {
     "access": "public"