fix(layout): fix menu item icon style error (ant-design#6745)

* fix(layout): fix menu item icon style error * fix build error * fix build error * chore: best test case * chore: best test case * chore: best test case
katavii · Mar 9, 2023 · 87f9656 · 87f9656
1 parent 7828d57
commit 87f9656
Show file tree

Hide file tree

Showing 132 changed files with 434 additions and 422 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -8,4 +8,5 @@ es
 .umi
 .github
 scripts
-webpack.config.js
+webpack.config.js
+server
diff --git a/.fatherrc.base.ts b/.fatherrc.base.ts
@@ -5,12 +5,13 @@ export default defineConfig({
   esm: {
     input: 'src', // 默认编译目录
     output: 'es',
+    extraBabelPlugins: [[require.resolve('./scripts/replaceLib'), {}]],
     platform: 'browser', // 默认构建为 Browser 环境的产物
     transformer: 'babel', // 默认使用 babel 以提供更好的兼容性
   },
   // 以下为 cjs 配置项启用时的默认值，有自定义需求时才需配置
   cjs: {
-    extraBabelPlugins: [[require.resolve('./scripts/replaceLib'), { 3: 'b' }]],
+    extraBabelPlugins: [[require.resolve('./scripts/replaceEs'), {}]],
     input: 'src', // 默认编译目录
     output: 'lib',
     platform: 'browser', // 默认构建为 Node.js 环境的产物

diff --git a/.prettierignore b/.prettierignore
@@ -5,4 +5,5 @@
 **/lib
 **/es
 **\__snapshots__\**
-pnpm-lock.yaml
+pnpm-lock.yaml
+server
diff --git a/packages/card/src/components/Card/index.tsx b/packages/card/src/components/Card/index.tsx
@@ -3,7 +3,7 @@ import { LabelIconTip } from '@ant-design/pro-utils';
 import { ConfigProvider, Grid, Tabs } from 'antd';
 import classNames from 'classnames';
 import omit from 'omit.js';
-import useMergedState from 'rc-util/es/hooks/useMergedState';
+import useMergedState from 'rc-util/lib/hooks/useMergedState';
 import React, { useContext } from 'react';
 import type { Breakpoint, CardProps, Gutter } from '../../typing';
 import Actions from '../Actions';

diff --git a/packages/card/src/components/StatisticCard/index.tsx b/packages/card/src/components/StatisticCard/index.tsx
@@ -9,8 +9,8 @@ import type { StatisticProps } from '../Statistic';
 import Statistic from '../Statistic';
 import { useStyle } from './style';
 
-import 'antd/es/divider/style';
-import 'antd/es/statistic/style';
+import 'antd/lib/divider/style';
+import 'antd/lib/statistic/style';
 import { ConfigContext } from 'antd/lib/config-provider';
 
 export type StatisticCardProps = {

diff --git a/packages/card/src/components/TabPane/index.tsx b/packages/card/src/components/TabPane/index.tsx
@@ -1,8 +1,8 @@
 import type { TabPaneProps, TabsProps } from 'antd';
 import { ConfigProvider, Tabs, version } from 'antd';
 import classNames from 'classnames';
-import toArray from 'rc-util/es/Children/toArray';
-import { noteOnce } from 'rc-util/es/warning';
+import toArray from 'rc-util/lib/Children/toArray';
+import { noteOnce } from 'rc-util/lib/warning';
 import React, { useContext } from 'react';
 import type { ProCardTabPaneProps, ProCardTabsProps } from '../../typing';
 import Card from '../Card';

diff --git a/packages/card/src/index.tsx b/packages/card/src/index.tsx
@@ -8,7 +8,7 @@ import type { ProCardProps } from './ProCard';
 import ProCard from './ProCard';
 import type { ProCardTabsProps } from './typing';
 
-import 'antd/es/card/style';
+import 'antd/lib/card/style';
 
 export type {
   ProCardTabsProps,

diff --git a/packages/card/src/typing.ts b/packages/card/src/typing.ts
@@ -1,5 +1,5 @@
 import type { TabPaneProps, TabsProps } from 'antd';
-import type { LabelTooltipType } from 'antd/es/form/FormItemLabel';
+import type { LabelTooltipType } from 'antd/lib/form/FormItemLabel';
 import type { ReactNode } from 'react';
 
 export type Breakpoint = 'xxl' | 'xl' | 'lg' | 'md' | 'sm' | 'xs';

diff --git a/packages/descriptions/src/index.tsx b/packages/descriptions/src/index.tsx
@@ -19,16 +19,16 @@ import {
 } from '@ant-design/pro-utils';
 import type { DescriptionsProps, FormInstance, FormProps } from 'antd';
 import { ConfigProvider, Descriptions, Space } from 'antd';
-import type { LabelTooltipType } from 'antd/es/form/FormItemLabel';
-import toArray from 'rc-util/es/Children/toArray';
-import get from 'rc-util/es/utils/get';
+import type { LabelTooltipType } from 'antd/lib/form/FormItemLabel';
+import toArray from 'rc-util/lib/Children/toArray';
+import get from 'rc-util/lib/utils/get';
 import React, { useContext, useEffect } from 'react';
 import { stringify } from 'use-json-comparison';
 import type { RequestData } from './useFetchData';
 import useFetchData from './useFetchData';
 
 // 兼容代码-----------
-import 'antd/es/descriptions/style';
+import 'antd/lib/descriptions/style';
 import type { ProFieldFCMode } from '@ant-design/pro-provider';
 //----------------------
 

diff --git a/packages/descriptions/src/useFetchData.tsx b/packages/descriptions/src/useFetchData.tsx
@@ -1,4 +1,4 @@
-import useMergedState from 'rc-util/es/hooks/useMergedState';
+import useMergedState from 'rc-util/lib/hooks/useMergedState';
 import { useEffect } from 'react';
 
 export type RequestData<T = any> = {

diff --git a/packages/field/src/components/Cascader/index.tsx b/packages/field/src/components/Cascader/index.tsx
@@ -10,7 +10,7 @@ import type { FieldSelectProps } from '../Select';
 import { ObjToMap, proFieldParsingText, useFieldFetchData } from '../Select';
 import { ConfigContext } from 'antd/lib/config-provider';
 // 兼容代码-----------
-import 'antd/es/cascader/style';
+import 'antd/lib/cascader/style';
 //----------------------
 
 export type GroupProps = {

diff --git a/packages/field/src/components/Checkbox/index.tsx b/packages/field/src/components/Checkbox/index.tsx
@@ -1,6 +1,6 @@
 import { useStyle } from '@ant-design/pro-utils';
 import { Checkbox, ConfigProvider, Space, Spin } from 'antd';
-import type { CheckboxGroupProps } from 'antd/es/checkbox';
+import type { CheckboxGroupProps } from 'antd/lib/checkbox';
 import classNames from 'classnames';
 import React, { useContext, useImperativeHandle, useRef } from 'react';
 import type { ProFieldFC } from '../../index';
@@ -12,7 +12,7 @@ export type GroupProps = {
 } & FieldSelectProps;
 import { ConfigContext } from 'antd/lib/config-provider';
 // 兼容代码-----------
-import 'antd/es/checkbox/style';
+import 'antd/lib/checkbox/style';
 //----------------------
 /**
  * 多选组件

diff --git a/packages/field/src/components/Code/index.tsx b/packages/field/src/components/Code/index.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 import type { ProFieldFC } from '../../index';
 
 // 兼容代码-----------
-import 'antd/es/input/style';
+import 'antd/lib/input/style';
 //----------------------
 
 const languageFormat = (text: string, language: string) => {

diff --git a/packages/field/src/components/ColorPicker/index.tsx b/packages/field/src/components/ColorPicker/index.tsx
@@ -3,7 +3,7 @@ import { SketchPicker } from '@chenshuai2144/sketch-color';
 import type { PopoverProps } from 'antd';
 import { ConfigProvider, Popover } from 'antd';
 import { ConfigContext } from 'antd/lib/config-provider';
-import useMergedState from 'rc-util/es/hooks/useMergedState';
+import useMergedState from 'rc-util/lib/hooks/useMergedState';
 import React, { useContext, useImperativeHandle } from 'react';
 import type { ProFieldFC } from '../../index';
 

diff --git a/packages/field/src/components/DatePicker/index.tsx b/packages/field/src/components/DatePicker/index.tsx
@@ -8,7 +8,7 @@ import React, { useContext, useState } from 'react';
 import type { ProFieldFC, ProFieldLightProps } from '../../index';
 import { ConfigContext } from 'antd/lib/config-provider';
 // 兼容代码-----------
-import 'antd/es/date-picker/style';
+import 'antd/lib/date-picker/style';
 //----------------------
 
 dayjs.extend(weekOfYear);

diff --git a/packages/field/src/components/Digit/index.tsx b/packages/field/src/components/Digit/index.tsx
@@ -5,7 +5,7 @@ import omit from 'omit.js';
 import type { ProFieldFC } from '../../index';
 
 // 兼容代码-----------
-import 'antd/es/input-number/style';
+import 'antd/lib/input-number/style';
 import { useIntl } from '@ant-design/pro-provider';
 //----------------------
 

diff --git a/packages/field/src/components/DigitRange/index.tsx b/packages/field/src/components/DigitRange/index.tsx
@@ -1,10 +1,10 @@
 import { Input, InputNumber } from 'antd';
-import useMergedState from 'rc-util/es/hooks/useMergedState';
+import useMergedState from 'rc-util/lib/hooks/useMergedState';
 import React from 'react';
 import type { ProFieldFC } from '../../index';
 
 // 兼容代码-----------
-import 'antd/es/input-number/style';
+import 'antd/lib/input-number/style';
 import { useIntl } from '@ant-design/pro-provider';
 //----------------------
 

diff --git a/packages/field/src/components/FromNow/index.tsx b/packages/field/src/components/FromNow/index.tsx
@@ -6,7 +6,7 @@ import relativeTime from 'dayjs/plugin/relativeTime';
 import type { ProFieldFC } from '../../index';
 
 // 兼容代码-----------
-import 'antd/es/date-picker/style';
+import 'antd/lib/date-picker/style';
 import React from 'react';
 //----------------------
 

diff --git a/packages/field/src/components/Image/index.tsx b/packages/field/src/components/Image/index.tsx
@@ -4,7 +4,7 @@ import type { ProFieldFC } from '../../index';
 
 // 兼容代码-----------
 import { useIntl } from '@ant-design/pro-provider';
-import 'antd/es/image/style';
+import 'antd/lib/image/style';
 //----------------------
 
 export type FieldImageProps = {

diff --git a/packages/field/src/components/Money/index.tsx b/packages/field/src/components/Money/index.tsx
@@ -2,13 +2,13 @@ import { intlMap as allIntlMap, useIntl } from '@ant-design/pro-provider';
 import type { InputNumberProps } from 'antd';
 import { InputNumber, Popover } from 'antd';
 import omit from 'omit.js';
-import useMergedState from 'rc-util/es/hooks/useMergedState';
+import useMergedState from 'rc-util/lib/hooks/useMergedState';
 import React, { useCallback, useMemo } from 'react';
 import type { ProFieldFC } from '../../index';
 
 // 兼容代码-----------
-import 'antd/es/input-number/style';
-import 'antd/es/popover/style';
+import 'antd/lib/input-number/style';
+import 'antd/lib/popover/style';
 //----------------------
 
 import { openVisibleCompatible } from '@ant-design/pro-utils';

diff --git a/packages/field/src/components/Options/index.tsx b/packages/field/src/components/Options/index.tsx
@@ -3,7 +3,7 @@ import React, { useContext, useImperativeHandle } from 'react';
 import type { ProFieldFC } from '../../index';
 import { ConfigContext } from 'antd/lib/config-provider';
 // 兼容代码-----------
-import 'antd/es/space/style';
+import 'antd/lib/space/style';
 //----------------------
 
 const addArrayKeys = (doms: React.ReactNode[]) =>

diff --git a/packages/field/src/components/Password/index.tsx b/packages/field/src/components/Password/index.tsx
@@ -1,13 +1,13 @@
 import { EyeInvisibleOutlined, EyeOutlined } from '@ant-design/icons';
 import { useIntl } from '@ant-design/pro-provider';
 import { Input, Space } from 'antd';
-import useMergedState from 'rc-util/es/hooks/useMergedState';
+import useMergedState from 'rc-util/lib/hooks/useMergedState';
 import React from 'react';
 import type { ProFieldFC } from '../../index';
 
 // 兼容代码-----------
-import 'antd/es/input/style';
-import 'antd/es/space/style';
+import 'antd/lib/input/style';
+import 'antd/lib/space/style';
 //----------------------
 
 /**

diff --git a/packages/field/src/components/Percent/index.tsx b/packages/field/src/components/Percent/index.tsx
@@ -6,7 +6,7 @@ import type { ProFieldFC } from '../../index';
 import { getColorByRealValue, getRealTextWithPrecision, getSymbolByRealValue } from './util';
 
 // 兼容代码-----------
-import 'antd/es/input-number/style';
+import 'antd/lib/input-number/style';
 import { useIntl } from '@ant-design/pro-provider';
 //------------
 

diff --git a/packages/field/src/components/Progress/index.tsx b/packages/field/src/components/Progress/index.tsx
@@ -4,8 +4,8 @@ import React, { useMemo } from 'react';
 import type { ProFieldFC } from '../../index';
 
 // 兼容代码-----------
-import 'antd/es/input-number/style';
-import 'antd/es/progress/style';
+import 'antd/lib/input-number/style';
+import 'antd/lib/progress/style';
 import { useIntl } from '@ant-design/pro-provider';
 //------------
 

diff --git a/packages/field/src/components/Radio/index.tsx b/packages/field/src/components/Radio/index.tsx
@@ -7,7 +7,7 @@ import type { ProFieldFC } from '../../index';
 import type { FieldSelectProps } from '../Select';
 import { ObjToMap, proFieldParsingText, useFieldFetchData } from '../Select';
 // 兼容代码-----------
-import 'antd/es/radio/style';
+import 'antd/lib/radio/style';
 import { ConfigContext } from 'antd/lib/config-provider';
 //------------
 export type GroupProps = {

diff --git a/packages/field/src/components/RangePicker/index.tsx b/packages/field/src/components/RangePicker/index.tsx
@@ -6,7 +6,7 @@ import React, { useCallback } from 'react';
 import type { ProFieldFC } from '../../index';
 
 // 兼容代码-----------
-import 'antd/es/date-picker/style';
+import 'antd/lib/date-picker/style';
 //------------
 
 /**

diff --git a/packages/field/src/components/Rate/index.tsx b/packages/field/src/components/Rate/index.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 import type { ProFieldFC } from '../../index';
 
 // 兼容代码-----------
-import 'antd/es/rate/style';
+import 'antd/lib/rate/style';
 //------------
 
 /**

diff --git a/packages/field/src/components/Second/index.tsx b/packages/field/src/components/Second/index.tsx
@@ -2,7 +2,7 @@ import { InputNumber } from 'antd';
 import React from 'react';
 import type { ProFieldFC } from '../../index';
 // 兼容代码-----------
-import 'antd/es/input-number/style';
+import 'antd/lib/input-number/style';
 import { useIntl } from '@ant-design/pro-provider';
 //------------
 

diff --git a/packages/field/src/components/Segmented/index.tsx b/packages/field/src/components/Segmented/index.tsx
@@ -5,8 +5,8 @@ import omit from 'omit.js';
 import type { FieldSelectProps } from '../Select';
 import { ObjToMap, proFieldParsingText, useFieldFetchData } from '../Select';
 
-import 'antd/es/segmented/style';
-import 'antd/es/spin/style';
+import 'antd/lib/segmented/style';
+import 'antd/lib/spin/style';
 
 /**
  * Segmented https://ant.design/components/segmented-cn/

diff --git a/packages/field/src/components/Select/LightSelect/index.tsx b/packages/field/src/components/Select/LightSelect/index.tsx
@@ -4,7 +4,7 @@ import type { SelectProps } from 'antd';
 import { ConfigProvider, Input, Select } from 'antd';
 import { ConfigContext } from 'antd/lib/config-provider';
 import classNames from 'classnames';
-import toArray from 'rc-util/es/Children/toArray';
+import toArray from 'rc-util/lib/Children/toArray';
 import React, { useContext, useMemo, useState } from 'react';
 import type { ProFieldLightProps } from '../../../index';
 

diff --git a/packages/field/src/components/Select/SearchSelect/index.tsx b/packages/field/src/components/Select/SearchSelect/index.tsx
@@ -2,7 +2,7 @@ import type { RequestOptionsType } from '@ant-design/pro-utils';
 import type { SelectProps } from 'antd';
 import { ConfigProvider, Select } from 'antd';
 import { ConfigContext } from 'antd/lib/config-provider';
-import type { LabeledValue } from 'antd/es/select';
+import type { LabeledValue } from 'antd/lib/select';
 import classNames from 'classnames';
 import React, { useContext, useEffect, useImperativeHandle, useRef, useState } from 'react';
 

diff --git a/packages/field/src/components/Select/index.tsx b/packages/field/src/components/Select/index.tsx
@@ -33,7 +33,7 @@ import LightSelect from './LightSelect';
 import SearchSelect from './SearchSelect';
 import { ConfigContext } from 'antd/lib/config-provider';
 // 兼容代码-----------
-import 'antd/es/select/style';
+import 'antd/lib/select/style';
 //------------
 
 type SelectOptionType = Partial<RequestOptionsType>[];

diff --git a/packages/field/src/components/Slider/index.tsx b/packages/field/src/components/Slider/index.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 import type { ProFieldFC } from '../../index';
 
 // 兼容代码-----------
-import 'antd/es/slider/style';
+import 'antd/lib/slider/style';
 //------------
 /**
  * 评分组件

diff --git a/packages/field/src/components/Status/index.tsx b/packages/field/src/components/Status/index.tsx
@@ -3,7 +3,7 @@ import type { CSSProperties } from 'react';
 import React from 'react';
 
 // 兼容代码-----------
-import 'antd/es/badge/style';
+import 'antd/lib/badge/style';
 //------------
 
 type StatusProps = {

diff --git a/packages/field/src/components/Switch/index.tsx b/packages/field/src/components/Switch/index.tsx
@@ -6,7 +6,7 @@ import React, { useMemo } from 'react';
 import type { ProFieldFC } from '../../index';
 
 // 兼容代码-----------
-import 'antd/es/switch/style';
+import 'antd/lib/switch/style';
 //------------
 
 /**

diff --git a/packages/field/src/components/Text/index.tsx b/packages/field/src/components/Text/index.tsx
@@ -4,7 +4,7 @@ import React, { useEffect, useImperativeHandle, useRef } from 'react';
 import type { ProFieldFC } from '../../index';
 
 // 兼容代码-----------
-import 'antd/es/input/style';
+import 'antd/lib/input/style';
 //------------
 
 /**

diff --git a/packages/field/src/components/TextArea/index.tsx b/packages/field/src/components/TextArea/index.tsx
@@ -4,7 +4,7 @@ import React from 'react';
 import type { ProFieldFC } from '../../index';
 
 // 兼容代码-----------
-import 'antd/es/input/style';
+import 'antd/lib/input/style';
 //------------
 /**
  * 最基本的组件，就是个普通的 Input.TextArea

diff --git a/packages/field/src/components/TimePicker/index.tsx b/packages/field/src/components/TimePicker/index.tsx
@@ -5,7 +5,7 @@ import React, { useState } from 'react';
 import type { ProFieldFC, ProFieldLightProps } from '../../index';
 
 // 兼容代码-----------
-import 'antd/es/date-picker/style';
+import 'antd/lib/date-picker/style';
 import { useDatePickerStyle } from '../DatePicker';
 //----------------------;