From 0fe5b5367ab9a0fbaac233274ae7e96f1dece383 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=AB=E9=9B=A8=E6=B0=B4=E8=BF=87=E6=BB=A4=E7=9A=84?= =?UTF-8?q?=E7=A9=BA=E6=B0=94-Rain?= <958414905@qq.com> Date: Tue, 1 Aug 2023 11:51:30 +0800 Subject: [PATCH] chore: upgrade antd to 5.7.3 (#2359) * chore: upgrade antd to 5.7.3 * chore: fix build * chore: fix build --- packages/core/client/package.json | 2 +- .../antd/__builtins__/hooks/useToken.ts | 6 +- .../antd/__builtins__/style.ts | 4 +- packages/core/client/src/style/useToken.ts | 6 +- packages/plugins/api-keys/package.json | 2 +- packages/plugins/auth/package.json | 2 +- packages/plugins/charts/package.json | 2 +- packages/plugins/client/package.json | 2 +- .../plugins/data-visualization/package.json | 2 +- packages/plugins/duplicator/package.json | 2 +- packages/plugins/file-manager/package.json | 2 +- .../graph-collection-manager/package.json | 2 +- packages/plugins/iframe-block/package.json | 2 +- packages/plugins/import/package.json | 2 +- packages/plugins/map/package.json | 2 +- packages/plugins/mobile-client/package.json | 2 +- .../plugins/multi-app-manager/package.json | 2 +- .../multi-app-share-collection/package.json | 2 +- packages/plugins/oidc/package.json | 2 +- packages/plugins/saml/package.json | 2 +- packages/plugins/sequence-field/package.json | 2 +- packages/plugins/sms-auth/package.json | 2 +- packages/plugins/snapshot-field/package.json | 2 +- packages/plugins/theme-editor/package.json | 3 +- .../token-panel-pro/AliasPanel.tsx | 9 +- .../token-panel-pro/ComponentDemoPro.tsx | 2 +- .../token-panel-pro/TokenContent.tsx | 9 +- .../token-panel-pro/TokenDetail.tsx | 2 +- .../token-panel-pro/index.tsx | 2 +- packages/plugins/verification/package.json | 2 +- packages/plugins/workflow/package.json | 2 +- packages/samples/hello/package.json | 2 +- packages/samples/shop-i18n/package.json | 2 +- yarn.lock | 190 +++++++++++++++++- 34 files changed, 228 insertions(+), 53 deletions(-) diff --git a/packages/core/client/package.json b/packages/core/client/package.json index 82322c002b..ce9000124f 100644 --- a/packages/core/client/package.json +++ b/packages/core/client/package.json @@ -26,7 +26,7 @@ "@nocobase/sdk": "0.11.1-alpha.5", "@nocobase/utils": "0.11.1-alpha.5", "ahooks": "^3.7.2", - "antd": "^5.6.4", + "antd": "^5.7.3", "antd-style": "^3.3.0", "axios": "^0.26.1", "classnames": "^2.3.1", diff --git a/packages/core/client/src/schema-component/antd/__builtins__/hooks/useToken.ts b/packages/core/client/src/schema-component/antd/__builtins__/hooks/useToken.ts index 9ce900979d..e148d3e101 100644 --- a/packages/core/client/src/schema-component/antd/__builtins__/hooks/useToken.ts +++ b/packages/core/client/src/schema-component/antd/__builtins__/hooks/useToken.ts @@ -1,14 +1,12 @@ import { theme } from 'antd'; import { CustomToken } from '../../../../global-theme'; -const { useToken: useAntdToken } = theme; - -interface Result extends ReturnType { +interface Result extends ReturnType { token: CustomToken; } const useToken = () => { - const result = useAntdToken(); + const result = theme.useToken(); return result as Result; }; diff --git a/packages/core/client/src/schema-component/antd/__builtins__/style.ts b/packages/core/client/src/schema-component/antd/__builtins__/style.ts index 2a5519562d..76a73c281a 100644 --- a/packages/core/client/src/schema-component/antd/__builtins__/style.ts +++ b/packages/core/client/src/schema-component/antd/__builtins__/style.ts @@ -27,7 +27,7 @@ export type TokenWithCommonCls = T & { export type GenerateStyle< ComponentToken extends object = TokenWithCommonCls, - ReturnType = CSSInterpolation, + ReturnType = CSSInterpolation > = (token: ComponentToken, options?: any) => ReturnType; export const genCommonStyle = (token: any, componentPrefixCls: string): CSSObject => { @@ -75,7 +75,7 @@ export const genStyleHook = ( return { wrapSSR: useStyleRegister( { - theme, + theme: theme as any, token, hashId, path: ['formily-antd', component, prefixCls, iconPrefixCls], diff --git a/packages/core/client/src/style/useToken.ts b/packages/core/client/src/style/useToken.ts index 9f4b147fb8..79a76a19d2 100644 --- a/packages/core/client/src/style/useToken.ts +++ b/packages/core/client/src/style/useToken.ts @@ -1,14 +1,12 @@ import { theme } from 'antd'; import { CustomToken } from '../global-theme'; -const { useToken: useAntdToken } = theme; - -interface Result extends ReturnType { +interface Result extends ReturnType { token: CustomToken; } const useToken = () => { - const result = useAntdToken(); + const result = theme.useToken(); return result as Result; }; diff --git a/packages/plugins/api-keys/package.json b/packages/plugins/api-keys/package.json index 2c33137587..5def7db24b 100644 --- a/packages/plugins/api-keys/package.json +++ b/packages/plugins/api-keys/package.json @@ -28,7 +28,7 @@ "@nocobase/server": "0.11.1-alpha.5", "@nocobase/test": "0.11.1-alpha.5", "@nocobase/utils": "0.11.1-alpha.5", - "antd": "^5.6.4", + "antd": "^5.7.3", "dayjs": "^1.11.8", "i18next": "^22.4.9", "react": "^18.2.0", diff --git a/packages/plugins/auth/package.json b/packages/plugins/auth/package.json index f392750b79..bbfc8afcd3 100644 --- a/packages/plugins/auth/package.json +++ b/packages/plugins/auth/package.json @@ -20,7 +20,7 @@ "@nocobase/auth": "0.11.1-alpha.5", "@nocobase/test": "0.11.1-alpha.5", "@types/cron": "^2.0.1", - "antd": "^5.6.4", + "antd": "^5.7.3", "react": "^18.2.0", "react-i18next": "^11.15.1" }, diff --git a/packages/plugins/charts/package.json b/packages/plugins/charts/package.json index afa6c104b0..93396ae86d 100644 --- a/packages/plugins/charts/package.json +++ b/packages/plugins/charts/package.json @@ -31,7 +31,7 @@ "@nocobase/server": "0.11.1-alpha.5", "@nocobase/test": "0.11.1-alpha.5", "@nocobase/utils": "0.11.1-alpha.5", - "antd": "^5.6.4", + "antd": "^5.7.3", "react": "^18.2.0", "react-i18next": "^11.15.1", "react-router-dom": "^6.11.2" diff --git a/packages/plugins/client/package.json b/packages/plugins/client/package.json index 43ba672929..4538b696c8 100644 --- a/packages/plugins/client/package.json +++ b/packages/plugins/client/package.json @@ -19,7 +19,7 @@ ], "license": "AGPL-3.0", "dependencies": { - "antd": "^5.6.4", + "antd": "^5.7.3", "cronstrue": "^2.11.0", "koa-send": "^5.0.1", "koa-static": "^5.0.0" diff --git a/packages/plugins/data-visualization/package.json b/packages/plugins/data-visualization/package.json index dd299aca59..140065b074 100644 --- a/packages/plugins/data-visualization/package.json +++ b/packages/plugins/data-visualization/package.json @@ -25,7 +25,7 @@ "@nocobase/test": "0.11.1-alpha.5", "@nocobase/utils": "0.11.1-alpha.5", "@testing-library/react": "^14.0.0", - "antd": "^5.6.4", + "antd": "^5.7.3", "lodash": "^4.17.21", "react": "^18.2.0", "react-i18next": "^11.15.1", diff --git a/packages/plugins/duplicator/package.json b/packages/plugins/duplicator/package.json index 84bf1369ff..eb1d914743 100644 --- a/packages/plugins/duplicator/package.json +++ b/packages/plugins/duplicator/package.json @@ -40,7 +40,7 @@ "@nocobase/server": "0.11.1-alpha.5", "@nocobase/test": "0.11.1-alpha.5", "@nocobase/utils": "0.11.1-alpha.5", - "antd": "^5.6.4", + "antd": "^5.7.3", "react": "^18.2.0" } } diff --git a/packages/plugins/file-manager/package.json b/packages/plugins/file-manager/package.json index 12d98f59a1..b348c20bfc 100644 --- a/packages/plugins/file-manager/package.json +++ b/packages/plugins/file-manager/package.json @@ -43,7 +43,7 @@ "@nocobase/server": "0.11.1-alpha.5", "@nocobase/test": "0.11.1-alpha.5", "@nocobase/utils": "0.11.1-alpha.5", - "antd": "^5.6.4", + "antd": "^5.7.3", "react": "^18.2.0", "react-i18next": "^11.15.1", "supertest": "^6.1.6" diff --git a/packages/plugins/graph-collection-manager/package.json b/packages/plugins/graph-collection-manager/package.json index 420aa5ba42..39acdb76d6 100644 --- a/packages/plugins/graph-collection-manager/package.json +++ b/packages/plugins/graph-collection-manager/package.json @@ -34,7 +34,7 @@ "@nocobase/server": "0.11.1-alpha.5", "@nocobase/test": "0.11.1-alpha.5", "@nocobase/utils": "0.11.1-alpha.5", - "antd": "^5.6.4", + "antd": "^5.7.3", "react": "^18.2.0", "react-i18next": "^11.15.1" } diff --git a/packages/plugins/iframe-block/package.json b/packages/plugins/iframe-block/package.json index 54658a8c00..fa537c02a3 100644 --- a/packages/plugins/iframe-block/package.json +++ b/packages/plugins/iframe-block/package.json @@ -30,7 +30,7 @@ "@nocobase/database": "0.11.1-alpha.5", "@nocobase/server": "0.11.1-alpha.5", "@nocobase/test": "0.11.1-alpha.5", - "antd": "^5.6.4", + "antd": "^5.7.3", "react": "^18.2.0", "react-i18next": "^11.15.1" } diff --git a/packages/plugins/import/package.json b/packages/plugins/import/package.json index ea16aee153..97e739db5b 100644 --- a/packages/plugins/import/package.json +++ b/packages/plugins/import/package.json @@ -38,7 +38,7 @@ "@nocobase/server": "0.11.1-alpha.5", "@nocobase/test": "0.11.1-alpha.5", "@nocobase/utils": "0.11.1-alpha.5", - "antd": "^5.6.4", + "antd": "^5.7.3", "react": "^18.2.0", "react-dom": "^18.2.0", "react-i18next": "^11.15.1" diff --git a/packages/plugins/map/package.json b/packages/plugins/map/package.json index 756ff202fb..79d2f78f1c 100644 --- a/packages/plugins/map/package.json +++ b/packages/plugins/map/package.json @@ -39,7 +39,7 @@ "@nocobase/utils": "0.11.1-alpha.5", "@types/react": "^17.0.0", "@types/react-dom": "^17.0.0", - "antd": "^5.6.4", + "antd": "^5.7.3", "react": "18.x", "react-dom": "18.x", "react-i18next": "^11.15.1", diff --git a/packages/plugins/mobile-client/package.json b/packages/plugins/mobile-client/package.json index 6057c1cf74..aca7a4904e 100644 --- a/packages/plugins/mobile-client/package.json +++ b/packages/plugins/mobile-client/package.json @@ -29,7 +29,7 @@ "@nocobase/utils": "0.11.1-alpha.5", "@types/react": "^17.0.0", "@types/react-dom": "^17.0.0", - "antd": "^5.6.4", + "antd": "^5.7.3", "antd-style": "^3.3.0", "react": "^18.0.0", "react-dom": "^18.0.0", diff --git a/packages/plugins/multi-app-manager/package.json b/packages/plugins/multi-app-manager/package.json index a3b275d761..60e9b236fa 100644 --- a/packages/plugins/multi-app-manager/package.json +++ b/packages/plugins/multi-app-manager/package.json @@ -26,7 +26,7 @@ "@nocobase/server": "0.11.1-alpha.5", "@nocobase/test": "0.11.1-alpha.5", "@nocobase/utils": "0.11.1-alpha.5", - "antd": "^5.6.4", + "antd": "^5.7.3", "react": "18.x", "react-i18next": "^11.15.1", "react-router-dom": "^6.11.2" diff --git a/packages/plugins/multi-app-share-collection/package.json b/packages/plugins/multi-app-share-collection/package.json index 5024d7aff5..e5fef9b01c 100644 --- a/packages/plugins/multi-app-share-collection/package.json +++ b/packages/plugins/multi-app-share-collection/package.json @@ -28,7 +28,7 @@ "@nocobase/server": "0.11.1-alpha.5", "@nocobase/test": "0.11.1-alpha.5", "@nocobase/utils": "0.11.1-alpha.5", - "antd": "^5.6.4", + "antd": "^5.7.3", "react": "18.x", "react-i18next": "^11.15.1" } diff --git a/packages/plugins/oidc/package.json b/packages/plugins/oidc/package.json index 9000df405d..0b8d20a0ae 100644 --- a/packages/plugins/oidc/package.json +++ b/packages/plugins/oidc/package.json @@ -29,7 +29,7 @@ "@nocobase/server": "0.11.1-alpha.5", "@nocobase/test": "0.11.1-alpha.5", "ahooks": "^3.7.2", - "antd": "^5.6.4", + "antd": "^5.7.3", "react": "18.x", "react-i18next": "^11.15.1" }, diff --git a/packages/plugins/saml/package.json b/packages/plugins/saml/package.json index 0ed7045bbe..434e6bbb5f 100644 --- a/packages/plugins/saml/package.json +++ b/packages/plugins/saml/package.json @@ -27,7 +27,7 @@ "@nocobase/database": "0.11.1-alpha.5", "@nocobase/server": "0.11.1-alpha.5", "@nocobase/test": "0.11.1-alpha.5", - "antd": "^5.6.4", + "antd": "^5.7.3", "react": "18.x", "react-i18next": "^11.15.1" }, diff --git a/packages/plugins/sequence-field/package.json b/packages/plugins/sequence-field/package.json index 817c1225a9..6270028bfc 100644 --- a/packages/plugins/sequence-field/package.json +++ b/packages/plugins/sequence-field/package.json @@ -33,7 +33,7 @@ "@nocobase/server": "0.11.1-alpha.5", "@nocobase/test": "0.11.1-alpha.5", "@nocobase/utils": "0.11.1-alpha.5", - "antd": "^5.6.4", + "antd": "^5.7.3", "react": "18.x", "react-i18next": "^11.15.1" }, diff --git a/packages/plugins/sms-auth/package.json b/packages/plugins/sms-auth/package.json index 88fdf916af..3b6138a0fd 100644 --- a/packages/plugins/sms-auth/package.json +++ b/packages/plugins/sms-auth/package.json @@ -27,7 +27,7 @@ "@nocobase/plugin-verification": "0.11.1-alpha.5", "@nocobase/server": "0.11.1-alpha.5", "@nocobase/test": "0.11.1-alpha.5", - "antd": "^5.6.4", + "antd": "^5.7.3", "react": "18.x", "react-i18next": "^11.15.1" } diff --git a/packages/plugins/snapshot-field/package.json b/packages/plugins/snapshot-field/package.json index 4442095d02..5d25184f5b 100644 --- a/packages/plugins/snapshot-field/package.json +++ b/packages/plugins/snapshot-field/package.json @@ -28,7 +28,7 @@ "@nocobase/server": "0.11.1-alpha.5", "@nocobase/test": "0.11.1-alpha.5", "@nocobase/utils": "0.11.1-alpha.5", - "antd": "^5.6.4", + "antd": "^5.7.3", "rc-tree-select": "5.5.5", "react": "18.x", "react-i18next": "^11.15.1" diff --git a/packages/plugins/theme-editor/package.json b/packages/plugins/theme-editor/package.json index 09af13e16e..64bea1257f 100644 --- a/packages/plugins/theme-editor/package.json +++ b/packages/plugins/theme-editor/package.json @@ -9,7 +9,6 @@ "dependencies": { "@arvinxu/layout-kit": "^1", "@ctrl/tinycolor": "^3.6.0", - "antd-token-previewer": "2.0.0-alpha.8", "classnames": "^2.3.1", "rc-util": "^5.32.0", "react-colorful": "^5.5.1", @@ -26,7 +25,7 @@ "@nocobase/server": "0.11.1-alpha.5", "@nocobase/test": "0.11.1-alpha.5", "@nocobase/utils": "0.11.1-alpha.5", - "antd": "^5.6.4", + "antd": "^5.7.3", "lodash": "4.17.21", "react": "^18.2.0" } diff --git a/packages/plugins/theme-editor/src/client/antd-token-previewer/token-panel-pro/AliasPanel.tsx b/packages/plugins/theme-editor/src/client/antd-token-previewer/token-panel-pro/AliasPanel.tsx index 02102fb883..fee3f733de 100644 --- a/packages/plugins/theme-editor/src/client/antd-token-previewer/token-panel-pro/AliasPanel.tsx +++ b/packages/plugins/theme-editor/src/client/antd-token-previewer/token-panel-pro/AliasPanel.tsx @@ -1,10 +1,10 @@ import { CaretRightOutlined, QuestionCircleOutlined, RightOutlined, ShrinkOutlined } from '@ant-design/icons'; import { Button, Collapse, Empty, Tooltip } from 'antd'; -import type { MutableTheme } from 'antd-token-previewer'; import classNames from 'classnames'; import useMergedState from 'rc-util/es/hooks/useMergedState'; import type { FC } from 'react'; import React, { useMemo } from 'react'; +import { MutableTheme } from '../../../types'; import { Pick } from '../icons'; import type { AliasToken, SelectedToken } from '../interface'; import { mapRelatedAlias, seedRelatedAlias } from '../meta/TokenRelation'; @@ -41,10 +41,9 @@ const useStyle = makeStyle('TokenPanelProAlias', (token) => ({ }, [`.token-panel-pro-alias-collapse${token.rootCls}-collapse`]: { - [`> ${token.rootCls}-collapse-item > ${token.rootCls}-collapse-content > ${token.rootCls}-collapse-content-box`]: - { - paddingBlock: '0', - }, + [`> ${token.rootCls}-collapse-item > ${token.rootCls}-collapse-content > ${token.rootCls}-collapse-content-box`]: { + paddingBlock: '0', + }, [`> ${token.rootCls}-collapse-item`]: { [`> ${token.rootCls}-collapse-header`]: { diff --git a/packages/plugins/theme-editor/src/client/antd-token-previewer/token-panel-pro/ComponentDemoPro.tsx b/packages/plugins/theme-editor/src/client/antd-token-previewer/token-panel-pro/ComponentDemoPro.tsx index 7b71cfa86f..d94da0aa87 100644 --- a/packages/plugins/theme-editor/src/client/antd-token-previewer/token-panel-pro/ComponentDemoPro.tsx +++ b/packages/plugins/theme-editor/src/client/antd-token-previewer/token-panel-pro/ComponentDemoPro.tsx @@ -1,7 +1,7 @@ import { ConfigProvider, Segmented, Space, theme as antdTheme } from 'antd'; -import type { MutableTheme } from 'antd-token-previewer'; import type { FC } from 'react'; import React from 'react'; +import { MutableTheme } from '../../../types'; import ComponentDemoGroup from '../component-panel/ComponentDemoGroup'; import { useLocale } from '../locale'; import { Error, Primary, Success, Warning } from '../overviews'; diff --git a/packages/plugins/theme-editor/src/client/antd-token-previewer/token-panel-pro/TokenContent.tsx b/packages/plugins/theme-editor/src/client/antd-token-previewer/token-panel-pro/TokenContent.tsx index 8fc1847f6f..c679ea58af 100644 --- a/packages/plugins/theme-editor/src/client/antd-token-previewer/token-panel-pro/TokenContent.tsx +++ b/packages/plugins/theme-editor/src/client/antd-token-previewer/token-panel-pro/TokenContent.tsx @@ -1,12 +1,12 @@ import { CaretRightOutlined, ExpandOutlined, QuestionCircleOutlined } from '@ant-design/icons'; import { Button, Checkbox, Collapse, ConfigProvider, Popover, Switch, Tooltip, Typography } from 'antd'; -import type { MutableTheme } from 'antd-token-previewer'; import type { ThemeConfig } from 'antd/es/config-provider/context'; import seed from 'antd/es/theme/themes/seed'; import classNames from 'classnames'; import type { FC } from 'react'; import React, { useEffect, useMemo, useState } from 'react'; import { useDebouncyFn } from 'use-debouncy'; +import { MutableTheme } from '../../../types'; import ColorPanel from '../ColorPanel'; import IconSwitch from '../IconSwitch'; import type { ThemeCode } from '../hooks/useControlledTheme'; @@ -60,10 +60,9 @@ const useStyle = makeStyle('ColorTokenContent', (token) => ({ transition: 'box-shadow 0.2s ease-in-out', borderRadius: 8, }, - [`> ${token.rootCls}-collapse-item > ${token.rootCls}-collapse-content > ${token.rootCls}-collapse-content-box`]: - { - paddingBlock: '0 12px', - }, + [`> ${token.rootCls}-collapse-item > ${token.rootCls}-collapse-content > ${token.rootCls}-collapse-content-box`]: { + paddingBlock: '0 12px', + }, '.token-panel-pro-token-collapse-description': { color: token.colorTextTertiary, diff --git a/packages/plugins/theme-editor/src/client/antd-token-previewer/token-panel-pro/TokenDetail.tsx b/packages/plugins/theme-editor/src/client/antd-token-previewer/token-panel-pro/TokenDetail.tsx index 9d1395edee..4683910f32 100644 --- a/packages/plugins/theme-editor/src/client/antd-token-previewer/token-panel-pro/TokenDetail.tsx +++ b/packages/plugins/theme-editor/src/client/antd-token-previewer/token-panel-pro/TokenDetail.tsx @@ -1,8 +1,8 @@ import { Tooltip } from 'antd'; -import type { MutableTheme } from 'antd-token-previewer'; import classNames from 'classnames'; import type { FC } from 'react'; import React, { useMemo } from 'react'; +import { MutableTheme } from '../../../types'; import TokenInput from '../TokenInput'; import type { TokenValue } from '../interface'; import { useLocale } from '../locale'; diff --git a/packages/plugins/theme-editor/src/client/antd-token-previewer/token-panel-pro/index.tsx b/packages/plugins/theme-editor/src/client/antd-token-previewer/token-panel-pro/index.tsx index 85ec0a85a3..660e878c1b 100644 --- a/packages/plugins/theme-editor/src/client/antd-token-previewer/token-panel-pro/index.tsx +++ b/packages/plugins/theme-editor/src/client/antd-token-previewer/token-panel-pro/index.tsx @@ -1,8 +1,8 @@ import { Tabs } from 'antd'; -import type { Theme } from 'antd-token-previewer'; import classNames from 'classnames'; import type { FC } from 'react'; import React, { useEffect, useMemo, useState } from 'react'; +import { Theme } from '../../../types'; import type { SelectedToken } from '../interface'; import { useLocale } from '../locale'; import { tokenCategory } from '../meta'; diff --git a/packages/plugins/verification/package.json b/packages/plugins/verification/package.json index 37f0b2b691..c14e7b193b 100644 --- a/packages/plugins/verification/package.json +++ b/packages/plugins/verification/package.json @@ -36,7 +36,7 @@ "@nocobase/server": "0.11.1-alpha.5", "@nocobase/test": "0.11.1-alpha.5", "@nocobase/utils": "0.11.1-alpha.5", - "antd": "^5.6.4", + "antd": "^5.7.3", "react": "18.x", "react-i18next": "^11.15.1" }, diff --git a/packages/plugins/workflow/package.json b/packages/plugins/workflow/package.json index 31ef1ec824..c88672947e 100644 --- a/packages/plugins/workflow/package.json +++ b/packages/plugins/workflow/package.json @@ -39,7 +39,7 @@ "@nocobase/resourcer": "0.11.0-alpha.1", "@nocobase/server": "0.11.0-alpha.1", "@nocobase/utils": "0.11.0-alpha.1", - "antd": "^5.6.4", + "antd": "^5.7.3", "dayjs": "^1.11.8", "react": "18.x", "react-i18next": "^11.15.1", diff --git a/packages/samples/hello/package.json b/packages/samples/hello/package.json index 31217acd7a..29957b8269 100644 --- a/packages/samples/hello/package.json +++ b/packages/samples/hello/package.json @@ -23,7 +23,7 @@ "@nocobase/client": "0.11.1-alpha.5", "@nocobase/server": "0.11.1-alpha.5", "@nocobase/test": "0.11.1-alpha.5", - "antd": "^5.6.4", + "antd": "^5.7.3", "react": "^18.2.0", "react-i18next": "^11.15.1" }, diff --git a/packages/samples/shop-i18n/package.json b/packages/samples/shop-i18n/package.json index 441c013854..17d2595c8e 100644 --- a/packages/samples/shop-i18n/package.json +++ b/packages/samples/shop-i18n/package.json @@ -20,7 +20,7 @@ "@nocobase/client": "0.11.1-alpha.5", "@nocobase/server": "0.11.1-alpha.5", "@nocobase/test": "0.11.1-alpha.5", - "antd": "^5.6.4", + "antd": "^5.7.3", "react": "^18.2.0", "react-i18next": "^11.15.1" }, diff --git a/yarn.lock b/yarn.lock index e581ff0a20..a5694b6256 100644 --- a/yarn.lock +++ b/yarn.lock @@ -162,6 +162,19 @@ rc-util "^5.34.1" stylis "^4.0.13" +"@ant-design/cssinjs@^1.13.2": + version "1.16.1" + resolved "https://registry.npmmirror.com/@ant-design/cssinjs/-/cssinjs-1.16.1.tgz#0032044db5678dd25ac12def1abb1d52e6a4d583" + integrity sha512-KKVB5Or6BDC1Bo3Y4KMlOkyQU0P+6GTodubrQ9YfrtXG1TgO4wpaEfg9I4ZA49R7M+Ij2KKNwb+5abvmXy6K8w== + dependencies: + "@babel/runtime" "^7.11.1" + "@emotion/hash" "^0.8.0" + "@emotion/unitless" "^0.7.5" + classnames "^2.3.1" + csstype "^3.0.10" + rc-util "^5.35.0" + stylis "^4.0.13" + "@ant-design/icons-svg@^4.2.1": version "4.2.1" resolved "https://registry.npmmirror.com/@ant-design/icons-svg/-/icons-svg-4.2.1.tgz#8630da8eb4471a4aabdaed7d1ff6a97dcb2cf05a" @@ -2423,7 +2436,7 @@ dependencies: regenerator-runtime "^0.13.11" -"@babel/runtime@^7.16.3": +"@babel/runtime@^7.16.3", "@babel/runtime@^7.22.5": version "7.22.6" resolved "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.22.6.tgz#57d64b9ae3cff1d67eb067ae117dac087f5bd438" dependencies: @@ -4916,6 +4929,16 @@ classnames "^2.2.6" rc-util "^5.30.0" +"@rc-component/color-picker@~1.4.0": + version "1.4.1" + resolved "https://registry.npmmirror.com/@rc-component/color-picker/-/color-picker-1.4.1.tgz#dcab0b660e9c4ed63a7582db68ed4a77c862cb93" + integrity sha512-vh5EWqnsayZa/JwUznqDaPJz39jznx/YDbyBuVJntv735tKXKwEUZZb2jYEldOg+NKWZwtALjGMrNeGBmqFoEw== + dependencies: + "@babel/runtime" "^7.10.1" + "@ctrl/tinycolor" "^3.6.0" + classnames "^2.2.6" + rc-util "^5.30.0" + "@rc-component/context@^1.3.0": version "1.3.0" resolved "https://registry.npmmirror.com/@rc-component/context/-/context-1.3.0.tgz#608ccf0abcbec9406751b17a4b35db08e481c110" @@ -4955,6 +4978,17 @@ classnames "^2.3.2" rc-util "^5.24.4" +"@rc-component/tour@~1.8.1": + version "1.8.1" + resolved "https://registry.npmmirror.com/@rc-component/tour/-/tour-1.8.1.tgz#a820714b66cb17f317ebd21ac1b45733d2b99183" + integrity sha512-CsrQnfKgNArxx2j1RNHVLZgVA+rLrEj06lIsl4KSynMqADsqz8eKvVkr0F3p9PA10948M6WEEZt5a/FGAbGR2A== + dependencies: + "@babel/runtime" "^7.18.0" + "@rc-component/portal" "^1.0.0-9" + "@rc-component/trigger" "^1.3.6" + classnames "^2.3.2" + rc-util "^5.24.4" + "@rc-component/trigger@^1.0.4", "@rc-component/trigger@^1.13.0", "@rc-component/trigger@^1.3.6", "@rc-component/trigger@^1.5.0", "@rc-component/trigger@^1.6.2", "@rc-component/trigger@^1.7.0": version "1.14.1" resolved "https://registry.npmmirror.com/@rc-component/trigger/-/trigger-1.14.1.tgz#ac24fec4372408514eeb6ac7c557a207ac4a8cb4" @@ -7575,7 +7609,7 @@ antd-style@^3.3.0: "@emotion/utils" "^1" use-merge-value "^1" -antd-token-previewer@2.0.0-alpha.8, antd-token-previewer@^2.0.0-alpha.6: +antd-token-previewer@^2.0.0-alpha.6: version "2.0.0-alpha.8" resolved "https://registry.npmmirror.com/antd-token-previewer/-/antd-token-previewer-2.0.0-alpha.8.tgz#9f47bc531d8bf6907f0e7e5cfbacf50d15619d86" dependencies: @@ -7593,7 +7627,7 @@ antd-token-previewer@2.0.0-alpha.8, antd-token-previewer@^2.0.0-alpha.6: use-debouncy "^4.3.0" vanilla-jsoneditor "^0.16.1" -antd@^5.4.2, antd@^5.5.1, antd@^5.6.4: +antd@^5.4.2, antd@^5.5.1: version "5.6.4" resolved "https://registry.npmmirror.com/antd/-/antd-5.6.4.tgz#689d74ba61181ba6ea87a0c5d249d30d116ce602" dependencies: @@ -7646,6 +7680,60 @@ antd@^5.4.2, antd@^5.5.1, antd@^5.6.4: scroll-into-view-if-needed "^3.0.3" throttle-debounce "^5.0.0" +antd@^5.7.3: + version "5.7.3" + resolved "https://registry.npmmirror.com/antd/-/antd-5.7.3.tgz#3a1b84fa3987554931b9d974efe9cb7454ff1347" + integrity sha512-7sQeE86XkUrYDIKGu/Qu7kl+NWYzkVSGbGqWGIbITHkFZorCyOvvqgF63fiWo/tp2lZWbEOO0Cm7IiYnoeWh9A== + dependencies: + "@ant-design/colors" "^7.0.0" + "@ant-design/cssinjs" "^1.13.2" + "@ant-design/icons" "^5.1.0" + "@ant-design/react-slick" "~1.0.0" + "@babel/runtime" "^7.18.3" + "@ctrl/tinycolor" "^3.6.0" + "@rc-component/color-picker" "~1.4.0" + "@rc-component/mutate-observer" "^1.0.0" + "@rc-component/tour" "~1.8.1" + "@rc-component/trigger" "^1.13.0" + classnames "^2.2.6" + copy-to-clipboard "^3.2.0" + dayjs "^1.11.1" + qrcode.react "^3.1.0" + rc-cascader "~3.12.0" + rc-checkbox "~3.1.0" + rc-collapse "~3.7.0" + rc-dialog "~9.1.0" + rc-drawer "~6.2.0" + rc-dropdown "~4.1.0" + rc-field-form "~1.34.0" + rc-image "~7.0.0" + rc-input "~1.1.0" + rc-input-number "~8.0.2" + rc-mentions "~2.5.0" + rc-menu "~9.10.0" + rc-motion "^2.7.3" + rc-notification "~5.0.4" + rc-pagination "~3.5.0" + rc-picker "~3.10.0" + rc-progress "~3.4.1" + rc-rate "~2.12.0" + rc-resize-observer "^1.2.0" + rc-segmented "~2.2.0" + rc-select "~14.5.0" + rc-slider "~10.1.0" + rc-steps "~6.0.1" + rc-switch "~4.1.0" + rc-table "~7.32.1" + rc-tabs "~12.9.0" + rc-textarea "~1.3.3" + rc-tooltip "~6.0.0" + rc-tree "~5.7.6" + rc-tree-select "~5.9.0" + rc-upload "~4.3.0" + rc-util "^5.32.0" + scroll-into-view-if-needed "^3.0.3" + throttle-debounce "^5.0.0" + any-promise@^1.0.0, any-promise@^1.3.0: version "1.3.0" resolved "https://registry.npmmirror.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f" @@ -21072,6 +21160,18 @@ rc-image@~5.17.1: rc-motion "^2.6.2" rc-util "^5.0.6" +rc-image@~7.0.0: + version "7.0.0" + resolved "https://registry.npmmirror.com/rc-image/-/rc-image-7.0.0.tgz#cad2105dd1708304328bc9c178f7953cb0198403" + integrity sha512-pOr/LYthg5a+R2LDlFPv8u2ndX4aJQNghWCiWxflmLglC3p0uts/NIWLAituQOKvV1wO1aFI1CZtLMT7jrU3vA== + dependencies: + "@babel/runtime" "^7.11.2" + "@rc-component/portal" "^1.0.2" + classnames "^2.2.6" + rc-dialog "~9.1.0" + rc-motion "^2.6.2" + rc-util "^5.34.1" + rc-input-number@~7.4.0: version "7.4.2" resolved "https://registry.npmmirror.com/rc-input-number/-/rc-input-number-7.4.2.tgz#7c52d26b986461aa16e486d469dc0476d97c6ea3" @@ -21081,6 +21181,17 @@ rc-input-number@~7.4.0: classnames "^2.2.5" rc-util "^5.28.0" +rc-input-number@~8.0.2: + version "8.0.3" + resolved "https://registry.npmmirror.com/rc-input-number/-/rc-input-number-8.0.3.tgz#208efac9937370d3c987979558e7e4882564af09" + integrity sha512-GHfWvufXEmwF/wtR8oPZNTuMdFb/rvx/+Sp2bZfaPftM+LFFdO8o3/PaeTk8DKt0Tv+u5Zuf68lqLdGCkmAXRg== + dependencies: + "@babel/runtime" "^7.10.1" + "@rc-component/mini-decimal" "^1.0.1" + classnames "^2.2.5" + rc-input "~1.1.0" + rc-util "^5.28.0" + rc-input@~1.0.0, rc-input@~1.0.4: version "1.0.4" resolved "https://registry.npmmirror.com/rc-input/-/rc-input-1.0.4.tgz#2f2c73c884f41e80685bb2eb7b9d5533e8540a77" @@ -21089,6 +21200,15 @@ rc-input@~1.0.0, rc-input@~1.0.4: classnames "^2.2.1" rc-util "^5.18.1" +rc-input@~1.1.0: + version "1.1.0" + resolved "https://registry.npmmirror.com/rc-input/-/rc-input-1.1.0.tgz#14951ad5b9d77b756b6ddb5088cca464a60c1454" + integrity sha512-izuNXPABQPh4KD7ANFcTrIGp9EZU0FkjTw6AvwCQ/rGPrdDsUTHLsp/Wju/kzGMLJFJWKNF3smbmXRNO23DtXA== + dependencies: + "@babel/runtime" "^7.11.1" + classnames "^2.2.1" + rc-util "^5.18.1" + rc-mentions@~2.3.0: version "2.3.0" resolved "https://registry.npmmirror.com/rc-mentions/-/rc-mentions-2.3.0.tgz#bb457c9664093be82baf33628b145f7c2bd49577" @@ -21101,6 +21221,19 @@ rc-mentions@~2.3.0: rc-textarea "~1.2.0" rc-util "^5.22.5" +rc-mentions@~2.5.0: + version "2.5.0" + resolved "https://registry.npmmirror.com/rc-mentions/-/rc-mentions-2.5.0.tgz#8b936e497e0deb922f40df46e42efc3f596ec207" + integrity sha512-rERXsbUTNVrb5T/iDC0ki/SRGWJnOVraDy6O25Us3FSpuUZ3uq2TPZB4fRk0Hss5kyiEPzz2sprhkI4b+F4jUw== + dependencies: + "@babel/runtime" "^7.22.5" + "@rc-component/trigger" "^1.5.0" + classnames "^2.2.6" + rc-input "~1.1.0" + rc-menu "~9.10.0" + rc-textarea "~1.3.0" + rc-util "^5.22.5" + rc-menu@~9.10.0: version "9.10.0" resolved "https://registry.npmmirror.com/rc-menu/-/rc-menu-9.10.0.tgz#5e0982e26786d67c8ebdba50406b197884c749a7" @@ -21157,6 +21290,16 @@ rc-pagination@~3.5.0: classnames "^2.2.1" rc-util "^5.32.2" +rc-picker@~3.10.0: + version "3.10.0" + resolved "https://registry.npmmirror.com/rc-picker/-/rc-picker-3.10.0.tgz#d34e659d88782eb1eac5939a1be0d6ba508f6f42" + integrity sha512-Euki50qtEct6ByOeYlnA4TLs/LcXz7BAYS4cmCTKJ3dWg2sNTVtredLdbS9aJ/9fhMacxGAYAlcQJpQx+av43A== + dependencies: + "@babel/runtime" "^7.10.1" + "@rc-component/trigger" "^1.5.0" + classnames "^2.2.1" + rc-util "^5.30.0" + rc-picker@~3.8.2: version "3.8.2" resolved "https://registry.npmmirror.com/rc-picker/-/rc-picker-3.8.2.tgz#1dc377a628cd94416e03974483daa36940a411b0" @@ -21240,6 +21383,15 @@ rc-steps@~6.0.0: classnames "^2.2.3" rc-util "^5.16.1" +rc-steps@~6.0.1: + version "6.0.1" + resolved "https://registry.npmmirror.com/rc-steps/-/rc-steps-6.0.1.tgz#c2136cd0087733f6d509209a84a5c80dc29a274d" + integrity sha512-lKHL+Sny0SeHkQKKDJlAjV5oZ8DwCdS2hFhAkIjuQt1/pB81M0cA0ErVFdHq9+jmPmFw1vJB2F5NBzFXLJxV+g== + dependencies: + "@babel/runtime" "^7.16.7" + classnames "^2.2.3" + rc-util "^5.16.1" + rc-switch@~4.1.0: version "4.1.0" resolved "https://registry.npmmirror.com/rc-switch/-/rc-switch-4.1.0.tgz#f37d81b4e0c5afd1274fd85367b17306bf25e7d7" @@ -21258,7 +21410,7 @@ rc-table@~7.32.1: rc-resize-observer "^1.1.0" rc-util "^5.27.1" -rc-tabs@^12.5.6: +rc-tabs@^12.5.6, rc-tabs@~12.9.0: version "12.9.0" resolved "https://registry.npmmirror.com/rc-tabs/-/rc-tabs-12.9.0.tgz#6d9af43d8ad2c47be00c75bee92417a4842d29d2" dependencies: @@ -21292,6 +21444,17 @@ rc-textarea@~1.2.0, rc-textarea@~1.2.2: rc-resize-observer "^1.0.0" rc-util "^5.27.0" +rc-textarea@~1.3.0, rc-textarea@~1.3.3: + version "1.3.4" + resolved "https://registry.npmmirror.com/rc-textarea/-/rc-textarea-1.3.4.tgz#e77baf2202ac8f7e34a50ec9e15dd1dcb1501455" + integrity sha512-wn0YjTpvcVolcfXa0HtzL+jgV2QcwtfB29RwNAKj8hMgZOju1V24M3TfEDjABeQEAQbUGbjMbISREOX/YSVKhg== + dependencies: + "@babel/runtime" "^7.10.1" + classnames "^2.2.1" + rc-input "~1.1.0" + rc-resize-observer "^1.0.0" + rc-util "^5.27.0" + rc-tooltip@~6.0.0: version "6.0.1" resolved "https://registry.npmmirror.com/rc-tooltip/-/rc-tooltip-6.0.1.tgz#6a5e33bd6c3f6afe8851ea90e7af43e5c26b3cc6" @@ -21330,6 +21493,17 @@ rc-tree@^5.7.3, rc-tree@~5.7.0, rc-tree@~5.7.4: rc-util "^5.16.1" rc-virtual-list "^3.5.1" +rc-tree@~5.7.6: + version "5.7.9" + resolved "https://registry.npmmirror.com/rc-tree/-/rc-tree-5.7.9.tgz#e0df730ffbba1df95901fd3b108267288056e162" + integrity sha512-1hKkToz/EVjJlMVwmZnpXeLXt/1iQMsaAq9m+GNkUbK746gkc7QpJXSN/TzjhTI5Hi+LOSlrMaXLMT0bHPqILQ== + dependencies: + "@babel/runtime" "^7.10.1" + classnames "2.x" + rc-motion "^2.0.1" + rc-util "^5.16.1" + rc-virtual-list "^3.5.1" + rc-trigger@^5.0.4: version "5.3.4" resolved "https://registry.npmmirror.com/rc-trigger/-/rc-trigger-5.3.4.tgz#6b4b26e32825677c837d1eb4d7085035eecf9a61" @@ -21355,6 +21529,14 @@ rc-util@^5.0.1, rc-util@^5.0.6, rc-util@^5.15.0, rc-util@^5.16.0, rc-util@^5.16. "@babel/runtime" "^7.18.3" react-is "^16.12.0" +rc-util@^5.35.0: + version "5.35.0" + resolved "https://registry.npmmirror.com/rc-util/-/rc-util-5.35.0.tgz#bed1986248b7be525cc0894109e609ac60207f29" + integrity sha512-MTXlixb3EoSTEchsOc7XWsVyoUQqoCsh2Z1a2IptwNgqleMF6ZgQeY52UzUbNj5CcVBg9YljOWjuOV07jSSm4Q== + dependencies: + "@babel/runtime" "^7.18.3" + react-is "^16.12.0" + rc-virtual-list@^3.2.0, rc-virtual-list@^3.5.1, rc-virtual-list@^3.5.2: version "3.5.2" resolved "https://registry.npmmirror.com/rc-virtual-list/-/rc-virtual-list-3.5.2.tgz#5e1028869bae900eacbae6788d4eca7210736006"