@vitest/browser 4.0.0-beta.1 → 4.0.0-beta.10

package/dist/locators/index.d.ts

@@ -279,13 +279,13 @@ interface SelectorEngine {
     queryAll: (root: SelectorRoot, selector: string | any) => Element[];
 }
 
-// we prefer using playwright locators because they are more powerful and support Shadow DOM
 declare const selectorEngine: Ivya;
 declare abstract class Locator {
 	abstract selector: string;
 	private _parsedSelector;
 	protected _container?: Element | undefined;
 	protected _pwSelector?: string | undefined;
+	constructor();
 	click(options?: UserEventClickOptions): Promise<void>;
 	dblClick(options?: UserEventClickOptions): Promise<void>;
 	tripleClick(options?: UserEventClickOptions): Promise<void>;
@@ -297,10 +297,10 @@ declare abstract class Locator {
 	dropTo(target: Locator, options?: UserEventDragAndDropOptions): Promise<void>;
 	selectOptions(value: HTMLElement | HTMLElement[] | Locator | Locator[] | string | string[], options?: UserEventSelectOptions): Promise<void>;
 	screenshot(options: Omit<LocatorScreenshotOptions, "base64"> & {
-		base64: true
+		base64: true;
 	}): Promise<{
-		path: string
-		base64: string
+		path: string;
+		base64: string;
 	}>;
 	screenshot(options?: LocatorScreenshotOptions): Promise<string>;
 	protected abstract locator(selector: string): Locator;
@@ -315,9 +315,10 @@ declare abstract class Locator {
 	filter(filter: LocatorOptions): Locator;
 	and(locator: Locator): Locator;
 	or(locator: Locator): Locator;
-	query(): Element | null;
-	element(): Element;
-	elements(): Element[];
+	query(): HTMLElement | SVGElement | null;
+	element(): HTMLElement | SVGElement;
+	elements(): (HTMLElement | SVGElement)[];
+	get length(): number;
 	all(): Locator[];
 	nth(index: number): Locator;
 	first(): Locator;

package/dist/locators/index.js

@@ -1 +1 @@
-import"@vitest/browser/context";import"../public-utils-Kx5DUGWa.js";export{L as Locator,s as selectorEngine}from"../index-W1MM53zC.js";import"vitest/internal/browser";
+import"@vitest/browser/context";import"../public-utils-Kx5DUGWa.js";export{L as Locator,s as selectorEngine}from"../index-DDlvjJVO.js";import"vitest/internal/browser";

package/dist/locators/playwright.js

@@ -1 +1 @@
-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-Kx5DUGWa.js";import{s as selectorEngine,L as Locator,p as processTimeoutOptions,g as getIframeScale}from"../index-W1MM53zC.js";import"vitest/internal/browser";page.extend({getByLabelText(e,_){return new PlaywrightLocator(getByLabelSelector(e,_))},getByRole(e,_){return new PlaywrightLocator(getByRoleSelector(e,_))},getByTestId(e){return new PlaywrightLocator(getByTestIdSelector(server.config.browser.locators.testIdAttribute,e))},getByAltText(e,_){return new PlaywrightLocator(getByAltTextSelector(e,_))},getByPlaceholder(e,_){return new PlaywrightLocator(getByPlaceholderSelector(e,_))},getByText(e,_){return new PlaywrightLocator(getByTextSelector(e,_))},getByTitle(e,_){return new PlaywrightLocator(getByTitleSelector(e,_))},_createLocator(e){return new PlaywrightLocator(e)},elementLocator(e){return new PlaywrightLocator(selectorEngine.generateSelectorSimple(e),e)}});class PlaywrightLocator extends Locator{constructor(e,_){super(),this.selector=e,this._container=_}click(e){return super.click(processTimeoutOptions(processClickOptions(e)))}dblClick(e){return super.dblClick(processTimeoutOptions(processClickOptions(e)))}tripleClick(e){return super.tripleClick(processTimeoutOptions(processClickOptions(e)))}selectOptions(e,_){return super.selectOptions(e,processTimeoutOptions(_))}clear(e){return super.clear(processTimeoutOptions(e))}hover(e){return super.hover(processTimeoutOptions(processHoverOptions(e)))}upload(e,_){return super.upload(e,processTimeoutOptions(_))}fill(e,_){return super.fill(e,processTimeoutOptions(_))}dropTo(e,_){return super.dropTo(e,processTimeoutOptions(processDragAndDropOptions(_)))}locator(e){return new PlaywrightLocator(`${this.selector} >> ${e}`,this._container)}elementLocator(e){return new PlaywrightLocator(selectorEngine.generateSelectorSimple(e),e)}}function processDragAndDropOptions(e){if(!e)return e;let _=e;return _.sourcePosition&&=processPlaywrightPosition(_.sourcePosition),_.targetPosition&&=processPlaywrightPosition(_.targetPosition),e}function processHoverOptions(e){if(!e)return e;let _=e;return _.position&&=processPlaywrightPosition(_.position),e}function processClickOptions(e){if(!e)return e;let _=e;return _.position&&=processPlaywrightPosition(_.position),_}function processPlaywrightPosition(e){let _=getIframeScale();return e.x!=null&&(e.x*=_),e.y!=null&&(e.y*=_),e}
+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-Kx5DUGWa.js";import{s as selectorEngine,L as Locator,p as processTimeoutOptions,g as getIframeScale}from"../index-DDlvjJVO.js";import"vitest/internal/browser";page.extend({getByLabelText(e,_){return new PlaywrightLocator(getByLabelSelector(e,_))},getByRole(e,_){return new PlaywrightLocator(getByRoleSelector(e,_))},getByTestId(e){return new PlaywrightLocator(getByTestIdSelector(server.config.browser.locators.testIdAttribute,e))},getByAltText(e,_){return new PlaywrightLocator(getByAltTextSelector(e,_))},getByPlaceholder(e,_){return new PlaywrightLocator(getByPlaceholderSelector(e,_))},getByText(e,_){return new PlaywrightLocator(getByTextSelector(e,_))},getByTitle(e,_){return new PlaywrightLocator(getByTitleSelector(e,_))},_createLocator(e){return new PlaywrightLocator(e)},elementLocator(e){return new PlaywrightLocator(selectorEngine.generateSelectorSimple(e),e)},frameLocator(e){return new PlaywrightLocator(`${e.selector} >> internal:control=enter-frame`)}});class PlaywrightLocator extends Locator{constructor(e,_){super(),this.selector=e,this._container=_}click(e){return super.click(processTimeoutOptions(processClickOptions(e)))}dblClick(e){return super.dblClick(processTimeoutOptions(processClickOptions(e)))}tripleClick(e){return super.tripleClick(processTimeoutOptions(processClickOptions(e)))}selectOptions(e,_){return super.selectOptions(e,processTimeoutOptions(_))}clear(e){return super.clear(processTimeoutOptions(e))}hover(e){return super.hover(processTimeoutOptions(processHoverOptions(e)))}upload(e,_){return super.upload(e,processTimeoutOptions(_))}fill(e,_){return super.fill(e,processTimeoutOptions(_))}dropTo(e,_){return super.dropTo(e,processTimeoutOptions(processDragAndDropOptions(_)))}locator(e){return new PlaywrightLocator(`${this.selector} >> ${e}`,this._container)}elementLocator(e){return new PlaywrightLocator(selectorEngine.generateSelectorSimple(e),e)}}function processDragAndDropOptions(e){if(!e)return e;let _=e;return _.sourcePosition&&=processPlaywrightPosition(_.sourcePosition),_.targetPosition&&=processPlaywrightPosition(_.targetPosition),e}function processHoverOptions(e){if(!e)return e;let _=e;return _.position&&=processPlaywrightPosition(_.position),e}function processClickOptions(e){if(!e)return e;let _=e;return _.position&&=processPlaywrightPosition(_.position),_}function processPlaywrightPosition(e){let _=getIframeScale();return e.x!=null&&(e.x*=_),e.y!=null&&(e.y*=_),e}

package/dist/locators/preview.js

@@ -1 +1 @@
-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-Kx5DUGWa.js";import{s as selectorEngine,L as Locator,c as convertElementToCssSelector}from"../index-W1MM53zC.js";import"vitest/internal/browser";page.extend({getByLabelText(e,m){return new PreviewLocator(getByLabelSelector(e,m))},getByRole(e,m){return new PreviewLocator(getByRoleSelector(e,m))},getByTestId(e){return new PreviewLocator(getByTestIdSelector(server.config.browser.locators.testIdAttribute,e))},getByAltText(e,m){return new PreviewLocator(getByAltTextSelector(e,m))},getByPlaceholder(e,m){return new PreviewLocator(getByPlaceholderSelector(e,m))},getByText(e,m){return new PreviewLocator(getByTextSelector(e,m))},getByTitle(e,m){return new PreviewLocator(getByTitleSelector(e,m))},_createLocator(e){return new PreviewLocator(e)},elementLocator(e){return new PreviewLocator(selectorEngine.generateSelectorSimple(e),e)}});class PreviewLocator extends Locator{constructor(e,m){super(),this._pwSelector=e,this._container=m}get selector(){let e=this.elements().map(e=>convertElementToCssSelector(e));if(!e.length)throw getElementError(this._pwSelector,this._container||document.body);return e.join(`, `)}click(){return userEvent.click(this.element())}dblClick(){return userEvent.dblClick(this.element())}tripleClick(){return userEvent.tripleClick(this.element())}hover(){return userEvent.hover(this.element())}unhover(){return userEvent.unhover(this.element())}async fill(e){return userEvent.fill(this.element(),e)}async upload(e){return userEvent.upload(this.element(),e)}selectOptions(e){return userEvent.selectOptions(this.element(),e)}clear(){return userEvent.clear(this.element())}locator(e){return new PreviewLocator(`${this._pwSelector} >> ${e}`,this._container)}elementLocator(e){return new PreviewLocator(selectorEngine.generateSelectorSimple(e),e)}}
+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-Kx5DUGWa.js";import{s as selectorEngine,L as Locator,c as convertElementToCssSelector}from"../index-DDlvjJVO.js";import"vitest/internal/browser";page.extend({getByLabelText(e,m){return new PreviewLocator(getByLabelSelector(e,m))},getByRole(e,m){return new PreviewLocator(getByRoleSelector(e,m))},getByTestId(e){return new PreviewLocator(getByTestIdSelector(server.config.browser.locators.testIdAttribute,e))},getByAltText(e,m){return new PreviewLocator(getByAltTextSelector(e,m))},getByPlaceholder(e,m){return new PreviewLocator(getByPlaceholderSelector(e,m))},getByText(e,m){return new PreviewLocator(getByTextSelector(e,m))},getByTitle(e,m){return new PreviewLocator(getByTitleSelector(e,m))},_createLocator(e){return new PreviewLocator(e)},elementLocator(e){return new PreviewLocator(selectorEngine.generateSelectorSimple(e),e)}});class PreviewLocator extends Locator{constructor(e,m){super(),this._pwSelector=e,this._container=m}get selector(){let e=this.elements().map(e=>convertElementToCssSelector(e));if(!e.length)throw getElementError(this._pwSelector,this._container||document.body);return e.join(`, `)}click(){return userEvent.click(this.element())}dblClick(){return userEvent.dblClick(this.element())}tripleClick(){return userEvent.tripleClick(this.element())}hover(){return userEvent.hover(this.element())}unhover(){return userEvent.unhover(this.element())}async fill(e){return userEvent.fill(this.element(),e)}async upload(e){return userEvent.upload(this.element(),e)}selectOptions(e){return userEvent.selectOptions(this.element(),e)}clear(){return userEvent.clear(this.element())}locator(e){return new PreviewLocator(`${this._pwSelector} >> ${e}`,this._container)}elementLocator(e){return new PreviewLocator(selectorEngine.generateSelectorSimple(e),e)}}

package/dist/locators/webdriverio.js

@@ -1 +1 @@
-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-Kx5DUGWa.js";import{s as selectorEngine,L as Locator,c as convertElementToCssSelector,a as getBrowserState,g as getIframeScale}from"../index-W1MM53zC.js";import"vitest/internal/browser";page.extend({getByLabelText(e,g){return new WebdriverIOLocator(getByLabelSelector(e,g))},getByRole(e,g){return new WebdriverIOLocator(getByRoleSelector(e,g))},getByTestId(e){return new WebdriverIOLocator(getByTestIdSelector(server.config.browser.locators.testIdAttribute,e))},getByAltText(e,g){return new WebdriverIOLocator(getByAltTextSelector(e,g))},getByPlaceholder(e,g){return new WebdriverIOLocator(getByPlaceholderSelector(e,g))},getByText(e,g){return new WebdriverIOLocator(getByTextSelector(e,g))},getByTitle(e,g){return new WebdriverIOLocator(getByTitleSelector(e,g))},_createLocator(e){return new WebdriverIOLocator(e)},elementLocator(e){return new WebdriverIOLocator(selectorEngine.generateSelectorSimple(e))}});class WebdriverIOLocator extends Locator{constructor(e,g){super(),this._pwSelector=e,this._container=g}get selector(){let e=this.elements().map(e=>convertElementToCssSelector(e));if(!e.length)throw getElementError(this._pwSelector,this._container||document.body);return e.join(`, `)}click(e){return super.click(processClickOptions(e))}dblClick(e){return super.dblClick(processClickOptions(e))}tripleClick(e){return super.tripleClick(processClickOptions(e))}selectOptions(e,g){let _=getWebdriverioSelectOptions(this.element(),e);return this.triggerCommand(`__vitest_selectOptions`,this.selector,_,g)}hover(e){return super.hover(processHoverOptions(e))}dropTo(e,g){return super.dropTo(e,processDragAndDropOptions(g))}locator(e){return new WebdriverIOLocator(`${this._pwSelector} >> ${e}`,this._container)}elementLocator(e){return new WebdriverIOLocator(selectorEngine.generateSelectorSimple(e),e)}}function getWebdriverioSelectOptions(e,g){let _=[...e.querySelectorAll(`option`)],v=Array.isArray(g)?g:[g];if(!v.length)return[];if(v.length>1)throw Error(`Provider "webdriverio" doesn't support selecting multiple values at once`);let y=v[0];if(typeof y!=`string`){let e=`element`in y?y.element():y,g=_.indexOf(e);if(g===-1)throw Error(`The element ${selectorEngine.previewNode(e)} was not found in the "select" options.`);return[{index:g}]}let b=_.findIndex(e=>e.value===y);if(b!==-1)return[{index:b}];let x=_.findIndex(e=>e.textContent?.trim()===y||e.ariaLabel===y);if(x===-1)throw Error(`The option "${y}" was not found in the "select" options.`);return[{index:x}]}function processClickOptions(e){if(!e||!getBrowserState().config.browser.ui)return e;let g=e;if(g.x!=null||g.y!=null){let e={};g.x!=null&&(g.x=scaleCoordinate(g.x,e)),g.y!=null&&(g.y=scaleCoordinate(g.y,e))}return e}function processHoverOptions(e){if(!e||!getBrowserState().config.browser.ui)return e;let g=e,_={};return g.xOffset!=null&&(g.xOffset=scaleCoordinate(g.xOffset,_)),g.yOffset!=null&&(g.yOffset=scaleCoordinate(g.yOffset,_)),e}function processDragAndDropOptions(e){if(!e||!getBrowserState().config.browser.ui)return e;let g={},_=e;return _.sourceX!=null&&(_.sourceX=scaleCoordinate(_.sourceX,g)),_.sourceY!=null&&(_.sourceY=scaleCoordinate(_.sourceY,g)),_.targetX!=null&&(_.targetX=scaleCoordinate(_.targetX,g)),_.targetY!=null&&(_.targetY=scaleCoordinate(_.targetY,g)),e}function scaleCoordinate(e,g){return Math.round(e*getCachedScale(g))}function getCachedScale(e){return e.scale??=getIframeScale()}
+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-Kx5DUGWa.js";import{s as selectorEngine,L as Locator,c as convertElementToCssSelector,a as getBrowserState,g as getIframeScale}from"../index-DDlvjJVO.js";import"vitest/internal/browser";page.extend({getByLabelText(e,g){return new WebdriverIOLocator(getByLabelSelector(e,g))},getByRole(e,g){return new WebdriverIOLocator(getByRoleSelector(e,g))},getByTestId(e){return new WebdriverIOLocator(getByTestIdSelector(server.config.browser.locators.testIdAttribute,e))},getByAltText(e,g){return new WebdriverIOLocator(getByAltTextSelector(e,g))},getByPlaceholder(e,g){return new WebdriverIOLocator(getByPlaceholderSelector(e,g))},getByText(e,g){return new WebdriverIOLocator(getByTextSelector(e,g))},getByTitle(e,g){return new WebdriverIOLocator(getByTitleSelector(e,g))},_createLocator(e){return new WebdriverIOLocator(e)},elementLocator(e){return new WebdriverIOLocator(selectorEngine.generateSelectorSimple(e))}});class WebdriverIOLocator extends Locator{constructor(e,g){super(),this._pwSelector=e,this._container=g}get selector(){let e=this.elements().map(e=>convertElementToCssSelector(e));if(!e.length)throw getElementError(this._pwSelector,this._container||document.body);let g=!1,_=e.map(e=>e.startsWith(`>>>`)?(g=!0,e.slice(3)):e);return(g?`>>>`:``)+_.join(`, `)}click(e){return super.click(processClickOptions(e))}dblClick(e){return super.dblClick(processClickOptions(e))}tripleClick(e){return super.tripleClick(processClickOptions(e))}selectOptions(e,g){let _=getWebdriverioSelectOptions(this.element(),e);return this.triggerCommand(`__vitest_selectOptions`,this.selector,_,g)}hover(e){return super.hover(processHoverOptions(e))}dropTo(e,g){return super.dropTo(e,processDragAndDropOptions(g))}locator(e){return new WebdriverIOLocator(`${this._pwSelector} >> ${e}`,this._container)}elementLocator(e){return new WebdriverIOLocator(selectorEngine.generateSelectorSimple(e),e)}}function getWebdriverioSelectOptions(e,g){let _=[...e.querySelectorAll(`option`)],v=Array.isArray(g)?g:[g];if(!v.length)return[];if(v.length>1)throw Error(`Provider "webdriverio" doesn't support selecting multiple values at once`);let y=v[0];if(typeof y!=`string`){let e=`element`in y?y.element():y,g=_.indexOf(e);if(g===-1)throw Error(`The element ${selectorEngine.previewNode(e)} was not found in the "select" options.`);return[{index:g}]}let b=_.findIndex(e=>e.value===y);if(b!==-1)return[{index:b}];let x=_.findIndex(e=>e.textContent?.trim()===y||e.ariaLabel===y);if(x===-1)throw Error(`The option "${y}" was not found in the "select" options.`);return[{index:x}]}function processClickOptions(e){if(!e||!getBrowserState().config.browser.ui)return e;let g=e;if(g.x!=null||g.y!=null){let e={};g.x!=null&&(g.x=scaleCoordinate(g.x,e)),g.y!=null&&(g.y=scaleCoordinate(g.y,e))}return e}function processHoverOptions(e){if(!e||!getBrowserState().config.browser.ui)return e;let g=e,_={};return g.xOffset!=null&&(g.xOffset=scaleCoordinate(g.xOffset,_)),g.yOffset!=null&&(g.yOffset=scaleCoordinate(g.yOffset,_)),e}function processDragAndDropOptions(e){if(!e||!getBrowserState().config.browser.ui)return e;let g={},_=e;return _.sourceX!=null&&(_.sourceX=scaleCoordinate(_.sourceX,g)),_.sourceY!=null&&(_.sourceY=scaleCoordinate(_.sourceY,g)),_.targetX!=null&&(_.targetX=scaleCoordinate(_.targetX,g)),_.targetY!=null&&(_.targetY=scaleCoordinate(_.targetY,g)),e}function scaleCoordinate(e,g){return Math.round(e*getCachedScale(g))}function getCachedScale(e){return e.scale??=getIframeScale()}

package/dist/providers/playwright.d.ts

@@ -0,0 +1,103 @@
+import { ScreenshotMatcherOptions, ScreenshotComparatorRegistry } from '@vitest/browser/context';
+import { Page, Frame, FrameLocator, BrowserContext, LaunchOptions, ConnectOptions, BrowserContextOptions, Browser } from 'playwright';
+import { Protocol } from 'playwright-core/types/protocol';
+import { BrowserProviderOption, BrowserProvider, BrowserModuleMocker, TestProject, CDPSession } from 'vitest/node';
+
+declare const playwrightBrowsers: readonly ["firefox", "webkit", "chromium"];
+type PlaywrightBrowser = (typeof playwrightBrowsers)[number];
+interface PlaywrightProviderOptions {
+	/**
+	* The options passed down to [`playwright.connect`](https://playwright.dev/docs/api/class-browsertype#browser-type-launch) method.
+	* @see {@link https://playwright.dev/docs/api/class-browsertype#browser-type-launch}
+	*/
+	launchOptions?: LaunchOptions;
+	/**
+	* The options passed down to [`playwright.connect`](https://playwright.dev/docs/api/class-browsertype#browser-type-connect) method.
+	*
+	* This is used only if you connect remotely to the playwright instance via a WebSocket connection.
+	* @see {@link https://playwright.dev/docs/api/class-browsertype#browser-type-connect}
+	*/
+	connectOptions?: ConnectOptions & {
+		wsEndpoint: string;
+	};
+	/**
+	* The options passed down to [`browser.newContext`](https://playwright.dev/docs/api/class-browser#browser-new-context) method.
+	* @see {@link https://playwright.dev/docs/api/class-browser#browser-new-context}
+	*/
+	contextOptions?: Omit<BrowserContextOptions, "ignoreHTTPSErrors" | "serviceWorkers">;
+	/**
+	* The maximum time in milliseconds to wait for `userEvent` action to complete.
+	* @default 0 (no timeout)
+	*/
+	actionTimeout?: number;
+}
+declare function playwright(options?: PlaywrightProviderOptions): BrowserProviderOption;
+declare class PlaywrightBrowserProvider implements BrowserProvider {
+	private project;
+	private options;
+	name: "playwright";
+	supportsParallelism: boolean;
+	browser: Browser | null;
+	contexts: Map<string, BrowserContext>;
+	pages: Map<string, Page>;
+	mocker: BrowserModuleMocker;
+	browserName: PlaywrightBrowser;
+	private browserPromise;
+	private closing;
+	constructor(project: TestProject, options: PlaywrightProviderOptions);
+	private openBrowser;
+	private createMocker;
+	private createContext;
+	getPage(sessionId: string): Page;
+	getCommandsContext(sessionId: string): {
+		page: Page;
+		context: BrowserContext;
+		frame: () => Promise<Frame>;
+		readonly iframe: FrameLocator;
+	};
+	private openBrowserPage;
+	openPage(sessionId: string, url: string, beforeNavigate?: () => Promise<void>): Promise<void>;
+	private _throwIfClosing;
+	getCDPSession(sessionid: string): Promise<CDPSession>;
+	close(): Promise<void>;
+}
+declare module "vitest/node" {
+	interface BrowserCommandContext {
+		page: Page;
+		frame(): Promise<Frame>;
+		iframe: FrameLocator;
+		context: BrowserContext;
+	}
+	interface ToMatchScreenshotOptions extends Omit<ScreenshotMatcherOptions, "comparatorName" | "comparatorOptions"> {}
+	interface ToMatchScreenshotComparators extends ScreenshotComparatorRegistry {}
+}
+type PWHoverOptions = NonNullable<Parameters<Page["hover"]>[1]>;
+type PWClickOptions = NonNullable<Parameters<Page["click"]>[1]>;
+type PWDoubleClickOptions = NonNullable<Parameters<Page["dblclick"]>[1]>;
+type PWFillOptions = NonNullable<Parameters<Page["fill"]>[2]>;
+type PWScreenshotOptions = NonNullable<Parameters<Page["screenshot"]>[0]>;
+type PWSelectOptions = NonNullable<Parameters<Page["selectOption"]>[2]>;
+type PWDragAndDropOptions = NonNullable<Parameters<Page["dragAndDrop"]>[2]>;
+type PWSetInputFiles = NonNullable<Parameters<Page["setInputFiles"]>[2]>;
+declare module "@vitest/browser/context" {
+	interface UserEventHoverOptions extends PWHoverOptions {}
+	interface UserEventClickOptions extends PWClickOptions {}
+	interface UserEventDoubleClickOptions extends PWDoubleClickOptions {}
+	interface UserEventTripleClickOptions extends PWClickOptions {}
+	interface UserEventFillOptions extends PWFillOptions {}
+	interface UserEventSelectOptions extends PWSelectOptions {}
+	interface UserEventDragAndDropOptions extends PWDragAndDropOptions {}
+	interface UserEventUploadOptions extends PWSetInputFiles {}
+	interface ScreenshotOptions extends Omit<PWScreenshotOptions, "mask"> {
+		mask?: ReadonlyArray<Element | Locator> | undefined;
+	}
+	interface CDPSession {
+		send<T extends keyof Protocol.CommandParameters>(method: T, params?: Protocol.CommandParameters[T]): Promise<Protocol.CommandReturnValues[T]>;
+		on<T extends keyof Protocol.Events>(event: T, listener: (payload: Protocol.Events[T]) => void): this;
+		once<T extends keyof Protocol.Events>(event: T, listener: (payload: Protocol.Events[T]) => void): this;
+		off<T extends keyof Protocol.Events>(event: T, listener: (payload: Protocol.Events[T]) => void): this;
+	}
+}
+
+export { PlaywrightBrowserProvider, playwright };
+export type { PlaywrightProviderOptions };

package/dist/{webdriver-KA1WiV0q.js → providers/playwright.js}

@@ -2,60 +2,64 @@ import { createManualModuleSource } from '@vitest/mocker/node';
 import c from 'tinyrainbow';
 import { createDebugger, isCSSRequest } from 'vitest/node';
 
-const debug$1 = createDebugger("vitest:browser:playwright");
+const debug = createDebugger("vitest:browser:playwright");
 const playwrightBrowsers = [
 	"firefox",
 	"webkit",
 	"chromium"
 ];
+function playwright(options = {}) {
+	return {
+		name: "playwright",
+		supportedBrowser: playwrightBrowsers,
+		factory(project) {
+			return new PlaywrightBrowserProvider(project, options);
+		},
+		_cli: true
+	};
+}
 class PlaywrightBrowserProvider {
 	name = "playwright";
 	supportsParallelism = true;
 	browser = null;
-	browserName;
-	project;
-	options;
 	contexts = new Map();
 	pages = new Map();
-	browserPromise = null;
 	mocker;
+	browserName;
+	browserPromise = null;
 	closing = false;
-	getSupportedBrowsers() {
-		return playwrightBrowsers;
-	}
-	initialize(project, { browser, options }) {
-		this.closing = false;
+	constructor(project, options) {
 		this.project = project;
-		this.browserName = browser;
 		this.options = options;
+		this.browserName = project.config.browser.name;
 		this.mocker = this.createMocker();
 	}
 	async openBrowser() {
 		await this._throwIfClosing();
 		if (this.browserPromise) {
-			debug$1?.("[%s] the browser is resolving, reusing the promise", this.browserName);
+			debug?.("[%s] the browser is resolving, reusing the promise", this.browserName);
 			return this.browserPromise;
 		}
 		if (this.browser) {
-			debug$1?.("[%s] the browser is resolved, reusing it", this.browserName);
+			debug?.("[%s] the browser is resolved, reusing it", this.browserName);
 			return this.browser;
 		}
 		this.browserPromise = (async () => {
 			const options = this.project.config.browser;
 			const playwright = await import('playwright');
-			if (this.options?.connect) {
-				if (this.options.launch) {
+			if (this.options.connectOptions) {
+				if (this.options.launchOptions) {
 					this.project.vitest.logger.warn(c.yellow(`Found both ${c.bold(c.italic(c.yellow("connect")))} and ${c.bold(c.italic(c.yellow("launch")))} options in browser instance configuration.
           Ignoring ${c.bold(c.italic(c.yellow("launch")))} options and using ${c.bold(c.italic(c.yellow("connect")))} mode.
           You probably want to remove one of the two options and keep only the one you want to use.`));
 				}
-				const browser = await playwright[this.browserName].connect(this.options.connect.wsEndpoint, this.options.connect.options);
+				const browser = await playwright[this.browserName].connect(this.options.connectOptions.wsEndpoint, this.options.connectOptions);
 				this.browser = browser;
 				this.browserPromise = null;
 				return this.browser;
 			}
 			const launchOptions = {
-				...this.options?.launch,
+				...this.options.launchOptions,
 				headless: options.headless
 			};
 			if (this.project.config.inspector.enabled) {
@@ -76,7 +80,7 @@ class PlaywrightBrowserProvider {
 					launchOptions.args.push("--start-maximized");
 				}
 			}
-			debug$1?.("[%s] initializing the browser with launch options: %O", this.browserName, launchOptions);
+			debug?.("[%s] initializing the browser with launch options: %O", this.browserName, launchOptions);
 			this.browser = await playwright[this.browserName].launch(launchOptions);
 			this.browserPromise = null;
 			return this.browser;
@@ -200,12 +204,13 @@ class PlaywrightBrowserProvider {
 	async createContext(sessionId) {
 		await this._throwIfClosing();
 		if (this.contexts.has(sessionId)) {
-			debug$1?.("[%s][%s] the context already exists, reusing it", sessionId, this.browserName);
+			debug?.("[%s][%s] the context already exists, reusing it", sessionId, this.browserName);
 			return this.contexts.get(sessionId);
 		}
 		const browser = await this.openBrowser();
 		await this._throwIfClosing(browser);
-		const { actionTimeout,...contextOptions } = this.options?.context ?? {};
+		const actionTimeout = this.options.actionTimeout;
+		const contextOptions = this.options.contextOptions ?? {};
 		const options = {
 			...contextOptions,
 			ignoreHTTPSErrors: true
@@ -215,10 +220,10 @@ class PlaywrightBrowserProvider {
 		}
 		const context = await browser.newContext(options);
 		await this._throwIfClosing(context);
-		if (actionTimeout) {
+		if (actionTimeout != null) {
 			context.setDefaultTimeout(actionTimeout);
 		}
-		debug$1?.("[%s][%s] the context is ready", sessionId, this.browserName);
+		debug?.("[%s][%s] the context is ready", sessionId, this.browserName);
 		this.contexts.set(sessionId, context);
 		return context;
 	}
@@ -258,14 +263,14 @@ class PlaywrightBrowserProvider {
 	async openBrowserPage(sessionId) {
 		await this._throwIfClosing();
 		if (this.pages.has(sessionId)) {
-			debug$1?.("[%s][%s] the page already exists, closing the old one", sessionId, this.browserName);
+			debug?.("[%s][%s] the page already exists, closing the old one", sessionId, this.browserName);
 			const page = this.pages.get(sessionId);
 			await page.close();
 			this.pages.delete(sessionId);
 		}
 		const context = await this.createContext(sessionId);
 		const page = await context.newPage();
-		debug$1?.("[%s][%s] the page is ready", sessionId, this.browserName);
+		debug?.("[%s][%s] the page is ready", sessionId, this.browserName);
 		await this._throwIfClosing(page);
 		this.pages.set(sessionId, page);
 		if (process.env.VITEST_PW_DEBUG) {
@@ -276,16 +281,16 @@ class PlaywrightBrowserProvider {
 		return page;
 	}
 	async openPage(sessionId, url, beforeNavigate) {
-		debug$1?.("[%s][%s] creating the browser page for %s", sessionId, this.browserName, url);
+		debug?.("[%s][%s] creating the browser page for %s", sessionId, this.browserName, url);
 		const browserPage = await this.openBrowserPage(sessionId);
 		await beforeNavigate?.();
-		debug$1?.("[%s][%s] browser page is created, opening %s", sessionId, this.browserName, url);
+		debug?.("[%s][%s] browser page is created, opening %s", sessionId, this.browserName, url);
 		await browserPage.goto(url, { timeout: 0 });
 		await this._throwIfClosing(browserPage);
 	}
 	async _throwIfClosing(disposable) {
 		if (this.closing) {
-			debug$1?.("[%s] provider was closed, cannot perform the action on %s", this.browserName, String(disposable));
+			debug?.("[%s] provider was closed, cannot perform the action on %s", this.browserName, String(disposable));
 			await disposable?.close();
 			this.pages.clear();
 			this.contexts.clear();
@@ -314,20 +319,20 @@ class PlaywrightBrowserProvider {
 		};
 	}
 	async close() {
-		debug$1?.("[%s] closing provider", this.browserName);
+		debug?.("[%s] closing provider", this.browserName);
 		this.closing = true;
-		const browser = this.browser;
-		this.browser = null;
 		if (this.browserPromise) {
 			await this.browserPromise;
 			this.browserPromise = null;
 		}
+		const browser = this.browser;
+		this.browser = null;
 		await Promise.all([...this.pages.values()].map((p) => p.close()));
 		this.pages.clear();
 		await Promise.all([...this.contexts.values()].map((c) => c.close()));
 		this.contexts.clear();
 		await browser?.close();
-		debug$1?.("[%s] provider is closed", this.browserName);
+		debug?.("[%s] provider is closed", this.browserName);
 	}
 }
 function getHeaders(config) {
@@ -356,152 +361,4 @@ function isDirectCSSRequest(request) {
 	return isCSSRequest(request) && directRequestRE.test(request);
 }
 
-const debug = createDebugger("vitest:browser:wdio");
-const webdriverBrowsers = [
-	"firefox",
-	"chrome",
-	"edge",
-	"safari"
-];
-class WebdriverBrowserProvider {
-	name = "webdriverio";
-	supportsParallelism = false;
-	browser = null;
-	browserName;
-	project;
-	options;
-	closing = false;
-	iframeSwitched = false;
-	topLevelContext;
-	getSupportedBrowsers() {
-		return webdriverBrowsers;
-	}
-	async initialize(ctx, { browser, options }) {
-		this.closing = false;
-		this.project = ctx;
-		this.browserName = browser;
-		this.options = options;
-	}
-	isIframeSwitched() {
-		return this.iframeSwitched;
-	}
-	async switchToTestFrame() {
-		const page = this.browser;
-		// support wdio@9
-		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);
-		}
-		this.iframeSwitched = true;
-	}
-	async switchToMainFrame() {
-		const page = this.browser;
-		if (page.switchFrame) {
-			await page.switchFrame(null);
-		} else {
-			await page.switchToParentFrame();
-		}
-		this.iframeSwitched = false;
-	}
-	async setViewport(options) {
-		if (this.topLevelContext == null || !this.browser) {
-			throw new Error(`The browser has no open pages.`);
-		}
-		await this.browser.send({
-			method: "browsingContext.setViewport",
-			params: {
-				context: this.topLevelContext,
-				devicePixelRatio: 1,
-				viewport: options
-			}
-		});
-	}
-	getCommandsContext() {
-		return { browser: this.browser };
-	}
-	async openBrowser() {
-		await this._throwIfClosing("opening the browser");
-		if (this.browser) {
-			debug?.("[%s] the browser is already opened, reusing it", this.browserName);
-			return this.browser;
-		}
-		const options = this.project.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.");
-			}
-		}
-		const { remote } = await import('webdriverio');
-		const remoteOptions = {
-			...this.options,
-			logLevel: "error",
-			capabilities: this.buildCapabilities()
-		};
-		debug?.("[%s] opening the browser with options: %O", this.browserName, remoteOptions);
-		// TODO: close everything, if browser is closed from the outside
-		this.browser = await remote(remoteOptions);
-		await this._throwIfClosing();
-		return this.browser;
-	}
-	buildCapabilities() {
-		const capabilities = {
-			...this.options?.capabilities,
-			browserName: this.browserName
-		};
-		const headlessMap = {
-			chrome: ["goog:chromeOptions", ["headless", "disable-gpu"]],
-			firefox: ["moz:firefoxOptions", ["-headless"]],
-			edge: ["ms:edgeOptions", ["--headless"]]
-		};
-		const options = this.project.config.browser;
-		const browser = this.browserName;
-		if (browser !== "safari" && options.headless) {
-			const [key, args] = headlessMap[browser];
-			const currentValues = (this.options?.capabilities)?.[key] || {};
-			const newArgs = [...currentValues.args || [], ...args];
-			capabilities[key] = {
-				...currentValues,
-				args: newArgs
-			};
-		}
-		// start Vitest UI maximized only on supported browsers
-		if (options.ui && (browser === "chrome" || browser === "edge")) {
-			const key = browser === "chrome" ? "goog:chromeOptions" : "ms:edgeOptions";
-			const args = capabilities[key]?.args || [];
-			if (!args.includes("--start-maximized") && !args.includes("--start-fullscreen")) {
-				args.push("--start-maximized");
-			}
-			capabilities[key] ??= {};
-			capabilities[key].args = args;
-		}
-		return capabilities;
-	}
-	async openPage(sessionId, url) {
-		await this._throwIfClosing("creating the browser");
-		debug?.("[%s][%s] creating the browser page for %s", sessionId, this.browserName, url);
-		const browserInstance = await this.openBrowser();
-		debug?.("[%s][%s] browser page is created, opening %s", sessionId, this.browserName, url);
-		await browserInstance.url(url);
-		this.topLevelContext = await browserInstance.getWindowHandle();
-		await this._throwIfClosing("opening the url");
-	}
-	async _throwIfClosing(action) {
-		if (this.closing) {
-			debug?.(`[%s] provider was closed, cannot perform the action${action ? ` ${action}` : ""}`, this.browserName);
-			await (this.browser?.sessionId ? this.browser?.deleteSession?.() : null);
-			throw new Error(`[vitest] The provider was closed.`);
-		}
-	}
-	async close() {
-		debug?.("[%s] closing provider", this.browserName);
-		this.closing = true;
-		await Promise.all([this.browser?.sessionId ? this.browser?.deleteSession?.() : null]);
-		// TODO: right now process can only exit with timeout, if we use browser
-		// needs investigating
-		process.exit();
-	}
-}
-
-export { PlaywrightBrowserProvider as P, WebdriverBrowserProvider as W };
+export { PlaywrightBrowserProvider, playwright };

package/dist/providers/preview.d.ts

@@ -0,0 +1,16 @@
+import { BrowserProviderOption, BrowserProvider, TestProject } from 'vitest/node';
+
+declare function preview(): BrowserProviderOption;
+declare class PreviewBrowserProvider implements BrowserProvider {
+	name: "preview";
+	supportsParallelism: boolean;
+	private project;
+	private open;
+	constructor(project: TestProject);
+	isOpen(): boolean;
+	getCommandsContext(): {};
+	openPage(_sessionId: string, url: string): Promise<void>;
+	close(): Promise<void>;
+}
+
+export { PreviewBrowserProvider, preview };

package/dist/{providers.js → providers/preview.js}

@@ -1,24 +1,18 @@
-import { W as WebdriverBrowserProvider, P as PlaywrightBrowserProvider } from './webdriver-KA1WiV0q.js';
-import '@vitest/mocker/node';
-import 'tinyrainbow';
-import 'vitest/node';
-
+function preview() {
+	return {
+		name: "preview",
+		factory(project) {
+			return new PreviewBrowserProvider(project);
+		},
+		_cli: true
+	};
+}
 class PreviewBrowserProvider {
 	name = "preview";
 	supportsParallelism = false;
 	project;
 	open = false;
-	getSupportedBrowsers() {
-		// `none` is not restricted to certain browsers.
-		return [];
-	}
-	isOpen() {
-		return this.open;
-	}
-	getCommandsContext() {
-		return {};
-	}
-	async initialize(project) {
+	constructor(project) {
 		this.project = project;
 		this.open = false;
 		if (project.config.browser.headless) {
@@ -26,6 +20,12 @@ class PreviewBrowserProvider {
 		}
 		project.vitest.logger.printBrowserBanner(project);
 	}
+	isOpen() {
+		return this.open;
+	}
+	getCommandsContext() {
+		return {};
+	}
 	async openPage(_sessionId, url) {
 		this.open = true;
 		if (!this.project.browser) {
@@ -40,8 +40,4 @@ class PreviewBrowserProvider {
 	async close() {}
 }
 
-const webdriverio = WebdriverBrowserProvider;
-const playwright = PlaywrightBrowserProvider;
-const preview = PreviewBrowserProvider;
-
-export { playwright, preview, webdriverio };
+export { PreviewBrowserProvider, preview };

package/dist/providers/webdriverio.d.ts

@@ -0,0 +1,50 @@
+import { ScreenshotMatcherOptions, ScreenshotComparatorRegistry } from '@vitest/browser/context';
+import { BrowserProviderOption, BrowserProvider, TestProject } from 'vitest/node';
+import { ClickOptions, DragAndDropOptions, remote } from 'webdriverio';
+
+interface WebdriverProviderOptions extends Partial<Parameters<typeof remote>[0]> {}
+declare function webdriverio(options?: WebdriverProviderOptions): BrowserProviderOption;
+declare class WebdriverBrowserProvider implements BrowserProvider {
+	name: "webdriverio";
+	supportsParallelism: boolean;
+	browser: WebdriverIO.Browser | null;
+	private browserName;
+	private project;
+	private options?;
+	private closing;
+	private iframeSwitched;
+	private topLevelContext;
+	getSupportedBrowsers(): readonly string[];
+	constructor(project: TestProject, options: WebdriverProviderOptions);
+	isIframeSwitched(): boolean;
+	switchToTestFrame(): Promise<void>;
+	switchToMainFrame(): Promise<void>;
+	setViewport(options: {
+		width: number;
+		height: number;
+	}): Promise<void>;
+	getCommandsContext(): {
+		browser: WebdriverIO.Browser | null;
+	};
+	openBrowser(): Promise<WebdriverIO.Browser>;
+	private buildCapabilities;
+	openPage(sessionId: string, url: string): Promise<void>;
+	private _throwIfClosing;
+	close(): Promise<void>;
+}
+declare module "vitest/node" {
+	interface UserEventClickOptions extends ClickOptions {}
+	interface UserEventDragOptions extends DragAndDropOptions {
+		sourceX?: number;
+		sourceY?: number;
+		targetX?: number;
+		targetY?: number;
+	}
+	interface BrowserCommandContext {
+		browser: WebdriverIO.Browser;
+	}
+	interface ToMatchScreenshotOptions extends Omit<ScreenshotMatcherOptions, "comparatorName" | "comparatorOptions"> {}
+	interface ToMatchScreenshotComparators extends ScreenshotComparatorRegistry {}
+}
+
+export { WebdriverBrowserProvider, webdriverio };