Skip to content

docs(en): merge reactjs.org/main into zh-hans.reactjs.org/main @ 09c9593e #1706

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

Open
wants to merge 7 commits into
base: main
Choose a base branch
from

Conversation

docschina-bot
Copy link
Collaborator

此 PR 自动生成。

合并 reactjs/reactjs.org 的修改至本仓库(@ 09c9593

以下文件存在冲突,可能需要重新翻译:

请解决所有冲突后提交到此 pull request,可直接在 Github 修改、切换到 sync-09c9593e 分支进行修改或者使用 Github Desktop 拉取此 pr 修改并提交。

禁止使用 Squash Merge 来合并此 Pull Request!

使用该操作会导致上游仓库的内容丢失,并致使下一次合并产生冲突。

cpojer and others added 7 commits April 22, 2025 20:04
* Fix ESLint plugin version.

* Update react-compiler-rc.md
…s.md (#7761)

Add `React Summit US 2025` and `React Advanced London 2025` to the list of upcoming conferences (`conferences.md`).
* init

* Add new error

* Bunch of updates

* Add addTransitionType

* Add Activity

* Expand on Activity

* Expand more on Activity

* Start on vt examples

* wip

* wip

* wip 2

* bump deploy

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* init

* Add new error

* Bunch of updates

* Add addTransitionType

* Add Activity

* Expand on Activity

* Expand more on Activity

* Start on vt examples

* wip

* wip

* wip 2

* bump deploy

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* Update existing VT examples to use video items

* Suspense animation example

* Add customization example

* typos

* Remove TODOs -- we might still want these but cutting scope

* Address wp feedback

* Fix reorder example

* wip

* wip

* wip

* wip

* fix activity iframe resize

---------

Co-authored-by: Jack Pope <[email protected]>
@docschina-bot docschina-bot requested a review from QC-L April 23, 2025 22:22
Copy link

vercel bot commented Apr 23, 2025

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
zh-hans-react-dev ❌ Failed (Inspect) Apr 23, 2025 10:23pm

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants