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

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-CJA71Bgl.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 contextId=getBrowserState().contextId;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;getBrowserState().cdp=createCdp();function rpc(){return state.rpc}function createCdp(){const listenersMap=new WeakMap;function getId(listener){const id=listenersMap.get(listener)||crypto.randomUUID();listenersMap.set(listener,id);return id}const listeners={};const error=err=>{window.dispatchEvent(new ErrorEvent("error",{error:err}))};const cdp={send(method,params){return rpc().sendCdpEvent(contextId,method,params)},on(event,listener){const listenerId=getId(listener);listeners[event]=listeners[event]||[];listeners[event].push(listener);rpc().trackCdpEvent(contextId,"on",event,listenerId).catch(error);return cdp},once(event,listener){const listenerId=getId(listener);const handler=data=>{listener(data);cdp.off(event,listener)};listeners[event]=listeners[event]||[];listeners[event].push(handler);rpc().trackCdpEvent(contextId,"once",event,listenerId).catch(error);return cdp},off(event,listener){const listenerId=getId(listener);if(listeners[event]){listeners[event]=listeners[event].filter(l=>l!==listener)}rpc().trackCdpEvent(contextId,"off",event,listenerId).catch(error);return cdp},emit(event,payload){if(listeners[event]){listeners[event].forEach(l=>{try{l(payload)}catch(err){error(err)}})}}};return cdp}

package/dist/{webdriver-CXn0ag9T.js → webdriver-CJA71Bgl.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,34 @@ 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),
+      frame() {
+        return new Promise((resolve, reject) => {
+          const frame = page.frame("vitest-iframe");
+          if (frame) {
+            return resolve(frame);
+          }
+          const timeout = setTimeout(() => {
+            const err = new Error(`Cannot find "vitest-iframe" on the page. This is a bug in Vitest, please report it.`);
+            reject(err);
+          }, 1e3);
+          page.on("frameattached", (frame2) => {
+            clearTimeout(timeout);
+            resolve(frame2);
+          });
+        });
+      },
+      get iframe() {
+        return page.frameLocator('[data-vitest="true"]');
       }
     };
   }
@@ -73,12 +92,43 @@ class PlaywrightBrowserProvider {
     const context = await this.createContext(contextId);
     const page = await context.newPage();
     this.pages.set(contextId, page);
+    if (process.env.VITEST_PW_DEBUG) {
+      page.on("requestfailed", (request) => {
+        console.error(
+          "[PW Error]",
+          request.resourceType(),
+          "request failed for",
+          request.url(),
+          "url:",
+          request.failure()?.errorText
+        );
+      });
+    }
     return page;
   }
   async openPage(contextId, url) {
     const browserPage = await this.openBrowserPage(contextId);
     await browserPage.goto(url);
   }
+  async getCDPSession(contextId) {
+    const page = this.getPage(contextId);
+    const cdp = await page.context().newCDPSession(page);
+    return {
+      async send(method, params) {
+        const result = await cdp.send(method, params);
+        return result;
+      },
+      on(event, listener) {
+        cdp.on(event, listener);
+      },
+      off(event, listener) {
+        cdp.off(event, listener);
+      },
+      once(event, listener) {
+        cdp.once(event, listener);
+      }
+    };
+  }
   async close() {
     const browser = this.browser;
     this.browser = null;
@@ -108,7 +158,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 +173,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({