fix(components): src alway use es path

.fatherrc.base.ts

@@ -10,7 +10,7 @@ export default defineConfig({
   },
   // 以下为 cjs 配置项启用时的默认值，有自定义需求时才需配置
   cjs: {
-    extraBabelPlugins: [[require.resolve('./scripts/replaceLib'), { 1: 'b' }]],
+    extraBabelPlugins: [[require.resolve('./scripts/replaceLib'), { 3: 'b' }]],
     input: 'src', // 默认编译目录
     output: 'lib',
     platform: 'browser', // 默认构建为 Node.js 环境的产物

lerna.json

@@ -17,7 +17,5 @@
     "**/es/**",
     "**/test/**"
   ],
-  "packages": [
-    "packages/*"
-  ]
+  "packages": ["packages/*"]
 }

packages/card/CHANGELOG.md

@@ -1,16 +1,11 @@
 # Change Log
 
-All notable changes to this project will be documented in this file.
-See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
 ## [2.1.13](https://github.com/ant-design/pro-components/compare/@ant-design/pro-card@2.1.12...@ant-design/pro-card@2.1.13) (2023-02-17)
 
 **Note:** Version bump only for package @ant-design/pro-card
 
-
-
-
-
 ## [2.1.12](https://github.com/ant-design/pro-components/compare/@ant-design/pro-card@2.1.11...@ant-design/pro-card@2.1.12) (2023-02-10)
 
 **Note:** Version bump only for package @ant-design/pro-card

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/lib/hooks/useMergedState';
+import useMergedState from 'rc-util/es/hooks/useMergedState';
 import React, { useContext } from 'react';
 import type { Breakpoint, CardProps, Gutter } from '../../typing';
 import Actions from '../Actions';

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/lib/Children/toArray';
-import { noteOnce } from 'rc-util/lib/warning';
+import toArray from 'rc-util/es/Children/toArray';
+import { noteOnce } from 'rc-util/es/warning';
 import React, { useContext } from 'react';
 import type { ProCardTabPaneProps, ProCardTabsProps } from '../../typing';
 import Card from '../Card';

packages/components/CHANGELOG.md

@@ -1,16 +1,11 @@
 # Change Log
 
-All notable changes to this project will be documented in this file.
-See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
 ## [2.3.55](https://github.com/ant-design/pro-components/compare/@ant-design/pro-components@2.3.54...@ant-design/pro-components@2.3.55) (2023-02-17)
 
 **Note:** Version bump only for package @ant-design/pro-components
 
-
-
-
-
 ## [2.3.54](https://github.com/ant-design/pro-components/compare/@ant-design/pro-components@2.3.53...@ant-design/pro-components@2.3.54) (2023-02-10)
 
 **Note:** Version bump only for package @ant-design/pro-components

packages/descriptions/CHANGELOG.md

@@ -1,16 +1,11 @@
 # Change Log
 
-All notable changes to this project will be documented in this file.
-See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
 ## [2.0.47](https://github.com/ant-design/pro-components/compare/@ant-design/pro-descriptions@2.0.46...@ant-design/pro-descriptions@2.0.47) (2023-02-17)
 
 **Note:** Version bump only for package @ant-design/pro-descriptions
 
-
-
-
-
 ## [2.0.46](https://github.com/ant-design/pro-components/compare/@ant-design/pro-descriptions@2.0.45...@ant-design/pro-descriptions@2.0.46) (2023-02-10)
 
 **Note:** Version bump only for package @ant-design/pro-descriptions

packages/descriptions/src/index.tsx

@@ -20,8 +20,8 @@ import {
 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/lib/Children/toArray';
-import get from 'rc-util/lib/utils/get';
+import toArray from 'rc-util/es/Children/toArray';
+import get from 'rc-util/es/utils/get';
 import React, { useContext, useEffect } from 'react';
 import { stringify } from 'use-json-comparison';
 import type { RequestData } from './useFetchData';

packages/descriptions/src/useFetchData.tsx

@@ -1,4 +1,4 @@
-import useMergedState from 'rc-util/lib/hooks/useMergedState';
+import useMergedState from 'rc-util/es/hooks/useMergedState';
 import { useEffect } from 'react';
 
 export type RequestData<T = any> = {

packages/field/CHANGELOG.md

@@ -1,19 +1,13 @@
 # Change Log
 
-All notable changes to this project will be documented in this file.
-See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
 ## [2.2.8](https://github.com/ant-design/pro-components/compare/@ant-design/pro-field@2.2.7...@ant-design/pro-field@2.2.8) (2023-02-17)
 
-
 ### Bug Fixes
 
-* **field:** `optionFilterProp` doesn't work with LightFilter ([#6603](https://github.com/ant-design/pro-components/issues/6603)) ([0e287f6](https://github.com/ant-design/pro-components/commit/0e287f6dba1cdc0f31bcae60e3149ed6a276169d))
-* **form:** inconsistent digit value when precision=0 ([#6591](https://github.com/ant-design/pro-components/issues/6591)) ([f83092a](https://github.com/ant-design/pro-components/commit/f83092a50993f3a86b59565394c24228f7e8541e))
-
-
-
-
+- **field:** `optionFilterProp` doesn't work with LightFilter ([#6603](https://github.com/ant-design/pro-components/issues/6603)) ([0e287f6](https://github.com/ant-design/pro-components/commit/0e287f6dba1cdc0f31bcae60e3149ed6a276169d))
+- **form:** inconsistent digit value when precision=0 ([#6591](https://github.com/ant-design/pro-components/issues/6591)) ([f83092a](https://github.com/ant-design/pro-components/commit/f83092a50993f3a86b59565394c24228f7e8541e))
 
 ## [2.2.7](https://github.com/ant-design/pro-components/compare/@ant-design/pro-field@2.2.6...@ant-design/pro-field@2.2.7) (2023-02-10)
 

packages/field/src/components/ColorPicker/index.tsx

@@ -2,7 +2,7 @@
 import { SketchPicker } from '@chenshuai2144/sketch-color';
 import type { PopoverProps } from 'antd';
 import { ConfigProvider, Popover } from 'antd';
-import useMergedState from 'rc-util/lib/hooks/useMergedState';
+import useMergedState from 'rc-util/es/hooks/useMergedState';
 import React, { useContext, useImperativeHandle } from 'react';
 import type { ProFieldFC } from '../../index';
 

packages/field/src/components/DigitRange/index.tsx

@@ -1,5 +1,5 @@
 import { Input, InputNumber } from 'antd';
-import useMergedState from 'rc-util/lib/hooks/useMergedState';
+import useMergedState from 'rc-util/es/hooks/useMergedState';
 import React from 'react';
 import type { ProFieldFC } from '../../index';
 

packages/field/src/components/Money/index.tsx

@@ -2,7 +2,7 @@ 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/lib/hooks/useMergedState';
+import useMergedState from 'rc-util/es/hooks/useMergedState';
 import React, { useCallback, useMemo } from 'react';
 import type { ProFieldFC } from '../../index';
 

packages/field/src/components/Password/index.tsx

@@ -1,7 +1,7 @@
 import { EyeInvisibleOutlined, EyeOutlined } from '@ant-design/icons';
 import { useIntl } from '@ant-design/pro-provider';
 import { Input, Space } from 'antd';
-import useMergedState from 'rc-util/lib/hooks/useMergedState';
+import useMergedState from 'rc-util/es/hooks/useMergedState';
 import React from 'react';
 import type { ProFieldFC } from '../../index';
 

packages/field/src/components/Select/LightSelect/index.tsx

@@ -3,7 +3,7 @@ import { FieldLabel, useStyle } from '@ant-design/pro-utils';
 import type { SelectProps } from 'antd';
 import { ConfigProvider, Input, Select } from 'antd';
 import classNames from 'classnames';
-import toArray from 'rc-util/lib/Children/toArray';
+import toArray from 'rc-util/es/Children/toArray';
 import React, { useContext, useMemo, useState } from 'react';
 import type { ProFieldLightProps } from '../../../index';
 

packages/field/src/components/TreeSelect/index.tsx

@@ -2,7 +2,7 @@ import { FieldLabel } from '@ant-design/pro-utils';
 import type { RadioGroupProps, TreeSelectProps } from 'antd';
 import { ConfigProvider, Spin, TreeSelect } from 'antd';
 import classNames from 'classnames';
-import useMergedState from 'rc-util/lib/hooks/useMergedState';
+import useMergedState from 'rc-util/es/hooks/useMergedState';
 import React, { useContext, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import type { ProFieldFC } from '../../index';
 import type { FieldSelectProps } from '../Select';

packages/field/src/index.tsx

@@ -13,7 +13,7 @@ import type {
 import { omitUndefined, pickProProps } from '@ant-design/pro-utils';
 import { Avatar } from 'antd';
 // import type {RangeInputNumberProps,ExtraProps as } from './components/DigitRange'
-import { noteOnce } from 'rc-util/lib/warning';
+import { noteOnce } from 'rc-util/es/warning';
 import React, { useContext } from 'react';
 import FieldCascader from './components/Cascader';
 import FieldCheckbox from './components/Checkbox';

packages/form/CHANGELOG.md

@@ -1,18 +1,12 @@
 # Change Log
 
-All notable changes to this project will be documented in this file.
-See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
 ## [2.5.7](https://github.com/ant-design/pro-components/compare/@ant-design/pro-form@2.5.6...@ant-design/pro-form@2.5.7) (2023-02-17)
 
-
 ### Bug Fixes
 
-* **components:** fix valuetype no work error ([f6215e9](https://github.com/ant-design/pro-components/commit/f6215e98eaeb46fa979c1ca4ac40ceaa0828f9f3))
-
-
-
-
+- **components:** fix valuetype no work error ([f6215e9](https://github.com/ant-design/pro-components/commit/f6215e98eaeb46fa979c1ca4ac40ceaa0828f9f3))
 
 ## [2.5.6](https://github.com/ant-design/pro-components/compare/@ant-design/pro-form@2.5.5...@ant-design/pro-form@2.5.6) (2023-02-10)
 

packages/form/src/BaseForm/BaseForm.tsx

@@ -26,9 +26,9 @@ import type { NamePath } from 'antd/es/form/interface';
 import classNames from 'classnames';
 import type dayjs from 'dayjs';
 import omit from 'omit.js';
-import get from 'rc-util/lib/utils/get';
-import { default as namePathSet, default as set } from 'rc-util/lib/utils/set';
-import { noteOnce } from 'rc-util/lib/warning';
+import get from 'rc-util/es/utils/get';
+import { default as namePathSet, default as set } from 'rc-util/es/utils/set';
+import { noteOnce } from 'rc-util/es/warning';
 import React, {
   useCallback,
   useContext,

packages/form/src/BaseForm/createField.tsx

@@ -7,7 +7,7 @@
 import type { FormItemProps } from 'antd';
 import classnames from 'classnames';
 import { FieldContext as RcFieldContext } from 'rc-field-form';
-import { noteOnce } from 'rc-util/lib/warning';
+import { noteOnce } from 'rc-util/es/warning';
 import React, { useCallback, useContext, useMemo, useState } from 'react';
 import { stringify } from 'use-json-comparison';
 import { ProFormDependency, ProFormItem } from '../components';

packages/form/src/components/Dependency/index.tsx

@@ -2,8 +2,8 @@ import { isDeepEqualReact, merge, ProFormContext } from '@ant-design/pro-utils';
 import type { FormItemProps } from 'antd';
 import { Form } from 'antd';
 import type { NamePath } from 'antd/es/form/interface';
-import get from 'rc-util/lib/utils/get';
-import set from 'rc-util/lib/utils/set';
+import get from 'rc-util/es/utils/get';
+import set from 'rc-util/es/utils/set';
 import { useContext, useMemo } from 'react';
 import type { ProFormInstance } from '../../BaseForm';
 import { FormListContext } from '../List';

packages/form/src/components/FieldSet/index.tsx

@@ -2,7 +2,7 @@
 import type { FormItemProps, SpaceProps } from 'antd';
 import { Input, Space } from 'antd';
 import type { GroupProps } from 'antd/es/input';
-import toArray from 'rc-util/lib/Children/toArray';
+import toArray from 'rc-util/es/Children/toArray';
 import React, { useCallback, useImperativeHandle, useMemo } from 'react';
 import { createField } from '../../BaseForm/createField';
 import { useGridHelpers } from '../../helpers';

packages/form/src/components/List/ListItem.tsx

@@ -3,8 +3,8 @@ import { ProProvider } from '@ant-design/pro-provider';
 import type { ButtonProps, FormInstance } from 'antd';
 import { Spin, Tooltip } from 'antd';
 import type { FormListFieldData, FormListOperation, FormListProps } from 'antd/es/form/FormList';
-import toArray from 'rc-util/lib/Children/toArray';
-import set from 'rc-util/lib/utils/set';
+import toArray from 'rc-util/es/Children/toArray';
+import set from 'rc-util/es/utils/set';
 import type { CSSProperties, ReactNode } from 'react';
 import React, { useContext, useEffect, useMemo, useRef, useState } from 'react';
 import { FormListContext } from '.';

packages/form/src/components/List/index.tsx

@@ -6,7 +6,7 @@ import type { LabelTooltipType } from 'antd/es/form/FormItemLabel';
 import type { FormListFieldData, FormListOperation, FormListProps } from 'antd/es/form/FormList';
 import type { NamePath } from 'antd/es/form/interface';
 import classNames from 'classnames';
-import { noteOnce } from 'rc-util/lib/warning';
+import { noteOnce } from 'rc-util/es/warning';
 import type { ReactNode } from 'react';
 import React, { useContext, useEffect, useImperativeHandle, useMemo, useRef } from 'react';
 import { useGridHelpers } from '../../helpers';

packages/form/src/components/SchemaForm/valueType/dependency.tsx

@@ -1,4 +1,4 @@
-import { noteOnce } from 'rc-util/lib/warning';
+import { noteOnce } from 'rc-util/es/warning';
 import ProFormDependency from '../../Dependency';
 import type { ItemType, ProFormRenderValueTypeHelpers } from '../typing';
 

packages/form/src/layouts/DrawerForm/index.tsx

@@ -2,8 +2,8 @@
 import type { DrawerProps, FormProps } from 'antd';
 import { ConfigProvider, Drawer } from 'antd';
 import merge from 'lodash.merge';
-import useMergedState from 'rc-util/lib/hooks/useMergedState';
-import { noteOnce } from 'rc-util/lib/warning';
+import useMergedState from 'rc-util/es/hooks/useMergedState';
+import { noteOnce } from 'rc-util/es/warning';
 import React, { useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react';
 import { createPortal } from 'react-dom';
 import type { CommonFormProps, ProFormInstance } from '../../BaseForm';

packages/form/src/layouts/ModalForm/index.tsx

@@ -2,8 +2,8 @@
 import type { FormProps, ModalProps } from 'antd';
 import { ConfigProvider, Modal } from 'antd';
 import merge from 'lodash.merge';
-import useMergedState from 'rc-util/lib/hooks/useMergedState';
-import { noteOnce } from 'rc-util/lib/warning';
+import useMergedState from 'rc-util/es/hooks/useMergedState';
+import { noteOnce } from 'rc-util/es/warning';
 import React, { useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react';
 import { createPortal } from 'react-dom';
 import type { CommonFormProps, ProFormInstance } from '../../BaseForm';

packages/form/src/layouts/QueryFilter/index.tsx

@@ -6,7 +6,7 @@ import { Col, ConfigProvider, Form, Row } from 'antd';
 import type { FormInstance, FormProps } from 'antd/es/form/Form';
 import classNames from 'classnames';
 import RcResizeObserver from 'rc-resize-observer';
-import useMergedState from 'rc-util/lib/hooks/useMergedState';
+import useMergedState from 'rc-util/es/hooks/useMergedState';
 import type { ReactElement } from 'react';
 import React, { useContext, useMemo } from 'react';
 import type { CommonFormProps } from '../../BaseForm';

packages/form/src/layouts/StepsForm/StepForm.tsx

@@ -1,6 +1,6 @@
 import type { FormInstance, FormProps } from 'antd';
-import type { StepProps } from 'rc-steps/lib/Step';
-import { noteOnce } from 'rc-util/lib/warning';
+import type { StepProps } from 'rc-steps/es/Step';
+import { noteOnce } from 'rc-util/es/warning';
 import { useContext, useEffect, useImperativeHandle, useRef } from 'react';
 import type { CommonFormProps } from '../../BaseForm';
 import { BaseForm } from '../../BaseForm';

packages/form/src/layouts/StepsForm/index.tsx

@@ -5,8 +5,8 @@ import { version } from 'antd';
 import { Button, Col, ConfigProvider, Form, Row, Space, Steps } from 'antd';
 import type { FormProviderProps } from 'antd/es/form/context';
 import classNames from 'classnames';
-import toArray from 'rc-util/lib/Children/toArray';
-import useMergedState from 'rc-util/lib/hooks/useMergedState';
+import toArray from 'rc-util/es/Children/toArray';
+import useMergedState from 'rc-util/es/hooks/useMergedState';
 import React, {
   useCallback,
   useContext,

packages/layout/CHANGELOG.md

@@ -1,25 +1,18 @@
 # Change Log
 
-All notable changes to this project will be documented in this file.
-See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
 # [7.8.0](https://github.com/ant-design/pro-components/compare/@ant-design/pro-layout@7.7.1...@ant-design/pro-layout@7.8.0) (2023-02-17)
 
-
 ### Bug Fixes
 
-* **layout:** alway use actionsRender ([2e62234](https://github.com/ant-design/pro-components/commit/2e62234323edcb720bfad1b34baf3c0ac460970a))
-* **layout:** remove `title` attribute ([#6604](https://github.com/ant-design/pro-components/issues/6604)) ([10820a6](https://github.com/ant-design/pro-components/commit/10820a628c731afe8d98d0f6ba74cf9e35d0aa2f))
-
+- **layout:** alway use actionsRender ([2e62234](https://github.com/ant-design/pro-components/commit/2e62234323edcb720bfad1b34baf3c0ac460970a))
+- **layout:** remove `title` attribute ([#6604](https://github.com/ant-design/pro-components/issues/6604)) ([10820a6](https://github.com/ant-design/pro-components/commit/10820a628c731afe8d98d0f6ba74cf9e35d0aa2f))
 
 ### Features
 
-* **components:** remove unstate-next for protable ([f284e66](https://github.com/ant-design/pro-components/commit/f284e6620c0afd818ff8d6f41c5cd83d5e28c7a8))
-* **layout:** layout avatarProps support render funtion ([1dd7900](https://github.com/ant-design/pro-components/commit/1dd790089cad44c937be3647a0cbb3666030fc5f))
-
-
-
-
+- **components:** remove unstate-next for protable ([f284e66](https://github.com/ant-design/pro-components/commit/f284e6620c0afd818ff8d6f41c5cd83d5e28c7a8))
+- **layout:** layout avatarProps support render funtion ([1dd7900](https://github.com/ant-design/pro-components/commit/1dd790089cad44c937be3647a0cbb3666030fc5f))
 
 ## [7.7.1](https://github.com/ant-design/pro-components/compare/@ant-design/pro-layout@7.7.0...@ant-design/pro-layout@7.7.1) (2023-02-10)
 

packages/layout/src/ProLayout.tsx

@@ -6,8 +6,8 @@ import type { BreadcrumbProps as AntdBreadcrumbProps } from 'antd';
 import { ConfigProvider, Layout } from 'antd';
 import classNames from 'classnames';
 import Omit from 'omit.js';
-import useMergedState from 'rc-util/lib/hooks/useMergedState';
-import warning from 'rc-util/lib/warning';
+import useMergedState from 'rc-util/es/hooks/useMergedState';
+import warning from 'rc-util/es/warning';
 import type { CSSProperties } from 'react';
 import React, { useCallback, useContext, useEffect, useMemo, useState } from 'react';
 import useSWR, { useSWRConfig } from 'swr';

packages/layout/src/components/SettingDrawer/index.tsx

@@ -18,7 +18,7 @@ import {
   version,
 } from 'antd';
 import omit from 'omit.js';
-import useMergedState from 'rc-util/lib/hooks/useMergedState';
+import useMergedState from 'rc-util/es/hooks/useMergedState';
 import React, { useEffect, useRef, useState } from 'react';
 import type { ProSettings } from '../../defaultSettings';
 import { defaultSettings } from '../../defaultSettings';

packages/list/CHANGELOG.md

@@ -1,18 +1,12 @@
 # Change Log
 
-All notable changes to this project will be documented in this file.
-See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
 # [2.1.0](https://github.com/ant-design/pro-components/compare/@ant-design/pro-list@2.0.47...@ant-design/pro-list@2.1.0) (2023-02-17)
 
-
 ### Features
 
-* **components:** remove unstate-next for protable ([f284e66](https://github.com/ant-design/pro-components/commit/f284e6620c0afd818ff8d6f41c5cd83d5e28c7a8))
-
-
-
-
+- **components:** remove unstate-next for protable ([f284e66](https://github.com/ant-design/pro-components/commit/f284e6620c0afd818ff8d6f41c5cd83d5e28c7a8))
 
 ## [2.0.47](https://github.com/ant-design/pro-components/compare/@ant-design/pro-list@2.0.46...@ant-design/pro-list@2.0.47) (2023-02-10)
 

packages/list/src/Item.tsx

@@ -6,7 +6,7 @@ import { ConfigProvider, List, Skeleton } from 'antd';
 import type { ListGridType } from 'antd/es/list';
 import type { ExpandableConfig } from 'antd/es/table/interface';
 import classNames from 'classnames';
-import useMergedState from 'rc-util/lib/hooks/useMergedState';
+import useMergedState from 'rc-util/es/hooks/useMergedState';
 import React, { useContext, useMemo } from 'react';
 import type { GetComponentProps } from './index';
 

packages/list/src/ListView.tsx

@@ -8,7 +8,7 @@ import usePagination from 'antd/es/table/hooks/usePagination';
 import useSelection from 'antd/es/table/hooks/useSelection';
 import type { GetRowKey } from 'antd/es/table/interface';
 import classNames from 'classnames';
-import get from 'rc-util/lib/utils/get';
+import get from 'rc-util/es/utils/get';
 import React, { useContext } from 'react';
 import { PRO_LIST_KEYS_MAP } from './constants';
 import type { GetComponentProps } from './index';

packages/provider/CHANGELOG.md

@@ -1,18 +1,12 @@
 # Change Log
 
-All notable changes to this project will be documented in this file.
-See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
 ## [2.4.3](https://github.com/ant-design/pro-components/compare/@ant-design/pro-provider@2.4.2...@ant-design/pro-provider@2.4.3) (2023-02-17)
 
-
 ### Bug Fixes
 
-* **components:** Thai translation in ProTable ([#6600](https://github.com/ant-design/pro-components/issues/6600)) ([d1fefbd](https://github.com/ant-design/pro-components/commit/d1fefbd88caad944f4837631e89f9c9cf5f7ea22))
-
-
-
-
+- **components:** Thai translation in ProTable ([#6600](https://github.com/ant-design/pro-components/issues/6600)) ([d1fefbd](https://github.com/ant-design/pro-components/commit/d1fefbd88caad944f4837631e89f9c9cf5f7ea22))
 
 ## [2.4.2](https://github.com/ant-design/pro-components/compare/@ant-design/pro-provider@2.4.1...@ant-design/pro-provider@2.4.2) (2023-02-10)
 

packages/table/CHANGELOG.md

@@ -1,26 +1,19 @@
 # Change Log
 
-All notable changes to this project will be documented in this file.
-See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
 # [3.3.0](https://github.com/ant-design/pro-components/compare/@ant-design/pro-table@3.2.14...@ant-design/pro-table@3.3.0) (2023-02-17)
 
-
 ### Bug Fixes
 
-* **components:** fix valuetype no work error ([f6215e9](https://github.com/ant-design/pro-components/commit/f6215e98eaeb46fa979c1ca4ac40ceaa0828f9f3))
-* **components:** Thai translation in ProTable ([#6600](https://github.com/ant-design/pro-components/issues/6600)) ([d1fefbd](https://github.com/ant-design/pro-components/commit/d1fefbd88caad944f4837631e89f9c9cf5f7ea22))
-* **table:** fix pagination padding style error ([a5e7439](https://github.com/ant-design/pro-components/commit/a5e7439e49286bf832dc20ff3b8af32495e418e8))
-* **table:** if toolBarRender,search and headerTitle is null, norender table card dom ([fc59a19](https://github.com/ant-design/pro-components/commit/fc59a1996b2a7670b7cc0f6c731bf04949dfe75e))
-
+- **components:** fix valuetype no work error ([f6215e9](https://github.com/ant-design/pro-components/commit/f6215e98eaeb46fa979c1ca4ac40ceaa0828f9f3))
+- **components:** Thai translation in ProTable ([#6600](https://github.com/ant-design/pro-components/issues/6600)) ([d1fefbd](https://github.com/ant-design/pro-components/commit/d1fefbd88caad944f4837631e89f9c9cf5f7ea22))
+- **table:** fix pagination padding style error ([a5e7439](https://github.com/ant-design/pro-components/commit/a5e7439e49286bf832dc20ff3b8af32495e418e8))
+- **table:** if toolBarRender,search and headerTitle is null, norender table card dom ([fc59a19](https://github.com/ant-design/pro-components/commit/fc59a1996b2a7670b7cc0f6c731bf04949dfe75e))
 
 ### Features
 
-* **components:** remove unstate-next for protable ([f284e66](https://github.com/ant-design/pro-components/commit/f284e6620c0afd818ff8d6f41c5cd83d5e28c7a8))
-
-
-
-
+- **components:** remove unstate-next for protable ([f284e66](https://github.com/ant-design/pro-components/commit/f284e6620c0afd818ff8d6f41c5cd83d5e28c7a8))
 
 ## [3.2.14](https://github.com/ant-design/pro-components/compare/@ant-design/pro-table@3.2.13...@ant-design/pro-table@3.2.14) (2023-02-10)
 

packages/table/src/Store/Provide.tsx

@@ -1,6 +1,6 @@
 import type { TableColumnType } from 'antd';
-import useMergedState from 'rc-util/lib/hooks/useMergedState';
-import { noteOnce } from 'rc-util/lib/warning';
+import useMergedState from 'rc-util/es/hooks/useMergedState';
+import { noteOnce } from 'rc-util/es/warning';
 import { createContext, useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import type { DensitySize } from '../components/ToolBar/DensityIcon';
 import type { ProTableProps } from '../index';

packages/table/src/components/DragSortTable/index.tsx

@@ -1,7 +1,7 @@
 import { MenuOutlined } from '@ant-design/icons';
 import type { ParamsType } from '@ant-design/pro-provider';
 import { ConfigProvider } from 'antd';
-import useMergedState from 'rc-util/lib/hooks/useMergedState';
+import useMergedState from 'rc-util/es/hooks/useMergedState';
 import React, { useCallback, useContext, useMemo, useRef } from 'react';
 import { SortableHandle } from 'react-sortable-hoc';
 import ProTable from '../../Table';

packages/table/src/components/EditableTable/index.tsx

@@ -8,9 +8,9 @@ import type { ButtonProps, FormItemProps } from 'antd';
 import { Button, Form } from 'antd';
 import type { NamePath } from 'antd/es/form/interface';
 import type { GetRowKey } from 'antd/es/table/interface';
-import useMergedState from 'rc-util/lib/hooks/useMergedState';
-import get from 'rc-util/lib/utils/get';
-import set from 'rc-util/lib/utils/set';
+import useMergedState from 'rc-util/es/hooks/useMergedState';
+import get from 'rc-util/es/utils/get';
+import set from 'rc-util/es/utils/set';
 import React, { useContext, useEffect, useImperativeHandle, useMemo, useRef } from 'react';
 import ProTable from '../../Table';
 import type { ActionType, ProTableProps } from '../../typing';

packages/table/src/components/ListToolBar/HeaderMenu.tsx

@@ -3,7 +3,7 @@ import { ProProvider } from '@ant-design/pro-provider';
 import { menuOverlayCompatible } from '@ant-design/pro-utils';
 import { Dropdown, Space, Tabs } from 'antd';
 import classNames from 'classnames';
-import useMergedState from 'rc-util/lib/hooks/useMergedState';
+import useMergedState from 'rc-util/es/hooks/useMergedState';
 import React, { useContext } from 'react';
 
 export type ListToolBarMenuItem = {

packages/table/src/utils/columnRender.tsx

@@ -6,7 +6,7 @@ import type {
   UseEditableUtilType,
 } from '@ant-design/pro-utils';
 import { genCopyable, isNil, LabelIconTip } from '@ant-design/pro-utils';
-import get from 'rc-util/lib/utils/get';
+import get from 'rc-util/es/utils/get';
 import React from 'react';
 import { isMergeCell } from '.';
 import type { ContainerType } from '../Store/Provide';

packages/table/src/utils/useDragSort.tsx

@@ -1,5 +1,5 @@
 import { useRefFunction } from '@ant-design/pro-utils';
-import type { TableComponents } from 'rc-table/lib/interface';
+import type { TableComponents } from 'rc-table/es/interface';
 import { SortableContainer, SortableElement } from 'react-sortable-hoc';
 import type { SortDataParams } from './index';
 import { sortData } from './index';

packages/utils/CHANGELOG.md

@@ -1,20 +1,14 @@
 # Change Log
 
-All notable changes to this project will be documented in this file.
-See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
 ## [2.5.7](https://github.com/ant-design/pro-components/compare/@ant-design/pro-utils@2.5.6...@ant-design/pro-utils@2.5.7) (2023-02-17)
 
-
 ### Bug Fixes
 
-* **components:** fix valuetype no work error ([f6215e9](https://github.com/ant-design/pro-components/commit/f6215e98eaeb46fa979c1ca4ac40ceaa0828f9f3))
-* **field:** `optionFilterProp` doesn't work with LightFilter ([#6603](https://github.com/ant-design/pro-components/issues/6603)) ([0e287f6](https://github.com/ant-design/pro-components/commit/0e287f6dba1cdc0f31bcae60e3149ed6a276169d))
-* **form:** inconsistent digit value when precision=0 ([#6591](https://github.com/ant-design/pro-components/issues/6591)) ([f83092a](https://github.com/ant-design/pro-components/commit/f83092a50993f3a86b59565394c24228f7e8541e))
-
-
-
-
+- **components:** fix valuetype no work error ([f6215e9](https://github.com/ant-design/pro-components/commit/f6215e98eaeb46fa979c1ca4ac40ceaa0828f9f3))
+- **field:** `optionFilterProp` doesn't work with LightFilter ([#6603](https://github.com/ant-design/pro-components/issues/6603)) ([0e287f6](https://github.com/ant-design/pro-components/commit/0e287f6dba1cdc0f31bcae60e3149ed6a276169d))
+- **form:** inconsistent digit value when precision=0 ([#6591](https://github.com/ant-design/pro-components/issues/6591)) ([f83092a](https://github.com/ant-design/pro-components/commit/f83092a50993f3a86b59565394c24228f7e8541e))
 
 ## [2.5.6](https://github.com/ant-design/pro-components/compare/@ant-design/pro-utils@2.5.5...@ant-design/pro-utils@2.5.6) (2023-02-10)
 

packages/utils/src/components/InlineErrorFormItem/index.tsx

@@ -2,7 +2,7 @@
 import { openVisibleCompatible } from '../../compareVersions/openVisibleCompatible';
 import type { FormItemProps, PopoverProps } from 'antd';
 import { ConfigProvider, Form, Popover } from 'antd';
-import type { NamePath } from 'rc-field-form/lib/interface';
+import type { NamePath } from 'rc-field-form/es/interface';
 import React, { useContext, useEffect, useState } from 'react';
 import { useStyle } from './style';
 

packages/utils/src/conversionMomentValue/index.ts

@@ -1,6 +1,6 @@
 import type { InternalNamePath, NamePath } from 'antd/es/form/interface';
 import dayjs from 'dayjs';
-import get from 'rc-util/lib/utils/get';
+import get from 'rc-util/es/utils/get';
 import { isNil } from '../isNil';
 import type { ProFieldValueType } from '../typing';
 import quarterOfYear from 'dayjs/plugin/quarterOfYear';

packages/utils/src/transformKeySubmitValue/index.ts

@@ -1,5 +1,5 @@
-import get from 'rc-util/lib/utils/get';
-import namePathSet from 'rc-util/lib/utils/set';
+import get from 'rc-util/es/utils/get';
+import namePathSet from 'rc-util/es/utils/set';
 import React from 'react';
 import { isNil } from '../isNil';
 import { merge } from '../merge';

packages/utils/src/useEditableArray/index.tsx

@@ -6,10 +6,10 @@ import { Form, message, Popconfirm } from 'antd';
 import type { NamePath } from 'antd/es/form/interface';
 import useLazyKVMap from 'antd/es/table/hooks/useLazyKVMap';
 import type { GetRowKey } from 'antd/es/table/interface';
-import useMergedState from 'rc-util/lib/hooks/useMergedState';
-import get from 'rc-util/lib/utils/get';
-import set from 'rc-util/lib/utils/set';
-import { noteOnce } from 'rc-util/lib/warning';
+import useMergedState from 'rc-util/es/hooks/useMergedState';
+import get from 'rc-util/es/utils/get';
+import set from 'rc-util/es/utils/set';
+import { noteOnce } from 'rc-util/es/warning';
 import React, {
   useContext,
   useMemo,

packages/utils/src/useEditableMap/index.tsx

@@ -1,7 +1,7 @@
 /* eslint-disable react-hooks/exhaustive-deps */
 import { useIntl } from '@ant-design/pro-provider';
 import { message } from 'antd';
-import useMergedState from 'rc-util/lib/hooks/useMergedState';
+import useMergedState from 'rc-util/es/hooks/useMergedState';
 import type React from 'react';
 import { useCallback, useMemo } from 'react';
 import type {

packages/utils/src/useMountMergeState/index.ts

@@ -1,3 +1,3 @@
-import useMergedState from 'rc-util/lib/hooks/useMergedState';
+import useMergedState from 'rc-util/es/hooks/useMergedState';
 
 export { useMergedState as useMountMergeState };

scripts/replaceLib.js

@@ -1,16 +1,15 @@
 const { join, dirname } = require('path');
-const fs = require('fs');
 
 function replacePath(path) {
-  if (path.node.source && /\/es\//.test(path.node.source.value)) {
+  if (path.node.source && path.node.source.value?.includes('es/')) {
     const esModule = path.node.source.value.replace('/es/', '/lib/');
-    const esPath = dirname(join(__dirname, '../', `node_modules/${esModule}`));
-    console.log(path.node.source.value, esPath);
     try {
-      if (require.resolve(esPath)) {
+      if (require.resolve(esModule)) {
         path.node.source.value = esModule;
       }
-    } catch (error) {}
+    } catch (error) {
+      console.log(error);
+    }
   }
 }
 

tests/descriptions/editor.test.tsx

@@ -6,7 +6,7 @@ import Descriptions from '@ant-design/pro-descriptions';
 import type { RowEditableConfig } from '@ant-design/pro-utils';
 import { act, fireEvent, render } from '@testing-library/react';
 import { Form, InputNumber } from 'antd';
-import useMergedState from 'rc-util/lib/hooks/useMergedState';
+import useMergedState from 'rc-util/es/hooks/useMergedState';
 import React, { useRef } from 'react';
 import { waitForComponentToPaint } from '../util';
 

tests/form/lightFilter.test.tsx

@@ -12,7 +12,7 @@ import {
 import { act, fireEvent, render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import dayjs from 'dayjs';
-import KeyCode from 'rc-util/lib/KeyCode';
+import KeyCode from 'rc-util/es/KeyCode';
 import { waitForComponentToPaint } from '../util';
 
 describe('LightFilter', () => {

tests/table/editor-table-two.test.tsx

@@ -3,7 +3,7 @@ import type { ActionType, ProColumns, TableRowEditable } from '@ant-design/pro-t
 import { EditableProTable } from '@ant-design/pro-table';
 import { act, fireEvent, render } from '@testing-library/react';
 import { Button, Input, InputNumber } from 'antd';
-import useMergedState from 'rc-util/lib/hooks/useMergedState';
+import useMergedState from 'rc-util/es/hooks/useMergedState';
 import React, { useRef } from 'react';
 import { waitForComponentToPaint, waitTime } from '../util';