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

Merged
merged 6 commits into from Dec 30, 2023
Merged

chore: merge master into feature #46710

merged 6 commits into from Dec 30, 2023

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

* fix: Upload tab experience

* test: update snapshot

* fix lint
* docs: Update faq

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

* Update faq.en-US.md

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

---------

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

stackblitz bot commented Dec 30, 2023

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

Copy link
Contributor

github-actions bot commented Dec 30, 2023

Visual Regression Report for PR #46710 Failed ❌

Target branch: feature (d7f0fdc)
View Full Report


image name expected actual diff
form-validate-other.png feature: d7f0fdc6ff58f0f47a75aba958d8b7a7bda9328a current: pr-46710 diff
form-validate-other.css-var.png feature: d7f0fdc6ff58f0f47a75aba958d8b7a7bda9328a current: pr-46710 diff
upload-drag.png feature: d7f0fdc6ff58f0f47a75aba958d8b7a7bda9328a current: pr-46710 diff
upload-drag.css-var.png feature: d7f0fdc6ff58f0f47a75aba958d8b7a7bda9328a current: pr-46710 diff

Check Full Report for details

Copy link
Contributor

github-actions bot commented Dec 30, 2023

Preview Is ready

Copy link
Contributor

Hi @li-jia-nan

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

Copy link

socket-security bot commented Dec 30, 2023

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

Packages Version New capabilities Transitives Size Publisher
react-intersection-observer 9.5.3 None +0 134 kB thebuilder
rc-upload 4.5.2 None +0 66.7 kB zombiej

Copy link
Contributor

github-actions bot commented Dec 30, 2023

size-limit report 📦

Path Size
./dist/antd.min.js 330.31 KB (+201 B 🔺)
./dist/antd-with-locales.min.js 376.17 KB (+105 B 🔺)

Copy link

codesandbox-ci bot commented Dec 30, 2023

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.

Latest deployment of this branch, based on commit 24b083e:

Sandbox Source
antd reproduction template (forked) Configuration

Copy link

codecov bot commented Dec 30, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (44d1b68) 100.00% compared to head (24b083e) 100.00%.
Report is 47 commits behind head on feature.

Additional details and impacted files
@@            Coverage Diff             @@
##           feature    #46710    +/-   ##
==========================================
  Coverage   100.00%   100.00%            
==========================================
  Files          708       721    +13     
  Lines        12120     12879   +759     
  Branches      3218      3427   +209     
==========================================
+ Hits         12120     12879   +759     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

zombieJ and others added 4 commits December 30, 2023 19:52
* docs: 5.12.6 changelog

* docs: fix changelog
…46711)

* docs: update workarounds for sub-components with Next.js App router

Signed-off-by: Navid <navidmafi2006@gmail.com>

* docs: (zh-CN) update workarounds for sub-components with Next.js App router

Signed-off-by: Navid <navidmafi2006@gmail.com>

* Apply suggestions from code review

Signed-off-by: Amumu <yoyo837@hotmail.com>

* Update docs/react/faq.zh-CN.md

Signed-off-by: Amumu <yoyo837@hotmail.com>

* Update docs/react/faq.zh-CN.md

Signed-off-by: Amumu <yoyo837@hotmail.com>

* Update docs/react/faq.zh-CN.md

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

* Update docs/react/faq.zh-CN.md

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

* Update docs/react/faq.zh-CN.md

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

* Update faq.zh-CN.md

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

* Update faq.en-US.md

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

* Update docs/react/faq.zh-CN.md

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

---------

Signed-off-by: Navid <navidmafi2006@gmail.com>
Signed-off-by: Amumu <yoyo837@hotmail.com>
Signed-off-by: lijianan <574980606@qq.com>
Co-authored-by: Amumu <yoyo837@hotmail.com>
Co-authored-by: lijianan <574980606@qq.com>
@li-jia-nan
Copy link
Member Author

Visual Regression Report for PR #46710 Failed ❌

这个是预期的

@li-jia-nan li-jia-nan merged commit 276e66c into feature Dec 30, 2023
257 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

5 participants