@vitest/browser 4.1.0-beta.2 → 4.1.0-beta.4

package/dist/index.js

@@ -1,14 +1,13 @@
 import { ManualMockedModule, RedirectedModule, AutomockedModule, AutospiedModule, MockerRegistry } from '@vitest/mocker';
 import { dynamicImportPlugin, ServerMockResolver, interceptorPlugin } from '@vitest/mocker/node';
 import c from 'tinyrainbow';
-import { isValidApiRequest, isFileServingAllowed, distDir, resolveApiServerConfig, resolveFsAllow, rolldownVersion, createDebugger, createViteLogger, createViteServer } from 'vitest/node';
+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';
@@ -18,7 +17,7 @@ import { PNG } from 'pngjs';
 import pm from 'pixelmatch';
 import { WebSocketServer } from 'ws';
 
-var version = "4.1.0-beta.2";
+var version = "4.1.0-beta.4";
 
 const _DRIVE_LETTER_START_RE = /^[A-Za-z]:\//;
 function normalizeWindowsPath(input = "") {
@@ -942,13 +941,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 +958,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 +1368,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, "");
@@ -1930,13 +1866,18 @@ _Mime_extensionToType = new WeakMap(), _Mime_typeToExtension = new WeakMap(), _M
 var mime = new Mime(types)._freeze();
 
 function assertFileAccess(path, project) {
-	if (!isFileServingAllowed(path, project.vite) && !isFileServingAllowed(path, project.vitest.vite)) {
+	if (!isFileLoadingAllowed(project.vite.config, path) && !isFileLoadingAllowed(project.vitest.vite.config, path)) {
 		throw new Error(`Access denied to "${path}". See Vite config documentation for "server.fs": https://vitejs.dev/config/server-options.html#server-fs-strict.`);
 	}
 }
+function assertWrite(path, project) {
+	if (!project.config.browser.api.allowWrite || !project.vitest.config.api.allowWrite) {
+		throw new Error(`Cannot modify file "${path}". File writing is disabled because server is exposed to the internet, see https://vitest.dev/config/browser/api.`);
+	}
+}
 const readFile = async ({ project }, path, options = {}) => {
 	const filepath = resolve$1(project.config.root, path);
-	assertFileAccess(filepath, project);
+	assertFileAccess(slash(filepath), project);
 	// never return a Buffer
 	if (typeof options === "object" && !options.encoding) {
 		options.encoding = "utf-8";
@@ -1944,8 +1885,9 @@ const readFile = async ({ project }, path, options = {}) => {
 	return promises.readFile(filepath, options);
 };
 const writeFile = async ({ project }, path, data, options) => {
+	assertWrite(path, project);
 	const filepath = resolve$1(project.config.root, path);
-	assertFileAccess(filepath, project);
+	assertFileAccess(slash(filepath), project);
 	const dir = dirname$1(filepath);
 	if (!fs.existsSync(dir)) {
 		await promises.mkdir(dir, { recursive: true });
@@ -1953,13 +1895,14 @@ const writeFile = async ({ project }, path, data, options) => {
 	await promises.writeFile(filepath, data, options);
 };
 const removeFile = async ({ project }, path) => {
+	assertWrite(path, project);
 	const filepath = resolve$1(project.config.root, path);
-	assertFileAccess(filepath, project);
+	assertFileAccess(slash(filepath), project);
 	await promises.rm(filepath);
 };
 const _fileInfo = async ({ project }, path, encoding) => {
 	const filepath = resolve$1(project.config.root, path);
-	assertFileAccess(filepath, project);
+	assertFileAccess(slash(filepath), project);
 	const content = await promises.readFile(filepath, encoding || "base64");
 	return {
 		content,
@@ -3067,10 +3010,13 @@ function setupBrowserRpc(globalServer, defaultMockerRegistry) {
 		vitest.state.catchError(err, "RPC Error");
 	}
 	function checkFileAccess(path) {
-		if (!isFileServingAllowed(path, vite)) {
+		if (!isFileLoadingAllowed(vite.config, path)) {
 			throw new Error(`Access denied to "${path}". See Vite config documentation for "server.fs": https://vitejs.dev/config/server-options.html#server-fs-strict.`);
 		}
 	}
+	function canWrite(project) {
+		return project.config.browser.api.allowWrite && project.vitest.config.browser.api.allowWrite && project.config.api.allowWrite && project.vitest.config.api.allowWrite;
+	}
 	function setupClient(project, rpcId, ws) {
 		const mockResolver = new ServerMockResolver(globalServer.vite, { moduleDirectories: project.config?.deps?.moduleDirectories });
 		const mocker = project.browser?.provider.mocker;
@@ -3097,6 +3043,18 @@ function setupBrowserRpc(globalServer, defaultMockerRegistry) {
 				}
 			},
 			async onTaskArtifactRecord(id, artifact) {
+				if (!canWrite(project)) {
+					if (artifact.type === "internal:annotation" && artifact.annotation.attachment) {
+						artifact.annotation.attachment = undefined;
+						vitest.logger.error(`[vitest] Cannot record annotation attachment because file writing is disabled. See https://vitest.dev/config/browser/api.`);
+					}
+					// remove attachments if cannot write
+					if (artifact.attachments?.length) {
+						const attachments = artifact.attachments.map((n) => n.path).filter((r) => !!r).join("\", \"");
+						artifact.attachments = [];
+						vitest.logger.error(`[vitest] Cannot record attachments ("${attachments}") because file writing is disabled, removing attachments from artifact "${artifact.type}". See https://vitest.dev/config/browser/api.`);
+					}
+				}
 				return vitest._testRun.recordArtifact(id, artifact);
 			},
 			async onTaskUpdate(method, packs, events) {
@@ -3134,15 +3092,23 @@ function setupBrowserRpc(globalServer, defaultMockerRegistry) {
 			},
 			async saveSnapshotFile(id, content) {
 				checkFileAccess(id);
+				if (!canWrite(project)) {
+					vitest.logger.error(`[vitest] Cannot save snapshot file "${id}". File writing is disabled because server is exposed to the internet, see https://vitest.dev/config/browser/api.`);
+					return;
+				}
 				await promises.mkdir(dirname(id), { recursive: true });
-				return promises.writeFile(id, content, "utf-8");
+				await promises.writeFile(id, content, "utf-8");
 			},
 			async removeSnapshotFile(id) {
 				checkFileAccess(id);
+				if (!canWrite(project)) {
+					vitest.logger.error(`[vitest] Cannot remove snapshot file "${id}". File writing is disabled because server is exposed to the internet, see https://vitest.dev/config/browser/api.`);
+					return;
+				}
 				if (!existsSync(id)) {
 					throw new Error(`Snapshot file "${id}" does not exist.`);
 				}
-				return promises.unlink(id);
+				await promises.unlink(id);
 			},
 			getBrowserFileSourceMap(id) {
 				const mod = globalServer.vite.moduleGraph.getModuleById(id);

package/dist/locators.js

@@ -1 +1 @@
-export{L as Locator,n as convertElementToCssSelector,q as getByAltTextSelector,r as getByLabelSelector,t as getByPlaceholderSelector,u as getByRoleSelector,v as getByTestIdSelector,w as getByTextSelector,x as getByTitleSelector,o as getIframeScale,p as processTimeoutOptions,s as selectorEngine}from"./index-5ZLDAkrH.js";import"vitest/browser";import"vitest/internal/browser";
+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";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/browser",
   "type": "module",
-  "version": "4.1.0-beta.2",
+  "version": "4.1.0-beta.4",
   "description": "Browser running for Vitest",
   "license": "MIT",
   "funding": "https://opencollective.com/vitest",
@@ -51,7 +51,7 @@
     "providers"
   ],
   "peerDependencies": {
-    "vitest": "4.1.0-beta.2"
+    "vitest": "4.1.0-beta.4"
   },
   "dependencies": {
     "magic-string": "^0.30.21",
@@ -60,8 +60,8 @@
     "sirv": "^3.0.2",
     "tinyrainbow": "^3.0.3",
     "ws": "^8.19.0",
-    "@vitest/mocker": "4.1.0-beta.2",
-    "@vitest/utils": "4.1.0-beta.2"
+    "@vitest/mocker": "4.1.0-beta.4",
+    "@vitest/utils": "4.1.0-beta.4"
   },
   "devDependencies": {
     "@opentelemetry/api": "^1.9.0",
@@ -70,11 +70,11 @@
     "@types/ws": "^8.18.1",
     "birpc": "^4.0.0",
     "flatted": "3.3.3",
-    "ivya": "^1.7.0",
+    "ivya": "^1.7.1",
     "mime": "^4.1.0",
     "pathe": "^2.0.3",
-    "@vitest/runner": "4.1.0-beta.2",
-    "vitest": "4.1.0-beta.2"
+    "vitest": "4.1.0-beta.4",
+    "@vitest/runner": "4.1.0-beta.4"
   },
   "scripts": {
     "typecheck": "tsc -p ./src/client/tsconfig.json --noEmit",