Skip to content

docs(en): merge docs-cn/sync-docs into docs-cn/dev @ 83c20df0#1000

Merged
NoiseFan merged 6 commits into
devfrom
sync-83c20df0-1
Jun 20, 2026
Merged

docs(en): merge docs-cn/sync-docs into docs-cn/dev @ 83c20df0#1000
NoiseFan merged 6 commits into
devfrom
sync-83c20df0-1

Conversation

@docschina-bot

Copy link
Copy Markdown
Collaborator

此 PR 自动生成。

合并 vitest-dev/docs-cn 的修改至本仓库(@ 83c20df

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

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

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

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

macarie and others added 5 commits June 18, 2026 10:25
Co-authored-by: Hiroshi Ogawa <4232207+hi-ogawa@users.noreply.github.com>
Co-authored-by: Codex <noreply@openai.com>
Co-authored-by: Hiroshi Ogawa <4232207+hi-ogawa@users.noreply.github.com>
@docschina-bot docschina-bot requested a review from elonehoo June 20, 2026 00:02
@netlify

netlify Bot commented Jun 20, 2026

Copy link
Copy Markdown

Deploy Preview for cn-vitest ready!

Name Link
🔨 Latest commit ddd2178
🔍 Latest deploy log https://app.netlify.com/projects/cn-vitest/deploys/6a36099f323f38000813d9da
😎 Deploy Preview https://deploy-preview-1000--cn-vitest.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.
🤖 Make changes Run an agent on this branch

To edit notification comments on pull requests, go to your Netlify project configuration.

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: f784aaecad

ℹ️ 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".

Comment thread config/outputfile.md Outdated
- **类型:** `string | Record<string, string>`
- **命令行终端:** `--outputFile=<path>`, `--outputFile.json=./path`

<<<<<<< HEAD

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Remove unresolved merge-conflict markers

This <<<<<<< HEAD starts an unresolved merge conflict that will be rendered into the published documentation instead of selecting one version of the text. I checked with rg '^(<<<<<<<|=======|>>>>>>>)' and the same conflict markers are also present in guide/index.md, guide/learn/mock-functions.md, guide/migration.md, guide/mocking/functions.md, guide/reporters.md, and guide/ui.md, so these conflicts need to be resolved before merging.

Useful? React with 👍 / 👎.

@NoiseFan NoiseFan merged commit b202296 into dev Jun 20, 2026
5 checks passed
@NoiseFan NoiseFan deleted the sync-83c20df0-1 branch June 20, 2026 03:32
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.

5 participants