Skip to content

Commit

Permalink
Merge pull request #804 from oceanbase/dengfuping-dev
Browse files Browse the repository at this point in the history 
chore(deps): Upgrade antd from ^5.20.6 to ^5.21.6
  • Loading branch information
@dengfuping
dengfuping authored Nov 1, 2024
2 parents d15a6d0 + 2ff4741 commit 667254f
Show file tree
Hide file tree
Showing 21 changed files with 7,276 additions and 16,674 deletions.
50 changes: 25 additions & 25 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,53 +44,53 @@
"devDependencies": {
"@ant-design/colors": "^7.1.0",
"@ant-design/cssinjs": "^1.21.1",
"@ant-design/icons": "^5.4.0",
"@babel/cli": "^7.24.8",
"@babel/preset-env": "^7.25.4",
"@ant-design/icons": "^5.5.1",
"@babel/cli": "^7.25.9",
"@babel/preset-env": "^7.26.0",
"@chenshuai2144/less2cssinjs": "^1.0.7",
"@ctrl/tinycolor": "^4.1.0",
"@emotion/babel-preset-css-prop": "^11.12.0",
"@emotion/css": "^11.13.0",
"@emotion/react": "^11.13.0",
"@emotion/css": "^11.13.4",
"@emotion/react": "^11.13.3",
"@emotion/server": "^11.11.0",
"@qixian.cs/github-contributors-list": "^2.0.2",
"@rc-component/trigger": "^2.2.3",
"@stackblitz/sdk": "^1.11.0",
"@testing-library/dom": "^10.4.0",
"@testing-library/jest-dom": "^6.5.0",
"@testing-library/jest-dom": "^6.6.3",
"@testing-library/react": "^16.0.1",
"@testing-library/react-hooks": "^8.0.1",
"@testing-library/user-event": "^14.5.2",
"@types/lodash": "^4.17.7",
"@types/node": "^20.14.14",
"@types/react": "^18.3.3",
"@types/lodash": "^4.17.13",
"@types/node": "^20.17.5",
"@types/react": "^18.3.12",
"@umijs/fabric": "^4.0.1",
"@umijs/test": "^4.3.20",
"@vercel/analytics": "^1.3.1",
"antd": "^5.20.6",
"antd-style": "^3.6.2",
"@umijs/test": "^4.3.28",
"@vercel/analytics": "^1.3.2",
"antd": "^5.21.6",
"antd-style": "^3.7.1",
"antd-token-previewer": "^2.0.8",
"babel-jest": "^29.7.0",
"classnames": "^2.5.1",
"copy-to-clipboard": "^3.3.3",
"cross-env": "^7.0.3",
"dayjs": "^1.11.13",
"dumi": "^2.4.7",
"eslint-plugin-jest": "^28.8.0",
"dumi": "^2.4.13",
"eslint-plugin-jest": "^28.8.3",
"execa": "^5.1.1",
"father": "^4.5.0",
"father": "^4.5.1",
"fs-extra": "^11.2.0",
"gh-pages": "^6.1.1",
"gh-pages": "^6.2.0",
"glob": "^11.0.0",
"html2sketch": "^1.0.2",
"husky": "^9.1.4",
"husky": "^9.1.6",
"identity-obj-proxy": "^3.0.0",
"isomorphic-fetch": "^3.0.0",
"jest-environment-jsdom": "^29.7.0",
"jsonml-to-react-element": "^1.1.11",
"jsonml.js": "^0.1.0",
"lerna": "^8.1.8",
"lint-staged": "^15.2.8",
"lerna": "^8.1.9",
"lint-staged": "^15.2.10",
"lodash": "^4.17.21",
"mockdate": "^3.0.5",
"prettier": "^3.3.3",
Expand All @@ -99,19 +99,19 @@
"rc-drawer": "^7.2.0",
"rc-footer": "^0.6.8",
"rc-resize-observer": "^1.4.0",
"rc-segmented": "^2.4.1",
"rc-tabs": "^15.2.0",
"rc-segmented": "^2.5.0",
"rc-tabs": "^15.4.0",
"rc-util": "^5.43.0",
"react": "^18.3.1",
"react-color": "^2.19.3",
"react-copy-to-clipboard": "^5.1.0",
"react-dom": "^18.3.1",
"react-fast-marquee": "^1.6.5",
"react-intl": "^6.6.8",
"react-router-dom": "^6.26.0",
"react-intl": "^6.8.4",
"react-router-dom": "^6.27.0",
"runscript": "^1.6.0",
"ts-node": "^10.9.2",
"typescript": "^5.6.2",
"typescript": "^5.6.3",
"vanilla-jsoneditor": "^0.23.8",
"vitest": "^2.1.1",
"vitest-canvas-mock": "^0.3.3",
Expand Down
4 changes: 2 additions & 2 deletions packages/codemod/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"is-git-clean": "^1.1.0",
"jscodeshift": "^0.16.1",
"lodash": "^4.17.21",
"postcss": "^8.4.41",
"postcss": "^8.4.47",
"postcss-less": "^6.0.0",
"prettier": "^3.3.3",
"read-pkg-up": "^10.1.0",
Expand All @@ -42,7 +42,7 @@
"yargs-parser": "^21.1.1"
},
"devDependencies": {
"@types/jest": "^29.5.12",
"@types/jest": "^29.5.14",
"@types/jscodeshift": "^0.11.11",
"enzyme": "^3.11.0",
"enzyme-to-json": "^3.6.2"
Expand Down
12 changes: 6 additions & 6 deletions packages/design/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"@oceanbase/icons": "workspace:^",
"@oceanbase/util": "workspace:^",
"ahooks": "^2.10.14",
"antd": "^5.20.6",
"antd": "^5.21.6",
"classnames": "^2.5.1",
"lodash": "^4.17.21",
"lottie-web": "^5.12.2",
Expand All @@ -49,12 +49,12 @@
"react-sticky-mouse-tooltip": "^0.0.1"
},
"devDependencies": {
"@babel/cli": "^7.24.8",
"@babel/preset-env": "^7.25.4",
"@babel/cli": "^7.25.9",
"@babel/preset-env": "^7.26.0",
"antd-token-previewer": "^2.0.8",
"rc-select": "^14.15.1",
"rc-table": "^7.47.1",
"rc-tree-select": "^5.22.1"
"rc-select": "^14.16.2",
"rc-table": "^7.48.1",
"rc-tree-select": "^5.24.3"
},
"peerDependencies": {
"react": ">=16.9.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/design/src/config-provider/__tests__/__snapshots__/form.test.tsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,15 +163,15 @@ exports[`ConfigProvider form > ConfigProvider form.requiredMark should be \`opti
style="display: flex; gap: 8px; align-items: center;"
>
<button
class="ant-btn ant-btn-default"
class="ant-btn ant-btn-default ant-btn-color-default ant-btn-variant-outlined"
type="button"
>
<span>
重 置
</span>
</button>
<button
class="ant-btn ant-btn-primary"
class="ant-btn ant-btn-primary ant-btn-color-primary ant-btn-variant-solid"
type="button"
>
<span>
Expand Down
20 changes: 10 additions & 10 deletions packages/design/src/drawer/__tests__/__snapshots__/index.test.tsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ exports[`Drawer > render with confirmLoading and okButtonProps 1`] = `
class="ant-space-item"
>
<button
class="ant-btn ant-btn-primary ant-btn-loading ant-btn-dangerous"
class="ant-btn ant-btn-primary ant-btn-dangerous ant-btn-color-dangerous ant-btn-variant-solid ant-btn-loading"
type="button"
>
<span
Expand Down Expand Up @@ -200,7 +200,7 @@ exports[`Drawer > render with confirmLoading and okButtonProps 1`] = `
class="ant-space-item"
>
<button
class="ant-btn ant-btn-default"
class="ant-btn ant-btn-default ant-btn-color-default ant-btn-variant-outlined"
type="button"
>
<span>
Expand Down Expand Up @@ -395,7 +395,7 @@ exports[`Drawer > render with default footer 1`] = `
class="ant-space-item"
>
<button
class="ant-btn ant-btn-primary"
class="ant-btn ant-btn-primary ant-btn-color-primary ant-btn-variant-solid"
type="button"
>
<span>
Expand All @@ -407,7 +407,7 @@ exports[`Drawer > render with default footer 1`] = `
class="ant-space-item"
>
<button
class="ant-btn ant-btn-default"
class="ant-btn ant-btn-default ant-btn-color-default ant-btn-variant-outlined"
type="button"
>
<span>
Expand Down Expand Up @@ -602,7 +602,7 @@ exports[`Drawer > render with footerExtra and default footer 1`] = `
class="ant-space-item"
>
<button
class="ant-btn ant-btn-primary"
class="ant-btn ant-btn-primary ant-btn-color-primary ant-btn-variant-solid"
type="button"
>
<span>
Expand All @@ -614,7 +614,7 @@ exports[`Drawer > render with footerExtra and default footer 1`] = `
class="ant-space-item"
>
<button
class="ant-btn ant-btn-default"
class="ant-btn ant-btn-default ant-btn-color-default ant-btn-variant-outlined"
type="button"
>
<span>
Expand Down Expand Up @@ -803,7 +803,7 @@ exports[`Drawer > render with okText and cancenText 1`] = `
class="ant-space-item"
>
<button
class="ant-btn ant-btn-primary"
class="ant-btn ant-btn-primary ant-btn-color-primary ant-btn-variant-solid"
type="button"
>
<span>
Expand All @@ -815,7 +815,7 @@ exports[`Drawer > render with okText and cancenText 1`] = `
class="ant-space-item"
>
<button
class="ant-btn ant-btn-default"
class="ant-btn ant-btn-default ant-btn-color-default ant-btn-variant-outlined"
type="button"
>
<span>
Expand Down Expand Up @@ -921,7 +921,7 @@ exports[`Drawer > render with onOk 1`] = `
class="ant-space-item"
>
<button
class="ant-btn ant-btn-primary"
class="ant-btn ant-btn-primary ant-btn-color-primary ant-btn-variant-solid"
type="button"
>
<span>
Expand All @@ -933,7 +933,7 @@ exports[`Drawer > render with onOk 1`] = `
class="ant-space-item"
>
<button
class="ant-btn ant-btn-default"
class="ant-btn ant-btn-default ant-btn-color-default ant-btn-variant-outlined"
type="button"
>
<span>
Expand Down
16 changes: 2 additions & 14 deletions packages/design/src/modal/__tests__/__snapshots__/modal.test.tsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,9 @@ exports[`Modal > should hide footer dom when footer is false 1`] = `
role="dialog"
style="width: 520px;"
>
<div
aria-hidden="true"
style="width: 0px; height: 0px; overflow: hidden; outline: none;"
tabindex="0"
/>
<div
style="outline: none;"
tabindex="-1"
tabindex="0"
>
<div
class="ant-modal-content"
Expand Down Expand Up @@ -78,7 +73,6 @@ exports[`Modal > should hide footer dom when footer is false 1`] = `
</div>
</div>
<div
aria-hidden="true"
style="width: 0px; height: 0px; overflow: hidden; outline: none;"
tabindex="0"
/>
Expand Down Expand Up @@ -109,14 +103,9 @@ exports[`Modal > should hide footer dom when footer is null 1`] = `
role="dialog"
style="width: 520px;"
>
<div
aria-hidden="true"
style="width: 0px; height: 0px; overflow: hidden; outline: none;"
tabindex="0"
/>
<div
style="outline: none;"
tabindex="-1"
tabindex="0"
>
<div
class="ant-modal-content"
Expand Down Expand Up @@ -167,7 +156,6 @@ exports[`Modal > should hide footer dom when footer is null 1`] = `
</div>
</div>
<div
aria-hidden="true"
style="width: 0px; height: 0px; overflow: hidden; outline: none;"
tabindex="0"
/>
Expand Down
32 changes: 4 additions & 28 deletions packages/design/src/modal/__tests__/__snapshots__/progress.test.tsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,9 @@ exports[`Modal.Progress > render with loading 1`] = `
role="dialog"
style="width: 567px;"
>
<div
aria-hidden="true"
style="width: 0px; height: 0px; overflow: hidden; outline: none;"
tabindex="0"
/>
<div
style="outline: none;"
tabindex="-1"
tabindex="0"
>
<div
class="ant-modal-content"
Expand Down Expand Up @@ -103,7 +98,6 @@ exports[`Modal.Progress > render with loading 1`] = `
</div>
</div>
<div
aria-hidden="true"
style="width: 0px; height: 0px; overflow: hidden; outline: none;"
tabindex="0"
/>
Expand Down Expand Up @@ -134,14 +128,9 @@ exports[`Modal.Progress > render with progress.percent 1`] = `
role="dialog"
style="width: 567px;"
>
<div
aria-hidden="true"
style="width: 0px; height: 0px; overflow: hidden; outline: none;"
tabindex="0"
/>
<div
style="outline: none;"
tabindex="-1"
tabindex="0"
>
<div
class="ant-modal-content"
Expand Down Expand Up @@ -252,7 +241,6 @@ exports[`Modal.Progress > render with progress.percent 1`] = `
</div>
</div>
<div
aria-hidden="true"
style="width: 0px; height: 0px; overflow: hidden; outline: none;"
tabindex="0"
/>
Expand Down Expand Up @@ -283,14 +271,9 @@ exports[`Modal.Progress > render with progress.status 1`] = `
role="dialog"
style="width: 567px;"
>
<div
aria-hidden="true"
style="width: 0px; height: 0px; overflow: hidden; outline: none;"
tabindex="0"
/>
<div
style="outline: none;"
tabindex="-1"
tabindex="0"
>
<div
class="ant-modal-content"
Expand Down Expand Up @@ -419,7 +402,6 @@ exports[`Modal.Progress > render with progress.status 1`] = `
</div>
</div>
<div
aria-hidden="true"
style="width: 0px; height: 0px; overflow: hidden; outline: none;"
tabindex="0"
/>
Expand Down Expand Up @@ -450,14 +432,9 @@ exports[`Modal.Progress > render without description 1`] = `
role="dialog"
style="width: 567px;"
>
<div
aria-hidden="true"
style="width: 0px; height: 0px; overflow: hidden; outline: none;"
tabindex="0"
/>
<div
style="outline: none;"
tabindex="-1"
tabindex="0"
>
<div
class="ant-modal-content"
Expand Down Expand Up @@ -563,7 +540,6 @@ exports[`Modal.Progress > render without description 1`] = `
</div>
</div>
<div
aria-hidden="true"
style="width: 0px; height: 0px; overflow: hidden; outline: none;"
tabindex="0"
/>
Expand Down
Loading

0 comments on commit 667254f

Please sign in to comment.