@umijs/plugins 4.0.38 → 4.0.40

package/dist/antd.js

@@ -25,8 +25,9 @@ __export(antd_exports, {
   default: () => antd_default
 });
 module.exports = __toCommonJS(antd_exports);
-var import_path = require("path");
 var import_assert = __toESM(require("assert"));
+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");
@@ -59,6 +60,7 @@ var antd_default = (api) => {
       return process.env.UMI_PLUGIN_ANTD_ENABLE || userConfig.antd;
     }
   });
+  api.addRuntimePluginKey(() => ["antd"]);
   function checkPkgPath() {
     if (!pkgPath) {
       throw new Error(`Can't find antd package. Please install antd first.`);
@@ -91,9 +93,9 @@ var antd_default = (api) => {
         ...theme,
         ...memo.theme
       };
-      if ((_a = memo.antd) == null ? void 0 : _a.import) {
-        const errorMessage = `Can't set antd.import=true while using antd5 (${antdVersion})`;
-        api.logger.fatal("please change config antd.import to false, then start server again");
+      if ((_a = memo.antd) == null ? void 0 : _a.style) {
+        const errorMessage = `Can't set antd.style while using antd5 (${antdVersion})`;
+        api.logger.fatal("please remove config antd.style, then start server again");
         throw Error(errorMessage);
       }
     }
@@ -116,17 +118,16 @@ var antd_default = (api) => {
     return memo;
   });
   api.addExtraBabelPlugins(() => {
-    const style = api.config.antd.style || "less";
-    if (antdVersion.startsWith("5")) {
-      return [];
-    }
+    const style = antdVersion.startsWith("5") ? 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 === "less" ? true : "css"
+          ...style ? {
+            style: style === "less" || "css"
+          } : {}
         },
         "antd"
       ]
@@ -140,9 +141,15 @@ var antd_default = (api) => {
       content: import_plugin_utils.Mustache.render(`
 import React from 'react';
 import { ConfigProvider, Modal, message, notification } from 'antd';
+import { ApplyPluginsType } from 'umi';
+import { getPluginManager } from '../core/plugin';
 
 export function rootContainer(container) {
-  const finalConfig = {...{{{ config }}}}
+  const finalConfig = getPluginManager().applyPlugins({
+    key: 'antd',
+    type: ApplyPluginsType.modify,
+    initialValue: {...{{{ config }}}},
+  });
   if (finalConfig.prefixCls) {
     Modal.config({
       rootPrefixCls: finalConfig.prefixCls
@@ -166,6 +173,22 @@ export function rootContainer(container) {
         config: JSON.stringify(api.config.antd.configProvider)
       })
     });
+    api.writeTmpFile({
+      path: "types.d.ts",
+      content: `
+import type { ConfigProviderProps } from 'antd/es/config-provider';
+export type RuntimeAntdConfig = (memo: ConfigProviderProps) => ConfigProviderProps;
+`
+    });
+    api.writeTmpFile({
+      path: import_umi.RUNTIME_TYPE_FILE_NAME,
+      content: `
+import type { RuntimeAntdConfig } from './types.d';
+export type IRuntimeConfig = {
+  antd?: RuntimeAntdConfig
+};
+      `
+    });
   });
   api.addRuntimePlugin(() => {
     return api.config.antd.configProvider ? [(0, import_withTmpPath.withTmpPath)({ api, path: "runtime.tsx" })] : [];

package/dist/layout.js

@@ -256,7 +256,9 @@ const { formatMessage } = useIntl();
     >
       <Exception
         route={matchedRoute}
+        noFound={runtimeConfig?.noFound}
         notFound={runtimeConfig?.notFound}
+        unAccessible={runtimeConfig?.unAccessible}
         noAccessible={runtimeConfig?.noAccessible}
       >
         {runtimeConfig.childrenRender

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umijs/plugins",
-  "version": "4.0.38",
+  "version": "4.0.40",
   "description": "@umijs/plugins",
   "homepage": "https://github.com/umijs/umi/tree/master/packages/plugins#readme",
   "bugs": "https://github.com/umijs/umi/issues",
@@ -27,7 +27,7 @@
     "@ant-design/antd-theme-variable": "^1.0.0",
     "@ant-design/icons": "^4.7.0",
     "@ant-design/pro-components": "^2.0.1",
-    "@umijs/bundler-utils": "4.0.38",
+    "@umijs/bundler-utils": "4.0.40",
     "@umijs/valtio": "^1.0.2",
     "antd-dayjs-webpack-plugin": "^1.0.6",
     "axios": "^0.27.2",
@@ -50,7 +50,7 @@
   },
   "devDependencies": {
     "antd": "^4.24.1",
-    "umi": "4.0.38"
+    "umi": "4.0.40"
   },
   "publishConfig": {
     "access": "public"