docs(en): merging all conflicts

Author: docschina-bot

.vitepress/config.ts

@@ -286,6 +286,189 @@ export default withPwa(
           },
         ],
       },
+<<<<<<< HEAD
+=======
+      {
+        text: `v${version}`,
+        link: `https://github.com/vitest-dev/vitest/releases/tag/v${version}`,
+      },
+    ],
+
+    sidebar: {
+      // TODO: bring sidebar of apis and config back
+      '/advanced': [
+        {
+          items: [
+            {
+              text: 'Vitest Node API',
+              link: '/advanced/api',
+            },
+            {
+              text: 'Runner API',
+              link: '/advanced/runner',
+            },
+            {
+              text: 'Task Metadata',
+              link: '/advanced/metadata',
+            },
+            {
+              text: 'Extending Reporters',
+              link: '/advanced/reporters',
+            },
+            {
+              text: 'Custom Pool',
+              link: '/advanced/pool',
+            },
+          ],
+        },
+      ],
+      '/guide/': [
+        {
+          items: [
+            {
+              text: 'Why Vitest',
+              link: '/guide/why',
+            },
+            {
+              text: 'Getting Started',
+              link: '/guide/',
+            },
+            {
+              text: 'Features',
+              link: '/guide/features',
+            },
+            {
+              text: 'Workspace',
+              link: '/guide/workspace',
+            },
+            {
+              text: 'CLI',
+              link: '/guide/cli',
+            },
+            {
+              text: 'Test Filtering',
+              link: '/guide/filtering',
+            },
+            {
+              text: 'Reporters',
+              link: '/guide/reporters',
+            },
+            {
+              text: 'Coverage',
+              link: '/guide/coverage',
+            },
+            {
+              text: 'Snapshot',
+              link: '/guide/snapshot',
+            },
+            {
+              text: 'Mocking',
+              link: '/guide/mocking',
+            },
+            {
+              text: 'Testing Types',
+              link: '/guide/testing-types',
+            },
+            {
+              text: 'Vitest UI',
+              link: '/guide/ui',
+            },
+            {
+              text: 'Browser Mode',
+              link: '/guide/browser',
+            },
+            {
+              text: 'In-Source Testing',
+              link: '/guide/in-source',
+            },
+            {
+              text: 'Test Context',
+              link: '/guide/test-context',
+            },
+            {
+              text: 'Environment',
+              link: '/guide/environment',
+            },
+            {
+              text: 'Extending Matchers',
+              link: '/guide/extending-matchers',
+            },
+            {
+              text: 'IDE Integration',
+              link: '/guide/ide',
+            },
+            {
+              text: 'Debugging',
+              link: '/guide/debugging',
+            },
+            {
+              text: 'Comparisons',
+              link: '/guide/comparisons',
+            },
+            {
+              text: 'Migration Guide',
+              link: '/guide/migration',
+            },
+            {
+              text: 'Common Errors',
+              link: '/guide/common-errors',
+            },
+            {
+              text: 'Improving Performance',
+              link: '/guide/improving-performance',
+            },
+          ],
+        },
+      ],
+      '/api/': [
+        {
+          items: [
+            {
+              text: 'Test API Reference',
+              link: '/api/',
+            },
+            {
+              text: 'Mock Functions',
+              link: '/api/mock',
+            },
+            {
+              text: 'Vi Utility',
+              link: '/api/vi',
+            },
+            {
+              text: 'Expect',
+              link: '/api/expect',
+            },
+            {
+              text: 'ExpectTypeOf',
+              link: '/api/expect-typeof',
+            },
+            {
+              text: 'Assert',
+              link: '/api/assert',
+            },
+            {
+              text: 'AssertType',
+              link: '/api/assert-type',
+            },
+          ],
+        },
+      ],
+      '/config/': [
+        {
+          items: [
+            {
+              text: 'Config File',
+              link: '/config/file',
+            },
+            {
+              text: 'Config Reference',
+              link: '/config/',
+            },
+          ],
+        },
+      ],
+>>>>>>> b017fcf5511078b058f902eae0469535dfe8392b
     },
     pwa,
     transformHead,

advanced/api.md

@@ -46,6 +46,16 @@ const vitest = await createVitest('test', {
 })
 ```
 
+## parseCLI
+
+You can use this method to parse CLI arguments. It accepts a string (where arguments are split by a single space) or a strings array of CLI arguments in the same format that Vitest CLI uses. It returns a filter and `options` that you can later pass down to `createVitest` or `startVitest` methods.
+
+```ts
+import { parseCLI } from 'vitest/node'
+
+parseCLI('vitest ./files.ts --coverage --browser=chrome')
+```
+
 ## Vitest
 
 Vitest 实例需要当前的测试模式。它可以是以下之一：

advanced/pool.md

@@ -50,7 +50,11 @@ export interface ProcessPool {
 
 这个函数只会被调用一次（除非服务器配置被更新），通常最好在这个函数内初始化测试所需的一切，并在调用 `runTests` 时重复使用它。
 
+<<<<<<< HEAD
 Vitest 在安排运行新测试时调用 `runTest`。如果 `files` 为空，将不会调用它。第一个参数是一个元组数组：第一个元素是对工作区项目的引用，第二个元素是测试文件的绝对路径。在调用 `runTests` 之前，文件将使用 [`sequencer`](/config/#sequence.sequencer) 进行排序。可能（但不太可能）会有相同的文件出现两次，但它们将始终属于不同的项目 - 这是通过 [`vitest.workspace.ts`](/guide/workspace) 配置实现的。
+=======
+Vitest calls `runTest` when new tests are scheduled to run. It will not call it if `files` is empty. The first argument is an array of tuples: the first element is a reference to a workspace project and the second one is an absolute path to a test file. Files are sorted using [`sequencer`](/config/#sequence-sequencer) before `runTests` is called. It's possible (but unlikely) to have the same file twice, but it will always have a different project - this is implemented via [`vitest.workspace.ts`](/guide/workspace) configuration.
+>>>>>>> b017fcf5511078b058f902eae0469535dfe8392b
 
 Vitest 会等到 `runTests` 执行完毕后才结束运行（即只有在 `runTests` 解决后才会触发 [`onFinished`](/guide/reporters)）。