Merge branch 'main' into fix-9642-merge-reports-reporter-errors

Author: hi-ogawa

.github/workflows/ci.yml

@@ -104,7 +104,7 @@ jobs:
         with:
           node-version: ${{ matrix.node_version }}
 
-      - uses: browser-actions/setup-chrome@b94431e051d1c52dcbe9a7092a4f10f827795416 # v2.1.0
+      - uses: browser-actions/setup-chrome@4f8e94349a351df0f048634f25fec36c3c91eded # v2.1.1
 
       - name: Install
         run: pnpm i
@@ -150,7 +150,7 @@ jobs:
         with:
           node-version: ${{ matrix.node_version }}
 
-      - uses: browser-actions/setup-chrome@b94431e051d1c52dcbe9a7092a4f10f827795416 # v2.1.0
+      - uses: browser-actions/setup-chrome@4f8e94349a351df0f048634f25fec36c3c91eded # v2.1.1
 
       - name: Install
         run: pnpm i
@@ -186,8 +186,8 @@ jobs:
         with:
           node-version: ${{ matrix.node_version }}
 
-      - uses: browser-actions/setup-chrome@b94431e051d1c52dcbe9a7092a4f10f827795416 # v2.1.0
-      - uses: browser-actions/setup-firefox@5914774dda97099441f02628f8d46411fcfbd208 # v1.7.0
+      - uses: browser-actions/setup-chrome@4f8e94349a351df0f048634f25fec36c3c91eded # v2.1.1
+      - uses: browser-actions/setup-firefox@fcf821c621167805dd63a29662bd7cb5676c81a8 # v1.7.1
 
       - name: Install
         run: pnpm i
@@ -219,7 +219,7 @@ jobs:
         with:
           node-version: 22
 
-      - uses: browser-actions/setup-chrome@b94431e051d1c52dcbe9a7092a4f10f827795416 # v2.1.0
+      - uses: browser-actions/setup-chrome@4f8e94349a351df0f048634f25fec36c3c91eded # v2.1.1
 
       - name: Install
         run: |

docs/guide/browser/index.md

@@ -402,7 +402,7 @@ Community packages are available for other frameworks:
 
 - [`vitest-browser-lit`](https://github.com/EskiMojo14/vitest-browser-lit) to render [lit](https://lit.dev) components
 - [`vitest-browser-preact`](https://github.com/JoviDeCroock/vitest-browser-preact) to render [preact](https://preactjs.com) components
-- [`vitest-browser-qwik`](https://github.com/kunai-consulting/vitest-browser-qwik) to render [qwik](https://qwik.dev) components
+- [`vitest-browser-qwik`](https://github.com/QwikDev/vitest-browser-qwik) to render [qwik](https://qwik.dev) components
 
 If your framework is not represented, feel free to create your own package - it is a simple wrapper around the framework renderer and `page.elementLocator` API. We will add a link to it on this page. Make sure it has a name starting with `vitest-browser-`.
 

docs/guide/migration.md

@@ -5,8 +5,17 @@ outline: deep
 
 # Migration Guide
 
+[Migrating to Vitest 3.0](https://v3.vitest.dev/guide/migration) | [Migrating to Vitest 2.0](https://v2.vitest.dev/guide/migration)
+
 ## Migrating to Vitest 4.0 {#vitest-4}
 
+::: warning Prerequisites
+Vitest 4.0 requires **Vite >= 6.0.0** and **Node.js >= 20.0.0**. Before proceeding
+with any other migration steps, ensure your environment meets these requirements.
+Running Vitest 4.0 on older versions of Vite or Node.js is not supported and may
+result in unexpected errors.
+:::
+
 ### V8 Code Coverage Major Changes
 
 Vitest's V8 code coverage provider is now using more accurate coverage result remapping logic.

docs/package.json

@@ -27,7 +27,7 @@
     "@vite-pwa/assets-generator": "^1.0.2",
     "@vite-pwa/vitepress": "^1.1.0",
     "@vitejs/plugin-vue": "catalog:",
-    "@voidzero-dev/vitepress-theme": "^4.5.0",
+    "@voidzero-dev/vitepress-theme": "^4.5.1",
     "https-localhost": "^4.7.1",
     "tinyglobby": "catalog:",
     "unocss": "catalog:",

package.json

@@ -3,7 +3,7 @@
   "type": "module",
   "version": "4.1.0-beta.4",
   "private": true,
-  "packageManager": "pnpm@10.30.1",
+  "packageManager": "pnpm@10.30.2",
   "description": "Next generation testing framework powered by Vite",
   "engines": {
     "node": "^20.0.0 || ^22.0.0 || >=24.0.0"
@@ -58,7 +58,7 @@
     "magic-string": "^0.30.21",
     "pathe": "^2.0.3",
     "premove": "^4.0.0",
-    "rollup": "^4.57.1",
+    "rollup": "^4.59.0",
     "rollup-plugin-dts": "^6.3.0",
     "rollup-plugin-license": "^3.7.0",
     "tinyglobby": "catalog:",

packages/browser/src/client/tester/context.ts

@@ -51,10 +51,10 @@ export function createUserEvent(__tl_user_event_base__?: TestingLibraryUserEvent
     setup() {
       return createUserEvent()
     },
-    async cleanup() {
+    cleanup() {
       // avoid cleanup rpc call if there is nothing to cleanup
       if (!keyboard.unreleased.length) {
-        return
+        return Promise.resolve()
       }
       return ensureAwaited(async (error) => {
         await triggerCommand('__vitest_cleanup', [keyboard], error)
@@ -100,7 +100,7 @@ export function createUserEvent(__tl_user_event_base__?: TestingLibraryUserEvent
     },
 
     // testing-library user-event
-    async type(element, text, options) {
+    type(element, text, options) {
       return ensureAwaited(async (error) => {
         const selector = await convertToSelector(element, options)
         const { unreleased } = await triggerCommand<{ unreleased: string[] }>(
@@ -118,7 +118,7 @@ export function createUserEvent(__tl_user_event_base__?: TestingLibraryUserEvent
     tab(options = {}) {
       return ensureAwaited(error => triggerCommand('__vitest_tab', [options], error))
     },
-    async keyboard(text) {
+    keyboard(text) {
       return ensureAwaited(async (error) => {
         const { unreleased } = await triggerCommand<{ unreleased: string[] }>(
           '__vitest_keyboard',
@@ -128,14 +128,14 @@ export function createUserEvent(__tl_user_event_base__?: TestingLibraryUserEvent
         keyboard.unreleased = unreleased
       })
     },
-    async copy() {
-      await userEvent.keyboard(`{${modifier}>}{c}{/${modifier}}`)
+    copy() {
+      return userEvent.keyboard(`{${modifier}>}{c}{/${modifier}}`)
     },
-    async cut() {
-      await userEvent.keyboard(`{${modifier}>}{x}{/${modifier}}`)
+    cut() {
+      return userEvent.keyboard(`{${modifier}>}{x}{/${modifier}}`)
     },
-    async paste() {
-      await userEvent.keyboard(`{${modifier}>}{v}{/${modifier}}`)
+    paste() {
+      return userEvent.keyboard(`{${modifier}>}{v}{/${modifier}}`)
     },
   }
   return userEvent

packages/browser/src/client/tester/locators/index.ts

@@ -135,7 +135,7 @@ export abstract class Locator {
     return this.triggerCommand<void>('__vitest_fill', this.selector, text, options)
   }
 
-  public async upload(files: string | string[] | File | File[], options?: UserEventUploadOptions): Promise<void> {
+  public upload(files: string | string[] | File | File[], options?: UserEventUploadOptions): Promise<void> {
     return ensureAwaited(async (error) => {
       const filesPromise = (Array.isArray(files) ? files : [files]).map(async (file) => {
         if (typeof file === 'string') {

packages/browser/src/node/projectParent.ts

@@ -11,10 +11,10 @@ import type {
   Vitest,
 } from 'vitest/node'
 import type { BrowserServerState } from './state'
-import { readFileSync } from 'node:fs'
 import { readFile } from 'node:fs/promises'
 import { parseErrorStacktrace, parseStacktrace } from '@vitest/utils/source-map'
-import { dirname, join, resolve } from 'pathe'
+import { extractSourcemapFromFile } from '@vitest/utils/source-map/node'
+import { join, resolve } from 'pathe'
 import { BrowserServerCDPHandler } from './cdp'
 import builtinCommands from './commands/index'
 import { distRoot } from './constants'
@@ -61,19 +61,17 @@ export class ParentBrowserProject {
         if (this.sourceMapCache.has(id)) {
           return this.sourceMapCache.get(id)
         }
+
         const result = this.vite.moduleGraph.getModuleById(id)?.transformResult
-        // this can happen for bundled dependencies in node_modules/.vite
+        // handle non-inline source map such as pre-bundled deps in node_modules/.vite
         if (result && !result.map) {
-          const sourceMapUrl = this.retrieveSourceMapURL(result.code)
-          if (!sourceMapUrl) {
-            return null
-          }
-          const filepathDir = dirname(id)
-          const sourceMapPath = resolve(filepathDir, sourceMapUrl)
-          const map = JSON.parse(readFileSync(sourceMapPath, 'utf-8'))
-          this.sourceMapCache.set(id, map)
-          return map
+          const filePath = id.split('?')[0]
+          const extracted = extractSourcemapFromFile(result.code, filePath)
+          this.sourceMapCache.set(id, extracted?.map)
+          return extracted?.map
         }
+
+        this.sourceMapCache.set(id, result?.map)
         return result?.map
       },
       getUrlId: (id) => {
@@ -262,20 +260,4 @@ export class ParentBrowserProject {
     const decodedTestFile = decodeURIComponent(testFile)
     return { sessionId, testFile: decodedTestFile }
   }
-
-  private retrieveSourceMapURL(source: string): string | null {
-    const re
-      = /\/\/[@#]\s*sourceMappingURL=([^\s'"]+)\s*$|\/\*[@#]\s*sourceMappingURL=[^\s*'"]+\s*\*\/\s*$/gm
-    // Keep executing the search to find the *last* sourceMappingURL to avoid
-    // picking up sourceMappingURLs from comments, strings, etc.
-    let lastMatch, match
-    // eslint-disable-next-line no-cond-assign
-    while ((match = re.exec(source))) {
-      lastMatch = match
-    }
-    if (!lastMatch) {
-      return null
-    }
-    return lastMatch[1]
-  }
 }

packages/browser/src/node/rpc.ts

@@ -6,12 +6,13 @@ import type { WebSocket } from 'ws'
 import type { WebSocketBrowserEvents, WebSocketBrowserHandlers } from '../types'
 import type { ParentBrowserProject } from './projectParent'
 import type { BrowserServerState } from './state'
-import { existsSync, promises as fs, readFileSync } from 'node:fs'
+import { existsSync, promises as fs } from 'node:fs'
 import { AutomockedModule, AutospiedModule, ManualMockedModule, RedirectedModule } from '@vitest/mocker'
 import { ServerMockResolver } from '@vitest/mocker/node'
+import { extractSourcemapFromFile } from '@vitest/utils/source-map/node'
 import { createBirpc } from 'birpc'
 import { parse, stringify } from 'flatted'
-import { dirname, join, resolve } from 'pathe'
+import { dirname, join } from 'pathe'
 import { createDebugger, isFileLoadingAllowed, isValidApiRequest } from 'vitest/node'
 import { WebSocketServer } from 'ws'
 
@@ -244,21 +245,11 @@ export function setupBrowserRpc(globalServer: ParentBrowserProject, defaultMocke
         getBrowserFileSourceMap(id) {
           const mod = globalServer.vite.moduleGraph.getModuleById(id)
           const result = mod?.transformResult
-          // this can happen for bundled dependencies in node_modules/.vite
+          // handle non-inline source map such as pre-bundled deps in node_modules/.vite
           if (result && !result.map) {
-            const sourceMapUrl = retrieveSourceMapURL(result.code)
-            if (!sourceMapUrl) {
-              return null
-            }
-            const filepathDir = dirname(id)
-            const sourceMapPath = resolve(filepathDir, sourceMapUrl)
-            try {
-              const map = JSON.parse(readFileSync(sourceMapPath, 'utf-8'))
-              return map
-            }
-            catch {
-              return null
-            }
+            const filePath = id.split('?')[0]
+            const extracted = extractSourcemapFromFile(result.code, filePath)
+            return extracted?.map
           }
           return result?.map
         },
@@ -410,21 +401,6 @@ export function setupBrowserRpc(globalServer: ParentBrowserProject, defaultMocke
   }
 }
 
-function retrieveSourceMapURL(source: string): string | null {
-  const re = /\/\/[@#]\s*sourceMappingURL=([^\s'"]+)\s*$|\/\*[@#]\s*sourceMappingURL=[^\s*'"]+\s*\*\/\s*$/gm
-  // keep executing the search to find the *last* sourceMappingURL to avoid
-  // picking up sourceMappingURLs from comments, strings, etc.
-  let lastMatch, match
-  // eslint-disable-next-line no-cond-assign
-  while ((match = re.exec(source))) {
-    lastMatch = match
-  }
-  if (!lastMatch) {
-    return null
-  }
-  return lastMatch[1]
-}
-
 // Serialization support utils.
 function cloneByOwnProperties(value: any) {
   // Clones the value's properties into a new Object. The simpler approach of

packages/runner/src/fixture.ts

@@ -18,7 +18,7 @@ export type UserFixtures = Record<string, unknown>
 export type FixtureRegistrations = Map<string, TestFixtureItem>
 
 export class TestFixtures {
-  private _suiteContexts: WeakMap<Suite | symbol, /* context object */ Record<string, unknown>>
+  private _suiteContexts: WeakMap<Suite | { type: 'worker' }, /* context object */ Record<string, unknown>>
   private _overrides = new WeakMap<Suite, FixtureRegistrations>()
   private _registrations: FixtureRegistrations
 
@@ -34,7 +34,7 @@ export class TestFixtures {
 
   private static _fixtureOptionKeys: string[] = ['auto', 'injected', 'scope']
   private static _fixtureScopes: string[] = ['test', 'file', 'worker']
-  private static _workerContextSymbol = Symbol('workerContext')
+  private static _workerContextSuite = { type: 'worker' } as const
 
   static clearDefinitions(): void {
     TestFixtures._definitions.length = 0
@@ -103,10 +103,10 @@ export class TestFixtures {
   }
 
   getWorkerContext(): Record<string, any> {
-    if (!this._suiteContexts.has(TestFixtures._workerContextSymbol)) {
-      this._suiteContexts.set(TestFixtures._workerContextSymbol, Object.create(null))
+    if (!this._suiteContexts.has(TestFixtures._workerContextSuite)) {
+      this._suiteContexts.set(TestFixtures._workerContextSuite, Object.create(null))
     }
-    return this._suiteContexts.get(TestFixtures._workerContextSymbol)!
+    return this._suiteContexts.get(TestFixtures._workerContextSuite)!
   }
 
   private parseUserFixtures(