vitest-dev · docschina-bot · Feb 19, 2026 · Feb 20, 2026 · Feb 20, 2026 · Feb 20, 2026
diff --git a/.vitepress/config.ts b/.vitepress/config.ts
@@ -136,6 +136,12 @@ export default ({ mode }: { mode: string }) => {
         },
       },
 
+      banner: {
+        id: 'viteplus-alpha',
+        text: 'Announcing Vite+ Alpha: Open source. Unified. Next-gen.',
+        url: 'https://voidzero.dev/posts/announcing-vite-plus-alpha?utm_source=vitest&utm_content=top_banner',
+      },
+
       carbonAds: {
         code: 'CW7DVKJE',
         placement: 'vitestdev',

diff --git a/.vitepress/sponsors.ts b/.vitepress/sponsors.ts
@@ -6,14 +6,14 @@ export const sponsors: SponsorTier[] = [
     size: 'big',
     items: [
       {
-        name: 'NuxtLabs',
-        url: 'https://nuxtlabs.com',
-        img: '/nuxtlabs.svg',
+        name: 'Vercel',
+        url: 'https://vercel.com',
+        img: '/vercel.svg',
       },
       {
-        name: 'Bolt',
-        url: 'https://bolt.new',
-        img: '/bolt.svg',
+        name: 'Chromatic',
+        url: 'https://www.chromatic.com/?utm_source=vitest&utm_medium=sponsorship&utm_campaign=vitestSponsorship',
+        img: '/chromatic.svg',
       },
       {
         name: 'Zammad',
@@ -26,10 +26,11 @@ export const sponsors: SponsorTier[] = [
     tier: '铂金赞助商',
     size: 'big',
     items: [
+
       {
-        name: 'Chromatic',
-        url: 'https://www.chromatic.com/?utm_source=vitest&utm_medium=sponsorship&utm_campaign=vitestSponsorship',
-        img: '/chromatic.svg',
+        name: 'Bolt',
+        url: 'https://bolt.new',
+        img: '/bolt.svg',
       },
     ],
   },
@@ -57,6 +58,11 @@ export const sponsors: SponsorTier[] = [
         url: 'https://www.liminity.se/',
         img: '/liminity.svg',
       },
+      {
+        name: 'Aerius Ventilation',
+        url: 'https://aerius.se/',
+        img: '/aerius.png',
+      },
     ],
   },
 ]
diff --git a/.vitepress/theme/Intro.vue b/.vitepress/theme/Intro.vue
@@ -21,7 +21,12 @@
           应用测试变得轻而易举。Vitest 基于 Vite 构建，原生支持 Vite 配置，并复用相同的解析和转换。
         </p>
         <p class="text-pretty">
+<<<<<<< HEAD
           即使不使用 Vite，也同样可以使用 Vitest。它兼容 Jest，也同样适用于后端代码。
+=======
+          You can also use Vitest even if you are not using Vite. It is Jest-compatible
+          and works for backend code too.
+>>>>>>> b72fc6b467384d82f530164b077760e0919f8532
         </p>
         <a href="/guide/why" target="_blank" class="button w-fit mt-8 block lg:hidden">了解更多</a>
       </div>

diff --git a/api/advanced/metadata.md b/api/advanced/metadata.md
@@ -36,9 +36,15 @@ export default {
 ::: danger BEWARE
 Vitest 使用不同的方法与 Node.js 进程进行通信。
 
+<<<<<<< HEAD
 - 如果 Vitest 在工作线程内运行测试，它将通过[消息端口](https://developer.mozilla.org/en-US/docs/Web/API/MessagePort)发送数据
 - 如果 Vitest 使用子进程，数据将通过 [`process.send`](https://nodejs.org/api/process.html#processsendmessage-sendhandle-options-callback) API 作为序列化缓冲区发送
 - 如果 Vitest 在浏览器中运行测试，数据将使用 [flatted](https://www.npmjs.com/package/flatted) 包进行字符串化
+=======
+- If Vitest runs tests inside worker threads, it will send data via [message port](https://developer.mozilla.org/en-US/docs/Web/API/MessagePort)
+- If Vitest uses child process, the data will be send as a serialized Buffer via [`process.send`](https://nodejs.org/api/process.html#processsendmessage-sendhandle-options-callback) API
+- If Vitest runs tests in the browser, the data will be stringified using [flatted](https://npmx.dev/package/flatted) package
+>>>>>>> b72fc6b467384d82f530164b077760e0919f8532
 
 该属性也会出现在每个测试的 `json` 报告中，因此请确保数据可以序列化为 JSON。
 

diff --git a/api/advanced/plugin.md b/api/advanced/plugin.md
@@ -11,7 +11,11 @@ outline: deep
 本指南假设我们知道如何使用 [Vite 插件](https://vite.dev/guide/api-plugin.html)。
 :::
 
+<<<<<<< HEAD
 Vitest 自 3.1 版起支持实验性的 `configureVitest` [插件](https://cn.vite.dev/guide/api-plugin) hook。
+=======
+Vitest supports a `configureVitest` [plugin](https://vite.dev/guide/api-plugin.html) hook since version 3.1.
+>>>>>>> b72fc6b467384d82f530164b077760e0919f8532
 
 ::: code-group
 ```ts [only vitest]

diff --git a/api/advanced/test-project.md b/api/advanced/test-project.md
@@ -51,7 +51,11 @@ export default defineConfig({
 :::
 
 ::: info
+<<<<<<< HEAD
 如果 [根项目](/api/advanced/vitest#getroottestproject) 不是用户工作区的一部分，则不会解析其 `name`。
+=======
+If the [root project](/api/advanced/vitest#getrootproject) is not part of user projects, its `name` will not be resolved.
+>>>>>>> b72fc6b467384d82f530164b077760e0919f8532
 :::
 
 ## vitest
@@ -78,7 +82,11 @@ project.serializedConfig === project.serializedConfig // ❌
 
 ## globalConfig
 
+<<<<<<< HEAD
 [`Vitest`](/api/advanced/vitest) 初始化时的测试配置。如果这是 [根项目](/api/advanced/vitest#getroottestproject)，`globalConfig` 和 `config` 将引用同一个对象。此配置对于无法在项目级别设置的值非常有用，例如 `coverage` 或 `reporters`。
+=======
+The test config that [`Vitest`](/api/advanced/vitest) was initialized with. If this is the [root project](/api/advanced/vitest#getrootproject), `globalConfig` and `config` will reference the same object. This config is useful for values that cannot be set on the project level, like `coverage` or `reporters`.
+>>>>>>> b72fc6b467384d82f530164b077760e0919f8532
 
 ```ts
 import type { ResolvedConfig } from 'vitest/node'
@@ -206,7 +214,11 @@ await vitest.runTestSpecifications([specification])
 function isRootProject(): boolean
 ```
 
+<<<<<<< HEAD
 检查当前项目是否为根项目。我们也可以通过调用 [`vitest.getRootProject()`](#getrootproject) 获取根项目。
+=======
+Checks if the current project is the root project. You can also get the root project by calling [`vitest.getRootProject()`](/api/advanced/vitest#getrootproject).
+>>>>>>> b72fc6b467384d82f530164b077760e0919f8532
 
 ## globTestFiles
 
@@ -233,7 +245,11 @@ project.globTestFiles(['basic/foo.js:10']) // ❌
 ```
 
 ::: tip
+<<<<<<< HEAD
 Vitest 使用 [fast-glob](https://www.npmjs.com/package/fast-glob) 来查找测试文件。`test.dir`、`test.root`、`root` 或 `process.cwd()` 定义了 `cwd` 选项。
+=======
+Vitest uses [fast-glob](https://npmx.dev/package/fast-glob) to find test files. `test.dir`, `test.root`, `root` or `process.cwd()` define the `cwd` option.
+>>>>>>> b72fc6b467384d82f530164b077760e0919f8532
 
 此方法查看多个配置选项：
 

diff --git a/api/advanced/vitest.md b/api/advanced/vitest.md
@@ -351,7 +351,11 @@ function collectTests(
 function cancelCurrentRun(reason: CancelReason): Promise<void>
 ```
 
+<<<<<<< HEAD
 此方法将优雅地取消所有正在进行的测试。它将等待已启动的测试完成运行，并且不会运行已计划运行但尚未启动的测试。
+=======
+This method will gracefully cancel all ongoing tests. It will stop the on-going tests and will not run tests that were scheduled to run but haven't started yet.
+>>>>>>> b72fc6b467384d82f530164b077760e0919f8532
 
 ## setGlobalTestNamePattern
 

diff --git a/api/browser/assertions.md b/api/browser/assertions.md
@@ -370,7 +370,11 @@ await expect.element(getByTestId('parent')).toContainHTML('</span>')
 ::: warning
 你可能不需要使用这个匹配器。我们鼓励从用户在浏览器中感知应用程序的角度进行测试。这就是为什么不建议针对特定的 DOM 结构进行测试。
 
+<<<<<<< HEAD
 在某些情况下，被测试的代码会渲染从外部来源获取的 HTML，而你希望验证该 HTML 代码是否按预期使用。
+=======
+It could be useful in situations where the code being tested renders html that was obtained from an external source, and you want to validate that html code was used as intended.
+>>>>>>> b72fc6b467384d82f530164b077760e0919f8532
 
 不应使用它来检查你控制的 DOM 结构。请改用 [`toContainElement`](#tocontainelement)。
 :::
@@ -1077,9 +1081,15 @@ await expect.element(getByTestId('button')).toMatchScreenshot('fancy-button', {
 
 - `comparatorName: "pixelmatch" = "pixelmatch"`
 
+<<<<<<< HEAD
   用于比较图像的算法/库名称。
 
   目前，仅支持 [“pixelmatch”](https://github.com/mapbox/pixelmatch)。
+=======
+  The algorithm/library used for comparing images.
+
+  `"pixelmatch"` is the only built-in comparator, but you can use custom ones by [registering them in the config file](/config/browser/expect#browser-expect-tomatchscreenshot-comparators).
+>>>>>>> b72fc6b467384d82f530164b077760e0919f8532
 
 - `comparatorOptions: object`
 
@@ -1130,7 +1140,11 @@ await expect.element(getByTestId('button')).toMatchScreenshot('fancy-button', {
 
 #### `"pixelmatch"` comparator options
 
+<<<<<<< HEAD
 使用 `"pixelmatch"` 比较器时，以下选项可用：
+=======
+The `"pixelmatch"` comparator uses [`@blazediff/core`](https://blazediff.dev/docs/core) under the hood. The following options are available when using it:
+>>>>>>> b72fc6b467384d82f530164b077760e0919f8532
 
 - `allowedMismatchedPixelRatio: number | undefined = undefined`
 

diff --git a/api/browser/context.md b/api/browser/context.md
@@ -78,7 +78,19 @@ export const page: {
     base64: string
   }>) & ((options?: ScreenshotOptions) => Promise<string>)
   /**
+<<<<<<< HEAD
    * 使用自定义方法扩展默认的 `page` 对象。
+=======
+   * Add a trace marker when browser tracing is enabled.
+   */
+  mark(name: string, options?: { stack?: string }): Promise<void>
+  /**
+   * Group multiple operations under a trace marker when browser tracing is enabled.
+   */
+  mark<T>(name: string, body: () => T | Promise<T>, options?: { stack?: string }): Promise<T>
+  /**
+   * Extend default `page` object with custom methods.
+>>>>>>> b72fc6b467384d82f530164b077760e0919f8532
    */
   extend: (methods: Partial<BrowserPage>) => BrowserPage
   /**
@@ -114,6 +126,40 @@ export const page: {
 在这种情况下，`path` 也会被忽略。
 :::
 
+### mark
+
+```ts
+function mark(name: string, options?: { stack?: string }): Promise<void>
+function mark<T>(
+  name: string,
+  body: () => T | Promise<T>,
+  options?: { stack?: string },
+): Promise<T>
+```
+
+Adds a named marker to the trace timeline for the current test.
+
+Pass `options.stack` to override the callsite location in trace metadata. This is useful for wrapper libraries that need to preserve the end-user source location.
+
+If you pass a callback, Vitest creates a trace group with this name, runs the callback, and closes the group automatically.
+
+```ts
+import { page } from 'vitest/browser'
+
+await page.mark('before submit')
+await page.getByRole('button', { name: 'Submit' }).click()
+await page.mark('after submit')
+
+await page.mark('submit flow', async () => {
+  await page.getByRole('textbox', { name: 'Email' }).fill('john@example.com')
+  await page.getByRole('button', { name: 'Submit' }).click()
+})
+```
+
+::: tip
+This method is useful only when [`browser.trace`](/config/browser/trace) is enabled.
+:::
+
 ### frameLocator
 
 ```ts
@@ -246,7 +292,7 @@ utils.configurePrettyDOM({
 - **`maxLength`** - Maximum length of the output string (default: `7000`)
 - **`filterNode`** - A CSS selector string or function to filter out nodes from the output. When a string is provided, elements matching the selector will be excluded. When a function is provided, it should return `false` to exclude a node.
 - **`highlight`** - Enable syntax highlighting (default: `true`)
-- And other options from [`pretty-format`](https://www.npmjs.com/package/@vitest/pretty-format)
+- And other options from [`pretty-format`](https://npmx.dev/package/@vitest/pretty-format)
 
 #### Filtering with CSS Selectors <Version>4.1.0</Version> {#filtering-with-css-selectors}