vitest 5.0.0-beta.4 → 5.0.0-beta.6

package/dist/chunks/{index.nQFVd50u.js → index.DNRmy2jU.js}

@@ -1,7 +1,7 @@
 import fs__default from 'node:fs';
-import { isBareImport } from '@vitest/utils/helpers';
+import { splitFileAndPostfix as splitFileAndPostfix$1, isBareImport } from '@vitest/utils/helpers';
 import { i as isBuiltin, a as isBrowserExternal, t as toBuiltin } from './modules.BJuCwlRJ.js';
-import { E as EnvironmentTeardownError, a as getSafeWorkerState } from './utils.BX5Fg8C4.js';
+import { E as EnvironmentTeardownError, a as getSafeWorkerState } from './utils.DYj33du9.js';
 import { pathToFileURL, URL as URL$1 } from 'node:url';
 import { normalize, join } from 'pathe';
 import { distDir } from '../path.js';
@@ -234,8 +234,11 @@ function fixLeadingSlashes(id) {
 	return id;
 }
 
-// copied from vite/src/shared/utils.ts
+// copied from vite
+// https://github.com/vitejs/vite/blob/4417b4f305623b2850bd6ae6553834c017694672/packages/vite/src/shared/utils.ts
+// https://github.com/vitejs/vite/blob/4417b4f305623b2850bd6ae6553834c017694672/packages/vite/src/node/utils.ts
 const postfixRE = /[?#].*$/;
+const trailingSeparatorRE = /[?&]$/;
 function cleanUrl(url) {
 	return url.replace(postfixRE, "");
 }
@@ -251,7 +254,7 @@ function injectQuery(url, queryToInject) {
 	return `${file}?${queryToInject}${postfix[0] === "?" ? `&${postfix.slice(1)}` : postfix}`;
 }
 function removeQuery(url, queryToRemove) {
-	return url.replace(new RegExp(`[?&]${queryToRemove}(?=[&#]|$)`), "").replace(/\?$/, "");
+	return url.replace(new RegExp(`([?&])${queryToRemove}(?:&|$)`), "$1").replace(trailingSeparatorRE, "");
 }
 
 const spyModulePath = resolve(distDir, "spy.js");
@@ -602,7 +605,8 @@ function getCachedVitestImport(id, state) {
 	const root = state().config.root;
 	const relativeRoot = relativeIds[root] ?? (relativeIds[root] = normalizedDistDir.slice(root.length));
 	if (id.includes(distDir) || id.includes(normalizedDistDir)) {
-		const externalize = id.startsWith("file://") ? id : pathToFileURL(id).toString();
+		const { file, postfix } = splitFileAndPostfix$1(id);
+		const externalize = id.startsWith("file://") ? id : `${pathToFileURL(file)}${postfix}`;
 		externalizeMap.set(id, externalize);
 		return {
 			externalize,
@@ -610,7 +614,8 @@ function getCachedVitestImport(id, state) {
 		};
 	}
 	if (relativeRoot && relativeRoot !== "/" && id.startsWith(relativeRoot)) {
-		const externalize = pathToFileURL(join(root, id)).toString();
+		const { file, postfix } = splitFileAndPostfix$1(id);
+		const externalize = `${pathToFileURL(join(root, file))}${postfix}`;
 		externalizeMap.set(id, externalize);
 		return {
 			externalize,
@@ -927,6 +932,7 @@ const OTHER_KEYS = [
 	"innerHeight",
 	"innerWidth",
 	"length",
+	"localStorage",
 	"location",
 	"matchMedia",
 	"moveBy",
@@ -959,6 +965,7 @@ const OTHER_KEYS = [
 	"scrollX",
 	"scrollY",
 	"self",
+	"sessionStorage",
 	"stop",
 	"top",
 	"Window",
@@ -991,7 +998,18 @@ function populateGlobal(global, win, options = {}) {
 	const overrideObject = /* @__PURE__ */ new Map();
 	for (const key of keys) {
 		const boundFunction = bindFunctions && typeof win[key] === "function" && !isClassLikeName(key) && win[key].bind(win);
-		if (overriddenKeys.has(key) && key in global) originals.set(key, global[key]);
+		if (overriddenKeys.has(key) && key in global) {
+			// capture the descriptor instead of the value to avoid invoking native
+			// lazy getters such as Node's `localStorage`, which warns when accessed
+			// without `--localstorage-file`
+			const descriptor = Object.getOwnPropertyDescriptor(global, key) ?? {
+				value: global[key],
+				configurable: true,
+				writable: true,
+				enumerable: true
+			};
+			originals.set(key, descriptor);
+		}
 		Object.defineProperty(global, key, {
 			get() {
 				if (overrideObject.has(key)) return overrideObject.get(key);
@@ -1000,6 +1018,10 @@ function populateGlobal(global, win, options = {}) {
 			},
 			set(v) {
 				overrideObject.set(key, v);
+				// propagate changes to underlying window implementation,
+				// which can affect other window API behavior internally, e.g.
+				// updating `innerWidth` affects `matchMedia("(max-width: *)")` on happy-dom.
+				win[key] = v;
 			},
 			configurable: true
 		});
@@ -1054,7 +1076,7 @@ var edge = {
 		} }).context, { bindFunctions: true });
 		return { teardown(global) {
 			keys.forEach((key) => delete global[key]);
-			originals.forEach((v, k) => global[k] = v);
+			originals.forEach((d, k) => Object.defineProperty(global, k, d));
 		} };
 	}
 };
@@ -1124,7 +1146,7 @@ var happy = {
 		return { async teardown(global) {
 			await teardownWindow(win);
 			keys.forEach((key) => delete global[key]);
-			originals.forEach((v, k) => global[k] = v);
+			originals.forEach((d, k) => Object.defineProperty(global, k, d));
 		} };
 	}
 };
@@ -1265,7 +1287,7 @@ var jsdom = {
 			dom.window.close();
 			delete global.jsdom;
 			keys.forEach((key) => delete global[key]);
-			originals.forEach((v, k) => global[k] = v);
+			originals.forEach((d, k) => Object.defineProperty(global, k, d));
 		} };
 	}
 };