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
24 changes: 23 additions & 1 deletion packages/vite/src/module-runner/runner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
type NormalizedModuleRunnerTransport,
normalizeModuleRunnerTransport,
} from '../shared/moduleRunnerTransport'
import { createIsBuiltin } from '../shared/builtin'
import type { EvaluatedModuleNode } from './evaluatedModules'
import { EvaluatedModules } from './evaluatedModules'
import type {
Expand Down Expand Up @@ -44,6 +45,8 @@ export class ModuleRunner {
string,
Promise<EvaluatedModuleNode>
>()
private isBuiltin?: (id: string) => boolean
private builtinsPromise?: Promise<void>

private closed = false

Expand Down Expand Up @@ -238,6 +241,23 @@ export class ModuleRunner {
return cached
}

private ensureBuiltins(): Promise<void> | undefined {
if (this.isBuiltin) return

this.builtinsPromise ??= (async () => {
try {
this.debug?.('[module runner] fetching builtins from server')
const builtins = await this.transport.invoke('getBuiltins', [])
this.isBuiltin = createIsBuiltin(builtins)
this.debug?.('[module runner] builtins loaded:', builtins)
} finally {
this.builtinsPromise = undefined
}
})()

return this.builtinsPromise
}

private async getModuleInformation(
url: string,
importer: string | undefined,
Expand All @@ -247,13 +267,15 @@ export class ModuleRunner {
throw new Error(`Vite module runner has been closed.`)
}

await this.ensureBuiltins()

this.debug?.('[module runner] fetching', url)

const isCached = !!(typeof cachedModule === 'object' && cachedModule.meta)

const fetchedModule = // fast return for established externalized pattern
(
url.startsWith('data:')
url.startsWith('data:') || this.isBuiltin?.(url)
? { externalize: url, type: 'builtin' }
: await this.transport.invoke('fetchModule', [
url,
Expand Down
3 changes: 3 additions & 0 deletions packages/vite/src/node/server/environment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,9 @@ export class DevEnvironment extends BaseEnvironment {
fetchModule: (id, importer, options) => {
return this.fetchModule(id, importer, options)
},
getBuiltins: async () => {
return this.config.resolve.builtins
},
})

this.hot.on(
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import { basename } from 'node:path'

export default basename('/foo/bar/baz.txt')
Original file line number Diff line number Diff line change
Expand Up @@ -98,4 +98,13 @@ describe('running module runner inside a worker and using the ModuleRunnerTransp
expect(output).not.toHaveProperty('result')
expect(output.error).toContain('Error: Unknown invoke error')
})

it('resolves builtin module without server round-trip', async () => {
handleInvoke = (data: any) => server.environments.ssr.hot.handleInvoke(data)

const output = await run('./fixtures/builtin-import.ts')
expect(output).toHaveProperty('result')
expect(output.result).toBe('baz.txt')
expect(output.error).toBeUndefined()
})
})
15 changes: 1 addition & 14 deletions packages/vite/src/node/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import {
withTrailingSlash,
} from '../shared/utils'
import { VALID_ID_PREFIX } from '../shared/constants'
import { createIsBuiltin } from '../shared/builtin'
import {
CLIENT_ENTRY,
CLIENT_PUBLIC_PATH,
Expand Down Expand Up @@ -117,20 +118,6 @@ export function isBuiltin(builtins: (string | RegExp)[], id: string): boolean {
return isBuiltin(id)
}

export function createIsBuiltin(
builtins: (string | RegExp)[],
): (id: string) => boolean {
const plainBuiltinsSet = new Set(
builtins.filter((builtin) => typeof builtin === 'string'),
)
const regexBuiltins = builtins.filter(
(builtin) => typeof builtin !== 'string',
)

return (id) =>
plainBuiltinsSet.has(id) || regexBuiltins.some((regexp) => regexp.test(id))
}

export const nodeLikeBuiltins: (string | RegExp)[] = [
...nodeBuiltins,
new RegExp(`^${NODE_BUILTIN_NAMESPACE}`),
Expand Down
13 changes: 13 additions & 0 deletions packages/vite/src/shared/builtin.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
export function createIsBuiltin(
builtins: (string | RegExp)[],
): (id: string) => boolean {
const plainBuiltinsSet = new Set(
builtins.filter((builtin) => typeof builtin === 'string'),
)
const regexBuiltins = builtins.filter(
(builtin) => typeof builtin !== 'string',
)

return (id: string) =>
plainBuiltinsSet.has(id) || regexBuiltins.some((regexp) => regexp.test(id))
}
2 changes: 2 additions & 0 deletions packages/vite/src/shared/invokeMethods.ts
Original file line number Diff line number Diff line change
Expand Up @@ -82,4 +82,6 @@ export type InvokeMethods = {
importer?: string,
options?: FetchFunctionOptions,
) => Promise<FetchResult>

getBuiltins: () => Promise<(string | RegExp)[]>
}