Skip to content

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

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.

Sign up for GitHub

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
docschina-bot wants to merge 2 commits into
base: dev
Choose a base branch
from
+17 −1
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75b8e75
chore: remove tinyspy from docs (#9990)
sheremet-va Mar 28, 2026
b722a89
docs(en): merging all conflicts
docschina-bot Mar 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .vitepress/components/FeaturesList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<a target="_blank" href="https://vitejs.dev" rel="noopener noreferrer">Vite</a>
通用的配置、转换器、解析器和插件。
</ListItem>
<<<<<<< HEAD

Check failure on line 12 in .vitepress/components/FeaturesList.vue

View workflow job for this annotation

GitHub Actions / autofix 

Parsing error: invalid-first-character-of-tag-name

Check failure on line 12 in .vitepress/components/FeaturesList.vue

View workflow job for this annotation

GitHub Actions / autofix 

Parsing error: invalid-first-character-of-tag-name

Check failure on line 12 in .vitepress/components/FeaturesList.vue

View workflow job for this annotation

GitHub Actions / autofix 

Parsing error: invalid-first-character-of-tag-name

Check failure on line 12 in .vitepress/components/FeaturesList.vue

View workflow job for this annotation

GitHub Actions / autofix 

Parsing error: invalid-first-character-of-tag-name

Check failure on line 12 in .vitepress/components/FeaturesList.vue

View workflow job for this annotation

GitHub Actions / autofix 

Parsing error: invalid-first-character-of-tag-name

Check failure on line 12 in .vitepress/components/FeaturesList.vue

View workflow job for this annotation

GitHub Actions / autofix 

Parsing error: invalid-first-character-of-tag-name

Check failure on line 12 in .vitepress/components/FeaturesList.vue

View workflow job for this annotation

GitHub Actions / autofix 

Parsing error: invalid-first-character-of-tag-name
Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector bot Mar 28, 2026

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 👍 / 👎.

<ListItem>使用与你的应用相同的设置来运行测试！</ListItem>
<ListItem>智能文件监听模式，就像是测试的 HMR！</ListItem>
<ListItem>支持对 Vue、React、Svelte、Lit 等框架进行组件测试。</ListItem>
Expand Down Expand Up @@ -64,6 +65,17 @@
</ListItem>
<ListItem>支持分片执行</ListItem>
<ListItem>报告未捕获的错误</ListItem>
=======
<ListItem><a target="_blank" href="https://www.chaijs.com/" rel="noopener noreferrer">Chai</a> built-in for assertions + <a target="_blank" href="https://jestjs.io/docs/expect" rel="noopener noreferrer">Jest expect</a> compatible APIs</ListItem>
<ListItem>Jest-compatible mocking</ListItem>
<ListItem><a target="_blank" href="https://github.com/capricorn86/happy-dom" rel="noopener noreferrer">happy-dom</a> or <a target="_blank" href="https://github.com/jsdom/jsdom" rel="noopener noreferrer">jsdom</a> for DOM mocking</ListItem>
<ListItem><a href="https://vitest.dev/guide/browser/" rel="noopener noreferrer">Browser Mode</a> for running component tests in the browser</ListItem>
<ListItem>Code coverage via <a target="_blank" href="https://v8.dev/blog/javascript-code-coverage" rel="noopener noreferrer">v8</a> or <a target="_blank" href="https://istanbul.js.org/" rel="noopener noreferrer">istanbul</a></ListItem>
<ListItem>Rust-like <a href="/guide/in-source">in-source testing</a></ListItem>
<ListItem>Type Testing via <a target="_blank" href="https://github.com/mmkal/expect-type" rel="noopener noreferrer">expect-type</a></ListItem>
<ListItem>Sharding Support</ListItem>
<ListItem>Reporting Uncaught Errors</ListItem>
>>>>>>> 75b8e759c1128a8da6df977d50acf33d2c46d033
</ul>
</template>

Expand Down
2 changes: 1 addition & 1 deletion .vitepress/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export default ({ mode }: { mode: string }) => {
['link', { rel: 'icon', href: '/favicon.ico', sizes: '48x48' }],
['link', { rel: 'icon', href: '/logo-without-border.svg', type: 'image/svg+xml' }],
['meta', { name: 'author', content: `${teamMembers.map(c => c.name).join(', ')} and ${vitestName} contributors` }],
['meta', { name: 'keywords', content: 'vitest, vite, test, coverage, snapshot, react, vue, preact, svelte, solid, lit, marko, ruby, cypress, puppeteer, jsdom, happy-dom, test-runner, jest, typescript, esm, tinyspy, node' }],
['meta', { name: 'keywords', content: 'vitest, vite, test, coverage, snapshot, react, vue, preact, svelte, solid, lit, marko, ruby, cypress, puppeteer, jsdom, happy-dom, test-runner, jest, typescript, esm, node' }],
['meta', { property: 'og:title', content: vitestName }],
['meta', { property: 'og:description', content: vitestDescription }],
['meta', { property: 'og:url', content: ogUrl }],
Expand Down
4 changes: 4 additions & 0 deletions guide/features.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,11 @@

## 对象模拟 (Mocking) {#mocking}

<<<<<<< HEAD

Check failure on line 123 in guide/features.md

View workflow job for this annotation

GitHub Actions / autofix 

Unexpected additional H1 heading found
内置 [Tinyspy](https://github.com/tinylibs/tinyspy) 用于在 `vi` 对象上使用 `jest` 兼容的 API 进行对象模拟。
=======
Vitest provides `jest`-compatible APIs on `vi` object.
>>>>>>> 75b8e759c1128a8da6df977d50acf33d2c46d033
Comment on lines +123 to +127
Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector bot Mar 28, 2026

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 👍 / 👎.

```ts
import { expect, vi } from 'vitest'
Expand Down
Loading