share workerdBuiltinModules

Author: edmundhung

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

@@ -4,6 +4,7 @@ import fs from "node:fs/promises";
 import { builtinModules } from "node:module";
 import path from "node:path";
 import { MessageChannel, receiveMessageOnPort } from "node:worker_threads";
+import { workerdBuiltinModules } from "../shared/builtin-modules";
 import type {
 	WorkersConfigPluginAPI,
 	WorkersPoolOptions,
@@ -111,13 +112,6 @@ function ensureArrayExcludes<T>(array: T[], items: T[]) {
 const requiredConditions = ["workerd", "worker", "browser"];
 const requiredMainFields = ["browser", "module", "jsnext:main", "jsnext"];
 
-const cloudflareBuiltInModules = [
-	"cloudflare:email",
-	"cloudflare:sockets",
-	"cloudflare:workers",
-	"cloudflare:workflows",
-];
-
 function createConfigPlugin(): Plugin<WorkersConfigPluginAPI> {
 	// Use a unique ID for each `cloudflare:test` module so updates in one `main`
 	// don't trigger re-runs in all other projects, just the one that changed.
@@ -162,7 +156,7 @@ function createConfigPlugin(): Plugin<WorkersConfigPluginAPI> {
 			config.test.deps.optimizer.ssr.enabled ??= true;
 			config.test.deps.optimizer.ssr.exclude ??= [];
 			ensureArrayIncludes(config.test.deps.optimizer.ssr.exclude, [
-				...cloudflareBuiltInModules,
+				...workerdBuiltinModules,
 				...builtinModules.concat(builtinModules.map((m) => `node:${m}`)),
 			]);
 

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

@@ -23,6 +23,7 @@ import {
 } from "miniflare";
 import semverSatisfies from "semver/functions/satisfies.js";
 import { createMethodsRPC } from "vitest/node";
+import { workerdBuiltinModules } from "../shared/builtin-modules";
 import { createChunkingSocket } from "../shared/chunking-socket";
 import { CompatibilityFlagAssertions } from "./compatibility-flag-assertions";
 import { OPTIONS_PATH, parseProjectOptions } from "./config";
@@ -41,7 +42,6 @@ import {
 import {
 	ensurePosixLikePath,
 	handleModuleFallbackRequest,
-	workerdBuiltinModules,
 } from "./module-fallback";
 import type {
 	SourcelessWorkerOptions,

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

@@ -8,6 +8,7 @@ import util from "node:util";
 import * as cjsModuleLexer from "cjs-module-lexer";
 import { buildSync } from "esbuild";
 import { ModuleRuleTypeSchema, Response } from "miniflare";
+import { workerdBuiltinModules } from "../shared/builtin-modules";
 import { isFileNotFoundError } from "./helpers";
 import type { ModuleRuleType, Request, Worker_Module } from "miniflare";
 import type { ViteDevServer } from "vite";
@@ -67,12 +68,6 @@ const forceModuleTypeRegexp = new RegExp(
 	`\\?mf_vitest_force=(${ModuleRuleTypeSchema.options.join("|")})$`
 );
 
-// Node.js built-in modules provided by `workerd`
-export const workerdBuiltinModules = new Set([
-	...VITEST_POOL_WORKERS_DEFINE_BUILTIN_MODULES,
-	"__STATIC_CONTENT_MANIFEST",
-]);
-
 // `chai` contains circular `require()`s which aren't supported by `workerd`
 // TODO(someday): support circular `require()` in `workerd`
 const bundleDependencies = ["chai"];

packages/vitest-pool-workers/src/shared/builtin-modules.ts

@@ -0,0 +1,5 @@
+// Node.js built-in modules provided by `workerd`
+export const workerdBuiltinModules = new Set([
+	...VITEST_POOL_WORKERS_DEFINE_BUILTIN_MODULES,
+	"__STATIC_CONTENT_MANIFEST",
+]);

packages/vitest-pool-workers/src/pool/types-global.d.ts renamed to packages/vitest-pool-workers/src/shared/types-global.d.ts

@@ -8,5 +8,5 @@
 		"incremental": false
 	},
 	// Only want to emit `.d.ts` for `/config` sub-export
-	"include": ["./src/config/**/*.ts"]
+	"include": ["./src/shared/types-global.d.ts", "./src/config/**/*.ts"]
 }