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
13 changes: 12 additions & 1 deletion packages/vite/src/module-runner/runner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,18 @@ export class ModuleRunner {
this.builtinsPromise ??= (async () => {
try {
this.debug?.('[module runner] fetching builtins from server')
const builtins = await this.transport.invoke('getBuiltins', [])
const serializedBuiltins = await this.transport.invoke(
'getBuiltins',
[],
)
const builtins = serializedBuiltins.map((builtin) =>
typeof builtin === 'object' && builtin && 'type' in builtin
? builtin.type === 'string'
? builtin.value
: new RegExp(builtin.source, builtin.flags)
: // NOTE: Vitest returns raw values instead of serialized ones
builtin,
)
this.isBuiltin = createIsBuiltin(builtins)
this.debug?.('[module runner] builtins loaded:', builtins)
} finally {
Expand Down
6 changes: 5 additions & 1 deletion packages/vite/src/node/server/environment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,11 @@ export class DevEnvironment extends BaseEnvironment {
return this.fetchModule(id, importer, options)
},
getBuiltins: async () => {
return this.config.resolve.builtins
return this.config.resolve.builtins.map((builtin) =>
typeof builtin === 'string'
? { type: 'string', value: builtin }
: { type: 'RegExp', source: builtin.source, flags: builtin.flags },
)
},
})

Expand Down
7 changes: 6 additions & 1 deletion packages/vite/src/shared/invokeMethods.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,5 +83,10 @@ export type InvokeMethods = {
options?: FetchFunctionOptions,
) => Promise<FetchResult>

getBuiltins: () => Promise<(string | RegExp)[]>
getBuiltins: () => Promise<
Array<
| { type: 'string'; value: string }
| { type: 'RegExp'; source: string; flags: string }
>
>
}
Loading