From 14ee16dfc886343330a79f859ee08b2c60d5abeb Mon Sep 17 00:00:00 2001
From: Joshua Horowitz <joshuah@alum.mit.edu>
Date: Fri, 1 Mar 2024 23:17:23 -0800
Subject: [PATCH 01/20] docs: grammar fix (#5324)

---
 docs/api/expect.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/api/expect.md b/docs/api/expect.md
index 04f4317b04d6..7b74129f6d53 100644
--- a/docs/api/expect.md
+++ b/docs/api/expect.md
@@ -836,7 +836,7 @@ test('spy function', () => {
 
 - **Type**: `(...args: any[]) => Awaitable<void>`
 
-This assertion checks if a function was called with certain parameters at it's last invocation. Requires a spy function to be passed to `expect`.
+This assertion checks if a function was called with certain parameters at its last invocation. Requires a spy function to be passed to `expect`.
 
 ```ts
 import { expect, test, vi } from 'vitest'
@@ -950,7 +950,7 @@ test('spy function returns a product', () => {
 
 - **Type**: `(returnValue: any) => Awaitable<void>`
 
-You can call this assertion to check if a function has successfully returned a value with certain parameters on it's last invoking. Requires a spy function to be passed to `expect`.
+You can call this assertion to check if a function has successfully returned a value with certain parameters on its last invoking. Requires a spy function to be passed to `expect`.
 
 ```ts
 import { expect, test, vi } from 'vitest'

From ab60bf8dff46c05bc67194c3cc2a5fa753916609 Mon Sep 17 00:00:00 2001
From: Hiroshi Ogawa <hi.ogawa.zz@gmail.com>
Date: Tue, 5 Mar 2024 05:02:36 +0900
Subject: [PATCH 02/20] fix(ui): escape html in error diff (#5325)

---
 packages/ui/client/components/views/ViewReportError.vue | 3 ++-
 test/ui/fixtures/error.test.ts                          | 6 ++++++
 test/ui/test/html-report.spec.ts                        | 8 +++++++-
 test/ui/test/ui.spec.ts                                 | 8 +++++++-
 test/ui/vitest.config.ts                                | 3 +++
 5 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 test/ui/fixtures/error.test.ts

diff --git a/packages/ui/client/components/views/ViewReportError.vue b/packages/ui/client/components/views/ViewReportError.vue
index 9a9bf01d96a6..5a1de0a9fe2c 100644
--- a/packages/ui/client/components/views/ViewReportError.vue
+++ b/packages/ui/client/components/views/ViewReportError.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import type { ErrorWithDiff } from 'vitest'
 import { openInEditor, shouldOpenInEditor } from '~/composables/error'
+import { escapeHtml } from '~/utils/escape';
 
 const props = defineProps<{
   root: string
@@ -20,7 +21,7 @@ const isDiffShowable = computed(() => {
   return !!props.error?.diff
 })
 
-const diff = computed(() => props.error.diff ? filter.value.toHtml(props.error.diff) : undefined)
+const diff = computed(() => props.error.diff ? filter.value.toHtml(escapeHtml(props.error.diff)) : undefined)
 </script>
 
 <template>
diff --git a/test/ui/fixtures/error.test.ts b/test/ui/fixtures/error.test.ts
new file mode 100644
index 000000000000..b2fa62d7a405
--- /dev/null
+++ b/test/ui/fixtures/error.test.ts
@@ -0,0 +1,6 @@
+import { expect, it } from "vitest"
+
+// https://github.com/vitest-dev/vitest/issues/5321
+it('escape html in error diff', () => {
+  expect('<style>* {border: 2px solid green};</style>').toBe("")
+})
diff --git a/test/ui/test/html-report.spec.ts b/test/ui/test/html-report.spec.ts
index 71398fbf7d65..0fd7530b024d 100644
--- a/test/ui/test/html-report.spec.ts
+++ b/test/ui/test/html-report.spec.ts
@@ -32,7 +32,7 @@ test.describe('html report', () => {
     await page.goto(pageUrl)
 
     // dashbaord
-    await expect(page.locator('[aria-labelledby=tests]')).toContainText('5 Pass 0 Fail 5 Total')
+    await expect(page.locator('[aria-labelledby=tests]')).toContainText('5 Pass 1 Fail 6 Total')
 
     // unhandled errors
     await expect(page.getByTestId('unhandled-errors')).toContainText(
@@ -64,4 +64,10 @@ test.describe('html report', () => {
     await page.getByLabel('Show coverage').click()
     await page.frameLocator('#vitest-ui-coverage').getByRole('heading', { name: 'All files' }).click()
   })
+
+  test('error', async ({ page }) => {
+    await page.goto(pageUrl)
+    await page.getByText('fixtures/error.test.ts').click()
+    await expect(page.getByTestId('diff')).toContainText('- Expected + Received + <style>* {border: 2px solid green};</style>')
+  })
 })
diff --git a/test/ui/test/ui.spec.ts b/test/ui/test/ui.spec.ts
index 3245b1fc5274..a54e1a2c608d 100644
--- a/test/ui/test/ui.spec.ts
+++ b/test/ui/test/ui.spec.ts
@@ -23,7 +23,7 @@ test.describe('ui', () => {
     await page.goto(pageUrl)
 
     // dashbaord
-    await expect(page.locator('[aria-labelledby=tests]')).toContainText('5 Pass 0 Fail 5 Total')
+    await expect(page.locator('[aria-labelledby=tests]')).toContainText('5 Pass 1 Fail 6 Total')
 
     // unhandled errors
     await expect(page.getByTestId('unhandled-errors')).toContainText(
@@ -63,6 +63,12 @@ test.describe('ui', () => {
     await page.getByText('/(?<char>\\w)/').click()
   })
 
+  test('error', async ({ page }) => {
+    await page.goto(pageUrl)
+    await page.getByText('fixtures/error.test.ts').click()
+    await expect(page.getByTestId('diff')).toContainText('- Expected + Received + <style>* {border: 2px solid green};</style>')
+  })
+
   test('file-filter', async ({ page }) => {
     await page.goto(pageUrl)
 
diff --git a/test/ui/vitest.config.ts b/test/ui/vitest.config.ts
index 47a9163b7cbc..990367300149 100644
--- a/test/ui/vitest.config.ts
+++ b/test/ui/vitest.config.ts
@@ -4,5 +4,8 @@ export default defineConfig({
   test: {
     dir: './fixtures',
     environment: 'happy-dom',
+    coverage: {
+      reportOnFailure: true,
+    },
   },
 })

From c3eb8deb768f6ef1adff8e6644ce99de58fd8b01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ari=20Perkki=C3=B6?= <ari.perkkio@gmail.com>
Date: Mon, 4 Mar 2024 22:03:15 +0200
Subject: [PATCH 03/20] fix(coverage): v8 to ignore type-only files (#5328)

---
 packages/coverage-v8/package.json    |  1 +
 packages/coverage-v8/src/provider.ts | 26 ++++++++++++++++++++------
 pnpm-lock.yaml                       |  3 +++
 test/coverage-test/src/types.ts      |  3 +++
 4 files changed, 27 insertions(+), 6 deletions(-)
 create mode 100644 test/coverage-test/src/types.ts

diff --git a/packages/coverage-v8/package.json b/packages/coverage-v8/package.json
index 569920243152..d01b01765276 100644
--- a/packages/coverage-v8/package.json
+++ b/packages/coverage-v8/package.json
@@ -55,6 +55,7 @@
     "magicast": "^0.3.3",
     "picocolors": "^1.0.0",
     "std-env": "^3.5.0",
+    "strip-literal": "^2.0.0",
     "test-exclude": "^6.0.0",
     "v8-to-istanbul": "^9.2.0"
   },
diff --git a/packages/coverage-v8/src/provider.ts b/packages/coverage-v8/src/provider.ts
index 517f446618cb..2f52cf8bf386 100644
--- a/packages/coverage-v8/src/provider.ts
+++ b/packages/coverage-v8/src/provider.ts
@@ -14,6 +14,7 @@ import remapping from '@ampproject/remapping'
 import { normalize, resolve } from 'pathe'
 import c from 'picocolors'
 import { provider } from 'std-env'
+import { stripLiteral } from 'strip-literal'
 import createDebug from 'debug'
 import { cleanUrl } from 'vite-node/utils'
 import type { EncodedSourceMap, FetchResult } from 'vite-node'
@@ -260,7 +261,13 @@ export class V8CoverageProvider extends BaseCoverageProvider implements Coverage
       }
 
       const coverages = await Promise.all(chunk.map(async (filename) => {
-        const { source } = await this.getSources(filename.href, transformResults)
+        const transformResult = await this.ctx.vitenode.transformRequest(filename.pathname).catch(() => {})
+
+        // Ignore empty files, e.g. files that contain only typescript types and no runtime code
+        if (transformResult && stripLiteral(transformResult.code).trim() === '')
+          return null
+
+        const { originalSource } = await this.getSources(filename.href, transformResults)
 
         const coverage = {
           url: filename.href,
@@ -269,7 +276,7 @@ export class V8CoverageProvider extends BaseCoverageProvider implements Coverage
           functions: [{
             ranges: [{
               startOffset: 0,
-              endOffset: source.length,
+              endOffset: originalSource.length,
               count: 0,
             }],
             isBlockCoverage: true,
@@ -281,7 +288,10 @@ export class V8CoverageProvider extends BaseCoverageProvider implements Coverage
         return { result: [coverage] }
       }))
 
-      merged = mergeProcessCovs([merged, ...coverages])
+      merged = mergeProcessCovs([
+        merged,
+        ...coverages.filter((cov): cov is NonNullable<typeof cov> => cov != null),
+      ])
     }
 
     return merged
@@ -289,7 +299,7 @@ export class V8CoverageProvider extends BaseCoverageProvider implements Coverage
 
   private async getSources(url: string, transformResults: TransformResults, functions: Profiler.FunctionCoverage[] = []): Promise<{
     source: string
-    originalSource?: string
+    originalSource: string
     sourceMap?: { sourcemap: EncodedSourceMap }
   }> {
     const filePath = normalize(fileURLToPath(url))
@@ -306,8 +316,12 @@ export class V8CoverageProvider extends BaseCoverageProvider implements Coverage
     })
 
     // These can be uncovered files included by "all: true" or files that are loaded outside vite-node
-    if (!map)
-      return { source: code || sourcesContent }
+    if (!map) {
+      return {
+        source: code || sourcesContent,
+        originalSource: sourcesContent,
+      }
+    }
 
     return {
       originalSource: sourcesContent,
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 2b79c7577f3a..62d5671c7555 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1054,6 +1054,9 @@ importers:
       std-env:
         specifier: ^3.5.0
         version: 3.5.0
+      strip-literal:
+        specifier: ^2.0.0
+        version: 2.0.0
       test-exclude:
         specifier: ^6.0.0
         version: 6.0.0
diff --git a/test/coverage-test/src/types.ts b/test/coverage-test/src/types.ts
new file mode 100644
index 000000000000..439f557c49cf
--- /dev/null
+++ b/test/coverage-test/src/types.ts
@@ -0,0 +1,3 @@
+export type First = 'This' | 'file' | 'should'
+
+export type Second = 'be' | 'excluded' | 'from' | 'report'

From 6d1b145118d42b14bc0739820c4ce9e17fbd45dd Mon Sep 17 00:00:00 2001
From: Hiroshi Ogawa <hi.ogawa.zz@gmail.com>
Date: Tue, 5 Mar 2024 19:06:16 +0900
Subject: [PATCH 04/20] fix(vitest): loosen `onConsoleLog` return type (#5337)

---
 packages/vitest/src/types/config.ts | 2 +-
 test/web-worker/vitest.config.ts    | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/vitest/src/types/config.ts b/packages/vitest/src/types/config.ts
index b8db4b5e5d49..2c1e5951d3c5 100644
--- a/packages/vitest/src/types/config.ts
+++ b/packages/vitest/src/types/config.ts
@@ -580,7 +580,7 @@ export interface InlineConfig {
    *
    * Return `false` to ignore the log.
    */
-  onConsoleLog?: (log: string, type: 'stdout' | 'stderr') => false | void
+  onConsoleLog?: (log: string, type: 'stdout' | 'stderr') => boolean | void
 
   /**
    * Enable stack trace filtering. If absent, all stack trace frames
diff --git a/test/web-worker/vitest.config.ts b/test/web-worker/vitest.config.ts
index c6de0b5c72d0..e2505eb392e5 100644
--- a/test/web-worker/vitest.config.ts
+++ b/test/web-worker/vitest.config.ts
@@ -13,8 +13,7 @@ export default defineConfig({
       },
     },
     onConsoleLog(log) {
-      if (log.includes('Failed to load'))
-        return false
+      return !log.includes('Failed to load')
     },
   },
 })

From 6eda473f30c4670ec72a06bd3b083a724712ae2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ari=20Perkki=C3=B6?= <ari.perkkio@gmail.com>
Date: Tue, 12 Mar 2024 17:00:46 +0200
Subject: [PATCH 05/20] fix(coverage): respect source maps of pre-transpiled
 sources (#5367)

---
 eslint.config.js                              |   2 +
 packages/coverage-v8/src/provider.ts          |   6 +-
 .../__snapshots__/custom.report.test.ts.snap  |   1 +
 .../istanbul.report.test.ts.snap              | 497 ++++++++++++++++++
 .../__snapshots__/v8.report.test.ts.snap      | 413 +++++++++++++++
 test/coverage-test/src/original.ts            |  21 +
 test/coverage-test/src/transpiled.d.ts        |   1 +
 test/coverage-test/src/transpiled.js          |  18 +
 test/coverage-test/src/transpiled.js.map      |  13 +
 test/coverage-test/test/coverage.test.ts      |   7 +
 10 files changed, 978 insertions(+), 1 deletion(-)
 create mode 100644 test/coverage-test/src/original.ts
 create mode 100644 test/coverage-test/src/transpiled.d.ts
 create mode 100644 test/coverage-test/src/transpiled.js
 create mode 100644 test/coverage-test/src/transpiled.js.map

diff --git a/eslint.config.js b/eslint.config.js
index 0e308cd46160..2a7def112665 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -15,6 +15,8 @@ export default antfu(
       'test/workspaces/results.json',
       'test/reporters/fixtures/with-syntax-error.test.js',
       'test/network-imports/public/slash@3.0.0.js',
+      'test/coverage-test/src/transpiled.js',
+      'test/coverage-test/src/original.ts',
       'examples/**/mockServiceWorker.js',
       'examples/sveltekit/.svelte-kit',
     ],
diff --git a/packages/coverage-v8/src/provider.ts b/packages/coverage-v8/src/provider.ts
index 2f52cf8bf386..11b904e9aa62 100644
--- a/packages/coverage-v8/src/provider.ts
+++ b/packages/coverage-v8/src/provider.ts
@@ -323,6 +323,10 @@ export class V8CoverageProvider extends BaseCoverageProvider implements Coverage
       }
     }
 
+    const sources = [url]
+    if (map.sources && map.sources[0] && !url.endsWith(map.sources[0]))
+      sources[0] = new URL(map.sources[0], url).href
+
     return {
       originalSource: sourcesContent,
       source: code || sourcesContent,
@@ -330,7 +334,7 @@ export class V8CoverageProvider extends BaseCoverageProvider implements Coverage
         sourcemap: excludeGeneratedCode(code, {
           ...map,
           version: 3,
-          sources: [url],
+          sources,
           sourcesContent: [sourcesContent],
         }),
       },
diff --git a/test/coverage-test/coverage-report-tests/__snapshots__/custom.report.test.ts.snap b/test/coverage-test/coverage-report-tests/__snapshots__/custom.report.test.ts.snap
index ccb552fe1c92..befb6d92a3e6 100644
--- a/test/coverage-test/coverage-report-tests/__snapshots__/custom.report.test.ts.snap
+++ b/test/coverage-test/coverage-report-tests/__snapshots__/custom.report.test.ts.snap
@@ -29,6 +29,7 @@ exports[`custom json report 1`] = `
     "<process-cwd>/src/index.mts",
     "<process-cwd>/src/multi-environment.ts",
     "<process-cwd>/src/multi-suite.ts",
+    "<process-cwd>/src/transpiled.js",
     "<process-cwd>/src/utils.ts",
   ],
 }
diff --git a/test/coverage-test/coverage-report-tests/__snapshots__/istanbul.report.test.ts.snap b/test/coverage-test/coverage-report-tests/__snapshots__/istanbul.report.test.ts.snap
index 30ae7c39868a..c44a052caa49 100644
--- a/test/coverage-test/coverage-report-tests/__snapshots__/istanbul.report.test.ts.snap
+++ b/test/coverage-test/coverage-report-tests/__snapshots__/istanbul.report.test.ts.snap
@@ -2106,6 +2106,503 @@ exports[`istanbul json report 1`] = `
       },
     },
   },
+  "<process-cwd>/src/original.ts": {
+    "b": {
+      "0": [
+        0,
+        0,
+      ],
+      "1": [
+        0,
+        0,
+      ],
+      "2": [
+        0,
+        0,
+      ],
+      "3": [
+        0,
+        0,
+      ],
+      "4": [
+        0,
+        0,
+      ],
+      "5": [
+        0,
+        0,
+      ],
+    },
+    "branchMap": {
+      "0": {
+        "loc": {
+          "end": {
+            "column": null,
+            "line": 5,
+          },
+          "start": {
+            "column": 2,
+            "line": 2,
+          },
+        },
+        "locations": [
+          {
+            "end": {
+              "column": null,
+              "line": 5,
+            },
+            "start": {
+              "column": 2,
+              "line": 2,
+            },
+          },
+          {
+            "end": {
+              "column": null,
+              "line": 5,
+            },
+            "start": {
+              "column": 2,
+              "line": 2,
+            },
+          },
+        ],
+        "type": "if",
+      },
+      "1": {
+        "loc": {
+          "end": {
+            "column": null,
+            "line": 13,
+          },
+          "start": {
+            "column": 2,
+            "line": 10,
+          },
+        },
+        "locations": [
+          {
+            "end": {
+              "column": null,
+              "line": 13,
+            },
+            "start": {
+              "column": 2,
+              "line": 10,
+            },
+          },
+          {
+            "end": {
+              "column": null,
+              "line": 13,
+            },
+            "start": {
+              "column": 2,
+              "line": 10,
+            },
+          },
+        ],
+        "type": "if",
+      },
+      "2": {
+        "loc": {
+          "end": {
+            "column": null,
+            "line": 18,
+          },
+          "start": {
+            "column": 2,
+            "line": 15,
+          },
+        },
+        "locations": [
+          {
+            "end": {
+              "column": null,
+              "line": 18,
+            },
+            "start": {
+              "column": 2,
+              "line": 15,
+            },
+          },
+          {
+            "end": {
+              "column": null,
+              "line": 18,
+            },
+            "start": {
+              "column": 2,
+              "line": 15,
+            },
+          },
+        ],
+        "type": "if",
+      },
+      "3": {
+        "loc": {
+          "end": {
+            "column": 3,
+            "line": 5,
+          },
+          "start": {
+            "column": 2,
+            "line": 2,
+          },
+        },
+        "locations": [
+          {
+            "end": {
+              "column": 3,
+              "line": 5,
+            },
+            "start": {
+              "column": 2,
+              "line": 2,
+            },
+          },
+          {
+            "end": {
+              "column": 3,
+              "line": 5,
+            },
+            "start": {
+              "column": 2,
+              "line": 2,
+            },
+          },
+        ],
+        "type": "if",
+      },
+      "4": {
+        "loc": {
+          "end": {
+            "column": 3,
+            "line": 13,
+          },
+          "start": {
+            "column": 2,
+            "line": 10,
+          },
+        },
+        "locations": [
+          {
+            "end": {
+              "column": 3,
+              "line": 13,
+            },
+            "start": {
+              "column": 2,
+              "line": 10,
+            },
+          },
+          {
+            "end": {
+              "column": 3,
+              "line": 13,
+            },
+            "start": {
+              "column": 2,
+              "line": 10,
+            },
+          },
+        ],
+        "type": "if",
+      },
+      "5": {
+        "loc": {
+          "end": {
+            "column": 3,
+            "line": 18,
+          },
+          "start": {
+            "column": 2,
+            "line": 15,
+          },
+        },
+        "locations": [
+          {
+            "end": {
+              "column": 3,
+              "line": 18,
+            },
+            "start": {
+              "column": 2,
+              "line": 15,
+            },
+          },
+          {
+            "end": {
+              "column": 3,
+              "line": 18,
+            },
+            "start": {
+              "column": 2,
+              "line": 15,
+            },
+          },
+        ],
+        "type": "if",
+      },
+    },
+    "f": {
+      "0": 0,
+      "1": 0,
+      "2": 0,
+    },
+    "fnMap": {
+      "0": {
+        "decl": {
+          "end": {
+            "column": 22,
+            "line": 1,
+          },
+          "start": {
+            "column": 21,
+            "line": 1,
+          },
+        },
+        "loc": {
+          "end": {
+            "column": null,
+            "line": 19,
+          },
+          "start": {
+            "column": 40,
+            "line": 1,
+          },
+        },
+        "name": "(anonymous_0)",
+      },
+      "1": {
+        "decl": {
+          "end": {
+            "column": 16,
+            "line": 21,
+          },
+          "start": {
+            "column": 9,
+            "line": 21,
+          },
+        },
+        "loc": {
+          "end": {
+            "column": null,
+            "line": 21,
+          },
+          "start": {
+            "column": 16,
+            "line": 21,
+          },
+        },
+        "name": "noop",
+      },
+      "2": {
+        "decl": {
+          "end": {
+            "column": 13,
+            "line": 21,
+          },
+          "start": {
+            "column": 9,
+            "line": 21,
+          },
+        },
+        "loc": {
+          "end": {
+            "column": 18,
+            "line": 21,
+          },
+          "start": {
+            "column": 13,
+            "line": 21,
+          },
+        },
+        "name": "noop",
+      },
+    },
+    "path": "<process-cwd>/src/original.ts",
+    "s": {
+      "0": 0,
+      "1": 0,
+      "10": 0,
+      "11": 0,
+      "12": 0,
+      "13": 0,
+      "14": 0,
+      "15": 0,
+      "2": 0,
+      "3": 0,
+      "4": 0,
+      "5": 0,
+      "6": 0,
+      "7": 0,
+      "8": 0,
+      "9": 0,
+    },
+    "statementMap": {
+      "0": {
+        "end": {
+          "column": null,
+          "line": 19,
+        },
+        "start": {
+          "column": 21,
+          "line": 1,
+        },
+      },
+      "1": {
+        "end": {
+          "column": null,
+          "line": 5,
+        },
+        "start": {
+          "column": 2,
+          "line": 2,
+        },
+      },
+      "10": {
+        "end": {
+          "column": 11,
+          "line": 4,
+        },
+        "start": {
+          "column": 4,
+          "line": 4,
+        },
+      },
+      "11": {
+        "end": {
+          "column": 9,
+          "line": 8,
+        },
+        "start": {
+          "column": 2,
+          "line": 8,
+        },
+      },
+      "12": {
+        "end": {
+          "column": 3,
+          "line": 13,
+        },
+        "start": {
+          "column": 2,
+          "line": 10,
+        },
+      },
+      "13": {
+        "end": {
+          "column": 11,
+          "line": 12,
+        },
+        "start": {
+          "column": 4,
+          "line": 12,
+        },
+      },
+      "14": {
+        "end": {
+          "column": 3,
+          "line": 18,
+        },
+        "start": {
+          "column": 2,
+          "line": 15,
+        },
+      },
+      "15": {
+        "end": {
+          "column": 11,
+          "line": 17,
+        },
+        "start": {
+          "column": 4,
+          "line": 17,
+        },
+      },
+      "2": {
+        "end": {
+          "column": null,
+          "line": 4,
+        },
+        "start": {
+          "column": 4,
+          "line": 4,
+        },
+      },
+      "3": {
+        "end": {
+          "column": null,
+          "line": 8,
+        },
+        "start": {
+          "column": 2,
+          "line": 8,
+        },
+      },
+      "4": {
+        "end": {
+          "column": null,
+          "line": 13,
+        },
+        "start": {
+          "column": 2,
+          "line": 10,
+        },
+      },
+      "5": {
+        "end": {
+          "column": null,
+          "line": 12,
+        },
+        "start": {
+          "column": 4,
+          "line": 12,
+        },
+      },
+      "6": {
+        "end": {
+          "column": null,
+          "line": 18,
+        },
+        "start": {
+          "column": 2,
+          "line": 15,
+        },
+      },
+      "7": {
+        "end": {
+          "column": null,
+          "line": 17,
+        },
+        "start": {
+          "column": 4,
+          "line": 17,
+        },
+      },
+      "8": {
+        "end": {
+          "column": 1,
+          "line": 19,
+        },
+        "start": {
+          "column": 21,
+          "line": 1,
+        },
+      },
+      "9": {
+        "end": {
+          "column": 3,
+          "line": 5,
+        },
+        "start": {
+          "column": 2,
+          "line": 2,
+        },
+      },
+    },
+  },
   "<process-cwd>/src/untested-file.ts": {
     "b": {
       "0": [
diff --git a/test/coverage-test/coverage-report-tests/__snapshots__/v8.report.test.ts.snap b/test/coverage-test/coverage-report-tests/__snapshots__/v8.report.test.ts.snap
index 4ee530489568..f768be1c91d0 100644
--- a/test/coverage-test/coverage-report-tests/__snapshots__/v8.report.test.ts.snap
+++ b/test/coverage-test/coverage-report-tests/__snapshots__/v8.report.test.ts.snap
@@ -4733,6 +4733,419 @@ exports[`v8 json report 1`] = `
       },
     },
   },
+  "<process-cwd>/src/original.ts": {
+    "all": false,
+    "b": {
+      "0": [
+        1,
+      ],
+      "1": [
+        0,
+      ],
+      "2": [
+        0,
+      ],
+      "3": [
+        2,
+      ],
+    },
+    "branchMap": {
+      "0": {
+        "line": 1,
+        "loc": {
+          "end": {
+            "column": 2,
+            "line": 19,
+          },
+          "start": {
+            "column": 21,
+            "line": 1,
+          },
+        },
+        "locations": [
+          {
+            "end": {
+              "column": 2,
+              "line": 19,
+            },
+            "start": {
+              "column": 21,
+              "line": 1,
+            },
+          },
+        ],
+        "type": "branch",
+      },
+      "1": {
+        "line": 2,
+        "loc": {
+          "end": {
+            "column": 3,
+            "line": 5,
+          },
+          "start": {
+            "column": 11,
+            "line": 2,
+          },
+        },
+        "locations": [
+          {
+            "end": {
+              "column": 3,
+              "line": 5,
+            },
+            "start": {
+              "column": 11,
+              "line": 2,
+            },
+          },
+        ],
+        "type": "branch",
+      },
+      "2": {
+        "line": 10,
+        "loc": {
+          "end": {
+            "column": 3,
+            "line": 13,
+          },
+          "start": {
+            "column": 17,
+            "line": 10,
+          },
+        },
+        "locations": [
+          {
+            "end": {
+              "column": 3,
+              "line": 13,
+            },
+            "start": {
+              "column": 17,
+              "line": 10,
+            },
+          },
+        ],
+        "type": "branch",
+      },
+      "3": {
+        "line": 21,
+        "loc": {
+          "end": {
+            "column": 18,
+            "line": 21,
+          },
+          "start": {
+            "column": 0,
+            "line": 21,
+          },
+        },
+        "locations": [
+          {
+            "end": {
+              "column": 18,
+              "line": 21,
+            },
+            "start": {
+              "column": 0,
+              "line": 21,
+            },
+          },
+        ],
+        "type": "branch",
+      },
+    },
+    "f": {
+      "0": 1,
+      "1": 2,
+    },
+    "fnMap": {
+      "0": {
+        "decl": {
+          "end": {
+            "column": 2,
+            "line": 19,
+          },
+          "start": {
+            "column": 21,
+            "line": 1,
+          },
+        },
+        "line": 1,
+        "loc": {
+          "end": {
+            "column": 2,
+            "line": 19,
+          },
+          "start": {
+            "column": 21,
+            "line": 1,
+          },
+        },
+        "name": "hello",
+      },
+      "1": {
+        "decl": {
+          "end": {
+            "column": 18,
+            "line": 21,
+          },
+          "start": {
+            "column": 0,
+            "line": 21,
+          },
+        },
+        "line": 21,
+        "loc": {
+          "end": {
+            "column": 18,
+            "line": 21,
+          },
+          "start": {
+            "column": 0,
+            "line": 21,
+          },
+        },
+        "name": "noop",
+      },
+    },
+    "path": "<process-cwd>/src/original.ts",
+    "s": {
+      "0": 1,
+      "1": 1,
+      "10": 0,
+      "11": 0,
+      "12": 0,
+      "13": 1,
+      "14": 1,
+      "15": 1,
+      "16": 1,
+      "17": 1,
+      "18": 1,
+      "19": 1,
+      "2": 0,
+      "20": 2,
+      "3": 0,
+      "4": 0,
+      "5": 1,
+      "6": 1,
+      "7": 1,
+      "8": 1,
+      "9": 1,
+    },
+    "statementMap": {
+      "0": {
+        "end": {
+          "column": 41,
+          "line": 1,
+        },
+        "start": {
+          "column": 0,
+          "line": 1,
+        },
+      },
+      "1": {
+        "end": {
+          "column": 12,
+          "line": 2,
+        },
+        "start": {
+          "column": 0,
+          "line": 2,
+        },
+      },
+      "10": {
+        "end": {
+          "column": 16,
+          "line": 11,
+        },
+        "start": {
+          "column": 0,
+          "line": 11,
+        },
+      },
+      "11": {
+        "end": {
+          "column": 11,
+          "line": 12,
+        },
+        "start": {
+          "column": 0,
+          "line": 12,
+        },
+      },
+      "12": {
+        "end": {
+          "column": 3,
+          "line": 13,
+        },
+        "start": {
+          "column": 0,
+          "line": 13,
+        },
+      },
+      "13": {
+        "end": {
+          "column": 0,
+          "line": 14,
+        },
+        "start": {
+          "column": 0,
+          "line": 14,
+        },
+      },
+      "14": {
+        "end": {
+          "column": 26,
+          "line": 15,
+        },
+        "start": {
+          "column": 0,
+          "line": 15,
+        },
+      },
+      "15": {
+        "end": {
+          "column": 14,
+          "line": 16,
+        },
+        "start": {
+          "column": 0,
+          "line": 16,
+        },
+      },
+      "16": {
+        "end": {
+          "column": 11,
+          "line": 17,
+        },
+        "start": {
+          "column": 0,
+          "line": 17,
+        },
+      },
+      "17": {
+        "end": {
+          "column": 3,
+          "line": 18,
+        },
+        "start": {
+          "column": 0,
+          "line": 18,
+        },
+      },
+      "18": {
+        "end": {
+          "column": 2,
+          "line": 19,
+        },
+        "start": {
+          "column": 0,
+          "line": 19,
+        },
+      },
+      "19": {
+        "end": {
+          "column": 0,
+          "line": 20,
+        },
+        "start": {
+          "column": 0,
+          "line": 20,
+        },
+      },
+      "2": {
+        "end": {
+          "column": 16,
+          "line": 3,
+        },
+        "start": {
+          "column": 0,
+          "line": 3,
+        },
+      },
+      "20": {
+        "end": {
+          "column": 18,
+          "line": 21,
+        },
+        "start": {
+          "column": 0,
+          "line": 21,
+        },
+      },
+      "3": {
+        "end": {
+          "column": 11,
+          "line": 4,
+        },
+        "start": {
+          "column": 0,
+          "line": 4,
+        },
+      },
+      "4": {
+        "end": {
+          "column": 3,
+          "line": 5,
+        },
+        "start": {
+          "column": 0,
+          "line": 5,
+        },
+      },
+      "5": {
+        "end": {
+          "column": 0,
+          "line": 6,
+        },
+        "start": {
+          "column": 0,
+          "line": 6,
+        },
+      },
+      "6": {
+        "end": {
+          "column": 12,
+          "line": 7,
+        },
+        "start": {
+          "column": 0,
+          "line": 7,
+        },
+      },
+      "7": {
+        "end": {
+          "column": 9,
+          "line": 8,
+        },
+        "start": {
+          "column": 0,
+          "line": 8,
+        },
+      },
+      "8": {
+        "end": {
+          "column": 0,
+          "line": 9,
+        },
+        "start": {
+          "column": 0,
+          "line": 9,
+        },
+      },
+      "9": {
+        "end": {
+          "column": 18,
+          "line": 10,
+        },
+        "start": {
+          "column": 0,
+          "line": 10,
+        },
+      },
+    },
+  },
   "<process-cwd>/src/untested-file.ts": {
     "all": true,
     "b": {
diff --git a/test/coverage-test/src/original.ts b/test/coverage-test/src/original.ts
new file mode 100644
index 000000000000..68adfc0d71ef
--- /dev/null
+++ b/test/coverage-test/src/original.ts
@@ -0,0 +1,21 @@
+export const hello = (arg?: unknown) => {
+  if (arg) {
+    // Uncovered
+    noop();
+  }
+
+  // Covered
+  noop();
+
+  if (arg === 3) {
+    // Uncovered
+    noop();
+  }
+
+  if (arg === undefined) {
+    // Covered
+    noop();
+  }
+};
+
+function noop() {}
diff --git a/test/coverage-test/src/transpiled.d.ts b/test/coverage-test/src/transpiled.d.ts
new file mode 100644
index 000000000000..29ef6e88f2d4
--- /dev/null
+++ b/test/coverage-test/src/transpiled.d.ts
@@ -0,0 +1 @@
+export * from './original'
diff --git a/test/coverage-test/src/transpiled.js b/test/coverage-test/src/transpiled.js
new file mode 100644
index 000000000000..5424a2703651
--- /dev/null
+++ b/test/coverage-test/src/transpiled.js
@@ -0,0 +1,18 @@
+export var hello = function (arg) {
+    if (arg) {
+        // Uncovered
+        noop();
+    }
+    // Covered
+    noop();
+    if (arg === 3) {
+        // Uncovered
+        noop();
+    }
+    if (arg === undefined) {
+        // Covered
+        noop();
+    }
+};
+function noop() { }
+//# sourceMappingURL=transpiled.js.map
\ No newline at end of file
diff --git a/test/coverage-test/src/transpiled.js.map b/test/coverage-test/src/transpiled.js.map
new file mode 100644
index 000000000000..325a67f109fa
--- /dev/null
+++ b/test/coverage-test/src/transpiled.js.map
@@ -0,0 +1,13 @@
+{
+  "version": 3,
+  "file": "transpiled.js",
+  "sourceRoot": "",
+  "sources": [
+    "./original.ts"
+  ],
+  "names": [],
+  "mappings": "AAAA,MAAM,CAAC,IAAM,KAAK,GAAG,UAAC,GAAa;IACjC,IAAI,GAAG,EAAE,CAAC;QACR,YAAY;QACZ,IAAI,EAAE,CAAC;IACT,CAAC;IAED,UAAU;IACV,IAAI,EAAE,CAAC;IAEP,IAAI,GAAG,KAAK,CAAC,EAAE,CAAC;QACd,YAAY;QACZ,IAAI,EAAE,CAAC;IACT,CAAC;IAED,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;QACtB,UAAU;QACV,IAAI,EAAE,CAAC;IACT,CAAC;AACH,CAAC,CAAC;AAEF,SAAS,IAAI,KAAI,CAAC",
+  "sourcesContent": [
+    "export const hello = (arg?: unknown) => {\n  if (arg) {\n    // Uncovered\n    noop();\n  }\n\n  // Covered\n  noop();\n\n  if (arg === 3) {\n    // Uncovered\n    noop();\n  }\n\n  if (arg === undefined) {\n    // Covered\n    noop();\n  }\n};\n\nfunction noop() {}\n"
+  ]
+}
diff --git a/test/coverage-test/test/coverage.test.ts b/test/coverage-test/test/coverage.test.ts
index 366743ab4e8f..5d1d1b72e894 100644
--- a/test/coverage-test/test/coverage.test.ts
+++ b/test/coverage-test/test/coverage.test.ts
@@ -76,3 +76,10 @@ test('virtual file imports', () => {
 test('decorators', () => {
   new DecoratorsTester().method('cover line')
 })
+
+// Istanbul fails to follow source maps on windows
+test.skipIf(globalThis.process?.env.COVERAGE_PROVIDER === 'istanbul')('pre-transpiled code with source maps to original', async () => {
+  const transpiled = await import('../src/transpiled.js')
+
+  transpiled.hello()
+})

From bdc371ee83e36812bb6e4467d9d3608eb068daa7 Mon Sep 17 00:00:00 2001
From: Hiroshi Ogawa <hi.ogawa.zz@gmail.com>
Date: Thu, 14 Mar 2024 21:10:12 +0900
Subject: [PATCH 06/20] fix(typecheck): update get-tsconfig 4.7.3 to fix false
 circularity error (#5384)

---
 packages/vitest/package.json |  2 +-
 pnpm-lock.yaml               | 72 ++++++++++++++++++------------------
 2 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/packages/vitest/package.json b/packages/vitest/package.json
index 13bb9e588591..886cc1966ec0 100644
--- a/packages/vitest/package.json
+++ b/packages/vitest/package.json
@@ -185,7 +185,7 @@
     "fast-glob": "^3.3.2",
     "find-up": "^6.3.0",
     "flatted": "^3.2.9",
-    "get-tsconfig": "^4.7.2",
+    "get-tsconfig": "^4.7.3",
     "happy-dom": "^13.3.8",
     "jsdom": "^24.0.0",
     "log-update": "^5.0.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 62d5671c7555..e7cc2fdec85f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1446,8 +1446,8 @@ importers:
         specifier: ^3.2.9
         version: 3.2.9
       get-tsconfig:
-        specifier: ^4.7.2
-        version: 4.7.2
+        specifier: ^4.7.3
+        version: 4.7.3
       happy-dom:
         specifier: ^13.3.8
         version: 13.3.8
@@ -5138,7 +5138,7 @@ packages:
     resolution: {integrity: sha512-Rt4O1mXlPEDVxvjsHLgbtHVdUXYK9C1/6ThpQnt7FaXIjUOsI6qhHYMgALhNnlIMZffag44lXd6Dqgx3xALbpQ==}
     dependencies:
       '@esbuild-kit/core-utils': 2.3.0
-      get-tsconfig: 4.7.2
+      get-tsconfig: 4.7.3
     dev: true
 
   /@esbuild-kit/core-utils@2.3.0:
@@ -5152,7 +5152,7 @@ packages:
     resolution: {integrity: sha512-N9dPKAj8WOx6djVnStgILWXip4fjDcBk9L7azO0/uQDpu8Ee0eaL78mkN4Acid9BzvNAKWwdYXFJZnsVahNEew==}
     dependencies:
       '@esbuild-kit/core-utils': 2.3.0
-      get-tsconfig: 4.7.2
+      get-tsconfig: 4.7.3
     dev: true
 
   /@esbuild/aix-ppc64@0.19.11:
@@ -5789,7 +5789,7 @@ packages:
     engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
     dependencies:
       '@jest/types': 27.5.1
-      '@types/node': 20.11.24
+      '@types/node': 20.11.27
       chalk: 4.1.2
       jest-message-util: 27.5.1
       jest-util: 27.5.1
@@ -5810,7 +5810,7 @@ packages:
       '@jest/test-result': 27.5.1
       '@jest/transform': 27.5.1
       '@jest/types': 27.5.1
-      '@types/node': 20.11.24
+      '@types/node': 20.11.27
       ansi-escapes: 4.3.2
       chalk: 4.1.2
       emittery: 0.8.1
@@ -5847,7 +5847,7 @@ packages:
     dependencies:
       '@jest/fake-timers': 27.5.1
       '@jest/types': 27.5.1
-      '@types/node': 20.11.24
+      '@types/node': 20.11.27
       jest-mock: 27.5.1
     dev: true
 
@@ -5864,7 +5864,7 @@ packages:
     dependencies:
       '@jest/types': 27.5.1
       '@sinonjs/fake-timers': 8.1.0
-      '@types/node': 20.11.24
+      '@types/node': 20.11.27
       jest-message-util: 27.5.1
       jest-mock: 27.5.1
       jest-util: 27.5.1
@@ -5893,7 +5893,7 @@ packages:
       '@jest/test-result': 27.5.1
       '@jest/transform': 27.5.1
       '@jest/types': 27.5.1
-      '@types/node': 20.11.24
+      '@types/node': 20.11.27
       chalk: 4.1.2
       collect-v8-coverage: 1.0.2
       exit: 0.1.2
@@ -6024,7 +6024,7 @@ packages:
     dependencies:
       '@types/istanbul-lib-coverage': 2.0.6
       '@types/istanbul-reports': 3.0.4
-      '@types/node': 20.11.24
+      '@types/node': 20.11.27
       '@types/yargs': 16.0.7
       chalk: 4.1.2
     dev: true
@@ -9370,7 +9370,7 @@ packages:
     resolution: {integrity: sha512-N7UDG0/xiPQa2D/XrVJXjkWbpqHCd2sBaB32ggRF2l83RhPfamgKGF8gwwqyksS95qUS5ZYF9aF+lLPRlwI2UA==}
     dependencies:
       '@types/connect': 3.4.37
-      '@types/node': 20.11.24
+      '@types/node': 20.11.27
     dev: true
 
   /@types/braces@3.0.1:
@@ -9391,7 +9391,7 @@ packages:
   /@types/connect@3.4.37:
     resolution: {integrity: sha512-zBUSRqkfZ59OcwXon4HVxhx5oWCJmc0OtBTK05M+p0dYjgN6iTwIL2T/WbsQZrEsdnwaF9cWQ+azOnpPvIqY3Q==}
     dependencies:
-      '@types/node': 20.11.24
+      '@types/node': 20.11.27
     dev: true
 
   /@types/cookie@0.4.1:
@@ -9458,7 +9458,7 @@ packages:
   /@types/express-serve-static-core@4.17.39:
     resolution: {integrity: sha512-BiEUfAiGCOllomsRAZOiMFP7LAnrifHpt56pc4Z7l9K6ACyN06Ns1JLMBxwkfLOjJRlSf06NwWsT7yzfpaVpyQ==}
     dependencies:
-      '@types/node': 20.11.24
+      '@types/node': 20.11.27
       '@types/qs': 6.9.9
       '@types/range-parser': 1.2.6
       '@types/send': 0.17.3
@@ -9519,7 +9519,7 @@ packages:
   /@types/graceful-fs@4.1.8:
     resolution: {integrity: sha512-NhRH7YzWq8WiNKVavKPBmtLYZHxNY19Hh+az28O/phfp68CF45pMFud+ZzJ8ewnxnC5smIdF3dqFeiSUQ5I+pw==}
     dependencies:
-      '@types/node': 20.11.24
+      '@types/node': 20.11.27
     dev: true
 
   /@types/hast@2.3.4:
@@ -9679,7 +9679,7 @@ packages:
   /@types/node-fetch@2.6.7:
     resolution: {integrity: sha512-lX17GZVpJ/fuCjguZ5b3TjEbSENxmEk1B2z02yoXSK9WMEWRivhdSY73wWMn6bpcCDAOh6qAdktpKHIlkDk2lg==}
     dependencies:
-      '@types/node': 20.11.24
+      '@types/node': 20.11.27
       form-data: 4.0.0
     dev: true
 
@@ -9706,8 +9706,8 @@ packages:
       undici-types: 5.26.5
     dev: true
 
-  /@types/node@20.11.24:
-    resolution: {integrity: sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long==}
+  /@types/node@20.11.27:
+    resolution: {integrity: sha512-qyUZfMnCg1KEz57r7pzFtSGt49f6RPkPBis3Vo4PbS7roQEDn22hiHzl/Lo1q4i4hDEgBJmBF/NTNg2XR0HbFg==}
     dependencies:
       undici-types: 5.26.5
     dev: true
@@ -9871,7 +9871,7 @@ packages:
   /@types/resolve@1.17.1:
     resolution: {integrity: sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==}
     dependencies:
-      '@types/node': 20.11.24
+      '@types/node': 20.11.27
     dev: true
 
   /@types/resolve@1.20.2:
@@ -9889,7 +9889,7 @@ packages:
     resolution: {integrity: sha512-/7fKxvKUoETxjFUsuFlPB9YndePpxxRAOfGC/yJdc9kTjTeP5kRCTzfnE8kPUKCeyiyIZu0YQ76s50hCedI1ug==}
     dependencies:
       '@types/mime': 1.3.4
-      '@types/node': 20.11.24
+      '@types/node': 20.11.27
     dev: true
 
   /@types/serve-static@1.15.4:
@@ -9897,7 +9897,7 @@ packages:
     dependencies:
       '@types/http-errors': 2.0.3
       '@types/mime': 3.0.3
-      '@types/node': 20.11.24
+      '@types/node': 20.11.27
     dev: true
 
   /@types/set-cookie-parser@2.4.2:
@@ -15565,7 +15565,7 @@ packages:
       eslint: 8.54.0
       eslint-import-resolver-node: 0.3.9
       eslint-module-utils: 2.8.0(@typescript-eslint/parser@6.21.0)(eslint-import-resolver-node@0.3.9)(eslint@8.54.0)
-      get-tsconfig: 4.7.2
+      get-tsconfig: 4.7.3
       is-glob: 4.0.3
       minimatch: 3.1.2
       semver: 7.5.4
@@ -15634,7 +15634,7 @@ packages:
       builtins: 5.0.1
       eslint: 8.54.0
       eslint-plugin-es-x: 7.5.0(eslint@8.54.0)
-      get-tsconfig: 4.7.2
+      get-tsconfig: 4.7.3
       globals: 13.24.0
       ignore: 5.2.4
       is-builtin-module: 3.2.1
@@ -17165,8 +17165,8 @@ packages:
       get-intrinsic: 1.2.1
     dev: true
 
-  /get-tsconfig@4.7.2:
-    resolution: {integrity: sha512-wuMsz4leaj5hbGgg4IvDU0bqJagpftG5l5cXIAvo8uZrqn0NJqwtfupTN00VnkQJPcIRrxYrm1Ue24btpCha2A==}
+  /get-tsconfig@4.7.3:
+    resolution: {integrity: sha512-ZvkrzoUA0PQZM6fy6+/Hce561s+faD1rsNwhnO5FelNjyy7EMGJ3Rz1AQ8GYDWjhRs/7dBLOEJvhK8MiEJOAFg==}
     dependencies:
       resolve-pkg-maps: 1.0.0
     dev: true
@@ -18916,7 +18916,7 @@ packages:
       '@jest/environment': 27.5.1
       '@jest/test-result': 27.5.1
       '@jest/types': 27.5.1
-      '@types/node': 20.11.24
+      '@types/node': 20.11.27
       chalk: 4.1.2
       co: 4.6.0
       dedent: 0.7.0
@@ -19051,7 +19051,7 @@ packages:
       '@jest/environment': 27.5.1
       '@jest/fake-timers': 27.5.1
       '@jest/types': 27.5.1
-      '@types/node': 20.11.24
+      '@types/node': 20.11.27
       jest-mock: 27.5.1
       jest-util: 27.5.1
       jsdom: 16.7.0
@@ -19069,7 +19069,7 @@ packages:
       '@jest/environment': 27.5.1
       '@jest/fake-timers': 27.5.1
       '@jest/types': 27.5.1
-      '@types/node': 20.11.24
+      '@types/node': 20.11.27
       jest-mock: 27.5.1
       jest-util: 27.5.1
     dev: true
@@ -19113,7 +19113,7 @@ packages:
     dependencies:
       '@jest/types': 27.5.1
       '@types/graceful-fs': 4.1.8
-      '@types/node': 20.11.24
+      '@types/node': 20.11.27
       anymatch: 3.1.3
       fb-watchman: 2.0.2
       graceful-fs: 4.2.11
@@ -19153,7 +19153,7 @@ packages:
       '@jest/source-map': 27.5.1
       '@jest/test-result': 27.5.1
       '@jest/types': 27.5.1
-      '@types/node': 20.11.24
+      '@types/node': 20.11.27
       chalk: 4.1.2
       co: 4.6.0
       expect: 27.5.1
@@ -19233,7 +19233,7 @@ packages:
     engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
     dependencies:
       '@jest/types': 27.5.1
-      '@types/node': 20.11.24
+      '@types/node': 20.11.27
     dev: true
 
   /jest-pnp-resolver@1.2.3(jest-resolve@27.5.1):
@@ -19294,7 +19294,7 @@ packages:
       '@jest/test-result': 27.5.1
       '@jest/transform': 27.5.1
       '@jest/types': 27.5.1
-      '@types/node': 20.11.24
+      '@types/node': 20.11.27
       chalk: 4.1.2
       emittery: 0.8.1
       graceful-fs: 4.2.11
@@ -19359,7 +19359,7 @@ packages:
     resolution: {integrity: sha512-jZCyo6iIxO1aqUxpuBlwTDMkzOAJS4a3eYz3YzgxxVQFwLeSA7Jfq5cbqCY+JLvTDrWirgusI/0KwxKMgrdf7w==}
     engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
     dependencies:
-      '@types/node': 20.11.24
+      '@types/node': 20.11.27
       graceful-fs: 4.2.11
     dev: true
 
@@ -19410,7 +19410,7 @@ packages:
     engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
     dependencies:
       '@jest/types': 27.5.1
-      '@types/node': 20.11.24
+      '@types/node': 20.11.27
       chalk: 4.1.2
       ci-info: 3.9.0
       graceful-fs: 4.2.11
@@ -19447,7 +19447,7 @@ packages:
     dependencies:
       '@jest/test-result': 27.5.1
       '@jest/types': 27.5.1
-      '@types/node': 20.11.24
+      '@types/node': 20.11.27
       ansi-escapes: 4.3.2
       chalk: 4.1.2
       jest-util: 27.5.1
@@ -23603,7 +23603,7 @@ packages:
       debug: 4.3.4(supports-color@8.1.1)
       es-module-lexer: 1.3.1
       esbuild: 0.19.11
-      get-tsconfig: 4.7.2
+      get-tsconfig: 4.7.3
       rollup: 4.9.6
     transitivePeerDependencies:
       - supports-color
@@ -25692,7 +25692,7 @@ packages:
     hasBin: true
     dependencies:
       esbuild: 0.18.20
-      get-tsconfig: 4.7.2
+      get-tsconfig: 4.7.3
     optionalDependencies:
       fsevents: 2.3.3
     dev: true

From 2fef5a7ee8038ad9daa2af091cdbf00689bd3127 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20=E3=82=B5=E3=82=A4=E3=83=88=E3=83=BC=20=E4=B8=AD?=
 =?UTF-8?q?=E6=9D=91=20Bashurov?= <accounts@saitonakamura.me>
Date: Thu, 14 Mar 2024 14:12:09 +0200
Subject: [PATCH 07/20] fix(api): use resolvedUrls from devserver (#5289)

Co-authored-by: Hiroshi Ogawa <hi.ogawa.zz@gmail.com>
---
 packages/vitest/src/node/logger.ts            | 12 ++++++++---
 pnpm-lock.yaml                                | 10 ++++++++++
 test/ws-api/fixtures/server-url/basic.test.ts |  5 +++++
 .../fixtures/server-url/vitest.config.ts      | 11 ++++++++++
 test/ws-api/package.json                      | 12 +++++++++++
 test/ws-api/tests/server-url.test.ts          | 20 +++++++++++++++++++
 test/ws-api/vitest.config.ts                  |  7 +++++++
 7 files changed, 74 insertions(+), 3 deletions(-)
 create mode 100644 test/ws-api/fixtures/server-url/basic.test.ts
 create mode 100644 test/ws-api/fixtures/server-url/vitest.config.ts
 create mode 100644 test/ws-api/package.json
 create mode 100644 test/ws-api/tests/server-url.test.ts
 create mode 100644 test/ws-api/vitest.config.ts

diff --git a/packages/vitest/src/node/logger.ts b/packages/vitest/src/node/logger.ts
index ce288f5f3867..fa17be5ebad0 100644
--- a/packages/vitest/src/node/logger.ts
+++ b/packages/vitest/src/node/logger.ts
@@ -171,10 +171,16 @@ export class Logger {
       this.log(c.dim(c.green(`     ${output} Browser runner started at ${new URL('/', origin)}`)))
     })
 
-    if (this.ctx.config.ui)
+    if (this.ctx.config.ui) {
       this.log(c.dim(c.green(`      UI started at http://${this.ctx.config.api?.host || 'localhost'}:${c.bold(`${this.ctx.server.config.server.port}`)}${this.ctx.config.uiBase}`)))
-    else if (this.ctx.config.api?.port)
-      this.log(c.dim(c.green(`      API started at http://${this.ctx.config.api?.host || 'localhost'}:${c.bold(`${this.ctx.config.api.port}`)}`)))
+    }
+    else if (this.ctx.config.api?.port) {
+      const resolvedUrls = this.ctx.server.resolvedUrls
+      // workaround for https://github.com/vitejs/vite/issues/15438, it was fixed in vite 5.1
+      const fallbackUrl = `http://${this.ctx.config.api.host || 'localhost'}:${this.ctx.config.api.port}`
+      const origin = resolvedUrls?.local[0] ?? resolvedUrls?.network[0] ?? fallbackUrl
+      this.log(c.dim(c.green(`      API started at ${new URL('/', origin)}`)))
+    }
 
     if (this.ctx.coverageProvider)
       this.log(c.dim('      Coverage enabled with ') + c.yellow(this.ctx.coverageProvider.name))
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e7cc2fdec85f..4b2111674c5f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -2136,6 +2136,15 @@ importers:
         specifier: workspace:*
         version: link:../../packages/vitest
 
+  test/ws-api:
+    devDependencies:
+      '@vitejs/plugin-basic-ssl':
+        specifier: ^1.0.2
+        version: 1.0.2(vite@5.0.12)
+      vitest:
+        specifier: workspace:*
+        version: link:../../packages/vitest
+
 packages:
 
   /@aashutoshrathi/word-wrap@1.2.6:
@@ -27570,6 +27579,7 @@ packages:
 
   /workbox-google-analytics@7.0.0:
     resolution: {integrity: sha512-MEYM1JTn/qiC3DbpvP2BVhyIH+dV/5BjHk756u9VbwuAhu0QHyKscTnisQuz21lfRpOwiS9z4XdqeVAKol0bzg==}
+    deprecated: It is not compatible with newer versions of GA starting with v4, as long as you are using GAv3 it should be ok, but the package is not longer being maintained
     dependencies:
       workbox-background-sync: 7.0.0
       workbox-core: 7.0.0
diff --git a/test/ws-api/fixtures/server-url/basic.test.ts b/test/ws-api/fixtures/server-url/basic.test.ts
new file mode 100644
index 000000000000..9bb0283e10c6
--- /dev/null
+++ b/test/ws-api/fixtures/server-url/basic.test.ts
@@ -0,0 +1,5 @@
+import { expect, test } from "vitest";
+
+test("basic", () => {
+  expect(1).toBe(1);
+})
diff --git a/test/ws-api/fixtures/server-url/vitest.config.ts b/test/ws-api/fixtures/server-url/vitest.config.ts
new file mode 100644
index 000000000000..1855b750849e
--- /dev/null
+++ b/test/ws-api/fixtures/server-url/vitest.config.ts
@@ -0,0 +1,11 @@
+import { defineConfig } from 'vitest/config'
+import basicSsl from '@vitejs/plugin-basic-ssl'
+
+// test https by
+//   TEST_HTTPS=1 pnpm test --root fixtures/server-url --api
+
+export default defineConfig({
+  plugins: [
+    !!process.env.TEST_HTTPS && basicSsl(),
+  ],
+})
diff --git a/test/ws-api/package.json b/test/ws-api/package.json
new file mode 100644
index 000000000000..83754d0a26e8
--- /dev/null
+++ b/test/ws-api/package.json
@@ -0,0 +1,12 @@
+{
+  "name": "@vitest/test-ws-api",
+  "type": "module",
+  "private": true,
+  "scripts": {
+    "test": "vitest"
+  },
+  "devDependencies": {
+    "@vitejs/plugin-basic-ssl": "^1.0.2",
+    "vitest": "workspace:*"
+  }
+}
diff --git a/test/ws-api/tests/server-url.test.ts b/test/ws-api/tests/server-url.test.ts
new file mode 100644
index 000000000000..68ecdaf11956
--- /dev/null
+++ b/test/ws-api/tests/server-url.test.ts
@@ -0,0 +1,20 @@
+import { join } from 'node:path'
+import { expect, it } from 'vitest'
+
+import { runVitestCli } from '../../test-utils'
+
+it('api server-url http', async () => {
+  delete process.env.TEST_HTTPS
+  const { stdout } = await runVitestCli('run', '--root', join(process.cwd(), './fixtures/server-url'), '--api')
+  expect(stdout).toContain('API started at http://localhost:51204/')
+  expect(stdout).toContain('Test Files  1 passed')
+})
+
+it('api server-url https', async () => {
+  process.env.TEST_HTTPS = '1'
+  const { stdout } = await runVitestCli('run', '--root', join(process.cwd(), './fixtures/server-url'), '--api')
+  expect(stdout).toContain('API started at https://localhost:51204/')
+  expect(stdout).toContain('Test Files  1 passed')
+})
+
+it.todo('api server-url fallback if resolvedUrls is null')
diff --git a/test/ws-api/vitest.config.ts b/test/ws-api/vitest.config.ts
new file mode 100644
index 000000000000..f964be2a40cc
--- /dev/null
+++ b/test/ws-api/vitest.config.ts
@@ -0,0 +1,7 @@
+import { defineConfig } from 'vitest/config'
+
+export default defineConfig({
+  test: {
+    include: ['tests/**/*.test.ts'],
+  },
+})

From 4f9dfc899bf7b4d96a8203b7cd76566e7e110ea2 Mon Sep 17 00:00:00 2001
From: ELanning <38930062+ELanning@users.noreply.github.com>
Date: Thu, 14 Mar 2024 05:13:55 -0700
Subject: [PATCH 08/20] chore: update tester.ts (#5377)

---
 packages/browser/src/client/tester.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/browser/src/client/tester.ts b/packages/browser/src/client/tester.ts
index 1e926157ed80..88a842b207d9 100644
--- a/packages/browser/src/client/tester.ts
+++ b/packages/browser/src/client/tester.ts
@@ -146,7 +146,7 @@ async function runTests(files: string[]) {
     preparedData = await tryCall(() => prepareTestEnvironment(files))
   }
   catch (error) {
-    debug('data cannot be loaded becuase it threw an error')
+    debug('data cannot be loaded because it threw an error')
     await client.rpc.onUnhandledError(serializeError(error), 'Preload Error')
     done(files)
     return

From 600b44d606ff7e936c7caec818bae48d07300c69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ari=20Perkki=C3=B6?= <ari.perkkio@gmail.com>
Date: Thu, 14 Mar 2024 15:48:25 +0200
Subject: [PATCH 09/20] feat(coverage): support `--changed` option (#5314)

---
 docs/guide/cli.md                             |   2 +
 packages/coverage-istanbul/src/provider.ts    |  20 ++-
 packages/coverage-v8/src/provider.ts          |   9 +-
 packages/vitest/src/node/core.ts              |   8 +-
 .../istanbul.report.test.ts.snap              |  83 ++++++++++
 .../__snapshots__/v8.report.test.ts.snap      | 147 ++++++++++++++++++
 .../coverage-report-tests/changed.test.ts     |  22 +++
 .../coverage-report-tests/utils.ts            |   4 +-
 .../option-tests/changed.test.ts              |   6 +
 test/coverage-test/src/file-to-change.ts      |   7 +
 test/coverage-test/testing-options.mjs        |  67 ++++++--
 11 files changed, 343 insertions(+), 32 deletions(-)
 create mode 100644 test/coverage-test/coverage-report-tests/changed.test.ts
 create mode 100644 test/coverage-test/option-tests/changed.test.ts
 create mode 100644 test/coverage-test/src/file-to-change.ts

diff --git a/docs/guide/cli.md b/docs/guide/cli.md
index 64f85d0a620c..5a74291c58c0 100644
--- a/docs/guide/cli.md
+++ b/docs/guide/cli.md
@@ -137,6 +137,8 @@ vitest --api=false
 
   To run tests against changes made in the last commit, you can use `--changed HEAD~1`. You can also pass commit hash (e.g. `--changed 09a9920`) or branch name (e.g. `--changed origin/develop`).
 
+  When used with code coverage the report will contain only the files that were related to the changes.
+
   If paired with the [`forceRerunTriggers`](/config/#forcereruntriggers) config option it will run the whole test suite if at least one of the files listed in the `forceRerunTriggers` list changes. By default, changes to the Vitest config file and `package.json` will always rerun the whole suite.
 
 ### shard
diff --git a/packages/coverage-istanbul/src/provider.ts b/packages/coverage-istanbul/src/provider.ts
index 50c25c4c45e6..7b4676dc62e9 100644
--- a/packages/coverage-istanbul/src/provider.ts
+++ b/packages/coverage-istanbul/src/provider.ts
@@ -253,13 +253,16 @@ export class IstanbulCoverageProvider extends BaseCoverageProvider implements Co
   }
 
   async getCoverageMapForUncoveredFiles(coveredFiles: string[]) {
-    // Load, instrument and collect empty coverages from all files which
-    // are not already in the coverage map
-    const includedFiles = await this.testExclude.glob(this.ctx.config.root)
+    const allFiles = await this.testExclude.glob(this.ctx.config.root)
+    let includedFiles = allFiles.map(file => resolve(this.ctx.config.root, file))
+
+    if (this.ctx.config.changed)
+      includedFiles = (this.ctx.config.related || []).filter(file => includedFiles.includes(file))
+
     const uncoveredFiles = includedFiles
-      .map(file => resolve(this.ctx.config.root, file))
       .filter(file => !coveredFiles.includes(file))
 
+    const cacheKey = new Date().getTime()
     const coverageMap = libCoverage.createCoverageMap({})
 
     // Note that these cannot be run parallel as synchronous instrumenter.lastFileCoverage
@@ -267,13 +270,8 @@ export class IstanbulCoverageProvider extends BaseCoverageProvider implements Co
     for (const [index, filename] of uncoveredFiles.entries()) {
       debug('Uncovered file %s %d/%d', filename, index, uncoveredFiles.length)
 
-      // Make sure file is not served from cache
-      // so that instrumenter loads up requested file coverage
-      if (this.ctx.vitenode.fetchCache.has(filename))
-        this.ctx.vitenode.fetchCache.delete(filename)
-
-      await this.ctx.vitenode.transformRequest(filename)
-
+      // Make sure file is not served from cache so that instrumenter loads up requested file coverage
+      await this.ctx.vitenode.transformRequest(`${filename}?v=${cacheKey}`)
       const lastCoverage = this.instrumenter.lastFileCoverage()
       coverageMap.addFileCoverage(lastCoverage)
     }
diff --git a/packages/coverage-v8/src/provider.ts b/packages/coverage-v8/src/provider.ts
index 11b904e9aa62..3f43c74ec131 100644
--- a/packages/coverage-v8/src/provider.ts
+++ b/packages/coverage-v8/src/provider.ts
@@ -246,9 +246,14 @@ export class V8CoverageProvider extends BaseCoverageProvider implements Coverage
   private async getUntestedFiles(testedFiles: string[]): Promise<RawCoverage> {
     const transformResults = normalizeTransformResults(this.ctx.vitenode.fetchCache)
 
-    const includedFiles = await this.testExclude.glob(this.ctx.config.root)
+    const allFiles = await this.testExclude.glob(this.ctx.config.root)
+    let includedFiles = allFiles.map(file => resolve(this.ctx.config.root, file))
+
+    if (this.ctx.config.changed)
+      includedFiles = (this.ctx.config.related || []).filter(file => includedFiles.includes(file))
+
     const uncoveredFiles = includedFiles
-      .map(file => pathToFileURL(resolve(this.ctx.config.root, file)))
+      .map(file => pathToFileURL(file))
       .filter(file => !testedFiles.includes(file.pathname))
 
     let merged: RawCoverage = { result: [] }
diff --git a/packages/vitest/src/node/core.ts b/packages/vitest/src/node/core.ts
index aa2bdfb458f9..a4e5ee13aead 100644
--- a/packages/vitest/src/node/core.ts
+++ b/packages/vitest/src/node/core.ts
@@ -382,10 +382,6 @@ export class Vitest {
       }
     }
 
-    // all subsequent runs will treat this as a fresh run
-    this.config.changed = false
-    this.config.related = undefined
-
     if (files.length) {
       // populate once, update cache on watch
       await this.cache.stats.populateStats(this.config.root, files)
@@ -532,6 +528,10 @@ export class Vitest {
 
         this.runningPromise = undefined
         this.isFirstRun = false
+
+        // all subsequent runs will treat this as a fresh run
+        this.config.changed = false
+        this.config.related = undefined
       })
 
     return await this.runningPromise
diff --git a/test/coverage-test/coverage-report-tests/__snapshots__/istanbul.report.test.ts.snap b/test/coverage-test/coverage-report-tests/__snapshots__/istanbul.report.test.ts.snap
index c44a052caa49..4ce5f2804de4 100644
--- a/test/coverage-test/coverage-report-tests/__snapshots__/istanbul.report.test.ts.snap
+++ b/test/coverage-test/coverage-report-tests/__snapshots__/istanbul.report.test.ts.snap
@@ -1134,6 +1134,89 @@ exports[`istanbul json report 1`] = `
       },
     },
   },
+  "<process-cwd>/src/file-to-change.ts": {
+    "b": {},
+    "branchMap": {},
+    "f": {
+      "0": 0,
+      "1": 0,
+    },
+    "fnMap": {
+      "0": {
+        "decl": {
+          "end": {
+            "column": 22,
+            "line": 1,
+          },
+          "start": {
+            "column": 16,
+            "line": 1,
+          },
+        },
+        "loc": {
+          "end": {
+            "column": null,
+            "line": 3,
+          },
+          "start": {
+            "column": 22,
+            "line": 1,
+          },
+        },
+        "name": "run",
+      },
+      "1": {
+        "decl": {
+          "end": {
+            "column": 36,
+            "line": 5,
+          },
+          "start": {
+            "column": 16,
+            "line": 5,
+          },
+        },
+        "loc": {
+          "end": {
+            "column": null,
+            "line": 7,
+          },
+          "start": {
+            "column": 36,
+            "line": 5,
+          },
+        },
+        "name": "uncoveredFunction",
+      },
+    },
+    "path": "<process-cwd>/src/file-to-change.ts",
+    "s": {
+      "0": 0,
+      "1": 0,
+    },
+    "statementMap": {
+      "0": {
+        "end": {
+          "column": null,
+          "line": 2,
+        },
+        "start": {
+          "column": 2,
+          "line": 2,
+        },
+      },
+      "1": {
+        "end": {
+          "column": null,
+          "line": 6,
+        },
+        "start": {
+          "column": 2,
+          "line": 6,
+        },
+      },
+    },
+  },
   "<process-cwd>/src/function-count.ts": {
     "b": {},
     "branchMap": {},
diff --git a/test/coverage-test/coverage-report-tests/__snapshots__/v8.report.test.ts.snap b/test/coverage-test/coverage-report-tests/__snapshots__/v8.report.test.ts.snap
index f768be1c91d0..cd0ff16fdc7d 100644
--- a/test/coverage-test/coverage-report-tests/__snapshots__/v8.report.test.ts.snap
+++ b/test/coverage-test/coverage-report-tests/__snapshots__/v8.report.test.ts.snap
@@ -2777,6 +2777,153 @@ exports[`v8 json report 1`] = `
       },
     },
   },
+  "<process-cwd>/src/file-to-change.ts": {
+    "all": true,
+    "b": {
+      "0": [
+        0,
+      ],
+    },
+    "branchMap": {
+      "0": {
+        "line": 1,
+        "loc": {
+          "end": {
+            "column": 1,
+            "line": 7,
+          },
+          "start": {
+            "column": 0,
+            "line": 1,
+          },
+        },
+        "locations": [
+          {
+            "end": {
+              "column": 1,
+              "line": 7,
+            },
+            "start": {
+              "column": 0,
+              "line": 1,
+            },
+          },
+        ],
+        "type": "branch",
+      },
+    },
+    "f": {
+      "0": 0,
+    },
+    "fnMap": {
+      "0": {
+        "decl": {
+          "end": {
+            "column": 1,
+            "line": 7,
+          },
+          "start": {
+            "column": 0,
+            "line": 1,
+          },
+        },
+        "line": 1,
+        "loc": {
+          "end": {
+            "column": 1,
+            "line": 7,
+          },
+          "start": {
+            "column": 0,
+            "line": 1,
+          },
+        },
+        "name": "(empty-report)",
+      },
+    },
+    "path": "<process-cwd>/src/file-to-change.ts",
+    "s": {
+      "0": 0,
+      "1": 0,
+      "2": 0,
+      "3": 0,
+      "4": 0,
+      "5": 0,
+      "6": 0,
+    },
+    "statementMap": {
+      "0": {
+        "end": {
+          "column": 23,
+          "line": 1,
+        },
+        "start": {
+          "column": 0,
+          "line": 1,
+        },
+      },
+      "1": {
+        "end": {
+          "column": 51,
+          "line": 2,
+        },
+        "start": {
+          "column": 0,
+          "line": 2,
+        },
+      },
+      "2": {
+        "end": {
+          "column": 1,
+          "line": 3,
+        },
+        "start": {
+          "column": 0,
+          "line": 3,
+        },
+      },
+      "3": {
+        "end": {
+          "column": 0,
+          "line": 4,
+        },
+        "start": {
+          "column": 0,
+          "line": 4,
+        },
+      },
+      "4": {
+        "end": {
+          "column": 37,
+          "line": 5,
+        },
+        "start": {
+          "column": 0,
+          "line": 5,
+        },
+      },
+      "5": {
+        "end": {
+          "column": 14,
+          "line": 6,
+        },
+        "start": {
+          "column": 0,
+          "line": 6,
+        },
+      },
+      "6": {
+        "end": {
+          "column": 1,
+          "line": 7,
+        },
+        "start": {
+          "column": 0,
+          "line": 7,
+        },
+      },
+    },
+  },
   "<process-cwd>/src/function-count.ts": {
     "all": false,
     "b": {
diff --git a/test/coverage-test/coverage-report-tests/changed.test.ts b/test/coverage-test/coverage-report-tests/changed.test.ts
new file mode 100644
index 000000000000..20f4602512b2
--- /dev/null
+++ b/test/coverage-test/coverage-report-tests/changed.test.ts
@@ -0,0 +1,22 @@
+import { expect, test } from 'vitest'
+import libCoverage from 'istanbul-lib-coverage'
+
+import { readCoverageJson } from './utils'
+
+test('report contains only the changed files', async () => {
+  const coverageJson = await readCoverageJson('./coverage/coverage-final.json')
+  const coverageMap = libCoverage.createCoverageMap(coverageJson as any)
+
+  expect(coverageMap.files()).toMatchInlineSnapshot(`
+    [
+      "<process-cwd>/src/file-to-change.ts",
+      "<process-cwd>/src/new-uncovered-file.ts",
+    ]
+  `)
+
+  const uncoveredFile = coverageMap.fileCoverageFor('<process-cwd>/src/new-uncovered-file.ts').toSummary()
+  expect(uncoveredFile.lines.pct).toBe(0)
+
+  const changedFile = coverageMap.fileCoverageFor('<process-cwd>/src/file-to-change.ts').toSummary()
+  expect(changedFile.lines.pct).toBeGreaterThanOrEqual(50)
+})
diff --git a/test/coverage-test/coverage-report-tests/utils.ts b/test/coverage-test/coverage-report-tests/utils.ts
index d06aa62cc71f..e6236e862594 100644
--- a/test/coverage-test/coverage-report-tests/utils.ts
+++ b/test/coverage-test/coverage-report-tests/utils.ts
@@ -17,8 +17,8 @@ interface CoverageFinalJson {
  * Read JSON coverage report from file system.
  * Normalizes paths to keep contents consistent between OS's
  */
-export async function readCoverageJson() {
-  const jsonReport = JSON.parse(readFileSync('./coverage/custom-json-report-name.json', 'utf8')) as CoverageFinalJson
+export async function readCoverageJson(name = './coverage/custom-json-report-name.json') {
+  const jsonReport = JSON.parse(readFileSync(name, 'utf8')) as CoverageFinalJson
 
   const normalizedReport: CoverageFinalJson['default'] = {}
 
diff --git a/test/coverage-test/option-tests/changed.test.ts b/test/coverage-test/option-tests/changed.test.ts
new file mode 100644
index 000000000000..0572c73653ad
--- /dev/null
+++ b/test/coverage-test/option-tests/changed.test.ts
@@ -0,0 +1,6 @@
+import { test } from 'vitest'
+import { run } from '../src/file-to-change'
+
+test('test case for changed file', () => {
+  run()
+})
diff --git a/test/coverage-test/src/file-to-change.ts b/test/coverage-test/src/file-to-change.ts
new file mode 100644
index 000000000000..ba9bfe2193bb
--- /dev/null
+++ b/test/coverage-test/src/file-to-change.ts
@@ -0,0 +1,7 @@
+export function run() {
+  return 'This file will be modified by test cases'
+}
+
+export function uncoveredFunction() {
+  return 1 + 2
+}
diff --git a/test/coverage-test/testing-options.mjs b/test/coverage-test/testing-options.mjs
index 4dfd1efcf60c..45bd0d773e6c 100644
--- a/test/coverage-test/testing-options.mjs
+++ b/test/coverage-test/testing-options.mjs
@@ -1,6 +1,13 @@
+import { readFileSync, rmSync, writeFileSync } from 'node:fs'
 import { startVitest } from 'vitest/node'
 
-/** @type {Record<string, Partial<import('vitest/config').UserConfig['test']>>[]} */
+/**
+ * @typedef {NonNullable<import('vitest/config').UserConfig['test']>} Config
+ * @typedef { () => void | Promise<void> } Callback
+ * @typedef {{ testConfig: Config, assertionConfig?: Config, after?: Callback, before?: Callback }} TestCase
+ */
+
+/** @type {TestCase[]} */
 const testCases = [
   {
     testConfig: {
@@ -51,10 +58,44 @@ const testCases = [
     },
     assertionConfig: null,
   },
+  {
+    testConfig: {
+      name: 'changed',
+      changed: 'HEAD',
+      coverage: {
+        include: ['src'],
+        reporter: 'json',
+        all: true,
+      },
+    },
+    assertionConfig: {
+      include: ['coverage-report-tests/changed.test.ts'],
+    },
+    before: () => {
+      let content = readFileSync('./src/file-to-change.ts', 'utf8')
+      content = content.replace('This file will be modified by test cases', 'Changed!')
+      writeFileSync('./src/file-to-change.ts', content, 'utf8')
+
+      writeFileSync('./src/new-uncovered-file.ts', `
+      // This file is not covered by any tests but should be picked by --changed
+      export default function helloworld() {
+        return 'Hello world'
+      }
+      `.trim(), 'utf8')
+    },
+    after: () => {
+      let content = readFileSync('./src/file-to-change.ts', 'utf8')
+      content = content.replace('Changed!', 'This file will be modified by test cases')
+      writeFileSync('./src/file-to-change.ts', content, 'utf8')
+      rmSync('./src/new-uncovered-file.ts')
+    },
+  },
 ]
 
 for (const provider of ['v8', 'istanbul']) {
-  for (const { testConfig, assertionConfig } of testCases) {
+  for (const { after, before, testConfig, assertionConfig } of testCases) {
+    await before?.()
+
     // Run test case
     await startVitest('test', ['option-tests/'], {
       config: false,
@@ -65,23 +106,23 @@ for (const provider of ['v8', 'istanbul']) {
         enabled: true,
         clean: true,
         all: false,
+        reporter: [],
         provider,
         ...testConfig.coverage,
       },
     })
 
-    checkExit()
-
-    if (!assertionConfig)
-      continue
-
     // Check generated coverage report
-    await startVitest('test', ['coverage-report-tests'], {
-      config: false,
-      watch: false,
-      ...assertionConfig,
-      name: `${provider} - assert ${testConfig.name}`,
-    })
+    if (assertionConfig) {
+      await startVitest('test', ['coverage-report-tests'], {
+        config: false,
+        watch: false,
+        ...assertionConfig,
+        name: `${provider} - assert ${testConfig.name}`,
+      })
+    }
+
+    await after?.()
 
     checkExit()
   }

From 201bd06737544af49d809cab0e4328a54349edd8 Mon Sep 17 00:00:00 2001
From: Han <fenghan770@gmail.com>
Date: Thu, 14 Mar 2024 22:49:37 +0800
Subject: [PATCH 10/20] feat(cli): support wildcards in `--project` option
 (#5295)

---
 docs/guide/cli.md                             |  2 +-
 packages/vitest/src/node/cli/cli-config.ts    |  2 +-
 packages/vitest/src/node/core.ts              | 13 +++++++----
 packages/vitest/src/utils/base.ts             |  9 ++++++++
 .../project/packages/project_1/base.test.ts   |  5 ++++
 .../project/packages/project_2/base.test.ts   |  5 ++++
 .../project/packages/space_1/base.test.ts     |  5 ++++
 test/cli/fixtures/project/vitest.config.ts    |  3 +++
 test/cli/fixtures/project/vitest.workspace.ts |  3 +++
 test/cli/test/project.test.ts                 | 23 +++++++++++++++++++
 10 files changed, 63 insertions(+), 7 deletions(-)
 create mode 100644 test/cli/fixtures/project/packages/project_1/base.test.ts
 create mode 100644 test/cli/fixtures/project/packages/project_2/base.test.ts
 create mode 100644 test/cli/fixtures/project/packages/space_1/base.test.ts
 create mode 100644 test/cli/fixtures/project/vitest.config.ts
 create mode 100644 test/cli/fixtures/project/vitest.workspace.ts
 create mode 100644 test/cli/test/project.test.ts

diff --git a/docs/guide/cli.md b/docs/guide/cli.md
index 5a74291c58c0..825fd6e6e74a 100644
--- a/docs/guide/cli.md
+++ b/docs/guide/cli.md
@@ -106,7 +106,7 @@ Run only [benchmark](https://vitest.dev/guide/features.html#benchmarking-experim
 | `--typecheck [options]` | Custom options for typecheck pool. If passed without options, enables typechecking |
 | `--typecheck.enabled` | Enable typechecking alongside tests (default: `false`) |
 | `--typecheck.only` | Run only typecheck tests. This automatically enables typecheck (default: `false`) |
-| `--project` | The name of the project to run if you are using Vitest workspace feature. This can be repeated for multiple projects: `--project=1 --project=2` |
+| `--project` | The name of the project to run if you are using Vitest workspace feature. This can be repeated for multiple projects: `--project=1 --project=2`. You can also filter projects using wildcards like `--project=packages*` |
 | `-h, --help` | Display available CLI options |
 
 ::: tip
diff --git a/packages/vitest/src/node/cli/cli-config.ts b/packages/vitest/src/node/cli/cli-config.ts
index ce0c7120ef84..28e1b48047e0 100644
--- a/packages/vitest/src/node/cli/cli-config.ts
+++ b/packages/vitest/src/node/cli/cli-config.ts
@@ -524,7 +524,7 @@ export const cliOptionsConfig: VitestCLIOptions = {
     },
   },
   project: {
-    description: 'The name of the project to run if you are using Vitest workspace feature. This can be repeated for multiple projects: --project=1 --project=2',
+    description: 'The name of the project to run if you are using Vitest workspace feature. This can be repeated for multiple projects: --project=1 --project=2. You can also filter projects using wildcards like --project=packages*',
     argument: '<name>',
     array: true,
   },
diff --git a/packages/vitest/src/node/core.ts b/packages/vitest/src/node/core.ts
index a4e5ee13aead..73500e99e185 100644
--- a/packages/vitest/src/node/core.ts
+++ b/packages/vitest/src/node/core.ts
@@ -11,7 +11,7 @@ import type { CancelReason, File } from '@vitest/runner'
 import { ViteNodeServer } from 'vite-node/server'
 import type { defineWorkspace } from 'vitest/config'
 import type { ArgumentsType, CoverageProvider, OnServerRestartHandler, Reporter, ResolvedConfig, UserConfig, UserWorkspaceConfig, VitestRunMode } from '../types'
-import { hasFailed, noop, slash, toArray } from '../utils'
+import { hasFailed, noop, slash, toArray, wildcardPatternToRegExp } from '../utils'
 import { getCoverageProvider } from '../integrations/coverage'
 import type { BrowserProvider } from '../types/browser'
 import { CONFIG_NAMES, configFiles, workspacesFiles as workspaceFiles } from '../constants'
@@ -161,11 +161,14 @@ export class Vitest {
     await Promise.all(this._onSetServer.map(fn => fn()))
 
     const projects = await this.resolveWorkspace(cliOptions)
-    this.projects = projects
     this.resolvedProjects = projects
-    const filteredProjects = toArray(resolved.project)
-    if (filteredProjects.length)
-      this.projects = this.projects.filter(p => filteredProjects.includes(p.getName()))
+    this.projects = projects
+    const filters = toArray(resolved.project).map(s => wildcardPatternToRegExp(s))
+    if (filters.length > 0) {
+      this.projects = this.projects.filter(p =>
+        filters.some(pattern => pattern.test(p.getName())),
+      )
+    }
     if (!this.coreWorkspaceProject)
       this.coreWorkspaceProject = WorkspaceProject.createBasicProject(this)
 
diff --git a/packages/vitest/src/utils/base.ts b/packages/vitest/src/utils/base.ts
index 3897cad739f7..eadf011419a0 100644
--- a/packages/vitest/src/utils/base.ts
+++ b/packages/vitest/src/utils/base.ts
@@ -160,3 +160,12 @@ export function setProcessTitle(title: string) {
   }
   catch {}
 }
+
+export function escapeRegExp(s: string) {
+  // From https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions#escaping
+  return s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&') // $& means the whole matched string
+}
+
+export function wildcardPatternToRegExp(pattern: string): RegExp {
+  return new RegExp(`^${pattern.split('*').map(escapeRegExp).join('.*')}$`, 'i')
+}
diff --git a/test/cli/fixtures/project/packages/project_1/base.test.ts b/test/cli/fixtures/project/packages/project_1/base.test.ts
new file mode 100644
index 000000000000..8d97874ff383
--- /dev/null
+++ b/test/cli/fixtures/project/packages/project_1/base.test.ts
@@ -0,0 +1,5 @@
+import { expect, test } from "vitest";
+
+test("", () => {
+  expect(1).toBe(1);
+})
diff --git a/test/cli/fixtures/project/packages/project_2/base.test.ts b/test/cli/fixtures/project/packages/project_2/base.test.ts
new file mode 100644
index 000000000000..8d97874ff383
--- /dev/null
+++ b/test/cli/fixtures/project/packages/project_2/base.test.ts
@@ -0,0 +1,5 @@
+import { expect, test } from "vitest";
+
+test("", () => {
+  expect(1).toBe(1);
+})
diff --git a/test/cli/fixtures/project/packages/space_1/base.test.ts b/test/cli/fixtures/project/packages/space_1/base.test.ts
new file mode 100644
index 000000000000..8d97874ff383
--- /dev/null
+++ b/test/cli/fixtures/project/packages/space_1/base.test.ts
@@ -0,0 +1,5 @@
+import { expect, test } from "vitest";
+
+test("", () => {
+  expect(1).toBe(1);
+})
diff --git a/test/cli/fixtures/project/vitest.config.ts b/test/cli/fixtures/project/vitest.config.ts
new file mode 100644
index 000000000000..cc579dcc148b
--- /dev/null
+++ b/test/cli/fixtures/project/vitest.config.ts
@@ -0,0 +1,3 @@
+import { defineConfig } from "vitest/config";
+
+export default defineConfig({})
diff --git a/test/cli/fixtures/project/vitest.workspace.ts b/test/cli/fixtures/project/vitest.workspace.ts
new file mode 100644
index 000000000000..ab1d8a7a7bf3
--- /dev/null
+++ b/test/cli/fixtures/project/vitest.workspace.ts
@@ -0,0 +1,3 @@
+export default [
+  'packages/*'
+]
diff --git a/test/cli/test/project.test.ts b/test/cli/test/project.test.ts
new file mode 100644
index 000000000000..cc84d3399e12
--- /dev/null
+++ b/test/cli/test/project.test.ts
@@ -0,0 +1,23 @@
+import { expect, test } from 'vitest'
+import { runVitestCli } from '../../test-utils'
+
+test.each([
+  { pattern: 'project_1', expected: ['project_1'] },
+  { pattern: '*', expected: ['project_1', 'project_2', 'space_1'] },
+  { pattern: '*j*', expected: ['project_1', 'project_2'] },
+  { pattern: 'project*', expected: ['project_1', 'project_2'] },
+  { pattern: 'space*', expected: ['space_1'] },
+])('should match projects correctly: $pattern', async ({ pattern, expected }) => {
+  const { stdout, stderr } = await runVitestCli(
+    'run',
+    '--root',
+    'fixtures/project',
+    '--project',
+    pattern,
+  )
+
+  expect(stderr).toBeFalsy()
+  expect(stdout).toBeTruthy()
+
+  expected.forEach(name => expect(stdout).toContain(name))
+})

From 356db87b71c238585a9315881ef89544d19dc4d7 Mon Sep 17 00:00:00 2001
From: Han <fenghan770@gmail.com>
Date: Thu, 14 Mar 2024 22:50:03 +0800
Subject: [PATCH 11/20] feat(config): add `shuffle.files` and `shuffle.tests`
 options (#5281)

---
 docs/config/index.md                       | 22 ++++++++--
 packages/vitest/src/node/cli/cli-config.ts | 11 ++++-
 packages/vitest/src/node/config.ts         |  5 +++
 packages/vitest/src/types/config.ts        | 16 ++++++-
 test/config/test/shuffle-options.test.ts   | 49 ++++++++++++++++++++++
 test/core/test/cli-test.test.ts            |  7 ++++
 6 files changed, 104 insertions(+), 6 deletions(-)
 create mode 100644 test/config/test/shuffle-options.test.ts

diff --git a/docs/config/index.md b/docs/config/index.md
index b297d11c926f..e9bf7d5730d2 100644
--- a/docs/config/index.md
+++ b/docs/config/index.md
@@ -1768,13 +1768,29 @@ Sharding is happening before sorting, and only if `--shard` option is provided.
 
 #### sequence.shuffle
 
-- **Type**: `boolean`
+- **Type**: `boolean | { files?, tests? }`
 - **Default**: `false`
 - **CLI**: `--sequence.shuffle`, `--sequence.shuffle=false`
 
-If you want tests to run randomly, you can enable it with this option, or CLI argument [`--sequence.shuffle`](/guide/cli).
+If you want files and tests to run randomly, you can enable it with this option, or CLI argument [`--sequence.shuffle`](/guide/cli).
+
+Vitest usually uses cache to sort tests, so long running tests start earlier - this makes tests run faster. If your files and tests will run in random order you will lose this performance improvement, but it may be useful to track tests that accidentally depend on another run previously.
+
+#### sequence.shuffle.files <Badge type="info">1.4.0+</Badge> {#sequence-shuffle-files}
+
+- **Type**: `boolean`
+- **Default**: `false`
+- **CLI**: `--sequence.shuffle.files`, `--sequence.shuffle.files=false`
+
+Whether to randomize files, be aware that long running tests will not start earlier if you enable this option.
+
+#### sequence.shuffle.tests <Badge type="info">1.4.0+</Badge> {#sequence-shuffle-tests}
+
+- **Type**: `boolean`
+- **Default**: `false`
+- **CLI**: `--sequence.shuffle.tests`, `--sequence.shuffle.tests=false`
 
-Vitest usually uses cache to sort tests, so long running tests start earlier - this makes tests run faster. If your tests will run in random order you will lose this performance improvement, but it may be useful to track tests that accidentally depend on another run previously.
+Whether to randomize tests.
 
 #### sequence.concurrent <Badge type="info">0.32.2+</Badge> {#sequence-concurrent}
 
diff --git a/packages/vitest/src/node/cli/cli-config.ts b/packages/vitest/src/node/cli/cli-config.ts
index 28e1b48047e0..c727d3a66276 100644
--- a/packages/vitest/src/node/cli/cli-config.ts
+++ b/packages/vitest/src/node/cli/cli-config.ts
@@ -436,7 +436,16 @@ export const cliOptionsConfig: VitestCLIOptions = {
     argument: '<options>',
     subcommands: {
       shuffle: {
-        description: 'Run tests in a random order. Enabling this option will impact Vitest\'s cache and have a performance impact. May be useful to find tests that accidentally depend on another run previously (default: false)',
+        description: 'Run files and tests in a random order. Enabling this option will impact Vitest\'s cache and have a performance impact. May be useful to find tests that accidentally depend on another run previously (default: false)',
+        argument: '',
+        subcommands: {
+          files: {
+            description: 'Run files in a random order. Long running tests will not start earlier if you enable this option. (default: false)',
+          },
+          tests: {
+            description: 'Run tests in a random oder (default: false)',
+          },
+        },
       },
       concurrent: {
         description: 'Make tests run in parallel (default: false)',
diff --git a/packages/vitest/src/node/config.ts b/packages/vitest/src/node/config.ts
index e1e46d16c6af..6d054f0a417e 100644
--- a/packages/vitest/src/node/config.ts
+++ b/packages/vitest/src/node/config.ts
@@ -441,6 +441,11 @@ export function resolveConfig(
     resolved.cache.dir = VitestCache.resolveCacheDir(resolved.root, resolved.cache.dir, resolved.name)
 
   resolved.sequence ??= {} as any
+  if (resolved.sequence.shuffle && typeof resolved.sequence.shuffle === 'object') {
+    const { files, tests } = resolved.sequence.shuffle
+    resolved.sequence.sequencer ??= files ? RandomSequencer : BaseSequencer
+    resolved.sequence.shuffle = tests
+  }
   if (!resolved.sequence?.sequencer) {
     // CLI flag has higher priority
     resolved.sequence.sequencer = resolved.sequence.shuffle
diff --git a/packages/vitest/src/types/config.ts b/packages/vitest/src/types/config.ts
index 2c1e5951d3c5..5888f434be24 100644
--- a/packages/vitest/src/types/config.ts
+++ b/packages/vitest/src/types/config.ts
@@ -48,10 +48,22 @@ interface SequenceOptions {
    */
   sequencer?: TestSequencerConstructor
   /**
-   * Should tests run in random order.
+   * Should files and tests run in random order.
    * @default false
    */
-  shuffle?: boolean
+  shuffle?: boolean | {
+    /**
+     * Should files run in random order. Long running tests will not start
+     * earlier if you enable this option.
+     * @default false
+     */
+    files?: boolean
+    /**
+     * Should tests run in random order.
+     * @default false
+     */
+    tests?: boolean
+  }
   /**
    * Should tests run in parallel.
    * @default false
diff --git a/test/config/test/shuffle-options.test.ts b/test/config/test/shuffle-options.test.ts
new file mode 100644
index 000000000000..554a38863ccc
--- /dev/null
+++ b/test/config/test/shuffle-options.test.ts
@@ -0,0 +1,49 @@
+import type { InlineConfig } from 'vitest'
+import { expect, test } from 'vitest'
+import { runVitest } from '../../test-utils'
+
+function run(sequence: InlineConfig['sequence']) {
+  return runVitest({
+    sequence,
+    include: [],
+  })
+}
+
+class CustomSequencer {
+  sort() {
+    return []
+  }
+
+  shard() {
+    return []
+  }
+}
+
+test.each([
+  false,
+  { files: false, tests: false },
+  { files: false, tests: true },
+],
+)('should use BaseSequencer if shuffle is %o', async (shuffle) => {
+  const { vitest } = await run({ shuffle })
+  expect(vitest?.config.sequence.sequencer.name).toBe('BaseSequencer')
+})
+
+test.each([
+  true,
+  { files: true, tests: false },
+  { files: true, tests: true },
+])('should use RandomSequencer if shuffle is %o', async (shuffle) => {
+  const { vitest } = await run({ shuffle })
+  expect(vitest?.config.sequence.sequencer.name).toBe('RandomSequencer')
+})
+
+test.each([
+  false,
+  true,
+  { files: true, tests: false },
+  { files: true, tests: true },
+])('should always use CustomSequencer if passed', async (shuffle) => {
+  const { vitest } = await run({ shuffle, sequencer: CustomSequencer })
+  expect(vitest?.config.sequence.sequencer.name).toBe('CustomSequencer')
+})
diff --git a/test/core/test/cli-test.test.ts b/test/core/test/cli-test.test.ts
index 0cf5b61b3847..b40ff72f9efc 100644
--- a/test/core/test/cli-test.test.ts
+++ b/test/core/test/cli-test.test.ts
@@ -223,6 +223,13 @@ test('cache is parsed correctly', () => {
   })
 })
 
+test('shuffle is parsed correctly', () => {
+  expect(getCLIOptions('--sequence.shuffle')).toEqual({ sequence: { shuffle: true } })
+  expect(getCLIOptions('--sequence.shuffle=false')).toEqual({ sequence: { shuffle: false } })
+  expect(getCLIOptions('--sequence.shuffle.files --sequence.shuffle.tests')).toEqual({ sequence: { shuffle: { files: true, tests: true } } })
+  expect(getCLIOptions('--sequence.shuffle.files=false --sequence.shuffle.tests=false')).toEqual({ sequence: { shuffle: { files: false, tests: false } } })
+})
+
 test('typecheck correctly passes down arguments', () => {
   const { options, args } = parseArguments('--typecheck some.name.ts')
   expect(options).toEqual({ typecheck: { enabled: true } })

From e1735fb6797866188d2e9855966e33e0987cb008 Mon Sep 17 00:00:00 2001
From: Hiroshi Ogawa <hi.ogawa.zz@gmail.com>
Date: Thu, 14 Mar 2024 23:54:06 +0900
Subject: [PATCH 12/20] feat(vitest): support `clearScreen` cli flag (#5241)

---
 docs/guide/cli.md                          |  1 +
 packages/vitest/src/node/cli/cli-config.ts |  3 ++
 packages/vitest/src/node/config.ts         |  2 ++
 packages/vitest/src/node/logger.ts         |  4 +--
 packages/vitest/src/types/config.ts        |  5 +++
 test/core/test/cli-test.test.ts            | 40 ++++++++++++++++++++++
 6 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/docs/guide/cli.md b/docs/guide/cli.md
index 825fd6e6e74a..424775c82dfc 100644
--- a/docs/guide/cli.md
+++ b/docs/guide/cli.md
@@ -103,6 +103,7 @@ Run only [benchmark](https://vitest.dev/guide/features.html#benchmarking-experim
 | `--exclude <glob>` | Additional file globs to be excluded from test |
 | `--expand-snapshot-diff` | Show full diff when snapshot fails |
 | `--disable-console-intercept` | Disable automatic interception of console logging (default: `false`) |
+| `--clearScreen` | Clear terminal screen when re-running tests during watch mode (default: `true`) |
 | `--typecheck [options]` | Custom options for typecheck pool. If passed without options, enables typechecking |
 | `--typecheck.enabled` | Enable typechecking alongside tests (default: `false`) |
 | `--typecheck.only` | Run only typecheck tests. This automatically enables typecheck (default: `false`) |
diff --git a/packages/vitest/src/node/cli/cli-config.ts b/packages/vitest/src/node/cli/cli-config.ts
index c727d3a66276..afb1ec4dc17e 100644
--- a/packages/vitest/src/node/cli/cli-config.ts
+++ b/packages/vitest/src/node/cli/cli-config.ts
@@ -580,6 +580,9 @@ export const cliOptionsConfig: VitestCLIOptions = {
     description: 'Removes colors from the console output',
     alias: 'no-color',
   },
+  clearScreen: {
+    description: 'Clear terminal screen when re-running tests during watch mode (default: true)',
+  },
 
   // disable CLI options
   cliExclude: null,
diff --git a/packages/vitest/src/node/config.ts b/packages/vitest/src/node/config.ts
index 6d054f0a417e..662bb12b542f 100644
--- a/packages/vitest/src/node/config.ts
+++ b/packages/vitest/src/node/config.ts
@@ -94,6 +94,8 @@ export function resolveConfig(
   if (viteConfig.base !== '/')
     resolved.base = viteConfig.base
 
+  resolved.clearScreen = resolved.clearScreen ?? viteConfig.clearScreen ?? true
+
   if (options.shard) {
     if (resolved.watch)
       throw new Error('You cannot use --shard option with enabled watch')
diff --git a/packages/vitest/src/node/logger.ts b/packages/vitest/src/node/logger.ts
index fa17be5ebad0..a494c9b619ee 100644
--- a/packages/vitest/src/node/logger.ts
+++ b/packages/vitest/src/node/logger.ts
@@ -54,7 +54,7 @@ export class Logger {
   }
 
   clearFullScreen(message: string) {
-    if (this.ctx.server.config.clearScreen === false) {
+    if (!this.ctx.config.clearScreen) {
       this.console.log(message)
       return
     }
@@ -63,7 +63,7 @@ export class Logger {
   }
 
   clearScreen(message: string, force = false) {
-    if (this.ctx.server.config.clearScreen === false) {
+    if (!this.ctx.config.clearScreen) {
       this.console.log(message)
       return
     }
diff --git a/packages/vitest/src/types/config.ts b/packages/vitest/src/types/config.ts
index 5888f434be24..594ed36eae35 100644
--- a/packages/vitest/src/types/config.ts
+++ b/packages/vitest/src/types/config.ts
@@ -809,6 +809,11 @@ export interface UserConfig extends InlineConfig {
    * Additional exclude patterns
    */
   cliExclude?: string[]
+
+  /**
+   * Override vite config's clearScreen from cli
+   */
+  clearScreen?: boolean
 }
 
 export interface ResolvedConfig extends Omit<Required<UserConfig>, 'config' | 'filters' | 'browser' | 'coverage' | 'testNamePattern' | 'related' | 'api' | 'reporters' | 'resolveSnapshotPath' | 'benchmark' | 'shard' | 'cache' | 'sequence' | 'typecheck' | 'runner' | 'poolOptions' | 'pool' | 'cliExclude'> {
diff --git a/test/core/test/cli-test.test.ts b/test/core/test/cli-test.test.ts
index b40ff72f9efc..90f5123799d4 100644
--- a/test/core/test/cli-test.test.ts
+++ b/test/core/test/cli-test.test.ts
@@ -1,4 +1,6 @@
 import { expect, test } from 'vitest'
+import { resolveConfig as viteResolveConfig } from 'vite'
+import { resolveConfig } from '../../../packages/vitest/src/node/config.js'
 import { createCLI, parseCLI } from '../../../packages/vitest/src/node/cli/cac.js'
 
 const vitestCli = createCLI()
@@ -261,6 +263,44 @@ test('browser by name', () => {
   expect(options).toEqual({ browser: { enabled: true, name: 'firefox' } })
 })
 
+test('clearScreen', async () => {
+  const examples = [
+    // vitest cli | vite clearScreen
+    ['--clearScreen', undefined],
+    ['--clearScreen', true],
+    ['--clearScreen', false],
+    ['--no-clearScreen', undefined],
+    ['--no-clearScreen', true],
+    ['--no-clearScreen', false],
+    ['', undefined],
+    ['', true],
+    ['', false],
+  ] as const
+  const baseViteConfig = await viteResolveConfig({ configFile: false }, 'serve')
+  const results = examples.map(([vitestClearScreen, viteClearScreen]) => {
+    const viteConfig = {
+      ...baseViteConfig,
+      clearScreen: viteClearScreen,
+    }
+    const vitestConfig = getCLIOptions(vitestClearScreen)
+    const config = resolveConfig('test', vitestConfig, viteConfig)
+    return config.clearScreen
+  })
+  expect(results).toMatchInlineSnapshot(`
+    [
+      true,
+      true,
+      true,
+      false,
+      false,
+      false,
+      true,
+      true,
+      false,
+    ]
+  `)
+})
+
 test('public parseCLI works correctly', () => {
   expect(parseCLI('vitest dev')).toEqual({
     filter: [],

From 0bea22473053a2bdcf33dce515533433a689c9b6 Mon Sep 17 00:00:00 2001
From: Hiroshi Ogawa <hi.ogawa.zz@gmail.com>
Date: Thu, 14 Mar 2024 23:54:27 +0900
Subject: [PATCH 13/20] fix(vitest): ensure restoring terminal cursor on close
 (#5292)

---
 packages/vitest/src/node/core.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/vitest/src/node/core.ts b/packages/vitest/src/node/core.ts
index 73500e99e185..a2d3d3154a2a 100644
--- a/packages/vitest/src/node/core.ts
+++ b/packages/vitest/src/node/core.ts
@@ -844,6 +844,7 @@ export class Vitest {
           results.filter(r => r.status === 'rejected').forEach((err) => {
             this.logger.error('error during close', (err as PromiseRejectedResult).reason)
           })
+          this.logger.logUpdate.done() // restore terminal cursor
         })
       })()
     }

From d627e209dd99ba17557ef6ba2e4b2c52ddf6fa97 Mon Sep 17 00:00:00 2001
From: Vladimir <sleuths.slews0s@icloud.com>
Date: Thu, 14 Mar 2024 15:54:40 +0100
Subject: [PATCH 14/20] feat: add a flag to include test location in tasks
 (#5342)

---
 docs/config/index.md                       | 13 +++++
 packages/browser/src/client/runner.ts      | 33 ++++++++++++-
 packages/runner/src/collect.ts             |  2 +-
 packages/runner/src/run.ts                 |  2 +-
 packages/runner/src/suite.ts               | 55 ++++++++++++++++++++--
 packages/runner/src/types/runner.ts        |  1 +
 packages/runner/src/types/tasks.ts         |  4 ++
 packages/vitest/src/api/setup.ts           |  6 +++
 packages/vitest/src/api/types.ts           |  1 +
 packages/vitest/src/node/cli/cli-config.ts |  1 +
 packages/vitest/src/node/workspace.ts      |  1 +
 packages/vitest/src/public/utils.ts        |  4 ++
 packages/vitest/src/types/config.ts        |  7 +++
 test/public-api/fixtures/vitest.config.ts  |  1 +
 test/public-api/package.json               |  3 +-
 test/public-api/tests/runner.spec.ts       | 23 +++++++--
 16 files changed, 145 insertions(+), 12 deletions(-)
 create mode 100644 test/public-api/fixtures/vitest.config.ts

diff --git a/docs/config/index.md b/docs/config/index.md
index e9bf7d5730d2..9dde7a667390 100644
--- a/docs/config/index.md
+++ b/docs/config/index.md
@@ -2108,3 +2108,16 @@ Disabling this option might [improve performance](/guide/improving-performance)
 ::: tip
 You can disable isolation for specific pools by using [`poolOptions`](#pooloptions) property.
 :::
+
+### includeTaskLocation <Badge type="info">1.4.0+</Badge> {#includeTaskLocation}
+
+- **Type:** `boolean`
+- **Default:** `false`
+
+Should `location` property be included when Vitest API receives tasks in [reporters](#reporters). If you have a lot of tests, this might cause a small performance regression.
+
+The `location` property has `column` and `line` values that correspond to the `test` or `describe` position in the original file.
+
+::: tip
+This option has no effect if you do not use custom code that relies on this.
+:::
diff --git a/packages/browser/src/client/runner.ts b/packages/browser/src/client/runner.ts
index 63a9be827640..1725b93883d2 100644
--- a/packages/browser/src/client/runner.ts
+++ b/packages/browser/src/client/runner.ts
@@ -55,7 +55,13 @@ export function createBrowserRunner(
       }
     }
 
-    onCollected = (files: File[]): unknown => {
+    onCollected = async (files: File[]): Promise<unknown> => {
+      if (this.config.includeTaskLocation) {
+        try {
+          await updateFilesLocations(files)
+        }
+        catch (_) {}
+      }
       return rpc().onCollected(files)
     }
 
@@ -107,3 +113,28 @@ export async function initiateRunner() {
   cachedRunner = runner
   return runner
 }
+
+async function updateFilesLocations(files: File[]) {
+  const { loadSourceMapUtils } = await importId('vitest/utils') as typeof import('vitest/utils')
+  const { TraceMap, originalPositionFor } = await loadSourceMapUtils()
+
+  const promises = files.map(async (file) => {
+    const result = await rpc().getBrowserFileSourceMap(file.filepath)
+    if (!result)
+      return null
+    const traceMap = new TraceMap(result as any)
+    function updateLocation(task: Task) {
+      if (task.location) {
+        const { line, column } = originalPositionFor(traceMap, task.location)
+        if (line != null && column != null)
+          task.location = { line, column: column + 1 }
+      }
+      if ('tasks' in task)
+        task.tasks.forEach(updateLocation)
+    }
+    file.tasks.forEach(updateLocation)
+    return null
+  })
+
+  await Promise.all(promises)
+}
diff --git a/packages/runner/src/collect.ts b/packages/runner/src/collect.ts
index a32501b67a2c..0a9a69bb540d 100644
--- a/packages/runner/src/collect.ts
+++ b/packages/runner/src/collect.ts
@@ -28,7 +28,7 @@ export async function collectTests(paths: string[], runner: VitestRunner): Promi
       projectName: config.name,
     }
 
-    clearCollectorContext(runner)
+    clearCollectorContext(filepath, runner)
 
     try {
       const setupStart = now()
diff --git a/packages/runner/src/run.ts b/packages/runner/src/run.ts
index 4087ab3b29fb..5155621fb129 100644
--- a/packages/runner/src/run.ts
+++ b/packages/runner/src/run.ts
@@ -393,7 +393,7 @@ export async function startTests(paths: string[], runner: VitestRunner) {
 
   const files = await collectTests(paths, runner)
 
-  runner.onCollected?.(files)
+  await runner.onCollected?.(files)
   await runner.onBeforeRunFiles?.(files)
 
   await runFiles(files, runner)
diff --git a/packages/runner/src/suite.ts b/packages/runner/src/suite.ts
index e3ae628cbfce..0f5feb6b787d 100644
--- a/packages/runner/src/suite.ts
+++ b/packages/runner/src/suite.ts
@@ -1,4 +1,5 @@
 import { format, isObject, objDisplay, objectAttr } from '@vitest/utils'
+import { parseSingleStack } from '@vitest/utils/source-map'
 import type { Custom, CustomAPI, File, Fixtures, RunMode, Suite, SuiteAPI, SuiteCollector, SuiteFactory, SuiteHooks, Task, TaskCustomOptions, Test, TestAPI, TestFunction, TestOptions } from './types'
 import type { VitestRunner } from './types/runner'
 import { createChainable } from './utils/chain'
@@ -25,19 +26,25 @@ export const it = test
 
 let runner: VitestRunner
 let defaultSuite: SuiteCollector
+let currentTestFilepath: string
 
 export function getDefaultSuite() {
   return defaultSuite
 }
 
+export function getTestFilepath() {
+  return currentTestFilepath
+}
+
 export function getRunner() {
   return runner
 }
 
-export function clearCollectorContext(currentRunner: VitestRunner) {
+export function clearCollectorContext(filepath: string, currentRunner: VitestRunner) {
   if (!defaultSuite)
     defaultSuite = currentRunner.config.sequence.shuffle ? suite.shuffle('') : currentRunner.config.sequence.concurrent ? suite.concurrent('') : suite('')
   runner = currentRunner
+  currentTestFilepath = filepath
   collectorContext.tasks.length = 0
   defaultSuite.clear()
   collectorContext.currentSuite = defaultSuite
@@ -103,7 +110,7 @@ function createSuiteCollector(name: string, factory: SuiteFactory = () => { }, m
 
   let suite: Suite
 
-  initSuite()
+  initSuite(true)
 
   const task = function (name = '', options: TaskCustomOptions = {}) {
     const task: Custom = {
@@ -140,6 +147,17 @@ function createSuiteCollector(name: string, factory: SuiteFactory = () => { }, m
       ))
     }
 
+    if (runner.config.includeTaskLocation) {
+      const limit = Error.stackTraceLimit
+      // custom can be called from any place, let's assume the limit is 10 stacks
+      Error.stackTraceLimit = 10
+      const error = new Error('stacktrace').stack!
+      Error.stackTraceLimit = limit
+      const stack = findStackTrace(error)
+      if (stack)
+        task.location = stack
+    }
+
     tasks.push(task)
     return task
   }
@@ -183,7 +201,7 @@ function createSuiteCollector(name: string, factory: SuiteFactory = () => { }, m
     getHooks(suite)[name].push(...fn as any)
   }
 
-  function initSuite() {
+  function initSuite(includeLocation: boolean) {
     if (typeof suiteOptions === 'number')
       suiteOptions = { timeout: suiteOptions }
 
@@ -199,13 +217,27 @@ function createSuiteCollector(name: string, factory: SuiteFactory = () => { }, m
       projectName: '',
     }
 
+    if (runner && includeLocation && runner.config.includeTaskLocation) {
+      const limit = Error.stackTraceLimit
+      Error.stackTraceLimit = 5
+      const error = new Error('stacktrace').stack!
+      Error.stackTraceLimit = limit
+      const stack = parseSingleStack(error.split('\n')[5])
+      if (stack) {
+        suite.location = {
+          line: stack.line,
+          column: stack.column,
+        }
+      }
+    }
+
     setHooks(suite, createSuiteHooks())
   }
 
   function clear() {
     tasks.length = 0
     factoryQueue.length = 0
-    initSuite()
+    initSuite(false)
   }
 
   async function collect(file?: File) {
@@ -397,3 +429,18 @@ function formatTemplateString(cases: any[], args: any[]): any[] {
   }
   return res
 }
+
+function findStackTrace(error: string) {
+  // first line is the error message
+  // and the first 3 stacks are always from the collector
+  const lines = error.split('\n').slice(4)
+  for (const line of lines) {
+    const stack = parseSingleStack(line)
+    if (stack && stack.file === getTestFilepath()) {
+      return {
+        line: stack.line,
+        column: stack.column,
+      }
+    }
+  }
+}
diff --git a/packages/runner/src/types/runner.ts b/packages/runner/src/types/runner.ts
index 6822c4903c1c..ce4d18f7a942 100644
--- a/packages/runner/src/types/runner.ts
+++ b/packages/runner/src/types/runner.ts
@@ -33,6 +33,7 @@ export interface VitestRunnerConfig {
   testTimeout: number
   hookTimeout: number
   retry: number
+  includeTaskLocation?: boolean
   diffOptions?: DiffOptions
 }
 
diff --git a/packages/runner/src/types/tasks.ts b/packages/runner/src/types/tasks.ts
index e2ceddfe7a50..afb822cb1e4f 100644
--- a/packages/runner/src/types/tasks.ts
+++ b/packages/runner/src/types/tasks.ts
@@ -18,6 +18,10 @@ export interface TaskBase {
   result?: TaskResult
   retry?: number
   repeats?: number
+  location?: {
+    line: number
+    column: number
+  }
 }
 
 export interface TaskPopulated extends TaskBase {
diff --git a/packages/vitest/src/api/setup.ts b/packages/vitest/src/api/setup.ts
index fd5e15df4e39..9abd0b32b1af 100644
--- a/packages/vitest/src/api/setup.ts
+++ b/packages/vitest/src/api/setup.ts
@@ -113,6 +113,12 @@ export function setup(vitestOrWorkspace: Vitest | WorkspaceProject, _server?: Vi
         getConfig() {
           return vitestOrWorkspace.config
         },
+        async getBrowserFileSourceMap(id) {
+          if (!('ctx' in vitestOrWorkspace))
+            return undefined
+          const mod = vitestOrWorkspace.browser?.moduleGraph.getModuleById(id)
+          return mod?.transformResult?.map
+        },
         async getTransformResult(id) {
           const result: TransformResultWithSource | null | undefined = await ctx.vitenode.transformRequest(id)
           if (result) {
diff --git a/packages/vitest/src/api/types.ts b/packages/vitest/src/api/types.ts
index b59c6dd151ff..4b47bedc7ed2 100644
--- a/packages/vitest/src/api/types.ts
+++ b/packages/vitest/src/api/types.ts
@@ -20,6 +20,7 @@ export interface WebSocketHandlers {
   resolveSnapshotPath: (testPath: string) => string
   resolveSnapshotRawPath: (testPath: string, rawPath: string) => string
   getModuleGraph: (id: string) => Promise<ModuleGraphData>
+  getBrowserFileSourceMap: (id: string) => Promise<TransformResult['map'] | undefined>
   getTransformResult: (id: string) => Promise<TransformResultWithSource | undefined>
   readSnapshotFile: (id: string) => Promise<string | null>
   readTestFile: (id: string) => Promise<string | null>
diff --git a/packages/vitest/src/node/cli/cli-config.ts b/packages/vitest/src/node/cli/cli-config.ts
index afb1ec4dc17e..622fb13f50a7 100644
--- a/packages/vitest/src/node/cli/cli-config.ts
+++ b/packages/vitest/src/node/cli/cli-config.ts
@@ -615,4 +615,5 @@ export const cliOptionsConfig: VitestCLIOptions = {
   poolMatchGlobs: null,
   deps: null,
   name: null,
+  includeTaskLocation: null,
 }
diff --git a/packages/vitest/src/node/workspace.ts b/packages/vitest/src/node/workspace.ts
index 0a973f9f00e6..b73f438ce4fa 100644
--- a/packages/vitest/src/node/workspace.ts
+++ b/packages/vitest/src/node/workspace.ts
@@ -382,6 +382,7 @@ export class WorkspaceProject {
       inspect: this.ctx.config.inspect,
       inspectBrk: this.ctx.config.inspectBrk,
       alias: [],
+      includeTaskLocation: this.config.includeTaskLocation ?? this.ctx.config.includeTaskLocation,
     }, this.ctx.configOverride || {} as any) as ResolvedConfig
   }
 
diff --git a/packages/vitest/src/public/utils.ts b/packages/vitest/src/public/utils.ts
index 7030fbb320bf..7947f1bff4f9 100644
--- a/packages/vitest/src/public/utils.ts
+++ b/packages/vitest/src/public/utils.ts
@@ -1 +1,5 @@
 export * from '@vitest/utils'
+
+export function loadSourceMapUtils() {
+  return import('@vitest/utils/source-map')
+}
diff --git a/packages/vitest/src/types/config.ts b/packages/vitest/src/types/config.ts
index 594ed36eae35..3dc2d42ef633 100644
--- a/packages/vitest/src/types/config.ts
+++ b/packages/vitest/src/types/config.ts
@@ -715,6 +715,13 @@ export interface InlineConfig {
    * @default false
    */
   disableConsoleIntercept?: boolean
+
+  /**
+   * Include "location" property inside the test definition
+   *
+   * @default false
+   */
+  includeTaskLocation?: boolean
 }
 
 export interface TypecheckConfig {
diff --git a/test/public-api/fixtures/vitest.config.ts b/test/public-api/fixtures/vitest.config.ts
new file mode 100644
index 000000000000..56004c9f9e06
--- /dev/null
+++ b/test/public-api/fixtures/vitest.config.ts
@@ -0,0 +1 @@
+export default {}
\ No newline at end of file
diff --git a/test/public-api/package.json b/test/public-api/package.json
index 36116b4d3ea6..3d4808f6a8eb 100644
--- a/test/public-api/package.json
+++ b/test/public-api/package.json
@@ -3,7 +3,8 @@
   "type": "module",
   "private": true,
   "scripts": {
-    "test": "vitest"
+    "test": "vitest",
+    "fixtures": "vitest --root ./fixtures"
   },
   "devDependencies": {
     "@vitest/browser": "workspace:*",
diff --git a/test/public-api/tests/runner.spec.ts b/test/public-api/tests/runner.spec.ts
index da2820fe1b15..e8160d4aa7f9 100644
--- a/test/public-api/tests/runner.spec.ts
+++ b/test/public-api/tests/runner.spec.ts
@@ -15,9 +15,10 @@ it.each([
       headless: true,
     },
   },
-] as UserConfig[])('passes down metadata when $name', async (config) => {
+] as UserConfig[])('passes down metadata when $name', { timeout: 60_000, retry: 3 }, async (config) => {
   const taskUpdate: TaskResultPack[] = []
   const finishedFiles: File[] = []
+  const collectedFiles: File[] = []
   const { vitest, stdout, stderr } = await runVitest({
     root: resolve(__dirname, '..', 'fixtures'),
     include: ['**/*.spec.ts'],
@@ -30,8 +31,12 @@ it.each([
         onFinished(files) {
           finishedFiles.push(...files || [])
         },
+        onCollected(files) {
+          collectedFiles.push(...files || [])
+        },
       },
     ],
+    includeTaskLocation: true,
     ...config,
   })
 
@@ -69,7 +74,17 @@ it.each([
 
   expect(files[0].meta).toEqual(suiteMeta)
   expect(files[0].tasks[0].meta).toEqual(testMeta)
-}, {
-  timeout: 60_000,
-  retry: 3,
+
+  expect(finishedFiles[0].tasks[0].location).toEqual({
+    line: 14,
+    column: 1,
+  })
+  expect(collectedFiles[0].tasks[0].location).toEqual({
+    line: 14,
+    column: 1,
+  })
+  expect(files[0].tasks[0].location).toEqual({
+    line: 14,
+    column: 1,
+  })
 })

From e77c553ffb389a79bf568ab0ec4a48f2c572f9a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ari=20Perkki=C3=B6?= <ari.perkkio@gmail.com>
Date: Thu, 14 Mar 2024 16:55:06 +0200
Subject: [PATCH 15/20] fix: `--inspect-brk` to pause before execution (#5355)

---
 packages/vite-node/src/source-map.ts     |  5 ++
 packages/vitest/src/runtime/inspector.ts | 26 +++++--
 packages/vitest/src/runtime/worker.ts    |  2 +-
 pnpm-lock.yaml                           | 12 ++++
 test/inspect/fixtures/math.test.ts       |  5 ++
 test/inspect/fixtures/vitest.config.ts   |  8 +++
 test/inspect/package.json                | 13 ++++
 test/inspect/test/inspect.test.ts        | 86 ++++++++++++++++++++++++
 test/inspect/vitest.config.ts            |  7 ++
 test/test-utils/index.ts                 |  3 +
 10 files changed, 162 insertions(+), 5 deletions(-)
 create mode 100644 test/inspect/fixtures/math.test.ts
 create mode 100644 test/inspect/fixtures/vitest.config.ts
 create mode 100644 test/inspect/package.json
 create mode 100644 test/inspect/test/inspect.test.ts
 create mode 100644 test/inspect/vitest.config.ts

diff --git a/packages/vite-node/src/source-map.ts b/packages/vite-node/src/source-map.ts
index fa4fc280f3d2..85bb26216a11 100644
--- a/packages/vite-node/src/source-map.ts
+++ b/packages/vite-node/src/source-map.ts
@@ -48,6 +48,11 @@ export function withInlineSourcemap(result: TransformResult, options: {
   while (OTHER_SOURCE_MAP_REGEXP.test(code))
     code = code.replace(OTHER_SOURCE_MAP_REGEXP, '')
 
+  // If the first line is not present on source maps, add simple 1:1 mapping ([0,0,0,0], [1,0,0,0])
+  // so that debuggers can be set to break on first line
+  if (map.mappings.startsWith(';'))
+    map.mappings = `AAAA,CAAA${map.mappings}`
+
   const sourceMap = Buffer.from(JSON.stringify(map), 'utf-8').toString('base64')
   result.code = `${code.trimEnd()}\n\n${VITE_NODE_SOURCEMAPPING_SOURCE}\n//# ${VITE_NODE_SOURCEMAPPING_URL};base64,${sourceMap}\n`
 
diff --git a/packages/vitest/src/runtime/inspector.ts b/packages/vitest/src/runtime/inspector.ts
index a43f976454e8..fdc8f31ab25d 100644
--- a/packages/vitest/src/runtime/inspector.ts
+++ b/packages/vitest/src/runtime/inspector.ts
@@ -1,15 +1,17 @@
 import { createRequire } from 'node:module'
 
-import type { ResolvedConfig } from '../types'
+import type { ContextRPC } from '../types'
 
 const __require = createRequire(import.meta.url)
 let inspector: typeof import('node:inspector')
+let session: InstanceType<typeof inspector.Session>
 
 /**
  * Enables debugging inside `worker_threads` and `child_process`.
  * Should be called as early as possible when worker/process has been set up.
  */
-export function setupInspect(config: ResolvedConfig) {
+export function setupInspect(ctx: ContextRPC) {
+  const config = ctx.config
   const isEnabled = config.inspect || config.inspectBrk
 
   if (isEnabled) {
@@ -20,8 +22,22 @@ export function setupInspect(config: ResolvedConfig) {
     if (!isOpen) {
       inspector.open()
 
-      if (config.inspectBrk)
+      if (config.inspectBrk) {
         inspector.waitForDebugger()
+        const firstTestFile = ctx.files[0]
+
+        // Stop at first test file
+        if (firstTestFile) {
+          session = new inspector.Session()
+          session.connect()
+
+          session.post('Debugger.enable')
+          session.post('Debugger.setBreakpointByUrl', {
+            lineNumber: 0,
+            url: new URL(firstTestFile, import.meta.url).href,
+          })
+        }
+      }
     }
   }
 
@@ -32,7 +48,9 @@ export function setupInspect(config: ResolvedConfig) {
   const keepOpen = config.watch && (isIsolatedSingleFork || isIsolatedSingleThread)
 
   return function cleanup() {
-    if (isEnabled && !keepOpen && inspector)
+    if (isEnabled && !keepOpen && inspector) {
       inspector.close()
+      session?.disconnect()
+    }
   }
 }
diff --git a/packages/vitest/src/runtime/worker.ts b/packages/vitest/src/runtime/worker.ts
index 41a3cb9cd4a1..d31467382ddb 100644
--- a/packages/vitest/src/runtime/worker.ts
+++ b/packages/vitest/src/runtime/worker.ts
@@ -15,7 +15,7 @@ if (isChildProcess())
 export async function run(ctx: ContextRPC) {
   const prepareStart = performance.now()
 
-  const inspectorCleanup = setupInspect(ctx.config)
+  const inspectorCleanup = setupInspect(ctx)
 
   process.env.VITEST_WORKER_ID = String(ctx.workerId)
   process.env.VITEST_POOL_ID = String(poolId)
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4b2111674c5f..1ee182d27ca4 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1854,6 +1854,18 @@ importers:
         specifier: workspace:*
         version: link:../../packages/vitest
 
+  test/inspect:
+    devDependencies:
+      vite:
+        specifier: ^5.0.12
+        version: 5.0.12(@types/node@20.11.5)(less@4.1.3)
+      vitest:
+        specifier: workspace:*
+        version: link:../../packages/vitest
+      ws:
+        specifier: ^8.14.2
+        version: 8.14.2
+
   test/mixed-pools:
     devDependencies:
       vitest:
diff --git a/test/inspect/fixtures/math.test.ts b/test/inspect/fixtures/math.test.ts
new file mode 100644
index 000000000000..54b50210a8f8
--- /dev/null
+++ b/test/inspect/fixtures/math.test.ts
@@ -0,0 +1,5 @@
+import { expect, test } from "vitest";
+
+test("sum", () => {
+  expect(1 + 1).toBe(2)
+})
\ No newline at end of file
diff --git a/test/inspect/fixtures/vitest.config.ts b/test/inspect/fixtures/vitest.config.ts
new file mode 100644
index 000000000000..800411ae369f
--- /dev/null
+++ b/test/inspect/fixtures/vitest.config.ts
@@ -0,0 +1,8 @@
+import { defineConfig } from 'vitest/config'
+
+export default defineConfig({
+  test: {
+    include: ['./**.test.ts'],
+    watch: false,
+  },
+})
diff --git a/test/inspect/package.json b/test/inspect/package.json
new file mode 100644
index 000000000000..ed5e2c5d23c7
--- /dev/null
+++ b/test/inspect/package.json
@@ -0,0 +1,13 @@
+{
+  "name": "@vitest/test-inspect",
+  "type": "module",
+  "private": true,
+  "scripts": {
+    "test": "vitest"
+  },
+  "devDependencies": {
+    "vite": "latest",
+    "vitest": "workspace:*",
+    "ws": "^8.14.2"
+  }
+}
diff --git a/test/inspect/test/inspect.test.ts b/test/inspect/test/inspect.test.ts
new file mode 100644
index 000000000000..bc634436727d
--- /dev/null
+++ b/test/inspect/test/inspect.test.ts
@@ -0,0 +1,86 @@
+import type { InspectorNotification } from 'node:inspector'
+import { expect, test } from 'vitest'
+import WebSocket from 'ws'
+
+import { isWindows } from '../../../packages/vite-node/src/utils'
+import { runVitestCli } from '../../test-utils'
+
+type Message = Partial<InspectorNotification<any>>
+
+test.skipIf(isWindows)('--inspect-brk stops at test file', async () => {
+  const vitest = await runVitestCli('--root', 'fixtures', '--inspect-brk', '--no-file-parallelism')
+
+  await vitest.waitForStderr('Debugger listening on ')
+  const url = vitest.stderr.split('\n')[0].replace('Debugger listening on ', '')
+
+  const { receive, send } = await createChannel(url)
+
+  send({ method: 'Debugger.enable' })
+  send({ method: 'Runtime.enable' })
+  await receive('Runtime.executionContextCreated')
+
+  const paused = receive('Debugger.paused')
+  send({ method: 'Runtime.runIfWaitingForDebugger' })
+
+  const { params } = await paused
+  const scriptId = params.callFrames[0].functionLocation.scriptId
+
+  // Verify that debugger paused on test file
+  const response = receive()
+  send({ method: 'Debugger.getScriptSource', params: { scriptId } })
+  const { result } = await response as any
+
+  expect(result.scriptSource).toContain('test("sum", () => {')
+  expect(result.scriptSource).toContain('expect(1 + 1).toBe(2)')
+
+  send({ method: 'Debugger.resume' })
+
+  await vitest.waitForStdout('Test Files  1 passed (1)')
+  await vitest.isDone
+})
+
+async function createChannel(url: string) {
+  const ws = new WebSocket(url)
+
+  let id = 1
+  let receiver = defer()
+
+  ws.onerror = receiver.reject
+  ws.onmessage = (message) => {
+    const response = JSON.parse(message.data.toString())
+    receiver.resolve(response)
+  }
+
+  async function receive(filter?: string) {
+    const message = await receiver.promise
+    receiver = defer()
+
+    if (filter && message.method !== filter)
+      return receive(filter)
+
+    return message
+  }
+
+  function send(message: Message) {
+    ws.send(JSON.stringify({ ...message, id: id++ }))
+  }
+
+  await new Promise(r => ws.on('open', r))
+
+  return { receive, send }
+}
+
+function defer(): {
+  promise: Promise<Message>
+  resolve: (response: Message) => void
+  reject: (error: unknown) => void
+} {
+  const pr = {} as ReturnType<typeof defer>
+
+  pr.promise = new Promise((resolve, reject) => {
+    pr.resolve = resolve
+    pr.reject = reject
+  })
+
+  return pr
+}
diff --git a/test/inspect/vitest.config.ts b/test/inspect/vitest.config.ts
new file mode 100644
index 000000000000..654ae2aa887a
--- /dev/null
+++ b/test/inspect/vitest.config.ts
@@ -0,0 +1,7 @@
+import { defineConfig } from 'vitest/config'
+
+export default defineConfig({
+  test: {
+    include: ['./test/**'],
+  },
+})
diff --git a/test/test-utils/index.ts b/test/test-utils/index.ts
index f0312d64b201..a58edba0084d 100644
--- a/test/test-utils/index.ts
+++ b/test/test-utils/index.ts
@@ -188,6 +188,9 @@ export async function runCli(command: string, _options?: Options | string, ...ar
     await cli.isDone
   })
 
+  if (args.includes('--inspect') || args.includes('--inspect-brk'))
+    return cli
+
   if (args.includes('--watch')) {
     if (command === 'vitest') // Wait for initial test run to complete
       await cli.waitForStdout('Waiting for file changes')

From 38119b75aff28682b0c8088991cc2c761760ff6d Mon Sep 17 00:00:00 2001
From: Vladimir Sheremet <sleuths.slews0s@icloud.com>
Date: Thu, 14 Mar 2024 16:25:08 +0100
Subject: [PATCH 16/20] fix(vitest): ignore timeout on websocket reporter rpc

---
 packages/vitest/src/api/setup.ts | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/vitest/src/api/setup.ts b/packages/vitest/src/api/setup.ts
index 9abd0b32b1af..754406300697 100644
--- a/packages/vitest/src/api/setup.ts
+++ b/packages/vitest/src/api/setup.ts
@@ -12,7 +12,7 @@ import type { StackTraceParserOptions } from '@vitest/utils/source-map'
 import { API_PATH } from '../constants'
 import type { Vitest } from '../node'
 import type { File, ModuleGraphData, Reporter, TaskResultPack, UserConsoleLog } from '../types'
-import { getModuleGraph, isPrimitive, stringifyReplace } from '../utils'
+import { getModuleGraph, isPrimitive, noop, stringifyReplace } from '../utils'
 import type { WorkspaceProject } from '../node/workspace'
 import { parseErrorStacktrace } from '../utils/source-map'
 import type { TransformResultWithSource, WebSocketEvents, WebSocketHandlers } from './types'
@@ -168,7 +168,7 @@ export function setup(vitestOrWorkspace: Vitest | WorkspaceProject, _server?: Vi
       {
         post: msg => ws.send(msg),
         on: fn => ws.on('message', fn),
-        eventNames: ['onUserConsoleLog', 'onFinished', 'onFinishedReportCoverage', 'onCollected', 'onCancel'],
+        eventNames: ['onUserConsoleLog', 'onFinished', 'onFinishedReportCoverage', 'onCollected', 'onCancel', 'onTaskUpdate'],
         serialize: (data: any) => stringify(data, stringifyReplace),
         deserialize: parse,
         onTimeoutError(functionName) {
@@ -200,7 +200,7 @@ export class WebSocketReporter implements Reporter {
     if (this.clients.size === 0)
       return
     this.clients.forEach((client) => {
-      client.onCollected?.(files)
+      client.onCollected?.(files).catch(noop)
     })
   }
 
@@ -222,25 +222,25 @@ export class WebSocketReporter implements Reporter {
     })
 
     this.clients.forEach((client) => {
-      client.onTaskUpdate?.(packs)
+      client.onTaskUpdate?.(packs).catch(noop)
     })
   }
 
   onFinished(files?: File[], errors?: unknown[]) {
     this.clients.forEach((client) => {
-      client.onFinished?.(files, errors)
+      client.onFinished?.(files, errors).catch(noop)
     })
   }
 
   onFinishedReportCoverage() {
     this.clients.forEach((client) => {
-      client.onFinishedReportCoverage?.()
+      client.onFinishedReportCoverage?.().catch(noop)
     })
   }
 
   onUserConsoleLog(log: UserConsoleLog) {
     this.clients.forEach((client) => {
-      client.onUserConsoleLog?.(log)
+      client.onUserConsoleLog?.(log).catch(noop)
     })
   }
 }

From 07ec3779aba22680ae1dd4cb83cd276354c8023f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ari=20Perkki=C3=B6?= <ari.perkkio@gmail.com>
Date: Thu, 14 Mar 2024 17:25:36 +0200
Subject: [PATCH 17/20] fix(coverage): prevent `reportsDirectory` from removing
 user's project (#5376)

---
 docs/config/index.md               |  4 ++++
 packages/vitest/src/node/config.ts |  8 +++++++
 test/config/test/failures.test.ts  | 38 ++++++++++++++++++++++++++++++
 3 files changed, 50 insertions(+)

diff --git a/docs/config/index.md b/docs/config/index.md
index 9dde7a667390..61a6a3f67737 100644
--- a/docs/config/index.md
+++ b/docs/config/index.md
@@ -1137,6 +1137,10 @@ Clean coverage report on watch rerun
 - **Available for providers:** `'v8' | 'istanbul'`
 - **CLI:** `--coverage.reportsDirectory=<path>`
 
+::: warning
+Vitest will delete this directory before running tests if `coverage.clean` is enabled (default value).
+:::
+
 Directory to write coverage report to.
 
 To preview the coverage report in the output of [HTML reporter](/guide/reporters.html#html-reporter), this option must be set as a sub-directory of the html report directory (for example `./html/coverage`).
diff --git a/packages/vitest/src/node/config.ts b/packages/vitest/src/node/config.ts
index 662bb12b542f..a6d3b3810a85 100644
--- a/packages/vitest/src/node/config.ts
+++ b/packages/vitest/src/node/config.ts
@@ -137,6 +137,7 @@ export function resolveConfig(
     }
   }
 
+  // TODO: V2.0.0 remove
   // @ts-expect-error -- check for removed API option
   if (resolved.coverage.provider === 'c8')
     throw new Error('"coverage.provider: c8" is not supported anymore. Use "coverage.provider: v8" instead')
@@ -144,6 +145,13 @@ export function resolveConfig(
   if (resolved.coverage.provider === 'v8' && resolved.coverage.enabled && isBrowserEnabled(resolved))
     throw new Error('@vitest/coverage-v8 does not work with --browser. Use @vitest/coverage-istanbul instead')
 
+  if (resolved.coverage.enabled && resolved.coverage.reportsDirectory) {
+    const reportsDirectory = resolve(resolved.root, resolved.coverage.reportsDirectory)
+
+    if (reportsDirectory === resolved.root || reportsDirectory === process.cwd())
+      throw new Error(`You cannot set "coverage.reportsDirectory" as ${reportsDirectory}. Vitest needs to be able to remove this directory before test run`)
+  }
+
   resolved.deps ??= {}
   resolved.deps.moduleDirectories ??= []
   resolved.deps.moduleDirectories = resolved.deps.moduleDirectories.map((dir) => {
diff --git a/test/config/test/failures.test.ts b/test/config/test/failures.test.ts
index 0007f55aac3f..cc65dd796e80 100644
--- a/test/config/test/failures.test.ts
+++ b/test/config/test/failures.test.ts
@@ -2,6 +2,7 @@ import { expect, test } from 'vitest'
 import type { UserConfig } from 'vitest/config'
 import { version } from 'vitest/package.json'
 
+import { normalize, resolve } from 'pathe'
 import * as testUtils from '../../test-utils'
 
 function runVitest(config: NonNullable<UserConfig['test']> & { shard?: any }) {
@@ -67,6 +68,43 @@ test('v8 coverage provider cannot be used with browser in workspace', async () =
   expect(stderr).toMatch('Error: @vitest/coverage-v8 does not work with --browser. Use @vitest/coverage-istanbul instead')
 })
 
+test('coverage reportsDirectory cannot be current working directory', async () => {
+  const { stderr } = await runVitest({
+    coverage: {
+      enabled: true,
+      reportsDirectory: './',
+
+      // Additional options to make sure this test doesn't accidentally remove whole vitest project
+      clean: false,
+      cleanOnRerun: false,
+      provider: 'custom',
+      customProviderModule: 'non-existing-provider-so-that-reportsDirectory-is-not-removed',
+    },
+  })
+
+  const directory = normalize(resolve('./'))
+  expect(stderr).toMatch(`Error: You cannot set "coverage.reportsDirectory" as ${directory}. Vitest needs to be able to remove this directory before test run`)
+})
+
+test('coverage reportsDirectory cannot be root', async () => {
+  const { stderr } = await runVitest({
+    root: './fixtures',
+    coverage: {
+      enabled: true,
+      reportsDirectory: './',
+
+      // Additional options to make sure this test doesn't accidentally remove whole vitest project
+      clean: false,
+      cleanOnRerun: false,
+      provider: 'custom',
+      customProviderModule: 'non-existing-provider-so-that-reportsDirectory-is-not-removed',
+    },
+  })
+
+  const directory = normalize(resolve('./fixtures'))
+  expect(stderr).toMatch(`Error: You cannot set "coverage.reportsDirectory" as ${directory}. Vitest needs to be able to remove this directory before test run`)
+})
+
 test('version number is printed when coverage provider fails to load', async () => {
   const { stderr, stdout } = await runVitest({
     coverage: {

From 8f04e798949c15602a81dd640697f31b8e22a95c Mon Sep 17 00:00:00 2001
From: Hiroshi Ogawa <hi.ogawa.zz@gmail.com>
Date: Fri, 15 Mar 2024 00:26:15 +0900
Subject: [PATCH 18/20] fix(browser): add `magic-string` to
 `optimizeDeps.include` (#5278)

---
 packages/browser/src/node/index.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/browser/src/node/index.ts b/packages/browser/src/node/index.ts
index 0f25198e7b4f..0da28819870c 100644
--- a/packages/browser/src/node/index.ts
+++ b/packages/browser/src/node/index.ts
@@ -149,6 +149,7 @@ export default (project: WorkspaceProject, base = '/'): Plugin[] => {
             include: [
               'vitest > @vitest/utils > pretty-format',
               'vitest > @vitest/snapshot > pretty-format',
+              'vitest > @vitest/snapshot > magic-string',
               'vitest > diff-sequences',
               'vitest > pretty-format',
               'vitest > pretty-format > ansi-styles',

From efe441fd217d4ec3081ec7aca58543b2233bab2d Mon Sep 17 00:00:00 2001
From: Vladimir Sheremet <sleuths.slews0s@icloud.com>
Date: Thu, 14 Mar 2024 18:09:15 +0100
Subject: [PATCH 19/20] chore: guard try/catch in websocket reporter

---
 packages/vitest/src/api/setup.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/vitest/src/api/setup.ts b/packages/vitest/src/api/setup.ts
index 754406300697..f236f08816e0 100644
--- a/packages/vitest/src/api/setup.ts
+++ b/packages/vitest/src/api/setup.ts
@@ -200,7 +200,7 @@ export class WebSocketReporter implements Reporter {
     if (this.clients.size === 0)
       return
     this.clients.forEach((client) => {
-      client.onCollected?.(files).catch(noop)
+      client.onCollected?.(files)?.catch?.(noop)
     })
   }
 
@@ -222,25 +222,25 @@ export class WebSocketReporter implements Reporter {
     })
 
     this.clients.forEach((client) => {
-      client.onTaskUpdate?.(packs).catch(noop)
+      client.onTaskUpdate?.(packs)?.catch?.(noop)
     })
   }
 
   onFinished(files?: File[], errors?: unknown[]) {
     this.clients.forEach((client) => {
-      client.onFinished?.(files, errors).catch(noop)
+      client.onFinished?.(files, errors)?.catch?.(noop)
     })
   }
 
   onFinishedReportCoverage() {
     this.clients.forEach((client) => {
-      client.onFinishedReportCoverage?.().catch(noop)
+      client.onFinishedReportCoverage?.()?.catch?.(noop)
     })
   }
 
   onUserConsoleLog(log: UserConsoleLog) {
     this.clients.forEach((client) => {
-      client.onUserConsoleLog?.(log).catch(noop)
+      client.onUserConsoleLog?.(log)?.catch?.(noop)
     })
   }
 }

From 51d1d47263e80f6a40da7639382efd5160f4145c Mon Sep 17 00:00:00 2001
From: Vladimir <sleuths.slews0s@icloud.com>
Date: Thu, 14 Mar 2024 19:08:56 +0100
Subject: [PATCH 20/20] fix(vitest): correctly override api with --no-api flag
 (#5386)

---
 examples/playwright/test/basic.test.ts    |  5 ++--
 packages/vitest/src/node/plugins/index.ts |  2 +-
 test/config/test/resolution.test.ts       | 28 +++++++++++++++++++++++
 3 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/examples/playwright/test/basic.test.ts b/examples/playwright/test/basic.test.ts
index 44cee93046d7..4c6631c55b81 100644
--- a/examples/playwright/test/basic.test.ts
+++ b/examples/playwright/test/basic.test.ts
@@ -20,9 +20,10 @@ describe.runIf(process.platform !== 'win32')('basic', async () => {
   })
 
   afterAll(async () => {
-    await browser.close()
+    // hook timed out and we already have another error
+    await browser?.close()
     await new Promise<void>((resolve, reject) => {
-      server.httpServer.close(error => error ? reject(error) : resolve())
+      server?.httpServer.close(error => error ? reject(error) : resolve())
     })
   })
 
diff --git a/packages/vitest/src/node/plugins/index.ts b/packages/vitest/src/node/plugins/index.ts
index 09969d21f1bf..c0b1d9b237b0 100644
--- a/packages/vitest/src/node/plugins/index.ts
+++ b/packages/vitest/src/node/plugins/index.ts
@@ -45,8 +45,8 @@ export async function VitestPlugin(options: UserConfig = {}, ctx = new Vitest('t
         const testConfig = deepMerge(
           {} as UserConfig,
           configDefaults,
-          options,
           removeUndefinedValues(viteConfig.test ?? {}),
+          options,
         )
         testConfig.api = resolveApiServerConfig(testConfig)
 
diff --git a/test/config/test/resolution.test.ts b/test/config/test/resolution.test.ts
index 63d6009dbfc3..f36b522e5831 100644
--- a/test/config/test/resolution.test.ts
+++ b/test/config/test/resolution.test.ts
@@ -235,3 +235,31 @@ describe('correctly defines inline and noExternal flags', async () => {
     ])
   })
 })
+
+describe('correctly defines api flag', () => {
+  it('CLI overrides disabling api', async () => {
+    const c = await vitest({ api: false }, {
+      api: {
+        port: 1234,
+      },
+      watch: true,
+    })
+    expect(c.server.config.server.middlewareMode).toBe(true)
+    expect(c.config.api).toEqual({
+      middlewareMode: true,
+    })
+  })
+
+  it('CLI overrides inlined value', async () => {
+    const c = await vitest({ api: { port: 4321 } }, {
+      api: {
+        port: 1234,
+      },
+      watch: true,
+    })
+    expect(c.server.config.server.port).toBe(4321)
+    expect(c.config.api).toEqual({
+      port: 4321,
+    })
+  })
+})