@vitest/browser 3.0.0-beta.1 → 3.0.0-beta.3

package/dist/locators/index.d.ts

@@ -253,6 +253,8 @@ declare abstract class Locator {
     element(): Element;
     elements(): Element[];
     all(): Locator[];
+    toString(): string;
+    toJSON(): string;
     private get state();
     private get worker();
     private get rpc();

package/dist/locators/index.js

@@ -1,4 +1,4 @@
 import '@vitest/browser/context';
 import '../public-utils-D6S2-5kI.js';
-export { L as Locator, s as selectorEngine } from '../index-CKtADM3n.js';
+export { L as Locator, s as selectorEngine } from '../index-VFFcOojA.js';
 import 'vitest/utils';

package/dist/locators/playwright.js

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

package/dist/locators/preview.js

@@ -1,7 +1,6 @@
-import { userEvent } from '@testing-library/user-event';
-import { page, server } from '@vitest/browser/context';
+import { page, server, userEvent } from '@vitest/browser/context';
 import { g as getByLabelSelector, a as getByRoleSelector, b as getByTestIdSelector, c as getByAltTextSelector, d as getByPlaceholderSelector, e as getByTextSelector, f as getByTitleSelector, h as getElementError } from '../public-utils-D6S2-5kI.js';
-import { s as selectorEngine, L as Locator, c as convertElementToCssSelector, e as ensureAwaited } from '../index-CKtADM3n.js';
+import { s as selectorEngine, L as Locator, c as convertElementToCssSelector } from '../index-VFFcOojA.js';
 import 'vitest/utils';
 
 page.extend({
@@ -47,53 +46,31 @@ class PreviewLocator extends Locator {
     return selectors.join(", ");
   }
   click() {
-    return ensureAwaited(() => userEvent.click(this.element()));
+    return userEvent.click(this.element());
   }
   dblClick() {
-    return ensureAwaited(() => userEvent.dblClick(this.element()));
+    return userEvent.dblClick(this.element());
   }
   tripleClick() {
-    return ensureAwaited(() => userEvent.tripleClick(this.element()));
+    return userEvent.tripleClick(this.element());
   }
   hover() {
-    return ensureAwaited(() => userEvent.hover(this.element()));
+    return userEvent.hover(this.element());
   }
   unhover() {
-    return ensureAwaited(() => userEvent.unhover(this.element()));
+    return userEvent.unhover(this.element());
   }
   async fill(text) {
-    await this.clear();
-    return ensureAwaited(() => userEvent.type(this.element(), text));
+    return userEvent.fill(this.element(), text);
   }
   async upload(file) {
-    const uploadPromise = (Array.isArray(file) ? file : [file]).map(async (file2) => {
-      if (typeof file2 !== "string") {
-        return file2;
-      }
-      const { content: base64, basename, mime } = await this.triggerCommand("__vitest_fileInfo", file2, "base64");
-      const fileInstance = fetch(`data:${mime};base64,${base64}`).then((r) => r.blob()).then((blob) => new File([blob], basename, { type: mime }));
-      return fileInstance;
-    });
-    const uploadFiles = await Promise.all(uploadPromise);
-    return ensureAwaited(() => userEvent.upload(this.element(), uploadFiles));
+    return userEvent.upload(this.element(), file);
   }
   selectOptions(options_) {
-    const options = (Array.isArray(options_) ? options_ : [options_]).map((option) => {
-      if (typeof option !== "string" && "element" in option) {
-        return option.element();
-      }
-      return option;
-    });
-    return ensureAwaited(() => userEvent.selectOptions(this.element(), options));
-  }
-  async dropTo() {
-    throw new Error('The "preview" provider doesn\'t support `dropTo` method.');
+    return userEvent.selectOptions(this.element(), options_);
   }
   clear() {
-    return ensureAwaited(() => userEvent.clear(this.element()));
-  }
-  async screenshot() {
-    throw new Error('The "preview" provider doesn\'t support `screenshot` method.');
+    return userEvent.clear(this.element());
   }
   locator(selector) {
     return new PreviewLocator(`${this._pwSelector} >> ${selector}`, this._container);

package/dist/locators/webdriverio.js

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

package/dist/providers.js

@@ -1,4 +1,4 @@
-import { W as WebdriverBrowserProvider, P as PlaywrightBrowserProvider } from './webdriver-JzwxG3Ek.js';
+import { W as WebdriverBrowserProvider, P as PlaywrightBrowserProvider } from './webdriver-dkCg9pjp.js';
 
 class PreviewBrowserProvider {
   name = "preview";
@@ -22,9 +22,9 @@ class PreviewBrowserProvider {
         `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`
       );
     }
-    project.ctx.logger.printBrowserBanner(project);
+    project.vitest.logger.printBrowserBanner(project);
   }
-  async openPage(_contextId, url) {
+  async openPage(_sessionId, url) {
     this.open = true;
     if (!this.project.browser) {
       throw new Error("Browser is not initialized");

package/dist/state.js

@@ -1 +1 @@
-(function(){"use strict";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,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 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}function error(err){window.dispatchEvent(new ErrorEvent("error",{error:err}))}})();
+(function(){"use strict";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 sessionId=getBrowserState().sessionId;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,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 cdp={send(method,params){return rpc().sendCdpEvent(sessionId,method,params)},on(event,listener){const listenerId=getId(listener);listeners[event]=listeners[event]||[];listeners[event].push(listener);rpc().trackCdpEvent(sessionId,"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(sessionId,"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(sessionId,"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}function error(err){window.dispatchEvent(new ErrorEvent("error",{error:err}))}})();

package/dist/{webdriver-JzwxG3Ek.js → webdriver-dkCg9pjp.js}

@@ -37,7 +37,7 @@ class PlaywrightBrowserProvider {
         launchOptions.args ||= [];
         launchOptions.args.push(`--remote-debugging-port=${port}`);
         launchOptions.args.push(`--remote-debugging-address=${host}`);
-        this.project.logger.log(`Debugger listening on ws://${host}:${port}`);
+        this.project.vitest.logger.log(`Debugger listening on ws://${host}:${port}`);
       }
       if (this.project.config.browser.ui && this.browserName === "chromium") {
         if (!launchOptions.args) {
@@ -54,9 +54,9 @@ class PlaywrightBrowserProvider {
     })();
     return this.browserPromise;
   }
-  async createContext(contextId) {
-    if (this.contexts.has(contextId)) {
-      return this.contexts.get(contextId);
+  async createContext(sessionId) {
+    if (this.contexts.has(sessionId)) {
+      return this.contexts.get(sessionId);
     }
     const browser = await this.openBrowser();
     const { actionTimeout, ...contextOptions } = this.options?.context ?? {};
@@ -72,21 +72,21 @@ class PlaywrightBrowserProvider {
     if (actionTimeout) {
       context.setDefaultTimeout(actionTimeout);
     }
-    this.contexts.set(contextId, context);
+    this.contexts.set(sessionId, context);
     return context;
   }
-  getPage(contextId) {
-    const page = this.pages.get(contextId);
+  getPage(sessionId) {
+    const page = this.pages.get(sessionId);
     if (!page) {
-      throw new Error(`Page "${contextId}" not found`);
+      throw new Error(`Page "${sessionId}" not found in ${this.browserName} browser.`);
     }
     return page;
   }
-  getCommandsContext(contextId) {
-    const page = this.getPage(contextId);
+  getCommandsContext(sessionId) {
+    const page = this.getPage(sessionId);
     return {
       page,
-      context: this.contexts.get(contextId),
+      context: this.contexts.get(sessionId),
       frame() {
         return new Promise((resolve, reject) => {
           const frame = page.frame("vitest-iframe");
@@ -108,15 +108,15 @@ class PlaywrightBrowserProvider {
       }
     };
   }
-  async openBrowserPage(contextId) {
-    if (this.pages.has(contextId)) {
-      const page2 = this.pages.get(contextId);
+  async openBrowserPage(sessionId) {
+    if (this.pages.has(sessionId)) {
+      const page2 = this.pages.get(sessionId);
       await page2.close();
-      this.pages.delete(contextId);
+      this.pages.delete(sessionId);
     }
-    const context = await this.createContext(contextId);
+    const context = await this.createContext(sessionId);
     const page = await context.newPage();
-    this.pages.set(contextId, page);
+    this.pages.set(sessionId, page);
     if (process.env.VITEST_PW_DEBUG) {
       page.on("requestfailed", (request) => {
         console.error(
@@ -131,13 +131,13 @@ class PlaywrightBrowserProvider {
     }
     return page;
   }
-  async openPage(contextId, url, beforeNavigate) {
-    const browserPage = await this.openBrowserPage(contextId);
+  async openPage(sessionId, url, beforeNavigate) {
+    const browserPage = await this.openBrowserPage(sessionId);
     await beforeNavigate?.();
     await browserPage.goto(url, { timeout: 0 });
   }
-  async getCDPSession(contextId) {
-    const page = this.getPage(contextId);
+  async getCDPSession(sessionid) {
+    const page = this.getPage(sessionid);
     const cdp = await page.context().newCDPSession(page);
     return {
       async send(method, params) {
@@ -247,7 +247,7 @@ class WebdriverBrowserProvider {
     }
     return capabilities;
   }
-  async openPage(_contextId, url) {
+  async openPage(_sessionId, url) {
     const browserInstance = await this.openBrowser();
     await browserInstance.url(url);
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/browser",
   "type": "module",
-  "version": "3.0.0-beta.1",
+  "version": "3.0.0-beta.3",
   "description": "Browser running for Vitest",
   "license": "MIT",
   "funding": "https://opencollective.com/vitest",
@@ -65,7 +65,7 @@
   "peerDependencies": {
     "playwright": "*",
     "webdriverio": "*",
-    "vitest": "3.0.0-beta.1"
+    "vitest": "3.0.0-beta.3"
   },
   "peerDependenciesMeta": {
     "playwright": {
@@ -81,13 +81,13 @@
   "dependencies": {
     "@testing-library/dom": "^10.4.0",
     "@testing-library/user-event": "^14.5.2",
-    "magic-string": "^0.30.14",
-    "msw": "^2.6.6",
+    "magic-string": "^0.30.17",
+    "msw": "^2.7.0",
     "sirv": "^3.0.0",
     "tinyrainbow": "^1.2.0",
     "ws": "^8.18.0",
-    "@vitest/mocker": "3.0.0-beta.1",
-    "@vitest/utils": "3.0.0-beta.1"
+    "@vitest/mocker": "3.0.0-beta.3",
+    "@vitest/utils": "3.0.0-beta.3"
   },
   "devDependencies": {
     "@testing-library/jest-dom": "^6.6.3",
@@ -96,17 +96,17 @@
     "birpc": "0.2.19",
     "flatted": "^3.3.2",
     "ivya": "^1.1.1",
-    "mime": "^4.0.4",
+    "mime": "^4.0.6",
     "pathe": "^1.1.2",
     "periscopic": "^4.0.2",
-    "playwright": "^1.49.0",
-    "playwright-core": "^1.49.0",
+    "playwright": "^1.49.1",
+    "playwright-core": "^1.49.1",
     "safaridriver": "^1.0.0",
-    "webdriverio": "^8.40.6",
-    "@vitest/ui": "3.0.0-beta.1",
-    "@vitest/runner": "3.0.0-beta.1",
-    "@vitest/ws-client": "3.0.0-beta.1",
-    "vitest": "3.0.0-beta.1"
+    "webdriverio": "^8.41.0",
+    "@vitest/runner": "3.0.0-beta.3",
+    "@vitest/ui": "3.0.0-beta.3",
+    "@vitest/ws-client": "3.0.0-beta.3",
+    "vitest": "3.0.0-beta.3"
   },
   "scripts": {
     "build": "rimraf dist && pnpm build:node && pnpm build:client",

package/providers/webdriverio.d.ts

@@ -2,7 +2,7 @@ import type { RemoteOptions, ClickOptions, DragAndDropOptions } from 'webdriveri
 import '../matchers.js'
 
 declare module 'vitest/node' {
-  interface BrowserProviderOptions extends RemoteOptions {}
+  interface BrowserProviderOptions extends Partial<RemoteOptions> {}
 
   export interface UserEventClickOptions extends ClickOptions {}