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 #47453

Merged
merged 20 commits into from Feb 16, 2024
Merged

chore: merge master into feature #47453

merged 20 commits into from Feb 16, 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 20 commits February 7, 2024 20:01
Updates the requirements on [eslint-plugin-unicorn](https://github.com/sindresorhus/eslint-plugin-unicorn) to permit the latest version.

Updates `eslint-plugin-unicorn` to 51.0.1
- [Release notes](https://github.com/sindresorhus/eslint-plugin-unicorn/releases)
- [Commits](sindresorhus/eslint-plugin-unicorn@v51.0.0...v51.0.1)

---
updated-dependencies:
- dependency-name: eslint-plugin-unicorn
  dependency-type: direct:development
  dependency-group: dev-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* fix: Dropdown should not display when items is empty array

* Apply suggestions from code review

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

---------

Signed-off-by: afc163 <afc163@gmail.com>
* fix: datePicker arrow out of bound

* chore: use logic prop
Bumps [@types/gtag.js](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/gtag.js) from 0.0.18 to 0.0.19.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/gtag.js)

---
updated-dependencies:
- dependency-name: "@types/gtag.js"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
updated-dependencies:
- dependency-name: "@types/react-dom"
  dependency-type: direct:development
  dependency-group: dev-dependencies
- dependency-name: react-fast-marquee
  dependency-type: direct:development
  dependency-group: dev-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* docs: Table colSpan render -> onCell

* Update components/table/demo/colspan-rowspan.md

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

---------

Signed-off-by: afc163 <afc163@gmail.com>
Co-authored-by: afc163 <afc163@gmail.com>
---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:development
  dependency-group: dev-dependencies
- dependency-name: tar-fs
  dependency-type: direct:development
  dependency-group: dev-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
updated-dependencies:
- dependency-name: "@codesandbox/sandpack-react"
  dependency-type: direct:development
  dependency-group: dev-dependencies
- dependency-name: "@types/semver"
  dependency-type: direct:development
  dependency-group: dev-dependencies
- dependency-name: react-intersection-observer
  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>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…47430)

* chore(deps-dev): update typedoc requirement from ^0.25.7 to ^0.25.8

Updates the requirements on [typedoc](https://github.com/TypeStrong/TypeDoc) to permit the latest version.
- [Release notes](https://github.com/TypeStrong/TypeDoc/releases)
- [Changelog](https://github.com/TypeStrong/typedoc/blob/master/CHANGELOG.md)
- [Commits](TypeStrong/typedoc@v0.25.7...v0.25.8)

---
updated-dependencies:
- dependency-name: typedoc
  dependency-type: direct:development
...

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>
* docs: changelog 5.14.1

* Apply suggestions from code review

Co-authored-by: lijianan <574980606@qq.com>
Signed-off-by: MadCcc <1075746765@qq.com>

---------

Signed-off-by: MadCcc <1075746765@qq.com>
Co-authored-by: lijianan <574980606@qq.com>
* chore(deps-dev): bump the dev-dependencies group with 2 updates

Bumps the dev-dependencies group with 2 updates: [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) and [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser).


Updates `@typescript-eslint/eslint-plugin` from 6.21.0 to 7.0.1
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v7.0.1/packages/eslint-plugin)

Updates `@typescript-eslint/parser` from 6.21.0 to 7.0.1
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v7.0.1/packages/parser)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-major
  dependency-group: dev-dependencies
- dependency-name: "@typescript-eslint/parser"
  dependency-type: direct:development
  update-type: version-update:semver-major
  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>
Updates the requirements on [husky](https://github.com/typicode/husky) to permit the latest version.

Updates `husky` to 9.0.11
- [Release notes](https://github.com/typicode/husky/releases)
- [Commits](typicode/husky@v9.0.10...v9.0.11)

---
updated-dependencies:
- dependency-name: husky
  dependency-type: direct:development
  dependency-group: dev-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Updates the requirements on [vanilla-jsoneditor](https://github.com/josdejong/svelte-jsoneditor) to permit the latest version.
- [Release notes](https://github.com/josdejong/svelte-jsoneditor/releases)
- [Changelog](https://github.com/josdejong/svelte-jsoneditor/blob/main/CHANGELOG.md)
- [Commits](josdejong/svelte-jsoneditor@v0.21.5...v0.21.6)

---
updated-dependencies:
- dependency-name: vanilla-jsoneditor
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:development
  dependency-group: dev-dependencies
- dependency-name: jest-puppeteer
  dependency-type: direct:development
  dependency-group: dev-dependencies
- dependency-name: terser
  dependency-type: direct:development
  dependency-group: dev-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Copy link

stackblitz bot commented Feb 16, 2024

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

Copy link
Contributor

github-actions bot commented Feb 16, 2024

Preview is ready

Copy link
Contributor

Hi @li-jia-nan

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

Copy link
Contributor

github-actions bot commented Feb 16, 2024

👁 Visual Regression Report for PR #47453 Passed ✅

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

🎊 Congrats! No visual-regression diff found.

Copy link
Contributor

size-limit report 📦

Path Size
./dist/antd.min.js 333.54 KB (-76 B 🔽)
./dist/antd-with-locales.min.js 379.32 KB (+79 B 🔺)

Copy link

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.

@li-jia-nan
Copy link
Member Author

@github-actions

@yoyo837
Copy link
Contributor

yoyo837 commented Feb 16, 2024

可能需要 @xrkffgg 来帮忙看看这个脚本了

@li-jia-nan
Copy link
Member Author

我看 CI 过了,这次应该不用手动 ap

@li-jia-nan
Copy link
Member Author

再等等

@li-jia-nan li-jia-nan merged commit 7587f12 into feature Feb 16, 2024
260 of 261 checks passed
Copy link
Contributor

🎉 Thank you for your contribution! If you have not yet joined our DingTalk community group, please feel free to join us (when joining, please provide the link to this PR).

🎉 感谢您的贡献!如果您还没有加入钉钉社区群,请扫描下方二维码加入我们(加群时请提供此 PR 链接)。

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

8 participants