Merge branch 'main' into fix-inlinesnapshot

Author: hi-ogawa

docs/api/vi.md

@@ -818,8 +818,8 @@ Mocking `nextTick` is not supported when running Vitest inside `node:child_proce
 The implementation is based internally on [`@sinonjs/fake-timers`](https://github.com/sinonjs/fake-timers).
 
 ::: tip
-`vi.useFakeTimers()` does not automatically mock `process.nextTick`.
-But you can enable it by specifying the option in `toFake` argument: `vi.useFakeTimers({ toFake: ['nextTick'] })`.
+`vi.useFakeTimers()` does not automatically mock `process.nextTick` and `queueMicrotask`.
+But you can enable it by specifying the option in `toFake` argument: `vi.useFakeTimers({ toFake: ['nextTick', 'queueMicrotask'] })`.
 :::
 
 ### vi.isFakeTimers {#vi-isfaketimers}

docs/config/index.md

@@ -2345,7 +2345,7 @@ Installs fake timers with the specified Unix epoch.
 #### fakeTimers.toFake
 
 - **Type:** `('setTimeout' | 'clearTimeout' | 'setImmediate' | 'clearImmediate' | 'setInterval' | 'clearInterval' | 'Date' | 'nextTick' | 'hrtime' | 'requestAnimationFrame' | 'cancelAnimationFrame' | 'requestIdleCallback' | 'cancelIdleCallback' | 'performance' | 'queueMicrotask')[]`
-- **Default:** everything available globally except `nextTick`
+- **Default:** everything available globally except `nextTick` and `queueMicrotask`
 
 An array with names of global methods and APIs to fake.
 

docs/guide/index.md

@@ -234,7 +234,7 @@ Vitest will prompt you to install certain dependencies if they are not already i
 
 ## IDE Integrations
 
-We also provided a official extension for Visual Studio Code to enhance your testing experience with Vitest.
+We also provided an official extension for Visual Studio Code to enhance your testing experience with Vitest.
 
 [Install from VS Code Marketplace](https://marketplace.visualstudio.com/items?itemName=vitest.explorer)
 

docs/guide/mocking.md

@@ -473,7 +473,7 @@ afterAll(() => server.close())
 afterEach(() => server.resetHandlers())
 ```
 
-```js [GrapQL Setup]
+```js [GraphQL Setup]
 import { afterAll, afterEach, beforeAll } from 'vitest'
 import { setupServer } from 'msw/node'
 import { graphql, HttpResponse } from 'msw'

docs/package.json

@@ -14,11 +14,11 @@
     "generate-pwa-icons": "pwa-assets-generator"
   },
   "dependencies": {
-    "@vueuse/core": "^12.5.0",
+    "@vueuse/core": "^12.7.0",
     "vue": "^3.5.12"
   },
   "devDependencies": {
-    "@iconify-json/carbon": "^1.2.6",
+    "@iconify-json/carbon": "^1.2.7",
     "@iconify-json/logos": "^1.2.4",
     "@shikijs/transformers": "^1.29.2",
     "@shikijs/vitepress-twoslash": "^1.29.2",
@@ -27,13 +27,13 @@
     "@vite-pwa/vitepress": "^0.5.3",
     "@vitejs/plugin-vue": "^5.2.1",
     "https-localhost": "^4.7.1",
-    "tinyglobby": "^0.2.10",
+    "tinyglobby": "^0.2.12",
     "unocss": "^0.65.4",
     "unplugin-vue-components": "^0.28.0",
     "vite": "^5.2.8",
     "vite-plugin-pwa": "^0.21.1",
     "vitepress": "^1.6.3",
-    "vitepress-plugin-group-icons": "^1.3.5",
+    "vitepress-plugin-group-icons": "^1.3.6",
     "vitepress-plugin-tabs": "^0.6.0",
     "workbox-window": "^7.3.0"
   }

package.json

@@ -1,9 +1,9 @@
 {
   "name": "@vitest/monorepo",
   "type": "module",
-  "version": "3.0.5",
+  "version": "3.0.7",
   "private": true,
-  "packageManager": "pnpm@9.15.5",
+  "packageManager": "pnpm@10.4.1",
   "description": "Next generation testing framework powered by Vite",
   "engines": {
     "node": "^18.0.0 || >=20.0.0"
@@ -42,25 +42,25 @@
     "@rollup/plugin-commonjs": "^28.0.2",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^16.0.0",
-    "@types/node": "^22.13.1",
+    "@types/node": "^22.13.5",
     "@types/ws": "^8.5.14",
     "@vitest/browser": "workspace:*",
     "@vitest/coverage-istanbul": "workspace:*",
     "@vitest/coverage-v8": "workspace:*",
     "@vitest/ui": "workspace:*",
-    "bumpp": "^10.0.2",
+    "bumpp": "^10.0.3",
     "changelogithub": "^13.12.1",
     "esbuild": "^0.25.0",
-    "eslint": "^9.20.0",
+    "eslint": "^9.21.0",
     "magic-string": "^0.30.17",
-    "pathe": "^2.0.2",
+    "pathe": "^2.0.3",
     "rimraf": "^6.0.1",
-    "rollup": "^4.34.6",
+    "rollup": "^4.34.8",
     "rollup-plugin-dts": "^6.1.1",
     "rollup-plugin-esbuild": "^6.2.0",
-    "rollup-plugin-license": "^3.5.3",
-    "tinyglobby": "^0.2.10",
-    "tsx": "^4.19.2",
+    "rollup-plugin-license": "^3.6.0",
+    "tinyglobby": "^0.2.12",
+    "tsx": "^4.19.3",
     "typescript": "^5.7.3",
     "vite": "^6.0.11",
     "vitest": "workspace:*",
@@ -88,6 +88,17 @@
       "@types/[email protected]": "patches/@[email protected]",
       "[email protected]": "patches/[email protected]",
       "[email protected]": "patches/[email protected]"
-    }
+    },
+    "onlyBuiltDependencies": [
+      "@sveltejs/kit",
+      "@swc/core",
+      "edgedriver",
+      "esbuild",
+      "geckodriver",
+      "msw",
+      "sharp",
+      "svelte-preprocess",
+      "vue-demi"
+    ]
   }
 }

packages/browser/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/browser",
   "type": "module",
-  "version": "3.0.5",
+  "version": "3.0.7",
   "description": "Browser running for Vitest",
   "license": "MIT",
   "funding": "https://opencollective.com/vitest",
@@ -60,6 +60,7 @@
     "*.d.ts",
     "context.js",
     "dist",
+    "dummy.js",
     "providers"
   ],
   "scripts": {
@@ -73,7 +74,7 @@
   "peerDependencies": {
     "playwright": "*",
     "vitest": "workspace:*",
-    "webdriverio": "*"
+    "webdriverio": "^7.0.0 || ^8.0.0 || ^9.0.0"
   },
   "peerDependenciesMeta": {
     "playwright": {
@@ -87,33 +88,33 @@
     }
   },
   "dependencies": {
-    "@testing-library/dom": "^10.4.0",
     "@testing-library/user-event": "^14.6.1",
     "@vitest/mocker": "workspace:*",
     "@vitest/utils": "workspace:*",
     "magic-string": "^0.30.17",
-    "msw": "^2.7.0",
-    "sirv": "^3.0.0",
+    "msw": "^2.7.3",
+    "sirv": "^3.0.1",
     "tinyrainbow": "^2.0.0",
-    "ws": "^8.18.0"
+    "ws": "^8.18.1"
   },
   "devDependencies": {
     "@testing-library/jest-dom": "^6.6.3",
     "@types/ws": "^8.5.14",
     "@vitest/runner": "workspace:*",
     "@vitest/ui": "workspace:*",
     "@vitest/ws-client": "workspace:*",
-    "@wdio/protocols": "^8.40.3",
+    "@wdio/protocols": "^9.7.0",
+    "@wdio/types": "^9.9.0",
     "birpc": "0.2.19",
-    "flatted": "^3.3.2",
+    "flatted": "^3.3.3",
     "ivya": "^1.1.1",
     "mime": "^4.0.6",
-    "pathe": "^2.0.2",
+    "pathe": "^2.0.3",
     "periscopic": "^4.0.2",
     "playwright": "^1.50.1",
     "playwright-core": "^1.50.1",
     "safaridriver": "^1.0.0",
     "vitest": "workspace:*",
-    "webdriverio": "^8.41.0"
+    "webdriverio": "^9.10.0"
   }
 }

packages/browser/providers/webdriverio.d.ts

@@ -1,9 +1,11 @@
-import type { RemoteOptions, ClickOptions, DragAndDropOptions } from 'webdriverio'
+import type { remote, ClickOptions, DragAndDropOptions } from 'webdriverio'
 import '../matchers.js'
 import type {} from "vitest/node"
 
 declare module 'vitest/node' {
-  export interface BrowserProviderOptions extends Partial<RemoteOptions> {}
+  export interface BrowserProviderOptions extends Partial<
+    Parameters<typeof remote>[0]
+  > {}
 
   export interface UserEventClickOptions extends ClickOptions {}
 

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

@@ -1,5 +1,4 @@
 import type { Options as TestingLibraryOptions, UserEvent as TestingLibraryUserEvent } from '@testing-library/user-event'
-import type { BrowserRPC } from '@vitest/browser/client'
 import type { RunnerTask } from 'vitest'
 import type {
   BrowserPage,
@@ -19,15 +18,11 @@ import { convertElementToCssSelector, ensureAwaited, getBrowserState, getWorkerS
 const state = () => getWorkerState()
 // @ts-expect-error not typed global
 const provider = __vitest_browser_runner__.provider
-function filepath() {
-  return getWorkerState().filepath || getWorkerState().current?.file?.filepath || undefined
-}
-const rpc = () => getWorkerState().rpc as any as BrowserRPC
 const sessionId = getBrowserState().sessionId
 const channel = new BroadcastChannel(`vitest:${sessionId}`)
 
 function triggerCommand<T>(command: string, ...args: any[]) {
-  return rpc().triggerCommand<T>(sessionId, command, filepath(), args)
+  return getBrowserState().commands.triggerCommand<T>(command, args)
 }
 
 export function createUserEvent(__tl_user_event_base__?: TestingLibraryUserEvent, options?: TestingLibraryOptions): UserEvent {
@@ -52,6 +47,10 @@ export function createUserEvent(__tl_user_event_base__?: TestingLibraryUserEvent
       return createUserEvent()
     },
     async cleanup() {
+      // avoid cleanup rpc call if there is nothing to cleanup
+      if (!keyboard.unreleased.length) {
+        return
+      }
       return ensureAwaited(async () => {
         await triggerCommand('__vitest_cleanup', keyboard)
         keyboard.unreleased = []
@@ -106,9 +105,7 @@ export function createUserEvent(__tl_user_event_base__?: TestingLibraryUserEvent
       })
     },
     tab(options: UserEventTabOptions = {}) {
-      return ensureAwaited(() => {
-        return triggerCommand('__vitest_tab', options)
-      })
+      return ensureAwaited(() => triggerCommand('__vitest_tab', options))
     },
     async keyboard(text: string) {
       return ensureAwaited(async () => {

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

@@ -1,4 +1,3 @@
-import type { BrowserRPC } from '@vitest/browser/client'
 import type {
   LocatorByRoleOptions,
   LocatorOptions,
@@ -8,8 +7,6 @@ import type {
   UserEventFillOptions,
   UserEventHoverOptions,
 } from '@vitest/browser/context'
-import type { WorkerGlobalState } from 'vitest'
-import type { BrowserRunnerState } from '../../utils'
 import { page, server } from '@vitest/browser/context'
 import {
   getByAltTextSelector,
@@ -22,7 +19,7 @@ import {
   Ivya,
   type ParsedSelector,
 } from 'ivya'
-import { ensureAwaited, getBrowserState, getWorkerState } from '../../utils'
+import { ensureAwaited, getBrowserState } from '../../utils'
 import { getElementError } from '../public-utils'
 
 // we prefer using playwright locators because they are more powerful and support Shadow DOM
@@ -205,27 +202,10 @@ export abstract class Locator {
     return this.selector
   }
 
-  private get state(): BrowserRunnerState {
-    return getBrowserState()
-  }
-
-  private get worker(): WorkerGlobalState {
-    return getWorkerState()
-  }
-
-  private get rpc(): BrowserRPC {
-    return this.worker.rpc as any as BrowserRPC
-  }
-
   protected triggerCommand<T>(command: string, ...args: any[]): Promise<T> {
-    const filepath = this.worker.filepath
-      || this.worker.current?.file?.filepath
-      || undefined
-
-    return ensureAwaited(() => this.rpc.triggerCommand<T>(
-      this.state.sessionId,
+    const commands = getBrowserState().commands
+    return ensureAwaited(() => commands.triggerCommand<T>(
       command,
-      filepath,
       args,
     ))
   }