docs(en): merge docs-cn/sync-docs into docs-cn/dev @ a1e8cf59 - #1016
docs(en): merge docs-cn/sync-docs into docs-cn/dev @ a1e8cf59#1016docschina-bot wants to merge 2 commits into
Conversation
Co-authored-by: OpenAI Codex <noreply@openai.com>
❌ Deploy Preview for cn-vitest failed.
|
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 0635110510
ℹ️ About Codex in GitHub
Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
| <<<<<<< HEAD | ||
| 默认情况下,Vite 的目标浏览器支持原生 [ES Modules](https://caniuse.com/es6-module)、原生 [ESM 动态导入](https://caniuse.com/es6-module-dynamic-import) 和 [`import.meta`](https://caniuse.com/mdn-javascript_operators_import_meta)。此外,我们还利用 [`BroadcastChannel`](https://caniuse.com/?search=BroadcastChannel)在 iframe 之间进行通信: | ||
| ======= | ||
| By default, Vite targets browsers which support the native [ES Modules](https://caniuse.com/es6-module), native [ESM dynamic import](https://caniuse.com/es6-module-dynamic-import), and [`import.meta`](https://caniuse.com/mdn-javascript_operators_import_meta). On top of that, we utilize [`BroadcastChannel`](https://caniuse.com/?search=BroadcastChannel) to communicate between iframes and `WeakRef` with `FinalizationRegistry` to track mocks without preventing garbage collection: | ||
| >>>>>>> a1e8cf594becb7231488d5fe41e437a29ed7e9a5 |
There was a problem hiding this comment.
Resolve the merge conflict in the browser guide
When VitePress renders this page, readers will see the conflict markers and both competing paragraphs, including an untranslated English copy. Resolve the conflict and retain a Chinese translation of the updated text mentioning WeakRef and FinalizationRegistry before publishing.
Useful? React with 👍 / 👎.
此 PR 自动生成。
合并 vitest-dev/docs-cn 的修改至本仓库(@ a1e8cf5)
以下文件存在冲突,可能需要重新翻译:
请解决所有冲突后提交到此 pull request,可直接在 Github 修改、切换到 sync-a1e8cf59-1 分支进行修改或者使用 Github Desktop 拉取此 pr 修改并提交。
禁止使用 Squash Merge 来合并此 Pull Request!
使用该操作会导致上游仓库的内容丢失,并致使下一次合并产生冲突。