@vitest/browser 3.2.0-beta.2 → 3.2.0

package/dist/{webdriver-D7k26Na7.js → webdriver-B1QbgqhC.js}

@@ -59,6 +59,7 @@ class PlaywrightBrowserProvider {
 				headless: options.headless
 			};
 			if (this.project.config.inspector.enabled) {
+				// NodeJS equivalent defaults: https://nodejs.org/en/learn/getting-started/debugging#enable-inspector
 				const port = this.project.config.inspector.port || 9229;
 				const host = this.project.config.inspector.host || "127.0.0.1";
 				launchOptions.args ||= [];
@@ -66,6 +67,7 @@ class PlaywrightBrowserProvider {
 				launchOptions.args.push(`--remote-debugging-address=${host}`);
 				this.project.vitest.logger.log(`Debugger listening on ws://${host}:${port}`);
 			}
+			// start Vitest UI maximized only on supported browsers
 			if (this.project.config.browser.ui && this.browserName === "chromium") {
 				if (!launchOptions.args) {
 					launchOptions.args = [];
@@ -90,15 +92,18 @@ class PlaywrightBrowserProvider {
 				if (url.searchParams.has("_vitest_original")) {
 					return false;
 				}
+				// different modules, ignore request
 				if (url.pathname !== moduleUrl.pathname) {
 					return false;
 				}
 				url.searchParams.delete("t");
 				url.searchParams.delete("v");
 				url.searchParams.delete("import");
+				// different search params, ignore request
 				if (url.searchParams.size !== moduleUrl.searchParams.size) {
 					return false;
 				}
+				// check that all search params are the same
 				for (const [param, value] of url.searchParams.entries()) {
 					if (moduleUrl.searchParams.get(param) !== value) {
 						return false;
@@ -109,9 +114,12 @@ class PlaywrightBrowserProvider {
 			const ids = sessionIds.get(sessionId) || [];
 			ids.push(moduleUrl.href);
 			sessionIds.set(sessionId, ids);
-			idPreficates.set(moduleUrl.href, predicate);
+			idPreficates.set(predicateKey(sessionId, moduleUrl.href), predicate);
 			return predicate;
 		}
+		function predicateKey(sessionId, url) {
+			return `${sessionId}:${url}`;
+		}
 		return {
 			register: async (sessionId, module) => {
 				const page = this.getPage(sessionId);
@@ -124,16 +132,19 @@ class PlaywrightBrowserProvider {
 							headers: getHeaders(this.project.browser.vite.config)
 						});
 					}
+					// webkit doesn't support redirect responses
+					// https://github.com/microsoft/playwright/issues/18318
 					const isWebkit = this.browserName === "webkit";
 					if (isWebkit) {
-						const url = module.type === "redirect" ? (() => {
-							const url = new URL(module.redirect);
-							return url.href.slice(url.origin.length);
-						})() : (() => {
-							const url = new URL(route.request().url());
-							url.searchParams.set("mock", module.type);
-							return url.href.slice(url.origin.length);
-						})();
+						let url;
+						if (module.type === "redirect") {
+							const redirect = new URL(module.redirect);
+							url = redirect.href.slice(redirect.origin.length);
+						} else {
+							const request = new URL(route.request().url());
+							request.searchParams.set("mock", module.type);
+							url = request.href.slice(request.origin.length);
+						}
 						const result = await this.project.browser.vite.transformRequest(url).catch(() => null);
 						if (!result) {
 							return route.continue();
@@ -165,18 +176,20 @@ class PlaywrightBrowserProvider {
 			},
 			delete: async (sessionId, id) => {
 				const page = this.getPage(sessionId);
-				const predicate = idPreficates.get(id);
+				const key = predicateKey(sessionId, id);
+				const predicate = idPreficates.get(key);
 				if (predicate) {
-					await page.unroute(predicate).finally(() => idPreficates.delete(id));
+					await page.unroute(predicate).finally(() => idPreficates.delete(key));
 				}
 			},
 			clear: async (sessionId) => {
 				const page = this.getPage(sessionId);
 				const ids = sessionIds.get(sessionId) || [];
 				const promises = ids.map((id) => {
-					const predicate = idPreficates.get(id);
+					const key = predicateKey(sessionId, id);
+					const predicate = idPreficates.get(key);
 					if (predicate) {
-						return page.unroute(predicate).finally(() => idPreficates.delete(id));
+						return page.unroute(predicate).finally(() => idPreficates.delete(key));
 					}
 					return null;
 				});
@@ -359,6 +372,8 @@ class WebdriverBrowserProvider {
 	project;
 	options;
 	closing = false;
+	iframeSwitched = false;
+	topLevelContext;
 	getSupportedBrowsers() {
 		return webdriverBrowsers;
 	}
@@ -368,14 +383,19 @@ class WebdriverBrowserProvider {
 		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;
@@ -384,6 +404,20 @@ class WebdriverBrowserProvider {
 		} 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 };
@@ -407,6 +441,7 @@ class WebdriverBrowserProvider {
 			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;
@@ -432,6 +467,7 @@ class WebdriverBrowserProvider {
 				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 || [];
@@ -449,6 +485,7 @@ class WebdriverBrowserProvider {
 		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) {
@@ -462,6 +499,8 @@ class WebdriverBrowserProvider {
 		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();
 	}
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/browser",
   "type": "module",
-  "version": "3.2.0-beta.2",
+  "version": "3.2.0",
   "description": "Browser running for Vitest",
   "license": "MIT",
   "funding": "https://opencollective.com/vitest",
@@ -66,7 +66,7 @@
   "peerDependencies": {
     "playwright": "*",
     "webdriverio": "^7.0.0 || ^8.0.0 || ^9.0.0",
-    "vitest": "3.2.0-beta.2"
+    "vitest": "3.2.0"
   },
   "peerDependenciesMeta": {
     "playwright": {
@@ -85,14 +85,14 @@
     "magic-string": "^0.30.17",
     "sirv": "^3.0.1",
     "tinyrainbow": "^2.0.0",
-    "ws": "^8.18.1",
-    "@vitest/mocker": "3.2.0-beta.2",
-    "@vitest/utils": "3.2.0-beta.2"
+    "ws": "^8.18.2",
+    "@vitest/mocker": "3.2.0",
+    "@vitest/utils": "3.2.0"
   },
   "devDependencies": {
     "@types/ws": "^8.18.1",
-    "@wdio/protocols": "^9.12.5",
-    "@wdio/types": "^9.12.6",
+    "@wdio/protocols": "^9.15.0",
+    "@wdio/types": "^9.15.0",
     "birpc": "2.3.0",
     "flatted": "^3.3.3",
     "ivya": "^1.6.0",
@@ -102,11 +102,11 @@
     "playwright": "^1.52.0",
     "playwright-core": "^1.52.0",
     "safaridriver": "^1.0.0",
-    "webdriverio": "^9.12.7",
-    "@vitest/runner": "3.2.0-beta.2",
-    "@vitest/ui": "3.2.0-beta.2",
-    "@vitest/ws-client": "3.2.0-beta.2",
-    "vitest": "3.2.0-beta.2"
+    "webdriverio": "^9.15.0",
+    "@vitest/runner": "3.2.0",
+    "vitest": "3.2.0",
+    "@vitest/ws-client": "3.2.0",
+    "@vitest/ui": "3.2.0"
   },
   "scripts": {
     "build": "rimraf dist && pnpm build:node && pnpm build:client",