Skip to content

Commit 27aa3a0

Browse files
committed
fixup! reuse workerdBuiltinModules
1 parent c6a3ac2 commit 27aa3a0

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import fs from "node:fs/promises";
44
import { builtinModules } from "node:module";
55
import path from "node:path";
66
import { MessageChannel, receiveMessageOnPort } from "node:worker_threads";
7-
import { workerdBuiltinModules } from "../pool/module-fallback";
7+
import { workerdBuiltinModules } from "../pool/builtin-modules";
88
import type {
99
WorkersConfigPluginAPI,
1010
WorkersPoolOptions,
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
// Node.js built-in modules provided by `workerd`
2+
export const workerdBuiltinModules = new Set([
3+
...VITEST_POOL_WORKERS_DEFINE_BUILTIN_MODULES,
4+
"__STATIC_CONTENT_MANIFEST",
5+
]);

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import util from "node:util";
88
import * as cjsModuleLexer from "cjs-module-lexer";
99
import { buildSync } from "esbuild";
1010
import { ModuleRuleTypeSchema, Response } from "miniflare";
11+
import { workerdBuiltinModules } from "./builtin-modules";
1112
import { isFileNotFoundError } from "./helpers";
1213
import type { ModuleRuleType, Request, Worker_Module } from "miniflare";
1314
import type { ViteDevServer } from "vite";
@@ -67,12 +68,6 @@ const forceModuleTypeRegexp = new RegExp(
6768
`\\?mf_vitest_force=(${ModuleRuleTypeSchema.options.join("|")})$`
6869
);
6970

70-
// Node.js built-in modules provided by `workerd`
71-
export const workerdBuiltinModules = new Set([
72-
...VITEST_POOL_WORKERS_DEFINE_BUILTIN_MODULES,
73-
"__STATIC_CONTENT_MANIFEST",
74-
]);
75-
7671
// `chai` contains circular `require()`s which aren't supported by `workerd`
7772
// TODO(someday): support circular `require()` in `workerd`
7873
const bundleDependencies = ["chai"];

0 commit comments

Comments
 (0)