Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: merge master into feature #48746

Merged
merged 10 commits into from
May 2, 2024
Merged

chore: merge master into feature #48746

merged 10 commits into from
May 2, 2024

Conversation

li-jia-nan
Copy link
Member

中文版模板 / Chinese template

🤔 This is a ...

  • New feature
  • Bug fix
  • Site / documentation update
  • Demo update
  • Component style update
  • TypeScript definition update
  • Bundle size optimization
  • Performance optimization
  • Enhancement feature
  • Internationalization
  • Refactoring
  • Code style optimization
  • Test Case
  • Branch merge
  • Workflow
  • Other (about what?)

🔗 Related issue link

💡 Background and solution

📝 Changelog

Language Changelog
🇺🇸 English chore: merge master into feature
🇨🇳 Chinese chore: merge master into feature

☑️ Self-Check before Merge

⚠️ Please check all items below before requesting a reviewing. ⚠️

  • Doc is updated/provided or not needed
  • Demo is updated/provided or not needed
  • TypeScript definition is updated/provided or not needed
  • Changelog is provided or not needed

dependabot bot and others added 10 commits May 1, 2024 21:00
* chore(deps-dev): bump the dev-dependencies group with 3 updates

Updates the requirements on [@biomejs/biome](https://github.com/biomejs/biome/tree/HEAD/packages/@biomejs/biome), [eslint](https://github.com/eslint/eslint), [remark-cli](https://github.com/remarkjs/remark) and [tsx](https://github.com/privatenumber/tsx) to permit the latest version.

Updates `@biomejs/biome` to 1.7.2
- [Release notes](https://github.com/biomejs/biome/releases)
- [Changelog](https://github.com/biomejs/biome/blob/main/CHANGELOG.md)
- [Commits](https://github.com/biomejs/biome/commits/cli/v1.7.2/packages/@biomejs/biome)

Updates `eslint` from 8.57.0 to 9.1.1
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](eslint/eslint@v8.57.0...v9.1.1)

Updates `remark-cli` to 12.0.1
- [Release notes](https://github.com/remarkjs/remark/releases)
- [Changelog](https://github.com/remarkjs/remark/blob/main/changelog.md)
- [Commits](https://github.com/remarkjs/remark/compare/remark-cli@12.0.0...remark-cli@12.0.1)

Updates `tsx` to 4.8.2
- [Release notes](https://github.com/privatenumber/tsx/releases)
- [Changelog](https://github.com/privatenumber/tsx/blob/master/release.config.cjs)
- [Commits](privatenumber/tsx@v4.7.3...v4.8.2)

---
updated-dependencies:
- dependency-name: "@biomejs/biome"
  dependency-type: direct:development
  dependency-group: dev-dependencies
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-major
  dependency-group: dev-dependencies
- dependency-name: remark-cli
  dependency-type: direct:development
  dependency-group: dev-dependencies
- dependency-name: tsx
  dependency-type: direct:development
  dependency-group: dev-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update package.json

Signed-off-by: lijianan <574980606@qq.com>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: lijianan <574980606@qq.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: lijianan <574980606@qq.com>
ignore dayjs updates

Signed-off-by: afc163 <afc163@gmail.com>
chore: merge feature to master
* chore: refactor Typography code

* Apply suggestions from code review

Co-authored-by: lijianan <574980606@qq.com>
Signed-off-by: afc163 <afc163@gmail.com>

---------

Signed-off-by: afc163 <afc163@gmail.com>
Co-authored-by: lijianan <574980606@qq.com>
* docs(:sparkles:): release 5.17.0

* Update CHANGELOG.zh-CN.md

Co-authored-by: Amumu <yoyo837@hotmail.com>
Signed-off-by: afc163 <afc163@gmail.com>

* Apply suggestions from code review

Signed-off-by: afc163 <afc163@gmail.com>

* Update CHANGELOG.zh-CN.md

Signed-off-by: afc163 <afc163@gmail.com>

* Update CHANGELOG.zh-CN.md

Signed-off-by: afc163 <afc163@gmail.com>

* Apply suggestions from code review

Signed-off-by: afc163 <afc163@gmail.com>

* docs: fix changelog format

* docs: fix changelog format

* docs: fix changelog format

* Apply suggestions from code review

Signed-off-by: afc163 <afc163@gmail.com>

---------

Signed-off-by: afc163 <afc163@gmail.com>
Co-authored-by: Amumu <yoyo837@hotmail.com>
* chore: code optimization

* fix: fix

* fix: fix

* fix: fix

---------

Co-authored-by: afc163 <afc163@gmail.com>
Copy link

stackblitz bot commented May 2, 2024

Review PR in StackBlitz Codeflow Run & review this pull request in StackBlitz Codeflow.

Copy link
Contributor

github-actions bot commented May 2, 2024

👁 Visual Regression Report for PR #48746 Passed ✅

🎯 Target branch: feature (7b30c80)
📖 View Full Report ↗︎

🎊 Congrats! No visual-regression diff found.

Copy link
Contributor

github-actions bot commented May 2, 2024

Hi @li-jia-nan

请注意,当前 PR 是分支间的互相合并,请使用 BranchAutoMerge 标签来进行自动合并。切记不要、不要、不要使用 Squash

Copy link
Contributor

github-actions bot commented May 2, 2024

Preview is ready

Copy link

socket-security bot commented May 2, 2024

New and removed dependencies detected. Learn more about Socket for GitHub ↗︎

Package New capabilities Transitives Size Publisher
npm/@ant-design/colors@7.0.2 None 0 23.6 kB madccc
npm/@ant-design/compatible@5.1.2 environment 0 399 kB madccc
npm/@ant-design/cssinjs@1.20.0 environment 0 258 kB zombiej
npm/@ant-design/happy-work-theme@1.0.0 None 0 30.9 kB zombiej
npm/@ant-design/icons@5.3.6 environment 0 11.3 MB afc163
npm/@ant-design/react-slick@1.1.2 environment 0 832 kB afc163
npm/@ant-design/tools@18.0.2 filesystem 0 65.7 kB madccc
npm/@antv/g6@4.8.24 None 0 7.99 MB iaaron
npm/@babel/eslint-plugin@7.24.5 None 0 32.9 kB nicolo-ribaudo
npm/@biomejs/biome@1.7.2 shell 0 134 kB dominionl
npm/@codesandbox/sandpack-react@2.13.10 eval 0 1.16 MB danilowoz
npm/@ctrl/tinycolor@3.6.1 None 0 249 kB scttcper
npm/@dnd-kit/core@6.1.0 environment 0 1.05 MB clauderic
npm/@dnd-kit/modifiers@7.0.0 environment 0 48.1 kB clauderic
npm/@dnd-kit/sortable@8.0.0 environment 0 233 kB clauderic
npm/@dnd-kit/utilities@3.2.2 environment 0 88.5 kB clauderic
npm/@emotion/react@11.11.4 environment 0 583 kB emotion-release-bot
npm/@emotion/server@11.11.0 environment 0 48.7 kB emotion-release-bot
npm/@ianvs/prettier-plugin-sort-imports@4.2.1 environment, unsafe 0 109 kB ianvs
npm/@madccc/duplicate-package-checker-webpack-plugin@1.0.0 None 0 19 kB madccc
npm/@microflash/rehype-figure@2.1.0 None 0 6.79 kB naiyer
npm/@npmcli/run-script@8.1.0 environment 0 18.3 kB npm-cli-ops
npm/@octokit/rest@20.1.0 None 0 9.96 kB octokitbot
npm/@qixian.cs/github-contributors-list@2.0.1 network 0 19.5 kB chenshuai2144
npm/@rc-component/color-picker@1.5.3 None 0 79.8 kB madccc
npm/@rc-component/mutate-observer@1.1.0 environment 0 16.7 kB zombiej
npm/@rc-component/tour@1.14.2 None 0 67.2 kB zombiej
npm/@rc-component/trigger@2.1.1 environment 0 179 kB zombiej
npm/@size-limit/file@11.1.2 None 0 3.43 kB ai
npm/@stackblitz/sdk@1.9.0 None 0 180 kB fvsch
npm/@testing-library/dom@10.1.0 environment 0 2.42 MB testing-library-bot
npm/@testing-library/jest-dom@6.4.2 None 0 266 kB testing-library-bot
npm/@testing-library/react@15.0.6 environment 0 4.31 MB testing-library-bot
npm/@testing-library/user-event@14.5.2 None 0 435 kB testing-library-bot
npm/@types/adm-zip@0.5.5 None 0 24.7 kB types
npm/@types/ali-oss@6.16.11 None 0 42.2 kB types
npm/@types/cli-progress@3.11.5 None 0 12.9 kB types
npm/@types/fs-extra@11.0.4 None 0 36.8 kB types
npm/@types/gtag.js@0.0.19 None 0 8.85 kB types
npm/@types/http-server@0.12.4 None 0 4.58 kB types
npm/@types/inquirer@9.0.7 None 0 73.6 kB types
npm/@types/isomorphic-fetch@0.0.39 None 0 2.77 kB types
npm/@types/jest-axe@3.5.9 None 0 6.62 kB types
npm/@types/jest-environment-puppeteer@5.0.6 None 0 6.09 kB types
npm/@types/jest-image-snapshot@6.4.0 None 0 9.68 kB types
npm/@types/jest@29.5.12 None 0 78.7 kB types
npm/@types/jquery@3.5.29 None 0 1.12 MB types
npm/@types/jsdom@21.1.6 None 0 21.9 kB types
npm/@types/minimist@1.2.5 None 0 6.27 kB types
npm/@types/nprogress@0.2.3 None 0 4.83 kB types
npm/@types/ora@3.2.0 None 0 1.7 kB types
npm/@types/pixelmatch@5.2.6 None 0 7.87 kB types
npm/@types/pngjs@6.0.4 None 0 5.45 kB types
npm/@types/prismjs@1.26.3 None 0 19.2 kB types
npm/@types/progress@2.0.7 None 0 6.51 kB types
npm/@types/react-copy-to-clipboard@5.0.7 None 0 4.36 kB types
npm/@types/react-dom@18.3.0 None 0 37.8 kB types
npm/@types/react-highlight-words@0.16.7 None 0 5.53 kB types
npm/@types/react-resizable@3.0.7 None 0 7.1 kB types
npm/@types/react@18.3.1 None 0 438 kB types
npm/@types/spinnies@0.5.3 None 0 8.22 kB types
npm/@types/tar@6.1.13 None 0 30.8 kB types
npm/@types/throttle-debounce@5.0.2 None 0 6.48 kB types
npm/@types/warning@3.0.3 None 0 2.71 kB types
npm/@typescript-eslint/eslint-plugin@7.8.0 None 0 2.69 MB jameshenry
npm/@typescript-eslint/parser@7.8.0 None 0 18 kB jameshenry
npm/adm-zip@0.5.12 filesystem 0 104 kB cthackers
npm/ali-oss@6.20.0 filesystem 0 2.72 MB fengmk2
npm/antd-img-crop@4.21.0 None 0 49.7 kB nanxiaobei
npm/antd-style@3.6.2 environment 0 188 kB arvinxx
npm/antd-token-previewer@2.0.8 None 0 1.22 MB madccc
npm/axios@1.6.8 network 0 1.84 MB jasonsaayman
npm/circular-dependency-plugin@5.2.2 None 0 10.5 kB theron
npm/classnames@2.5.1 None 0 23.6 kB jedwatson
npm/cli-progress@3.12.0 None 0 62.2 kB andidittrich
npm/copy-to-clipboard@3.3.3 None 0 15.1 kB sudodoki
npm/cross-fetch@4.0.0 network 0 88.1 kB lquixada
npm/crypto@1.0.1 None 0 778 B ehsalazar
npm/dekko@0.2.1 filesystem 0 8.91 kB benjycui
npm/dumi-plugin-color-chunk@1.1.0 None 0 38.8 kB wxh16144
npm/dumi@2.3.2 environment, eval, filesystem 0 2.89 MB yifankakaxi
npm/esbuild-loader@4.1.0 None 0 34.3 kB hirokiosame
npm/eslint-config-airbnb@19.0.4 None 0 81.7 kB ljharb
npm/eslint-import-resolver-typescript@3.6.1 None 0 45.1 kB jounqin
npm/eslint-plugin-compat@4.2.0 filesystem +1 56.3 kB amilajack
npm/eslint-plugin-import@2.29.1 filesystem, unsafe Transitive: environment +1 1.26 MB ljharb
npm/eslint-plugin-jest@28.3.0 filesystem 0 315 kB simenb
npm/eslint-plugin-jsx-a11y@6.8.0 None 0 739 kB ljharb
npm/eslint-plugin-lodash@7.4.0 filesystem 0 320 kB idok
npm/eslint-plugin-markdown@4.0.1 None 0 30.5 kB eslintbot
npm/eslint-plugin-react-hooks@4.6.2 environment 0 118 kB react-bot
npm/eslint-plugin-react@7.34.1 filesystem +1 915 kB ljharb
npm/eslint-plugin-unicorn@52.0.0 None 0 677 kB sindresorhus
npm/eslint@8.57.0 environment, filesystem +2 3.45 MB eslintbot
npm/fast-glob@3.3.2 filesystem 0 96.7 kB mrmlnc
npm/fetch-jsonp@1.3.0 None 0 12.4 kB camsong
npm/fs-extra@11.2.0 None +1 59.6 kB ryanzim
npm/gh-pages@6.1.1 filesystem, shell 0 39.9 kB tschaub
npm/glob@10.3.12 Transitive: environment +1 895 kB isaacs
npm/html2sketch@1.0.2 network 0 1.87 MB arvinxx
npm/http-server@14.1.1 environment, filesystem, network 0 124 kB thornjad
npm/identity-obj-proxy@3.0.0 None 0 8.38 kB keyanzhang
npm/immer@10.1.1 environment 0 627 kB mweststrate
npm/inquirer@9.2.20 None +1 92.9 kB sboudrias
npm/is-ci@3.0.1 None 0 3.81 kB sibiraj-s
npm/isomorphic-fetch@3.0.0 Transitive: network +1 169 kB mattandrews
npm/jest-axe@8.0.0 None 0 21 kB nickcolley
npm/jest-canvas-mock@2.5.2 None 0 112 kB atool
npm/jest-environment-jsdom@29.7.0 None 0 9.21 kB simenb
npm/jest-environment-node@29.7.0 unsafe 0 9.37 kB simenb
npm/jest-image-snapshot@6.4.0 environment, filesystem, shell 0 84.9 kB amexopensource
npm/jest@29.7.0 None 0 5.01 kB simenb
npm/qrcode.react@3.1.0 None 0 72.3 kB zpao
npm/rc-cascader@3.25.0 environment 0 192 kB zombiej
npm/rc-checkbox@3.2.0 None 0 20.2 kB zombiej
npm/rc-collapse@3.7.3 None 0 50.5 kB afc163
npm/rc-dialog@9.4.0 environment 0 77 kB zombiej
npm/rc-drawer@7.1.0 environment 0 59.3 kB afc163
npm/rc-dropdown@4.2.0 None 0 42.8 kB zombiej
npm/rc-field-form@2.0.0 environment 0 279 kB afc163
npm/rc-image@7.6.0 None 0 155 kB zombiej
npm/rc-input-number@9.0.0 None 0 80.2 kB madccc
npm/rc-input@1.4.5 None 0 70.6 kB zombiej
npm/rc-mentions@2.11.1 environment 0 74.7 kB zombiej
npm/rc-menu@9.13.0 environment 0 250 kB zombiej
npm/rc-motion@2.9.0 None 0 108 kB madccc
npm/rc-notification@5.4.0 environment 0 82.7 kB zombiej
npm/rc-pagination@4.0.4 environment 0 171 kB madccc
npm/rc-picker@4.5.0 environment 0 896 kB zombiej
npm/rc-progress@4.0.0 environment 0 52.3 kB afc163
npm/rc-rate@2.12.0 None 0 41.4 kB afc163
npm/rc-resize-observer@1.4.0 environment 0 36.5 kB zombiej
npm/rc-segmented@2.3.0 environment 0 39.7 kB afc163
npm/rc-select@14.13.1 environment 0 337 kB zombiej
npm/rc-slider@10.6.2 environment 0 156 kB afc163
npm/rc-steps@6.0.1 None 0 48.3 kB zombiej
npm/rc-switch@4.1.0 None 0 20.5 kB afc163
npm/rc-table@7.45.5 environment 0 398 kB afc163
npm/rc-tabs@15.0.0 environment 0 166 kB afc163
npm/rc-textarea@1.6.3 environment 0 61.9 kB madccc
npm/rc-tooltip@6.2.0 None 0 52.3 kB zombiej
npm/rc-tree-select@5.20.0 environment 0 162 kB zombiej
npm/rc-tree@5.8.5 environment 0 371 kB zombiej
npm/rc-upload@4.5.2 None 0 66.7 kB zombiej
npm/rc-util@5.39.1 environment +1 257 kB zombiej
npm/react-dom@18.3.1 environment 0 4.51 MB react-bot
npm/react@18.3.1 environment 0 318 kB react-bot
npm/scroll-into-view-if-needed@3.1.0 None 0 44.8 kB stipsan
npm/throttle-debounce@5.0.0 None 0 83.1 kB niksy

🚮 Removed packages: npm/jquery@3.7.1, npm/lodash@4.17.21, npm/minimist@1.2.8, npm/mockdate@3.0.5, npm/nprogress@0.2.0, npm/prettier@3.2.5, npm/qs@6.12.1, npm/regenerator-runtime@0.14.1, npm/stylelint-config-standard@36.0.0, npm/typescript@5.4.5

View full report↗︎

Copy link

socket-security bot commented May 2, 2024

👍 Dependency issues cleared. Learn more about Socket for GitHub ↗︎

This PR previously contained dependency changes with security issues that have been resolved, removed, or ignored.

Ignoring: npm/@ant-design/tools@18.0.2, npm/@biomejs/biome@1.7.2, npm/core-js@3.34.0

View full report↗︎

Next steps

Take a deeper look at the dependency

Take a moment to review the security alert above. Review the linked package source code to understand the potential risk. Ensure the package is not malicious before proceeding. If you're unsure how to proceed, reach out to your security team or ask the Socket team for help at support [AT] socket [DOT] dev.

Remove the package

If you happen to install a dependency that Socket reports as Known Malware you should immediately remove it and select a different dependency. For other alert types, you may may wish to investigate alternative packages or consider if there are other ways to mitigate the specific risk posed by the dependency.

Mark a package as acceptable risk

To ignore an alert, reply with a comment starting with @SocketSecurity ignore followed by a space separated list of ecosystem/package-name@version specifiers. e.g. @SocketSecurity ignore npm/foo@1.0.0 or ignore all packages with @SocketSecurity ignore-all

Copy link
Contributor

github-actions bot commented May 2, 2024

size-limit report 📦

Path Size
./dist/antd.min.js 337.69 KB (-16 B 🔽)
./dist/antd-with-locales.min.js 385.45 KB (+80 B 🔺)

@li-jia-nan
Copy link
Member Author

@SocketSecurity ignore npm/@ant-design/tools@18.0.2
@SocketSecurity ignore npm/core-js@3.34.0
@SocketSecurity ignore npm/@biomejs/biome@1.7.2

Copy link

codesandbox-ci bot commented May 2, 2024

This pull request is automatically built and testable in CodeSandbox.

To see build info of the built libraries, click here or the icon next to each commit SHA.

@github-actions github-actions bot merged commit d2e8549 into feature May 2, 2024
132 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants