Skip to content

docs(en): merge docs-cn/sync-docs into docs-cn/dev @ 75b8e759#949

Open
docschina-bot wants to merge 2 commits intodevfrom
sync-75b8e759-1
Open

docs(en): merge docs-cn/sync-docs into docs-cn/dev @ 75b8e759#949
docschina-bot wants to merge 2 commits intodevfrom
sync-75b8e759-1

Conversation

@docschina-bot
Copy link
Copy Markdown
Collaborator

此 PR 自动生成。

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

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

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

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

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

sheremet-va and others added 2 commits March 28, 2026 09:05
Co-authored-by: Ari Perkkiö <ari.perkkio@gmail.com>
@docschina-bot docschina-bot requested a review from elonehoo March 28, 2026 23:23
@netlify
Copy link
Copy Markdown

netlify bot commented Mar 28, 2026

Deploy Preview for cn-vitest failed.

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

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

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

<a target="_blank" href="https://vitejs.dev" rel="noopener noreferrer">Vite</a>
通用的配置、转换器、解析器和插件。
</ListItem>
<<<<<<< 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.

P1 Badge Remove merge-conflict markers from Vue template

The template still contains <<<<<<< HEAD/=======/>>>>>>> markers, which makes this SFC invalid and causes Vite/Vue compilation to fail when the component is loaded (e.g., the docs home feature list). This blocks docs builds and deployment until the conflict is resolved.

Useful? React with 👍 / 👎.

Comment on lines +123 to +127
<<<<<<< HEAD
内置 [Tinyspy](https://github.com/tinylibs/tinyspy) 用于在 `vi` 对象上使用 `jest` 兼容的 API 进行对象模拟。
=======
Vitest provides `jest`-compatible APIs on `vi` object.
>>>>>>> 75b8e759c1128a8da6df977d50acf33d2c46d033
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 Resolve leftover conflict block in features guide

This unresolved conflict block is published directly in the markdown source, so readers will see merge markers and conflicting text instead of a single finalized sentence in the Mocking section. It is a content regression introduced by the merge commit and should be cleaned up before release.

Useful? React with 👍 / 👎.

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.

2 participants