Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 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
14 changes: 4 additions & 10 deletions packages/vite/src/module-runner/createImportMeta.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
import { isWindows } from '../shared/utils'
import {
type ImportMetaResolver,
createImportMetaResolver,
} from './importMetaResolver'
import { createImportMetaResolver } from './importMetaResolver'
import type { ModuleRunnerImportMeta } from './types'
import { posixDirname, posixPathToFileHref, toWindowsPath } from './utils'

Expand Down Expand Up @@ -39,19 +36,16 @@ export function createDefaultImportMeta(
} satisfies Omit<ModuleRunnerImportMeta, 'main'> as any
}

let importMetaResolverCache: Promise<ImportMetaResolver | undefined> | undefined

/**
* Create import.meta object for Node.js.
*/
export async function createNodeImportMeta(
export function createNodeImportMeta(
modulePath: string,
): Promise<ModuleRunnerImportMeta> {
): ModuleRunnerImportMeta {
const defaultMeta = createDefaultImportMeta(modulePath)
const href = defaultMeta.url

importMetaResolverCache ??= createImportMetaResolver()
const importMetaResolver = await importMetaResolverCache
const importMetaResolver = createImportMetaResolver()

return {
...defaultMeta,
Expand Down
8 changes: 4 additions & 4 deletions packages/vite/src/module-runner/importMetaResolver.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
/* eslint-disable n/no-unsupported-features/node-builtins */
Comment thread
sheremet-va marked this conversation as resolved.
Outdated

import type { ResolveFnOutput, ResolveHookContext } from 'node:module'

export type ImportMetaResolver = (specifier: string, importer: string) => string
Expand Down Expand Up @@ -33,12 +35,10 @@ function customizationHookResolve(
return nextResolve(specifier, context)
}

export async function createImportMetaResolver(): Promise<
ImportMetaResolver | undefined
> {
export function createImportMetaResolver(): ImportMetaResolver | undefined {
let module: typeof import('node:module')
try {
module = (await import('node:module')).Module
module = process.getBuiltinModule('node:module').Module
} catch {
return
}
Expand Down
4 changes: 2 additions & 2 deletions packages/vite/src/node/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2388,7 +2388,7 @@ async function bundleConfigFile(
name: 'inject-file-scope-variables',
transform: {
filter: { id: /\.[cm]?[jt]s$/ },
async handler(code, id) {
handler(code, id) {
let injectValues =
`const ${dirnameVarName} = ${JSON.stringify(path.dirname(id))};` +
`const ${filenameVarName} = ${JSON.stringify(id)};` +
Expand All @@ -2399,7 +2399,7 @@ async function bundleConfigFile(
if (isESM) {
if (!importMetaResolverRegistered) {
importMetaResolverRegistered = true
await createImportMetaResolver()
createImportMetaResolver()
}
injectValues += `const ${importMetaResolveVarName} = (specifier, importer = ${importMetaUrlVarName}) => (${importMetaResolveWithCustomHookString})(specifier, importer);`
} else {
Expand Down
Loading