npm - @vitest/browser - Versions diffs - 4.1.0-beta.3 → 4.1.0-beta.4 - Mend

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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (13) hide show

package/dist/client/__vitest__/index.html CHANGED Viewed

@@ -23,8 +23,8 @@
       })();
     </script>
     <!-- !LOAD_METADATA! -->
-    <script type="module" src="./assets/index-BcP0bNv8.js"></script>
-    <link rel="stylesheet" href="./assets/index-DC7speYS.css">
+    <script type="module" src="./assets/index-CPanfHPD.js"></script>
+    <link rel="stylesheet" href="./assets/index-C71EXv4T.css">
   </head>
   <body>
     <div id="app"></div>

package/dist/client/__vitest_browser__/{orchestrator-fh7lJzlE.js → orchestrator-CXs6qrFe.js} RENAMED Viewed

@@ -1,4 +1,4 @@
-import { g as getBrowserState, a as getConfig, r as relative, b as generateFileHash } from "./utils-uxqdqUz8.js";
+import { g as getBrowserState, a as getConfig, r as relative, b as generateFileHash } from "./utils-C2ISqq1C.js";
 import { channel, globalChannel, client } from "@vitest/browser/client";
 import { Traces } from "vitest/internal/browser";
 // @__NO_SIDE_EFFECTS__

package/dist/client/__vitest_browser__/{tester-CH-bVWK6.js → tester-CgiVtoKi.js} RENAMED Viewed

@@ -1,8 +1,8 @@
-import { c as resolve, m as moduleRunner, d as getWorkerState, g as getBrowserState, e as getTestName, a as getConfig } from "./utils-uxqdqUz8.js";
+import { c as resolve, m as moduleRunner, d as getWorkerState, g as getBrowserState, e as getTestName, a as getConfig } from "./utils-C2ISqq1C.js";
 import { onCancel, globalChannel, channel, client } from "@vitest/browser/client";
 import { userEvent, page, server } from "vitest/browser";
 import { getSafeTimers, DecodedMap as DecodedMap$1, getOriginalPosition as getOriginalPosition$1, loadDiffConfig, loadSnapshotSerializers, takeCoverageInsideWorker, browserFormat, Traces, setupCommonEnv, startCoverageInsideWorker, stopCoverageInsideWorker, startTests, collectTests, SpyModule } from "vitest/internal/browser";
-import { TestRunner, BenchmarkRunner } from "vitest";
+import { TestRunner, BenchmarkRunner, recordArtifact } from "vitest";
 const scriptRel = "modulepreload";
 const assetsURL = function(dep) {
   return "/" + dep;
@@ -684,7 +684,11 @@ function createStackString(stacks) {
 }
 function parseStacktrace(stack, options = {}) {
   const { ignoreStackEntries = stackIgnorePatterns } = options;
-  const stacks = !CHROME_IE_STACK_REGEXP.test(stack) ? parseFFOrSafariStackTrace(stack) : parseV8Stacktrace(stack);
+  let stacks = !CHROME_IE_STACK_REGEXP.test(stack) ? parseFFOrSafariStackTrace(stack) : parseV8Stacktrace(stack);
+  const helperIndex = stacks.findLastIndex((s) => s.method === "__VITEST_HELPER__" || s.method === "async*__VITEST_HELPER__");
+  if (helperIndex >= 0) {
+    stacks = stacks.slice(helperIndex + 1);
+  }
   return stacks.map((stack2) => {
     var _a;
     if (options.getUrlId) {
@@ -737,7 +741,7 @@ class DecodedMap {
     this._decodedMemo = memoizedState();
     this.url = from;
     this.resolvedSources = (sources || []).map(
-      (s) => resolve(s || "", from)
+      (s) => resolve(from, "..", s || "")
     );
   }
   _encoded;
@@ -921,7 +925,10 @@ function createBrowserRunner(runnerClass, mocker, state, coverageModule) {
           console.error("[vitest] Failed to take a screenshot", err);
         });
         if (screenshot) {
-          task.meta.failScreenshotPath = screenshot;
+          await recordArtifact(task, {
+            type: "internal:failureScreenshot",
+            attachments: [{ contentType: "image/png", path: screenshot, originalPath: screenshot }]
+          });
         }
       }
     };
@@ -1395,7 +1402,7 @@ class ManualMockedModule {
     } catch (err) {
       throw createHelpfulError(err);
     }
-    if (typeof exports$1 === "object" && typeof (exports$1 === null || exports$1 === void 0 ? void 0 : exports$1.then) === "function") {
+    if (typeof exports$1 === "object" && typeof (exports$1 == null ? void 0 : exports$1.then) === "function") {
       return exports$1.then((result) => {
         assertValidExports(this.raw, result);
         return this.cache = result;
@@ -1802,7 +1809,7 @@ class ModuleMocker {
         return mod;
       }
       const m = mod.default;
-      return (m === null || m === void 0 ? void 0 : m.__esModule) ? m : {
+      return (m == null ? void 0 : m.__esModule) ? m : {
         ...typeof m === "object" && !Array.isArray(m) || typeof m === "function" ? m : {},
         default: m
       };
@@ -1859,7 +1866,7 @@ class ModuleMocker {
     return { callstack: null };
   }
   queueMock(rawId, importer, factoryOrOptions) {
-    const promise = this.rpc.resolveMock(rawId, importer, { mock: typeof factoryOrOptions === "function" ? "factory" : (factoryOrOptions === null || factoryOrOptions === void 0 ? void 0 : factoryOrOptions.spy) ? "spy" : "auto" }).then(async ({ redirectUrl, resolvedId, resolvedUrl, needsInterop, mockType }) => {
+    const promise = this.rpc.resolveMock(rawId, importer, { mock: typeof factoryOrOptions === "function" ? "factory" : (factoryOrOptions == null ? void 0 : factoryOrOptions.spy) ? "spy" : "auto" }).then(async ({ redirectUrl, resolvedId, resolvedUrl, needsInterop, mockType }) => {
       const mockUrl = this.resolveMockPath(cleanVersion(resolvedUrl));
       this.mockedIds.add(resolvedId);
       const factory = typeof factoryOrOptions === "function" ? async () => {

package/dist/client/__vitest_browser__/{utils-uxqdqUz8.js → utils-C2ISqq1C.js} RENAMED Viewed

@@ -159,9 +159,9 @@ function generateFileHash(file, projectName) {
 function getNames(task) {
   const names = [task.name];
   let current = task;
-  while (current === null || current === void 0 ? void 0 : current.suite) {
+  while (current == null ? void 0 : current.suite) {
     current = current.suite;
-    if (current === null || current === void 0 ? void 0 : current.name) {
+    if (current == null ? void 0 : current.name) {
       names.unshift(current.name);
     }
   }

package/dist/client/orchestrator.html CHANGED Viewed

@@ -26,8 +26,8 @@
     {__VITEST_INJECTOR__}
     {__VITEST_ERROR_CATCHER__}
     {__VITEST_SCRIPTS__}
-    <script type="module" crossorigin src="/__vitest_browser__/orchestrator-fh7lJzlE.js"></script>
-    <link rel="modulepreload" crossorigin href="/__vitest_browser__/utils-uxqdqUz8.js">
+    <script type="module" crossorigin src="/__vitest_browser__/orchestrator-CXs6qrFe.js"></script>
+    <link rel="modulepreload" crossorigin href="/__vitest_browser__/utils-C2ISqq1C.js">
   </head>
   <body>
     <div id="vitest-tester"></div>

package/dist/client/tester/tester.html CHANGED Viewed

@@ -5,8 +5,8 @@
     <link rel="icon" href="{__VITEST_FAVICON__}" type="image/svg+xml">
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Vitest Browser Tester</title>
-    <script type="module" crossorigin src="/__vitest_browser__/tester-CH-bVWK6.js"></script>
-    <link rel="modulepreload" crossorigin href="/__vitest_browser__/utils-uxqdqUz8.js">
+    <script type="module" crossorigin src="/__vitest_browser__/tester-CgiVtoKi.js"></script>
+    <link rel="modulepreload" crossorigin href="/__vitest_browser__/utils-C2ISqq1C.js">
   </head>
   <body>
   </body>

package/dist/index.js CHANGED Viewed

@@ -3,12 +3,11 @@ 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';
@@ -18,7 +17,7 @@ import { PNG } from 'pngjs';
 import pm from 'pixelmatch';
 import { WebSocketServer } from 'ws';
-var version = "4.1.0-beta.3";
+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, "");

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/browser",
   "type": "module",
-  "version": "4.1.0-beta.3",
+  "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.3"
+    "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.3",
-    "@vitest/utils": "4.1.0-beta.3"
+    "@vitest/mocker": "4.1.0-beta.4",
+    "@vitest/utils": "4.1.0-beta.4"
   },
   "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": "4.1.0-beta.4",
+    "@vitest/runner": "4.1.0-beta.4"
   },
   "scripts": {
     "typecheck": "tsc -p ./src/client/tsconfig.json --noEmit",