improve setup

Author: edmundhung

packages/vitest-pool-workers/src/config/index.ts

@@ -159,11 +159,7 @@ function createConfigPlugin(): Plugin<WorkersConfigPluginAPI> {
 			config.test.deps ??= {};
 			config.test.deps.optimizer ??= {};
 			config.test.deps.optimizer.ssr ??= {};
-			config.test.deps.optimizer.ssr.enabled = true;
-			config.test.deps.optimizer.ssr.exclude = [
-				...cloudflareBuiltInModules,
-				...builtinModules.concat(builtinModules.map((m) => `node:${m}`)),
-			];
+			config.test.deps.optimizer.ssr.enabled ??= true;
 			config.test.deps.optimizer.ssr.esbuildOptions = {
 				platform: "neutral",
 				resolveExtensions: [
@@ -179,6 +175,11 @@ function createConfigPlugin(): Plugin<WorkersConfigPluginAPI> {
 					".ctx",
 				],
 			};
+			config.test.deps.optimizer.ssr.exclude ??= [];
+			ensureArrayIncludes(config.test.deps.optimizer.ssr.exclude, [
+				...cloudflareBuiltInModules,
+				...builtinModules.concat(builtinModules.map((m) => `node:${m}`)),
+			]);
 
 			// Ideally, we would force `pool` to be @cloudflare/vitest-pool-workers here,
 			// but the tests in `packages/vitest-pool-workers` define `pool` as "../..".

packages/vitest-pool-workers/src/pool/module-fallback.ts

@@ -41,6 +41,16 @@ function trimSuffix(suffix: string, value: string) {
 	return value.substring(0, value.length - suffix.length);
 }
 
+const versionHashRegExp = /\?v=[0-9a-f]+$/;
+/**
+ * When pre-bundling is enabled, Vite will add a hash to the end of the file path
+ * @see https://vite.dev/guide/features.html#npm-dependency-resolving-and-pre-bundling
+ * @see https://github.com/cloudflare/workers-sdk/pull/5673
+ */
+function trimViteVersionHash(filePath: string) {
+	return filePath.replace(versionHashRegExp, "");
+}
+
 // RegExp for path suffix to force loading module as specific type.
 // (e.g. `/path/to/module.wasm?mf_vitest_force=CompiledWasm`)
 // This suffix will be added by the pool when fetching a module that matches a
@@ -323,21 +333,8 @@ async function viteResolve(
 		//       (Specifically, the "tinyrainbow" module imports `node:tty` as `tty`)
 		return id;
 	}
-	// strip off deps optimization hash from vite
-	// @see https://github.com/cloudflare/workers-sdk/pull/5673
-	if (resolved.id.includes("?v=")) {
-		const [id, hash] = resolved.id.split("?v=");
-		debuglog(
-			"Trimming deps optimization hash from vite, id =",
-			id,
-			"v =",
-			hash
-		);
 
-		return id;
-	}
-
-	return resolved.id;
+	return trimViteVersionHash(resolved.id);
 }
 
 type ResolveMethod = "import" | "require";
@@ -490,9 +487,6 @@ async function load(
 		filePath = trimSuffix(disableCjsEsmShimSuffix, filePath);
 	}
 
-	// debuglog("Trimming ");
-	// filePath = filePath.split("?v=")[0];
-
 	let isEsm =
 		filePath.endsWith(".mjs") ||
 		(filePath.endsWith(".js") && isWithinTypeModuleContext(filePath));