docs(en): merging all conflicts

Author: docschina-bot

.vitepress/config.ts

@@ -73,6 +73,7 @@ export default ({ mode }: { mode: string }) => {
             'CLI': 'vscode-icons:file-type-shell',
             'vitest.shims': 'vscode-icons:file-type-vitest',
             'vitest.config': 'vscode-icons:file-type-vitest',
+            'vitest.workspace': 'vscode-icons:file-type-vitest',
             '.spec.ts': 'vscode-icons:file-type-testts',
             '.test.ts': 'vscode-icons:file-type-testts',
             '.spec.js': 'vscode-icons:file-type-testjs',

advanced/api/vitest.md

@@ -553,6 +553,24 @@ function createCoverageProvider(): Promise<CoverageProvider | null>
 若未将 [`coverage.clean`](/config/#coverage-clean) 显式设为 false ，此方法还会清空之前的所有报告。
 :::
 
+## enableCoverage <Version>4.0.0</Version> {#enablecoverage}
+
+```ts
+function enableCoverage(): Promise<void>
+```
+
+This method enables coverage for tests that run after this call. `enableCoverage` doesn't run any tests; it only sets up Vitest to collect coverage.
+
+It creates a new coverage provider if one doesn't already exist.
+
+## disableCoverage <Version>4.0.0</Version> {#disablecoverage}
+
+```ts
+function disableCoverage(): void
+```
+
+This method disables coverage collection for tests that run afterwards.
+
 ## experimental_parseSpecification <Version>4.0.0</Version> <Badge type="warning">experimental</Badge> {#parsespecification}
 
 ```ts

api/expect-typeof.md

@@ -31,7 +31,14 @@ expectTypeOf({ a: 1, b: 1 }).not.toEqualTypeOf<{ a: number }>()
 
 - **类型:** `<T>(expected: T) => void`
 
+<<<<<<< HEAD
 此匹配器检查期望类型是否扩展了提供的类型。它不同于 `toEqual`，更类似于 [expect's](/api/expect) `toMatchObject()`。使用此匹配器，你可以检查对象是否“匹配”类型。
+=======
+::: warning DEPRECATED
+This matcher has been deprecated since expect-type v1.2.0. Use [`toExtend`](#toextend) instead.
+:::
+This matcher checks if expect type extends provided type. It is different from `toEqual` and is more similar to [expect's](/api/expect) `toMatchObject()`. With this matcher, you can check if an object “matches” a type.
+>>>>>>> ec2e441b2e5176ed50172b0eed5ac79812b5c578
 
 ```ts
 import { expectTypeOf } from 'vitest'
@@ -41,6 +48,44 @@ expectTypeOf<number>().toMatchTypeOf<string | number>()
 expectTypeOf<string | number>().not.toMatchTypeOf<number>()
 ```
 
+## toExtend
+
+- **Type:** `<T>(expected: T) => void`
+
+This matcher checks if expect type extends provided type. It is different from `toEqual` and is more similar to [expect's](/api/expect) `toMatchObject()`. With this matcher, you can check if an object "matches" a type.
+
+```ts
+import { expectTypeOf } from 'vitest'
+
+expectTypeOf({ a: 1, b: 1 }).toExtend({ a: 1 })
+expectTypeOf<number>().toExtend<string | number>()
+expectTypeOf<string | number>().not.toExtend<number>()
+```
+
+## toMatchObjectType
+
+- **Type:** `() => void`
+
+This matcher performs a strict check on object types, ensuring that the expected type matches the provided object type. It's stricter than [`toExtend`](#toextend) and is the recommended choice when working with object types as it's more likely to catch issues like readonly properties.
+
+```ts
+import { expectTypeOf } from 'vitest'
+
+expectTypeOf({ a: 1, b: 2 }).toMatchObjectType<{ a: number }>() // preferred
+expectTypeOf({ a: 1, b: 2 }).toExtend<{ a: number }>() // works but less strict
+
+// Supports nested object checking
+const user = {
+  name: 'John',
+  address: { city: 'New York', zip: '10001' }
+}
+expectTypeOf(user).toMatchObjectType<{ name: string; address: { city: string } }>()
+```
+
+::: warning
+This matcher only works with plain object types. It will fail for union types and other complex types. For those cases, use [`toExtend`](#toextend) instead.
+:::
+
 ## extract
 
 - **类型:** `ExpectTypeOf<ExtractedUnion>`

guide/browser/config.md

@@ -295,6 +295,7 @@ export interface BrowserScript {
 }
 ```
 
+<<<<<<< HEAD
 ## browser.testerScripts
 
 - **类型:** `BrowserScript[]`
@@ -308,6 +309,8 @@ export interface BrowserScript {
 
 脚本的 `src` 和 `content` 将由 Vite 插件处理。
 
+=======
+>>>>>>> ec2e441b2e5176ed50172b0eed5ac79812b5c578
 ## browser.commands
 
 - **类型:** `Record<string, BrowserCommand>`

guide/features.md

@@ -246,7 +246,7 @@ import { mount } from './mount.js'
 
 test('my types work properly', () => {
   expectTypeOf(mount).toBeFunction()
-  expectTypeOf(mount).parameter(0).toMatchTypeOf<{ name: string }>()
+  expectTypeOf(mount).parameter(0).toExtend<{ name: string }>()
 
   // @ts-expect-error name is a string
   assertType(mount({ name: 42 }))

guide/migration.md

@@ -78,7 +78,11 @@ export default defineConfig({
 - [覆盖率报告中的文件包含与排除](/guide/coverage.html#including-and-excluding-files-from-coverage-report)
 - [性能分析 | 代码覆盖率](/guide/profiling-test-performance.html#code-coverage) 了解调试覆盖率生成的方法
 
+<<<<<<< HEAD
 ### `spyOn` 支持构造函数
+=======
+### `spyOn` and `fn` Support Constructors
+>>>>>>> ec2e441b2e5176ed50172b0eed5ac79812b5c578
 
 在之前版本中，如果你对构造函数使用 `vi.spyOn`，会收到类似 `Constructor <name> requires 'new'` 的错误。从 Vitest 4 开始，所有用 `new` 调用的 mock 都会正确创建实例，而不是调用 `mock.apply`。这意味着 mock 实现必须使用 `function` 或 `class` 关键字，例如：
 
@@ -187,15 +191,63 @@ Vite 已提供外部化机制，但为降低破坏性，仍保留旧方案；[`s
 
 未使用上述高级功能者，升级无感知。
 
+<<<<<<< HEAD
 ### 移除废弃的 API
+=======
+### `workspace` is Replaced with `projects`
+
+The `workspace` configuration option was renamed to [`projects`](/guide/projects) in Vitest 3.2. They are functionally the same, except you cannot specify another file as the source of your workspace (previously you could specify a file that would export an array of projects). Migrating to `projects` is easy, just move the code from `vitest.workspace.js` to `vitest.config.ts`:
+
+::: code-group
+```ts [vitest.config.js]
+import { defineConfig } from 'vitest/config'
+
+export default defineConfig({
+  test: {
+    workspace: './vitest.workspace.js', // [!code --]
+    projects: [ // [!code ++]
+      './packages/*', // [!code ++]
+      { // [!code ++]
+        test: { // [!code ++]
+          name: 'unit', // [!code ++]
+        }, // [!code ++]
+      }, // [!code ++]
+    ] // [!code ++]
+  }
+})
+```
+```ts [vitest.workspace.js]
+import { defineWorkspace } from 'vitest/config' // [!code --]
+
+export default defineWorkspace([ // [!code --]
+  './packages/*', // [!code --]
+  { // [!code --]
+    test: { // [!code --]
+      name: 'unit', // [!code --]
+    }, // [!code --]
+  } // [!code --]
+]) // [!code --]
+```
+:::
+
+### Deprecated APIs are Removed
+>>>>>>> ec2e441b2e5176ed50172b0eed5ac79812b5c578
 
 Vitest 4.0 移除了以下废弃的配置项：
 
+<<<<<<< HEAD
 - `poolMatchGlobs` 配置项，请使用 [`projects`](/guide/projects) 代替。
 - `environmentMatchGlobs` 配置项，请使用 [`projects`](/guide/projects) 代替。
 - `workspace` 配置项，请使用 [`projects`](/guide/projects) 代替。
 - Reporter 的 API 例如 `onCollected`, `onSpecsCollected`, `onPathsCollected`, `onTaskUpdate` 及 `onFinished` 。查看 [`Reporters API`](/advanced/api/reporters) 了解替代方案。这些 API 在 Vitest v3.0.0 中引入。
 - 配置项 `deps.external`, `deps.inline`, `deps.fallbackCJS`。请改用 `server.deps.external`, `server.deps.inline` 或 `server.deps.fallbackCJS`。
+=======
+- `poolMatchGlobs` config option. Use [`projects`](/guide/projects) instead.
+- `environmentMatchGlobs` config option. Use [`projects`](/guide/projects) instead.
+- Reporter APIs `onCollected`, `onSpecsCollected`, `onPathsCollected`, `onTaskUpdate` and `onFinished`. See [`Reporters API`](/advanced/api/reporters) for new alternatives. These APIs were introduced in Vitest `v3.0.0`.
+- `deps.external`, `deps.inline`, `deps.fallbackCJS` config options. Use `server.deps.external`, `server.deps.inline`, or `server.deps.fallbackCJS` instead.
+- `browser.testerScripts` config option. Use [`browser.testerHtmlPath`](/guide/browser/config#browser-testerhtmlpath) instead.
+>>>>>>> ec2e441b2e5176ed50172b0eed5ac79812b5c578
 
 同时，所有弃用类型被一次性清理，彻底解决误引 `@types/node` 的问题（[#5481](https://github.com/vitest-dev/vitest/issues/5481)、[#6141](https://github.com/vitest-dev/vitest/issues/6141)）。
 
@@ -280,7 +332,11 @@ Vitest 的测试名使用 `>` 符号连接，方便区分测试与套件，而 J
 
 ### Done 回调
 
+<<<<<<< HEAD
 从 Vitest v0.10.0 开始，回调式测试声明被弃用。你可以改写为使用 `async`/`await`，或用 Promise 模拟回调风格。
+=======
+Vitest does not support the callback style of declaring tests. You can rewrite them to use `async`/`await` functions, or use Promise to mimic the callback style.
+>>>>>>> ec2e441b2e5176ed50172b0eed5ac79812b5c578
 
 <!--@include: ./examples/promise-done.md-->
 
@@ -293,7 +349,11 @@ beforeEach(() => setActivePinia(createTestingPinia())) // [!code --]
 beforeEach(() => { setActivePinia(createTestingPinia()) }) // [!code ++]
 ```
 
+<<<<<<< HEAD
 Jest 中钩子顺序执行（逐个执行），Vitest 默认并行执行。若想使用 Jest 行为，可配置 [`sequence.hooks`](/config/#sequence-hooks)：
+=======
+In Jest hooks are called sequentially (one after another). By default, Vitest runs hooks in a stack. To use Jest's behavior, update [`sequence.hooks`](/config/#sequence-hooks) option:
+>>>>>>> ec2e441b2e5176ed50172b0eed5ac79812b5c578
 
 ```ts
 export default defineConfig({
@@ -330,23 +390,20 @@ vi.setConfig({ testTimeout: 5_000 }) // [!code ++]
 
 ### Vue 快照
 
+<<<<<<< HEAD
 这不是 Jest 特有功能，但如果之前使用 Jest 的 vue-cli preset，需要安装 [`jest-serializer-vue`](https://github.com/eddyerburgh/jest-serializer-vue) 包，并在 [setupFiles](/config/#setupfiles) 中使用：
+=======
+This is not a Jest-specific feature, but if you previously were using Jest with vue-cli preset, you will need to install [`jest-serializer-vue`](https://github.com/eddyerburgh/jest-serializer-vue) package, and specify it in [`snapshotSerializers`](/config/#snapshotserializers):
+>>>>>>> ec2e441b2e5176ed50172b0eed5ac79812b5c578
 
-:::code-group
-```js [vite.config.js]
-import { defineConfig } from 'vite'
+```js [vitest.config.js]
+import { defineConfig } from 'vitest/config'
 
 export default defineConfig({
   test: {
-    setupFiles: ['./tests/unit/setup.js']
+    snapshotSerializers: ['jest-serializer-vue']
   }
 })
 ```
-```js [tests/unit/setup.js]
-import vueSnapshotSerializer from 'jest-serializer-vue'
-
-expect.addSnapshotSerializer(vueSnapshotSerializer)
-```
-:::
 
 否则快照中会出现大量转义的 `"` 字符。

guide/testing-types.md

@@ -30,7 +30,7 @@ import { mount } from './mount.js'
 
 test('my types work properly', () => {
   expectTypeOf(mount).toBeFunction()
-  expectTypeOf(mount).parameter(0).toMatchTypeOf<{ name: string }>()
+  expectTypeOf(mount).parameter(0).toExtend<{ name: string }>()
 
   // @ts-expect-error name is a string
   assertType(mount({ name: 42 }))
@@ -45,7 +45,11 @@ test('my types work properly', () => {
 
 如果使用的是 `expectTypeOf` API，请参阅 [expect-type 关于其错误信息的文档](https://github.com/mmkal/expect-type#error-messages)。
 
+<<<<<<< HEAD
 当类型不匹配时，`.toEqualTypeOf` 和 `.toMatchTypeOf`会使用一种特殊的辅助类型来生成尽可能可操作的错误信息。但要理解它们还有一些细微差别。由于断言是 "流畅地 "编写的，所以失败应该发生在 "预期 "类型上，而不是 "实际 "类型上（`expect<Actual>().toEqualTypeOf<Expected>()`）。这意味着类型错误可能有点令人困惑，因此该库生成了一个 `MismatchInfo` 类型，试图明确说明期望是什么。例如
+=======
+When types don't match, `.toEqualTypeOf` and `.toExtend` use a special helper type to produce error messages that are as actionable as possible. But there's a bit of an nuance to understanding them. Since the assertions are written "fluently", the failure should be on the "expected" type, not the "actual" type (`expect<Actual>().toEqualTypeOf<Expected>()`). This means that type errors can be a little confusing - so this library produces a `MismatchInfo` type to try to make explicit what the expectation is. For example:
+>>>>>>> ec2e441b2e5176ed50172b0eed5ac79812b5c578
 
 ```ts
 expectTypeOf({ a: 1 }).toEqualTypeOf<{ a: string }>()
@@ -91,7 +95,11 @@ expectTypeOf({ a: 1 }).toEqualTypeOf({ a: '' })
 expectTypeOf({ a: 1 }).toEqualTypeOf<{ a: string }>()
 ```
 
+<<<<<<< HEAD
 这是因为 TypeScript 编译器需要推断 `.toEqualTypeOf({a: ''})` 样式的类型参数，并且该库只能通过将其与通用的 `Mismatch` 类型进行比较来标记它为失败。因此，在可能的情况下，使用类型参数而不是具体类型来使用 `.toEqualTypeOf` 和 `toMatchTypeOf`。如果使用两个具体类型进行比较更加方便，可以使用 `typeof`：
+=======
+This is because the TypeScript compiler needs to infer the typearg for the `.toEqualTypeOf({a: ''})` style, and this library can only mark it as a failure by comparing it against a generic `Mismatch` type. So, where possible, use a typearg rather than a concrete type for `.toEqualTypeOf` and `.toExtend`. If it's much more convenient to compare two concrete types, you can use `typeof`:
+>>>>>>> ec2e441b2e5176ed50172b0eed5ac79812b5c578
 
 ```ts
 const one = valueFromFunctionOne({ some: { complex: inputs } })