Skip to content

docs(en): merge docs-cn/sync-docs into docs-cn/dev @ ad185a83#966

Closed
docschina-bot wants to merge 12 commits intodevfrom
sync-ad185a83-1
Closed

docs(en): merge docs-cn/sync-docs into docs-cn/dev @ ad185a83#966
docschina-bot wants to merge 12 commits intodevfrom
sync-ad185a83-1

Conversation

@docschina-bot
Copy link
Copy Markdown
Collaborator

此 PR 自动生成。

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

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

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

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

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

hi-ogawa and others added 12 commits April 25, 2026 13:01
…oncurrent: false })` + depreacte `sequential` test API and options (#10194)

Co-authored-by: Codex <noreply@openai.com>
Co-authored-by: Vladimir <sleuths.slews0s@icloud.com>
…rent` (#10198)

Co-authored-by: Codex <noreply@openai.com>
…Path` (#10138)

Co-authored-by: Vladimir <sleuths.slews0s@icloud.com>
…0219)

Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: neumaennl <7926739+neumaennl@users.noreply.github.com>
Co-authored-by: Martin Neumann <neumann@4soft.de>
Co-authored-by: Copilot <copilot@github.com>
@docschina-bot docschina-bot requested a review from elonehoo May 1, 2026 23:43
@netlify
Copy link
Copy Markdown

netlify Bot commented May 1, 2026

Deploy Preview for cn-vitest failed.

Name Link
🔨 Latest commit fe369a2
🔍 Latest deploy log https://app.netlify.com/projects/cn-vitest/deploys/69f53aad2cd6b20008ddad4e

Copy link
Copy Markdown

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

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: fe369a2bbd

ℹ️ 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 api/advanced/runner.md
Comment on lines +148 to +152
<<<<<<< HEAD
快照支持和其他功能是依赖于测试运行器的。如果你想保留这些功能,可以从 `vitest/runners` 导入 `VitestTestRunner` 并将你的测试运行器继承该类。如果你想扩展基准测试功能,它还提供了 `NodeBenchmarkRunner`。
=======
Snapshot support and some other features depend on the runner. If you don't want to lose it, you can extend your runner from `TestRunner` imported from `vitest`. It also exposes `NodeBenchmarkRunner`, if you want to extend benchmark functionality.
>>>>>>> ad185a835a130e727cdfb4ac909f05238364dc6a
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P1 Badge Resolve merge conflict markers before publishing docs

This commit leaves unresolved merge markers (<<<<<<<, =======, >>>>>>>) in rendered Markdown, which will show raw conflict text to users and can break docs tooling/parsing; I verified the same pattern appears in many touched files (for example api/advanced/runner.md, api/describe.md, config/reporters.md, and guide/reporters.md), so the merge needs to be resolved rather than committed as-is.

Useful? React with 👍 / 👎.

@NoiseFan NoiseFan closed this May 4, 2026
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.

8 participants