Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions packages/vitest/src/node/environments/serverRunner.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
import type { DevEnvironment } from 'vite'
import type { ResolvedConfig } from '../types/config'
import type { VitestFetchFunction } from './fetchModule'
import { builtinModules } from 'node:module'
import { VitestModuleEvaluator } from '#module-evaluator'
import { ModuleRunner } from 'vite/module-runner'
import { normalizeResolvedIdToUrl } from './normalizeUrl'

const nodeBuiltins = builtinModules.filter(id => !id.includes(':'))

export class ServerModuleRunner extends ModuleRunner {
constructor(
private environment: DevEnvironment,
Expand All @@ -24,7 +21,7 @@ export class ServerModuleRunner extends ModuleRunner {
}
const { name, data } = event.data
if (name === 'getBuiltins') {
return { result: [...nodeBuiltins, /^node:/] }
return await environment.hot.handleInvoke(event)
}
if (name !== 'fetchModule') {
return { error: new Error(`Unknown method: ${name}. Expected "fetchModule".`) }
Expand Down
7 changes: 3 additions & 4 deletions packages/vitest/src/runtime/moduleRunner/moduleTransport.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
import type { FetchFunction, ModuleRunnerTransport } from 'vite/module-runner'
import type { ResolveFunctionResult } from '../../types/general'
import { builtinModules } from 'node:module'

export interface VitestTransportOptions {
fetchModule: FetchFunction
resolveId: (id: string, importer?: string) => Promise<ResolveFunctionResult | null>
}

const nodeBuiltins = builtinModules.filter(id => !id.includes(':'))

export class VitestTransport implements ModuleRunnerTransport {
constructor(private options: VitestTransportOptions) {}

Expand All @@ -21,7 +18,9 @@ export class VitestTransport implements ModuleRunnerTransport {
}
const { name, data } = event.data
if (name === 'getBuiltins') {
return { result: [...nodeBuiltins, /^node:/] }
// we return an empty array here to avoid client-side builtin check,
// as we need builtins to go through `fetchModule`
return { result: [] }
}
if (name !== 'fetchModule') {
return { error: new Error(`Unknown method: ${name}. Expected "fetchModule".`) }
Expand Down
Loading