fix(antd): add missing configprovider prefixCls (#746)

zombieJ · chenshuai2144 · web-flow · commit c955a1361780 · 2021-11-16T22:34:19.000+08:00
* fix: add missing configprovider prefixCls

* better

* better

Co-authored-by: chenshuai2144 &lt;qixian.cs@outlook.com&gt;
diff --git a/example/.umirc.ts b/example/.umirc.ts
@@ -64,6 +64,9 @@ export default defineConfig({
   layout: {
     name: 'UMI 3',
   },
+  antd: {
+    config: {},
+  },
   qiankun: {
     master: {
       apps: [
diff --git a/example/typing.d.ts b/example/typing.d.ts
@@ -1,2 +1,3 @@
 declare module '*.css';
 declare module '*.less';
+declare module '*.semver';
diff --git a/packages/plugin-antd/package.json b/packages/plugin-antd/package.json
@@ -29,6 +29,7 @@
   },
   "dependencies": {
     "antd": "^4.1.3",
-    "antd-mobile": "^2.3.1"
+    "antd-mobile": "^2.3.1",
+    "semver": "^7.3.5"
   }
 }
diff --git a/packages/plugin-antd/src/index.ts b/packages/plugin-antd/src/index.ts
@@ -2,6 +2,7 @@ import { dirname, join } from 'path';
 import { readFileSync } from 'fs';
 import { IApi, utils } from 'umi';
 import { ConfigProviderProps } from 'antd/es/config-provider';
+import semver from 'semver';
 
 const { Mustache } = utils;
 
@@ -71,6 +72,14 @@ export default (api: IApi) => {
     });
   }
 
+  api.modifyDefaultConfig((config) => {
+    config.theme = {
+      'root-entry-name': 'default',
+      ...config.theme,
+    };
+    return config;
+  });
+
   api.addProjectFirstLibraries(() => {
     const imps = [
       {
@@ -94,10 +103,20 @@ export default (api: IApi) => {
           join(__dirname, 'runtime.tpl'),
           'utf-8',
         );
+
+        // 获取 antd 的版本号来判断应该是用什么api
+        let version = '4.0.0';
+        try {
+          version = require(require.resolve('antd/package.json')).version;
+        } catch (error) {}
+
         api.writeTmpFile({
           path: 'plugin-antd/runtime.tsx',
           content: Mustache.render(runtimeTpl, {
             config: JSON.stringify(opts?.config),
+            // @ts-ignore
+            newAntd: semver.lt('4.13.0', version) || version === '4.13.0',
+            oldAntd: semver.gt('4.13.0', version),
           }),
         });
       },
diff --git a/packages/plugin-antd/src/runtime.tpl b/packages/plugin-antd/src/runtime.tpl
@@ -1,18 +1,41 @@
-import React from 'react';
-import { ConfigProvider, message } from 'antd';
-import { ApplyPluginsType } from 'umi';
-import { plugin } from '../core/umiExports';
+import React from "react";
+{{#newAntd}}
+import { ConfigProvider, message } from "antd";
+{{/newAntd}}
+
+{{#oldAntd}}
+import { ConfigProvider, Modal, notification, message } from "antd";
+{{/oldAntd}}
+ 
+import { ApplyPluginsType } from "umi";
+import { plugin } from "../core/umiExports";
 
 export function rootContainer(container) {
   const runtimeAntd = plugin.applyPlugins({
-    key: 'antd',
+    key: "antd",
     type: ApplyPluginsType.modify,
     initialValue: {},
   });
 
   const finalConfig = {...{{{ config }}},...runtimeAntd}
 
   if (finalConfig.prefixCls) {
+    {{#newAntd}}
+      // 新版本的写法
+      ConfigProvider.config({
+        prefixCls: finalConfig.prefixCls,
+      });
+    {{/newAntd}}
+
+    {{#oldAntd}}
+      // 老版本的antd需要这些写
+      Modal.config({
+        rootPrefixCls: finalConfig.prefixCls,
+      });
+      notification.config({
+        prefixCls: `${finalConfig.prefixCls}-notification`,
+      });
+    {{/oldAntd}}
     message.config({
       prefixCls: `${finalConfig.prefixCls}-message`,
     });
diff --git a/typing.d.ts b/typing.d.ts
@@ -0,0 +1 @@
+﻿declare module 'semver';
diff --git a/yarn.lock b/yarn.lock
@@ -3826,16 +3826,15 @@
     through2 "^3.0.1"
     vinyl "^2.2.0"
 
-"@umijs/openapi@^1.1.6":
-  version "1.1.19"
-  resolved "https://registry.yarnpkg.com/@umijs/openapi/-/openapi-1.1.19.tgz#a40c9978d5a3b11139771320a34c7baa99a722e1"
-  integrity sha512-zXDrdaS//N4PAwrSHDP4D5s0n75dQQOzLYuAJXg9UAUScIuUwHorkzWZ0PpAfpXb+CBSG7gOjDHotncmpAC4Cw==
+"@umijs/openapi@^1.2.0":
+  version "1.3.6"
+  resolved "https://registry.npmmirror.com/@umijs/openapi/download/@umijs/openapi-1.3.6.tgz?cache=0&sync_timestamp=1636949302168&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40umijs%2Fopenapi%2Fdownload%2F%40umijs%2Fopenapi-1.3.6.tgz#78af4d4ee4b05ed401832e7731e518d54551ca61"
+  integrity sha512-JPhJc9n1i0B4KqgCK6/tgvaGh+Zk5hvwV3NakRAGE7R4emfewAa+phVArSVbEPOjYt4Jzz7Wpzt6J31Q+Kttsg==
   dependencies:
     "@umijs/fabric" "^2.5.6"
     dayjs "^1.10.3"
     eslint "^7.18.0"
     glob "^7.1.6"
-    lodash "^4.17.20"
     memoizee "^0.4.15"
     mock.js "^0.2.0"
     mockjs "^1.1.0"
@@ -3906,7 +3905,7 @@
     "@umijs/runtime" "3.5.13"
     react-router-config "5.1.1"
 
-"@umijs/route-utils@^1.0.35", "@umijs/route-utils@^1.0.7":
+"@umijs/route-utils@^1.0.35":
   version "1.0.37"
   resolved "https://registry.yarnpkg.com/@umijs/route-utils/-/route-utils-1.0.37.tgz#1ceb516980d4754ce2d5959878fe72259091a990"
   integrity sha512-RQYMYd0w3mKWlCvhUqYN2/dcCD8LxQWsr46DXpaLtqe2Y/8662qXA3E6moaFpyfokKJK6UHt2VxNGhkKPNJIgQ==
@@ -3916,6 +3915,16 @@
     lodash.isequal "^4.5.0"
     memoize-one "^5.1.1"
 
+"@umijs/route-utils@^2.0.0":
+  version "2.0.4"
+  resolved "https://registry.npmmirror.com/@umijs/route-utils/download/@umijs/route-utils-2.0.4.tgz?cache=0&sync_timestamp=1637048932696&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40umijs%2Froute-utils%2Fdownload%2F%40umijs%2Froute-utils-2.0.4.tgz#951bf55c826d670c3acfff0566ceac63b7b74fea"
+  integrity sha512-YWxGHZhIMLrsiydu8P/v2SNuuqRfRbLaZ5mc1K9snTf6yQ+TEGFrpU8uLxp2iRBijMBD0CFyrWNuhlB/bvluUQ==
+  dependencies:
+    "@qixian.cs/path-to-regexp" "^6.1.0"
+    fast-deep-equal "^3.1.3"
+    lodash.isequal "^4.5.0"
+    memoize-one "^5.1.1"
+
 "@umijs/runtime@3.5.13":
   version "3.5.13"
   resolved "https://registry.yarnpkg.com/@umijs/runtime/-/runtime-3.5.13.tgz#fd37279cad39e0f953bd982d3bb3ffb221b701e3"
@@ -11635,7 +11644,7 @@ lodash.zip@^4.2.0:
   resolved "https://registry.yarnpkg.com/lodash.zip/-/lodash.zip-4.2.0.tgz#ec6662e4896408ed4ab6c542a3990b72cc080020"
   integrity sha1-7GZi5IlkCO1KtsVCo5kLcswIACA=
 
-lodash@4.17.21, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.2.1, lodash@^4.7.0:
+lodash@4.17.21, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.2.1, lodash@^4.7.0:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`declare module '*.css';`
`2`	`2`	`declare module '*.less';`
	`3`	`+declare module '*.semver';`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@`
`29`	`29`	`},`
`30`	`30`	`"dependencies": {`
`31`	`31`	`"antd": "^4.1.3",`
`32`		`- "antd-mobile": "^2.3.1"`
	`32`	`+ "antd-mobile": "^2.3.1",`
	`33`	`+ "semver": "^7.3.5"`
`33`	`34`	`}`
`34`	`35`	`}`