@vitest/browser 2.0.0-beta.10 → 2.0.0-beta.11

package/dist/providers.js

@@ -1,4 +1,4 @@
-import { W as WebdriverBrowserProvider, P as PlaywrightBrowserProvider } from './webdriver-CXn0ag9T.js';
+import { W as WebdriverBrowserProvider, P as PlaywrightBrowserProvider } from './webdriver-BRud6NtS.js';
 
 class PreviewBrowserProvider {
   name = "preview";
@@ -17,17 +17,21 @@ class PreviewBrowserProvider {
   async initialize(ctx) {
     this.ctx = ctx;
     this.open = false;
-    if (ctx.config.browser.headless)
-      throw new Error(`You've enabled headless mode for "preview" provider but it doesn't support it. Use "playwright" or "webdriverio" instead: https://vitest.dev/guide/browser#configuration`);
+    if (ctx.config.browser.headless) {
+      throw new Error(
+        `You've enabled headless mode for "preview" provider but it doesn't support it. Use "playwright" or "webdriverio" instead: https://vitest.dev/guide/browser#configuration`
+      );
+    }
   }
   async openPage(_contextId, url) {
     this.open = true;
-    if (!this.ctx.browser)
+    if (!this.ctx.browser) {
       throw new Error("Browser is not initialized");
-    const options = this.ctx.browser.config.server;
+    }
+    const options = this.ctx.browser.vite.config.server;
     const _open = options.open;
     options.open = url;
-    this.ctx.browser.openBrowser();
+    this.ctx.browser.vite.openBrowser();
     options.open = _open;
   }
   async close() {

package/dist/state.js

@@ -0,0 +1 @@
+const{parse:$parse,stringify:$stringify}=JSON;const{keys}=Object;const Primitive=String;const primitive="string";const ignore={};const object="object";const noop=(_,value)=>value;const primitives=value=>value instanceof Primitive?Primitive(value):value;const Primitives=(_,value)=>typeof value===primitive?new Primitive(value):value;const revive=(input,parsed,output,$)=>{const lazy=[];for(let ke=keys(output),{length}=ke,y=0;y<length;y++){const k=ke[y];const value=output[k];if(value instanceof Primitive){const tmp=input[value];if(typeof tmp===object&&!parsed.has(tmp)){parsed.add(tmp);output[k]=ignore;lazy.push({k,a:[input,parsed,tmp,$]})}else output[k]=$.call(output,k,tmp)}else if(output[k]!==ignore)output[k]=$.call(output,k,value)}for(let{length}=lazy,i=0;i<length;i++){const{k,a}=lazy[i];output[k]=$.call(output,k,revive.apply(null,a))}return output};const parse=(text,reviver)=>{const input=$parse(text,Primitives).map(primitives);const value=input[0];const $=noop;const tmp=typeof value===object&&value?revive(input,new Set,value,$):value;return $.call({"":tmp},"",tmp)};function getBrowserState(){return window.__vitest_browser_runner__}const config=getBrowserState().config;const providedContext=parse(getBrowserState().providedContext);const state={ctx:{pool:"browser",worker:"./browser.js",workerId:1,config,projectName:config.name||"",files:[],environment:{name:"browser",options:null},providedContext,invalidates:[]},onCancel:null,mockMap:new Map,config,environment:{name:"browser",transformMode:"web",setup(){throw new Error("Not called in the browser")}},moduleCache:getBrowserState().moduleCache,rpc:null,durations:{environment:0,prepare:performance.now()},providedContext};globalThis.__vitest_browser__=true;globalThis.__vitest_worker__=state;

package/dist/{webdriver-CXn0ag9T.js → webdriver-BRud6NtS.js}

@@ -18,10 +18,12 @@ class PlaywrightBrowserProvider {
     this.options = options;
   }
   async openBrowser() {
-    if (this.browserPromise)
+    if (this.browserPromise) {
       return this.browserPromise;
-    if (this.browser)
+    }
+    if (this.browser) {
       return this.browser;
+    }
     this.browserPromise = (async () => {
       const options = this.ctx.config.browser;
       const playwright = await import('playwright');
@@ -36,8 +38,9 @@ class PlaywrightBrowserProvider {
     return this.browserPromise;
   }
   async createContext(contextId) {
-    if (this.contexts.has(contextId))
+    if (this.contexts.has(contextId)) {
       return this.contexts.get(contextId);
+    }
     const browser = await this.openBrowser();
     const context = await browser.newContext({
       ...this.options?.context,
@@ -49,18 +52,18 @@ class PlaywrightBrowserProvider {
   }
   getPage(contextId) {
     const page = this.pages.get(contextId);
-    if (!page)
+    if (!page) {
       throw new Error(`Page "${contextId}" not found`);
+    }
     return page;
   }
   getCommandsContext(contextId) {
     const page = this.getPage(contextId);
-    const tester = page.frameLocator("iframe[data-vitest]");
     return {
       page,
-      tester,
-      get body() {
-        return page.frameLocator("iframe[data-vitest]").locator("body");
+      context: this.contexts.get(contextId),
+      get frame() {
+        return page.frame("vitest-iframe");
       }
     };
   }
@@ -108,7 +111,10 @@ class WebdriverBrowserProvider {
   }
   async beforeCommand() {
     const page = this.browser;
-    const iframe = await page.findElement("css selector", "iframe[data-vitest]");
+    const iframe = await page.findElement(
+      "css selector",
+      "iframe[data-vitest]"
+    );
     await page.switchToFrame(iframe);
   }
   async afterCommand() {
@@ -120,12 +126,16 @@ class WebdriverBrowserProvider {
     };
   }
   async openBrowser() {
-    if (this.browser)
+    if (this.browser) {
       return this.browser;
+    }
     const options = this.ctx.config.browser;
     if (this.browserName === "safari") {
-      if (options.headless)
-        throw new Error("You've enabled headless mode for Safari but it doesn't currently support it.");
+      if (options.headless) {
+        throw new Error(
+          "You've enabled headless mode for Safari but it doesn't currently support it."
+        );
+      }
     }
     const { remote } = await import('webdriverio');
     this.browser = await remote({

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/browser",
   "type": "module",
-  "version": "2.0.0-beta.10",
+  "version": "2.0.0-beta.11",
   "description": "Browser running for Vitest",
   "license": "MIT",
   "funding": "https://opencollective.com/vitest",
@@ -41,13 +41,14 @@
   "types": "./dist/index.d.ts",
   "files": [
     "*.d.ts",
+    "context.js",
     "dist",
     "providers"
   ],
   "peerDependencies": {
     "playwright": "*",
     "webdriverio": "*",
-    "vitest": "2.0.0-beta.10"
+    "vitest": "2.0.0-beta.11"
   },
   "peerDependenciesMeta": {
     "playwright": {
@@ -66,7 +67,8 @@
     "magic-string": "^0.30.10",
     "msw": "^2.3.1",
     "sirv": "^2.0.4",
-    "@vitest/utils": "2.0.0-beta.10"
+    "ws": "^8.17.1",
+    "@vitest/utils": "2.0.0-beta.11"
   },
   "devDependencies": {
     "@types/ws": "^8.5.10",
@@ -79,10 +81,10 @@
     "playwright-core": "^1.44.1",
     "safaridriver": "^0.1.2",
     "webdriverio": "^8.38.2",
-    "@vitest/runner": "2.0.0-beta.10",
-    "@vitest/ui": "2.0.0-beta.10",
-    "@vitest/ws-client": "2.0.0-beta.10",
-    "vitest": "2.0.0-beta.10"
+    "@vitest/ws-client": "2.0.0-beta.11",
+    "@vitest/runner": "2.0.0-beta.11",
+    "vitest": "2.0.0-beta.11",
+    "@vitest/ui": "2.0.0-beta.11"
   },
   "scripts": {
     "build": "rimraf dist && pnpm build:node && pnpm build:client",

package/providers/playwright.d.ts

@@ -1,20 +1,42 @@
 import type {
+  BrowserContext,
   BrowserContextOptions,
-  FrameLocator,
+  Frame,
   LaunchOptions,
-  Locator,
   Page,
 } from 'playwright'
 
 declare module 'vitest/node' {
   interface BrowserProviderOptions {
     launch?: LaunchOptions
-    context?: Omit<BrowserContextOptions, 'ignoreHTTPSErrors' | 'serviceWorkers'>
+    context?: Omit<
+      BrowserContextOptions,
+      'ignoreHTTPSErrors' | 'serviceWorkers'
+    >
   }
 
   export interface BrowserCommandContext {
     page: Page
-    tester: FrameLocator
-    body: Locator
+    frame: Frame
+    context: BrowserContext
   }
 }
+
+type PWHoverOptions = Parameters<Page['hover']>[1]
+type PWClickOptions = Parameters<Page['click']>[1]
+type PWDoubleClickOptions = Parameters<Page['dblclick']>[1]
+type PWFillOptions = Parameters<Page['fill']>[2]
+type PWScreenshotOptions = Parameters<Page['screenshot']>[0]
+type PWSelectOptions = Parameters<Page['selectOption']>[2]
+type PWDragAndDropOptions = Parameters<Page['dragAndDrop']>[2]
+
+declare module '@vitest/browser/context' {
+  export interface UserEventHoverOptions extends PWHoverOptions {}
+  export interface UserEventClickOptions extends PWClickOptions {}
+  export interface UserEventDoubleClickOptions extends PWDoubleClickOptions {}
+  export interface UserEventFillOptions extends PWFillOptions {}
+  export interface UserEventSelectOptions extends PWSelectOptions {}
+  export interface UserEventDragOptions extends UserEventDragAndDropOptions {}
+
+  export interface ScreenshotOptions extends PWScreenshotOptions {}
+}