@vitest/browser 4.1.0-beta.3 → 4.1.0-beta.5

package/dist/index.js

@@ -3,22 +3,22 @@ import { dynamicImportPlugin, ServerMockResolver, interceptorPlugin } from '@vit
 import c from 'tinyrainbow';
 import { isValidApiRequest, isFileServingAllowed, distDir, resolveApiServerConfig, resolveFsAllow, rolldownVersion, isFileLoadingAllowed, createDebugger, createViteLogger, createViteServer } from 'vitest/node';
 import { fileURLToPath } from 'node:url';
-import fs, { readFileSync, lstatSync, createReadStream, promises, existsSync } from 'node:fs';
+import fs, { readFileSync, createReadStream, promises, existsSync } from 'node:fs';
 import { createRequire } from 'node:module';
 import { slash as slash$1, toArray, deepMerge } from '@vitest/utils/helpers';
 import MagicString from 'magic-string';
 import sirv from 'sirv';
-import { coverageConfigDefaults } from 'vitest/config';
 import crypto from 'node:crypto';
 import { readFile as readFile$1, mkdir, writeFile as writeFile$1 } from 'node:fs/promises';
 import { parseErrorStacktrace, parseStacktrace } from '@vitest/utils/source-map';
+import { extractSourcemapFromFile } from '@vitest/utils/source-map/node';
 import { resolve as resolve$1, basename as basename$1, dirname as dirname$1 } from 'node:path';
 import { platform } from 'node:os';
 import { PNG } from 'pngjs';
-import pm from 'pixelmatch';
+import { diff } from '@blazediff/core';
 import { WebSocketServer } from 'ws';
 
-var version = "4.1.0-beta.3";
+var version = "4.1.0-beta.5";
 
 const _DRIVE_LETTER_START_RE = /^[A-Za-z]:\//;
 function normalizeWindowsPath(input = "") {
@@ -942,13 +942,10 @@ var BrowserPlugin = (parentServer, base = "/") => {
 					res.write(content, "utf-8");
 					res.end();
 				});
-				const coverageFolder = resolveCoverageFolder(parentServer.vitest);
-				const coveragePath = coverageFolder ? coverageFolder[1] : undefined;
-				if (coveragePath && base === coveragePath) {
-					throw new Error(`The ui base path and the coverage path cannot be the same: ${base}, change coverage.reportsDirectory`);
-				}
-				if (coverageFolder) {
-					server.middlewares.use(coveragePath, sirv(coverageFolder[0], {
+				// Serve coverage HTML at ./coverage if configured
+				const coverageHtmlDir = parentServer.vitest.config.coverage?.htmlDir;
+				if (coverageHtmlDir) {
+					server.middlewares.use("/__vitest_test__/coverage", sirv(coverageHtmlDir, {
 						single: true,
 						dev: true,
 						setHeaders: (res) => {
@@ -962,46 +959,6 @@ var BrowserPlugin = (parentServer, base = "/") => {
 						}
 					}));
 				}
-				const uiEnabled = parentServer.config.browser.ui;
-				if (uiEnabled) {
-					// eslint-disable-next-line prefer-arrow-callback
-					server.middlewares.use(`${base}__screenshot-error`, function vitestBrowserScreenshotError(req, res) {
-						if (!req.url) {
-							res.statusCode = 404;
-							res.end();
-							return;
-						}
-						const url = new URL(req.url, "http://localhost");
-						const id = url.searchParams.get("id");
-						if (!id) {
-							res.statusCode = 404;
-							res.end();
-							return;
-						}
-						const task = parentServer.vitest.state.idMap.get(id);
-						const file = task?.meta.failScreenshotPath;
-						if (!file) {
-							res.statusCode = 404;
-							res.end();
-							return;
-						}
-						let stat;
-						try {
-							stat = lstatSync(file);
-						} catch {}
-						if (!stat?.isFile()) {
-							res.statusCode = 404;
-							res.end();
-							return;
-						}
-						const ext = extname(file);
-						const buffer = readFileSync(file);
-						res.setHeader("Cache-Control", "public,max-age=0,must-revalidate");
-						res.setHeader("Content-Length", buffer.length);
-						res.setHeader("Content-Type", ext === "jpeg" || ext === "jpg" ? "image/jpeg" : ext === "webp" ? "image/webp" : "image/png");
-						res.end(buffer);
-					});
-				}
 				server.middlewares.use((req, res, next) => {
 					// 9000 mega head move
 					// Vite always caches optimized dependencies, but users might mock
@@ -1412,26 +1369,6 @@ function getRequire() {
 	}
 	return _require;
 }
-function resolveCoverageFolder(vitest) {
-	const options = vitest.config;
-	const coverageOptions = vitest._coverageOptions;
-	const htmlReporter = coverageOptions?.enabled ? toArray(options.coverage.reporter).find((reporter) => {
-		if (typeof reporter === "string") {
-			return reporter === "html";
-		}
-		return reporter[0] === "html";
-	}) : undefined;
-	if (!htmlReporter) {
-		return undefined;
-	}
-	// reportsDirectory not resolved yet
-	const root = resolve(options.root || process.cwd(), coverageOptions.reportsDirectory || coverageConfigDefaults.reportsDirectory);
-	const subdir = Array.isArray(htmlReporter) && htmlReporter.length > 1 && "subdir" in htmlReporter[1] ? htmlReporter[1].subdir : undefined;
-	if (!subdir || typeof subdir !== "string") {
-		return [root, `/${basename(root)}/`];
-	}
-	return [resolve(root, subdir), `/${basename(root)}/${subdir}/`];
-}
 const postfixRE = /[?#].*$/;
 function cleanUrl(url) {
 	return url.replace(postfixRE, "");
@@ -2063,7 +2000,7 @@ const pixelmatch = (reference, actual, { createDiff, ...options }) => {
 		...options
 	};
 	const diffBuffer = createDiff ? new Uint8Array(reference.data.length) : undefined;
-	const mismatchedPixels = pm(reference.data, actual.data, diffBuffer, reference.metadata.width, reference.metadata.height, optionsWithDefaults);
+	const mismatchedPixels = diff(reference.data, actual.data, diffBuffer, reference.metadata.width, reference.metadata.height, optionsWithDefaults);
 	const imageArea = reference.metadata.width * reference.metadata.height;
 	let allowedMismatchedPixels = Math.min(optionsWithDefaults.allowedMismatchedPixels ?? Number.POSITIVE_INFINITY, (optionsWithDefaults.allowedMismatchedPixelRatio ?? Number.POSITIVE_INFINITY) * imageArea);
 	if (allowedMismatchedPixels === Number.POSITIVE_INFINITY) {
@@ -2101,6 +2038,7 @@ const defaultOptions = {
 		scale: "device"
 	},
 	timeout: 5e3,
+	strict: true,
 	resolveDiffPath: ({ arg, ext, root, attachmentsDir, browserName, platform, testFileDirectory, testFileName }) => resolve(root, attachmentsDir, testFileDirectory, testFileName, `${arg}-${browserName}-${platform}${ext}`),
 	resolveScreenshotPath: ({ arg, ext, root, screenshotDirectory, testFileDirectory, testFileName, browserName }) => resolve(root, testFileDirectory, screenshotDirectory, testFileName, `${arg}-${browserName}-${platform}${ext}`)
 };
@@ -2638,18 +2576,14 @@ class ParentBrowserProject {
 					return this.sourceMapCache.get(id);
 				}
 				const result = this.vite.moduleGraph.getModuleById(id)?.transformResult;
-				// this can happen for bundled dependencies in node_modules/.vite
+				// handle non-inline source map such as pre-bundled deps in node_modules/.vite
 				if (result && !result.map) {
-					const sourceMapUrl = this.retrieveSourceMapURL(result.code);
-					if (!sourceMapUrl) {
-						return null;
-					}
-					const filepathDir = dirname(id);
-					const sourceMapPath = resolve(filepathDir, sourceMapUrl);
-					const map = JSON.parse(readFileSync(sourceMapPath, "utf-8"));
-					this.sourceMapCache.set(id, map);
-					return map;
+					const filePath = id.split("?")[0];
+					const extracted = extractSourcemapFromFile(result.code, filePath);
+					this.sourceMapCache.set(id, extracted?.map);
+					return extracted?.map;
 				}
+				this.sourceMapCache.set(id, result?.map);
 				return result?.map;
 			},
 			getUrlId: (id) => {
@@ -2785,20 +2719,6 @@ class ParentBrowserProject {
 			testFile: decodedTestFile
 		};
 	}
-	retrieveSourceMapURL(source) {
-		const re = /\/\/[@#]\s*sourceMappingURL=([^\s'"]+)\s*$|\/\*[@#]\s*sourceMappingURL=[^\s*'"]+\s*\*\/\s*$/gm;
-		// Keep executing the search to find the *last* sourceMappingURL to avoid
-		// picking up sourceMappingURLs from comments, strings, etc.
-		let lastMatch, match;
-		// eslint-disable-next-line no-cond-assign
-		while (match = re.exec(source)) {
-			lastMatch = match;
-		}
-		if (!lastMatch) {
-			return null;
-		}
-		return lastMatch[1];
-	}
 }
 
 //#region src/messages.ts
@@ -3177,20 +3097,11 @@ function setupBrowserRpc(globalServer, defaultMockerRegistry) {
 			getBrowserFileSourceMap(id) {
 				const mod = globalServer.vite.moduleGraph.getModuleById(id);
 				const result = mod?.transformResult;
-				// this can happen for bundled dependencies in node_modules/.vite
+				// handle non-inline source map such as pre-bundled deps in node_modules/.vite
 				if (result && !result.map) {
-					const sourceMapUrl = retrieveSourceMapURL(result.code);
-					if (!sourceMapUrl) {
-						return null;
-					}
-					const filepathDir = dirname(id);
-					const sourceMapPath = resolve(filepathDir, sourceMapUrl);
-					try {
-						const map = JSON.parse(readFileSync(sourceMapPath, "utf-8"));
-						return map;
-					} catch {
-						return null;
-					}
+					const filePath = id.split("?")[0];
+					const extracted = extractSourcemapFromFile(result.code, filePath);
+					return extracted?.map;
 				}
 				return result?.map;
 			},
@@ -3318,20 +3229,6 @@ function setupBrowserRpc(globalServer, defaultMockerRegistry) {
 		};
 	}
 }
-function retrieveSourceMapURL(source) {
-	const re = /\/\/[@#]\s*sourceMappingURL=([^\s'"]+)\s*$|\/\*[@#]\s*sourceMappingURL=[^\s*'"]+\s*\*\/\s*$/gm;
-	// keep executing the search to find the *last* sourceMappingURL to avoid
-	// picking up sourceMappingURLs from comments, strings, etc.
-	let lastMatch, match;
-	// eslint-disable-next-line no-cond-assign
-	while (match = re.exec(source)) {
-		lastMatch = match;
-	}
-	if (!lastMatch) {
-		return null;
-	}
-	return lastMatch[1];
-}
 // Serialization support utils.
 function cloneByOwnProperties(value) {
 	// Clones the value's properties into a new Object. The simpler approach of

package/dist/locators.d.ts

@@ -1,4 +1,4 @@
-import { UserEventClickOptions, UserEventWheelOptions, UserEventClearOptions, UserEventHoverOptions, UserEventFillOptions, UserEventUploadOptions, UserEventDragAndDropOptions, UserEventSelectOptions, LocatorScreenshotOptions, LocatorByRoleOptions, LocatorOptions } from 'vitest/browser';
+import { UserEventClickOptions, UserEventWheelOptions, UserEventClearOptions, UserEventHoverOptions, UserEventFillOptions, UserEventUploadOptions, UserEventDragAndDropOptions, UserEventSelectOptions, LocatorScreenshotOptions, LocatorByRoleOptions, LocatorOptions, SelectorOptions } from 'vitest/browser';
 
 type ClauseCombinator = '' | '>' | '+' | '~' | '>=';
 type CSSFunctionArgument = CSSComplexSelector | number | string;
@@ -299,15 +299,18 @@ interface SelectorEngine {
 declare function convertElementToCssSelector(element: Element): string;
 declare function processTimeoutOptions<T extends {
 	timeout?: number;
-}>(options_?: T): T | undefined;
+}>(options_: T | undefined): T | undefined;
 declare function getIframeScale(): number;
 
+declare function ensureAwaited<T>(promise: (error?: Error) => Promise<T>): Promise<T>;
+
 declare const selectorEngine: Ivya;
 declare abstract class Locator {
 	abstract selector: string;
 	private _parsedSelector;
 	protected _container?: Element | undefined;
 	protected _pwSelector?: string | undefined;
+	protected _errorSource?: Error;
 	constructor();
 	click(options?: UserEventClickOptions): Promise<void>;
 	dblClick(options?: UserEventClickOptions): Promise<void>;
@@ -349,7 +352,13 @@ declare abstract class Locator {
 	last(): Locator;
 	toString(): string;
 	toJSON(): string;
+	findElement(options_?: SelectorOptions): Promise<HTMLElement | SVGElement>;
 	protected triggerCommand<T>(command: string, ...args: any[]): Promise<T>;
 }
+declare function triggerCommandWithTrace<T>(options: {
+	name: string;
+	arguments: unknown[];
+	errorSource?: Error | undefined;
+}): Promise<T>;
 
-export { Locator, convertElementToCssSelector, getByAltTextSelector, getByLabelSelector, getByPlaceholderSelector, getByRoleSelector, getByTestIdSelector, getByTextSelector, getByTitleSelector, getIframeScale, processTimeoutOptions, selectorEngine };
+export { Locator, convertElementToCssSelector, ensureAwaited, getByAltTextSelector, getByLabelSelector, getByPlaceholderSelector, getByRoleSelector, getByTestIdSelector, getByTextSelector, getByTitleSelector, getIframeScale, processTimeoutOptions, selectorEngine, triggerCommandWithTrace };

package/dist/locators.js

@@ -1 +1 @@
-export{L as Locator,n as convertElementToCssSelector,o as getByAltTextSelector,q as getByLabelSelector,r as getByPlaceholderSelector,s as getByRoleSelector,t as getByTestIdSelector,u as getByTextSelector,v as getByTitleSelector,w as getIframeScale,p as processTimeoutOptions,x as selectorEngine}from"./index-Dlkb5vw8.js";import"vitest/browser";import"vitest/internal/browser";
+export{L as Locator,n as convertElementToCssSelector,o as ensureAwaited,q as getByAltTextSelector,r as getByLabelSelector,s as getByPlaceholderSelector,t as getByRoleSelector,u as getByTestIdSelector,v as getByTextSelector,w as getByTitleSelector,x as getIframeScale,p as processTimeoutOptions,y as selectorEngine,z as triggerCommandWithTrace}from"./index-BvKPfXh9.js";import"vitest/browser";import"vitest/internal/browser";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/browser",
   "type": "module",
-  "version": "4.1.0-beta.3",
+  "version": "4.1.0-beta.5",
   "description": "Browser running for Vitest",
   "license": "MIT",
   "funding": "https://opencollective.com/vitest",
@@ -51,17 +51,17 @@
     "providers"
   ],
   "peerDependencies": {
-    "vitest": "4.1.0-beta.3"
+    "vitest": "4.1.0-beta.5"
   },
   "dependencies": {
+    "@blazediff/core": "1.9.1",
     "magic-string": "^0.30.21",
-    "pixelmatch": "7.1.0",
     "pngjs": "^7.0.0",
     "sirv": "^3.0.2",
     "tinyrainbow": "^3.0.3",
     "ws": "^8.19.0",
-    "@vitest/mocker": "4.1.0-beta.3",
-    "@vitest/utils": "4.1.0-beta.3"
+    "@vitest/mocker": "4.1.0-beta.5",
+    "@vitest/utils": "4.1.0-beta.5"
   },
   "devDependencies": {
     "@opentelemetry/api": "^1.9.0",
@@ -73,8 +73,8 @@
     "ivya": "^1.7.1",
     "mime": "^4.1.0",
     "pathe": "^2.0.3",
-    "@vitest/runner": "4.1.0-beta.3",
-    "vitest": "4.1.0-beta.3"
+    "@vitest/runner": "4.1.0-beta.5",
+    "vitest": "4.1.0-beta.5"
   },
   "scripts": {
     "typecheck": "tsc -p ./src/client/tsconfig.json --noEmit",