@vitest/browser 3.0.6 → 3.0.7

package/dist/client/.vite/manifest.json

@@ -1,24 +1,24 @@
 {
-  "_utils-Owv5OOOf.js": {
-    "file": "__vitest_browser__/utils-Owv5OOOf.js",
+  "_utils-CBFLDkwI.js": {
+    "file": "__vitest_browser__/utils-CBFLDkwI.js",
     "name": "utils"
   },
   "orchestrator.html": {
-    "file": "__vitest_browser__/orchestrator-BR1Ueh0Q.js",
+    "file": "__vitest_browser__/orchestrator-DeY4LJgz.js",
     "name": "orchestrator",
     "src": "orchestrator.html",
     "isEntry": true,
     "imports": [
-      "_utils-Owv5OOOf.js"
+      "_utils-CBFLDkwI.js"
     ]
   },
   "tester/tester.html": {
-    "file": "__vitest_browser__/tester-oUsZBBvV.js",
+    "file": "__vitest_browser__/tester-Cqa_buNy.js",
     "name": "tester",
     "src": "tester/tester.html",
     "isEntry": true,
     "imports": [
-      "_utils-Owv5OOOf.js"
+      "_utils-CBFLDkwI.js"
     ]
   }
 }

package/dist/client/__vitest_browser__/{orchestrator-BR1Ueh0Q.js → orchestrator-DeY4LJgz.js}

@@ -1,7 +1,7 @@
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-import { g as getBrowserState, a as getConfig, r as relative } from "./utils-Owv5OOOf.js";
+import { g as getBrowserState, a as getConfig, r as relative } from "./utils-CBFLDkwI.js";
 import { client, channel, globalChannel } from "@vitest/browser/client";
 function generateHash(str) {
   let hash = 0;

package/dist/client/__vitest_browser__/{tester-oUsZBBvV.js → tester-Cqa_buNy.js}

@@ -1,9 +1,9 @@
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-import { a as getConfig, g as getBrowserState, b as resolve, e as executor, c as getWorkerState } from "./utils-Owv5OOOf.js";
+import { a as getConfig, g as getBrowserState, b as resolve, e as executor, c as getWorkerState, C as CommandsManager } from "./utils-CBFLDkwI.js";
 import { globalChannel, client, onCancel, channel } from "@vitest/browser/client";
-import { userEvent, page } from "@vitest/browser/context";
+import { userEvent, page, server } from "@vitest/browser/context";
 import { loadDiffConfig, loadSnapshotSerializers, takeCoverageInsideWorker, setupCommonEnv, startCoverageInsideWorker, startTests, collectTests, stopCoverageInsideWorker, SpyModule } from "vitest/browser";
 import { expect, chai } from "vitest";
 import { getSafeTimers, stringify, format, TraceMap, originalPositionFor } from "vitest/utils";
@@ -13045,6 +13045,11 @@ ${stack}`, true);
 function stdout(base) {
   return (...args) => {
     base(...args);
+    if (args[0] === "[WDIO]") {
+      if (args[1] === "newShadowRoot" || args[1] === "removeShadowRoot") {
+        return;
+      }
+    }
     sendLog("stdout", processLog(args));
   };
 }
@@ -15366,6 +15371,7 @@ async function prepareTestEnvironment(files) {
   state.ctx.files = files;
   state.onCancel = onCancel;
   state.rpc = rpc2;
+  getBrowserState().commands = new CommandsManager();
   const interceptor = createModuleMockerInterceptor();
   const mocker = new VitestBrowserClientMocker(
     interceptor,
@@ -15394,7 +15400,9 @@ async function prepareTestEnvironment(files) {
   return {
     runner,
     config,
-    state
+    state,
+    rpc: rpc2,
+    commands: getBrowserState().commands
   };
 }
 function done(files) {
@@ -15425,9 +15433,25 @@ async function executeTests(method, files) {
     return;
   }
   debug("runner resolved successfully");
-  const { config, runner, state } = preparedData;
+  const { config, runner, state, commands, rpc: rpc2 } = preparedData;
   state.durations.prepare = performance.now() - state.durations.prepare;
   debug("prepare time", state.durations.prepare, "ms");
+  let contextSwitched = false;
+  if (server.provider === "webdriverio") {
+    let switchPromise = null;
+    commands.onCommand(async () => {
+      if (switchPromise) {
+        await switchPromise;
+      }
+      if (!contextSwitched) {
+        switchPromise = rpc2.wdioSwitchContext("iframe").finally(() => {
+          switchPromise = null;
+          contextSwitched = true;
+        });
+        await switchPromise;
+      }
+    });
+  }
   try {
     await Promise.all([
       setupCommonEnv(config),
@@ -15454,6 +15478,9 @@ async function executeTests(method, files) {
         page[cleanupSymbol]();
       }
       await userEvent.cleanup();
+      if (contextSwitched) {
+        await rpc2.wdioSwitchContext("parent");
+      }
     } catch (error) {
       await client.rpc.onUnhandledError({
         name: error.name,

package/dist/client/__vitest_browser__/{utils-Owv5OOOf.js → utils-CBFLDkwI.js}

@@ -1,3 +1,6 @@
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 (function polyfill() {
   const relList = document.createElement("link").relList;
   if (relList && relList.supports && relList.supports("modulepreload")) {
@@ -185,7 +188,27 @@ function getWorkerState() {
   }
   return state;
 }
+class CommandsManager {
+  constructor() {
+    __publicField(this, "_listeners", []);
+  }
+  onCommand(listener) {
+    this._listeners.push(listener);
+  }
+  async triggerCommand(command, args) {
+    var _a, _b;
+    const state = /* @__PURE__ */ getWorkerState();
+    const rpc = state.rpc;
+    const { sessionId } = /* @__PURE__ */ getBrowserState();
+    const filepath = state.filepath || ((_b = (_a = state.current) == null ? void 0 : _a.file) == null ? void 0 : _b.filepath);
+    if (this._listeners.length) {
+      await Promise.all(this._listeners.map((listener) => listener(command, args)));
+    }
+    return rpc.triggerCommand(sessionId, command, filepath, args);
+  }
+}
 export {
+  CommandsManager as C,
   getConfig as a,
   resolve as b,
   getWorkerState as c,

package/dist/client/orchestrator.html

@@ -26,8 +26,8 @@
     {__VITEST_INJECTOR__}
     {__VITEST_ERROR_CATCHER__}
     {__VITEST_SCRIPTS__}
-    <script type="module" crossorigin src="/__vitest_browser__/orchestrator-BR1Ueh0Q.js"></script>
-    <link rel="modulepreload" crossorigin href="/__vitest_browser__/utils-Owv5OOOf.js">
+    <script type="module" crossorigin src="/__vitest_browser__/orchestrator-DeY4LJgz.js"></script>
+    <link rel="modulepreload" crossorigin href="/__vitest_browser__/utils-CBFLDkwI.js">
   </head>
   <body>
     <div id="vitest-tester"></div>

package/dist/client/tester/tester.html

@@ -5,8 +5,8 @@
     <link rel="icon" href="{__VITEST_FAVICON__}" type="image/svg+xml">
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Vitest Browser Tester</title>
-    <script type="module" crossorigin src="/__vitest_browser__/tester-oUsZBBvV.js"></script>
-    <link rel="modulepreload" crossorigin href="/__vitest_browser__/utils-Owv5OOOf.js">
+    <script type="module" crossorigin src="/__vitest_browser__/tester-Cqa_buNy.js"></script>
+    <link rel="modulepreload" crossorigin href="/__vitest_browser__/utils-CBFLDkwI.js">
   </head>
   <body>
   </body>

package/dist/context.js

@@ -113,14 +113,10 @@ function getParent(el) {
 
 const state = () => getWorkerState();
 const provider = __vitest_browser_runner__.provider;
-function filepath() {
-  return getWorkerState().filepath || getWorkerState().current?.file?.filepath || void 0;
-}
-const rpc = () => getWorkerState().rpc;
 const sessionId = getBrowserState().sessionId;
 const channel = new BroadcastChannel(`vitest:${sessionId}`);
 function triggerCommand(command, ...args) {
-  return rpc().triggerCommand(sessionId, command, filepath(), args);
+  return getBrowserState().commands.triggerCommand(command, args);
 }
 function createUserEvent(__tl_user_event_base__, options) {
   if (__tl_user_event_base__) {
@@ -135,6 +131,9 @@ function createUserEvent(__tl_user_event_base__, options) {
       return createUserEvent();
     },
     async cleanup() {
+      if (!keyboard.unreleased.length) {
+        return;
+      }
       return ensureAwaited(async () => {
         await triggerCommand("__vitest_cleanup", keyboard);
         keyboard.unreleased = [];
@@ -187,9 +186,7 @@ function createUserEvent(__tl_user_event_base__, options) {
       });
     },
     tab(options2 = {}) {
-      return ensureAwaited(() => {
-        return triggerCommand("__vitest_tab", options2);
-      });
+      return ensureAwaited(() => triggerCommand("__vitest_tab", options2));
     },
     async keyboard(text) {
       return ensureAwaited(async () => {

package/dist/{index-D-kNWeee.js → index-fqTesRIH.js}

@@ -250,21 +250,10 @@ class Locator {
   toJSON() {
     return this.selector;
   }
-  get state() {
-    return getBrowserState();
-  }
-  get worker() {
-    return getWorkerState();
-  }
-  get rpc() {
-    return this.worker.rpc;
-  }
   triggerCommand(command, ...args) {
-    const filepath = this.worker.filepath || this.worker.current?.file?.filepath || void 0;
-    return ensureAwaited(() => this.rpc.triggerCommand(
-      this.state.sessionId,
+    const commands = getBrowserState().commands;
+    return ensureAwaited(() => commands.triggerCommand(
       command,
-      filepath,
       args
     ));
   }

package/dist/index.d.ts

@@ -48,6 +48,7 @@ interface WebSocketBrowserHandlers {
     getBrowserFileSourceMap: (id: string) => SourceMap | null | {
         mappings: '';
     } | undefined;
+    wdioSwitchContext: (direction: 'iframe' | 'parent') => void;
     sendCdpEvent: (sessionId: string, event: string, payload?: Record<string, unknown>) => unknown;
     trackCdpEvent: (sessionId: string, type: 'on' | 'once' | 'off', event: string, listenerId: string) => void;
 }

package/dist/index.js

@@ -11,12 +11,12 @@ import { fileURLToPath } from 'node:url';
 import crypto from 'node:crypto';
 import { mkdir, readFile as readFile$1 } from 'node:fs/promises';
 import { parseErrorStacktrace, parseStacktrace } from '@vitest/utils/source-map';
-import { P as PlaywrightBrowserProvider, W as WebdriverBrowserProvider } from './webdriver-kh_HHy0p.js';
+import { P as PlaywrightBrowserProvider, W as WebdriverBrowserProvider } from './webdriver-C5-VI7VH.js';
 import { resolve as resolve$1, dirname as dirname$1, basename as basename$1, normalize as normalize$1 } from 'node:path';
 import { WebSocketServer } from 'ws';
 import * as nodeos from 'node:os';
 
-var version = "3.0.6";
+var version = "3.0.7";
 
 const _DRIVE_LETTER_START_RE = /^[A-Za-z]:\//;
 function normalizeWindowsPath(input = "") {
@@ -548,11 +548,10 @@ function BrowserContext(globalServer) {
 }
 async function generateContextFile(globalServer) {
   const commands = Object.keys(globalServer.commands);
-  const filepathCode = "__vitest_worker__.filepath || __vitest_worker__.current?.file?.filepath || undefined";
   const provider = [...globalServer.children][0].provider || { name: "preview" };
   const providerName = provider.name;
   const commandsCode = commands.filter((command) => !command.startsWith("__vitest")).map((command) => {
-    return `    ["${command}"]: (...args) => rpc().triggerCommand(sessionId, "${command}", filepath(), args),`;
+    return `    ["${command}"]: (...args) => __vitest_browser_runner__.commands.triggerCommand("${command}", args),`;
   }).join("\n");
   const userEventNonProviderImport = await getUserEventImport(
     providerName,
@@ -562,9 +561,6 @@ async function generateContextFile(globalServer) {
   return `
 import { page, createUserEvent, cdp } from '${distContextPath}'
 ${userEventNonProviderImport}
-const filepath = () => ${filepathCode}
-const rpc = () => __vitest_worker__.rpc
-const sessionId = __vitest_browser_runner__.sessionId
 
 export const server = {
   platform: ${JSON.stringify(process.platform)},
@@ -2065,6 +2061,9 @@ const keyboard = async (context, text, state) => {
 };
 const keyboardCleanup = async (context, state) => {
   const { provider, sessionId } = context;
+  if (!state.unreleased) {
+    return;
+  }
   if (provider instanceof PlaywrightBrowserProvider) {
     const page = provider.getPage(sessionId);
     for (const key of state.unreleased) {
@@ -2932,6 +2931,20 @@ function setupBrowserRpc(globalServer) {
         getCountOfFailedTests() {
           return vitest.state.getCountOfFailedTests();
         },
+        async wdioSwitchContext(direction) {
+          const provider = project.browser.provider;
+          if (!provider) {
+            throw new Error("Commands are only available for browser tests.");
+          }
+          if (provider.name !== "webdriverio") {
+            throw new Error("Switch context is only available for WebDriverIO provider.");
+          }
+          if (direction === "iframe") {
+            await provider.switchToTestFrame();
+          } else {
+            await provider.switchToMainFrame();
+          }
+        },
         async triggerCommand(sessionId, command, testPath, payload) {
           debug$1?.('[%s] Triggering command "%s"', sessionId, command);
           const provider = project.browser.provider;
@@ -2942,7 +2955,6 @@ function setupBrowserRpc(globalServer) {
           if (!commands || !commands[command]) {
             throw new Error(`Unknown command "${command}".`);
           }
-          await provider.beforeCommand?.(command, payload);
           const context = Object.assign(
             {
               testPath,
@@ -2953,13 +2965,7 @@ function setupBrowserRpc(globalServer) {
             },
             provider.getCommandsContext(sessionId)
           );
-          let result;
-          try {
-            result = await commands[command](context, ...payload);
-          } finally {
-            await provider.afterCommand?.(command, payload);
-          }
-          return result;
+          return await commands[command](context, ...payload);
         },
         finishBrowserTests(sessionId) {
           debug$1?.("[%s] Finishing browser tests for session", sessionId);

package/dist/locators/index.d.ts

@@ -258,9 +258,6 @@ declare abstract class Locator {
     last(): Locator;
     toString(): string;
     toJSON(): string;
-    private get state();
-    private get worker();
-    private get rpc();
     protected triggerCommand<T>(command: string, ...args: any[]): Promise<T>;
 }
 

package/dist/locators/index.js

@@ -1,4 +1,4 @@
 import '@vitest/browser/context';
 import '../public-utils-J4vwTaki.js';
-export { L as Locator, s as selectorEngine } from '../index-D-kNWeee.js';
+export { L as Locator, s as selectorEngine } from '../index-fqTesRIH.js';
 import 'vitest/utils';

package/dist/locators/playwright.js

@@ -1,6 +1,6 @@
 import { page, server } from '@vitest/browser/context';
 import { g as getByTitleSelector, a as getByTextSelector, b as getByPlaceholderSelector, c as getByAltTextSelector, d as getByTestIdSelector, e as getByRoleSelector, f as getByLabelSelector } from '../public-utils-J4vwTaki.js';
-import { s as selectorEngine, L as Locator } from '../index-D-kNWeee.js';
+import { s as selectorEngine, L as Locator } from '../index-fqTesRIH.js';
 import 'vitest/utils';
 
 page.extend({

package/dist/locators/preview.js

@@ -1,6 +1,6 @@
 import { page, server, userEvent } from '@vitest/browser/context';
 import { g as getByTitleSelector, a as getByTextSelector, b as getByPlaceholderSelector, c as getByAltTextSelector, d as getByTestIdSelector, e as getByRoleSelector, f as getByLabelSelector, h as getElementError } from '../public-utils-J4vwTaki.js';
-import { s as selectorEngine, L as Locator, c as convertElementToCssSelector } from '../index-D-kNWeee.js';
+import { s as selectorEngine, L as Locator, c as convertElementToCssSelector } from '../index-fqTesRIH.js';
 import 'vitest/utils';
 
 page.extend({

package/dist/locators/webdriverio.js

@@ -1,6 +1,6 @@
 import { page, server } from '@vitest/browser/context';
 import { g as getByTitleSelector, a as getByTextSelector, b as getByPlaceholderSelector, c as getByAltTextSelector, d as getByTestIdSelector, e as getByRoleSelector, f as getByLabelSelector, h as getElementError } from '../public-utils-J4vwTaki.js';
-import { s as selectorEngine, L as Locator, c as convertElementToCssSelector } from '../index-D-kNWeee.js';
+import { s as selectorEngine, L as Locator, c as convertElementToCssSelector } from '../index-fqTesRIH.js';
 import 'vitest/utils';
 
 page.extend({

package/dist/providers.js

@@ -1,4 +1,4 @@
-import { W as WebdriverBrowserProvider, P as PlaywrightBrowserProvider } from './webdriver-kh_HHy0p.js';
+import { W as WebdriverBrowserProvider, P as PlaywrightBrowserProvider } from './webdriver-C5-VI7VH.js';
 
 class PreviewBrowserProvider {
   name = "preview";

package/dist/{webdriver-kh_HHy0p.js → webdriver-C5-VI7VH.js}

@@ -186,16 +186,25 @@ class WebdriverBrowserProvider {
     this.browserName = browser;
     this.options = options;
   }
-  async beforeCommand() {
+  async switchToTestFrame() {
     const page = this.browser;
-    const iframe = await page.findElement(
-      "css selector",
-      "iframe[data-vitest]"
-    );
-    await page.switchToFrame(iframe);
+    if (page.switchFrame) {
+      await page.switchFrame(page.$("iframe[data-vitest]"));
+    } else {
+      const iframe = await page.findElement(
+        "css selector",
+        "iframe[data-vitest]"
+      );
+      await page.switchToFrame(iframe);
+    }
   }
-  async afterCommand() {
-    await this.browser.switchToParentFrame();
+  async switchToMainFrame() {
+    const page = this.browser;
+    if (page.switchFrame) {
+      await page.switchFrame(null);
+    } else {
+      await page.switchToParentFrame();
+    }
   }
   getCommandsContext() {
     return {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/browser",
   "type": "module",
-  "version": "3.0.6",
+  "version": "3.0.7",
   "description": "Browser running for Vitest",
   "license": "MIT",
   "funding": "https://opencollective.com/vitest",
@@ -60,12 +60,13 @@
     "*.d.ts",
     "context.js",
     "dist",
+    "dummy.js",
     "providers"
   ],
   "peerDependencies": {
     "playwright": "*",
-    "webdriverio": "*",
-    "vitest": "3.0.6"
+    "webdriverio": "^7.0.0 || ^8.0.0 || ^9.0.0",
+    "vitest": "3.0.7"
   },
   "peerDependenciesMeta": {
     "playwright": {
@@ -82,19 +83,20 @@
     "@testing-library/dom": "^10.4.0",
     "@testing-library/user-event": "^14.6.1",
     "magic-string": "^0.30.17",
-    "msw": "^2.7.0",
+    "msw": "^2.7.3",
     "sirv": "^3.0.1",
     "tinyrainbow": "^2.0.0",
-    "ws": "^8.18.0",
-    "@vitest/utils": "3.0.6",
-    "@vitest/mocker": "3.0.6"
+    "ws": "^8.18.1",
+    "@vitest/mocker": "3.0.7",
+    "@vitest/utils": "3.0.7"
   },
   "devDependencies": {
     "@testing-library/jest-dom": "^6.6.3",
     "@types/ws": "^8.5.14",
-    "@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.3",
@@ -102,11 +104,11 @@
     "playwright": "^1.50.1",
     "playwright-core": "^1.50.1",
     "safaridriver": "^1.0.0",
-    "webdriverio": "^8.42.0",
-    "@vitest/runner": "3.0.6",
-    "@vitest/ws-client": "3.0.6",
-    "vitest": "3.0.6",
-    "@vitest/ui": "3.0.6"
+    "webdriverio": "^9.10.0",
+    "@vitest/runner": "3.0.7",
+    "@vitest/ui": "3.0.7",
+    "@vitest/ws-client": "3.0.7",
+    "vitest": "3.0.7"
   },
   "scripts": {
     "build": "rimraf dist && pnpm build:node && pnpm build:client",

package/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 {}