fix: support import.meta.resolve on Vite 7 (#8493)

hi-ogawa · web-flow · commit 549d321e22b5 · 2025-08-28T10:41:20.000+02:00
diff --git a/packages/vitest/src/runtime/moduleRunner/moduleRunner.ts b/packages/vitest/src/runtime/moduleRunner/moduleRunner.ts
@@ -6,16 +6,24 @@ import type { ExternalModulesExecutor } from '../external-executor'
 import type { ModuleExecutionInfo } from './moduleDebug'
 import type { VitestModuleEvaluator } from './moduleEvaluator'
 import type { VitestTransportOptions } from './moduleTransport'
-import { ModuleRunner } from 'vite/module-runner'
+import * as viteModuleRunner from 'vite/module-runner'
 import { VitestMocker } from './moduleMocker'
 import { VitestTransport } from './moduleTransport'
 
+// eslint-disable-next-line ts/ban-ts-comment
+// @ts-ignore available since Vite 7.1 https://github.com/vitejs/vite/pull/20260
+export type CreateImportMeta = NonNullable<viteModuleRunner.ModuleRunnerOptions['createImportMeta']>
+// eslint-disable-next-line ts/ban-ts-comment
+// @ts-ignore
+export const createNodeImportMeta: CreateImportMeta = viteModuleRunner.createNodeImportMeta
+
 // @ts-expect-error overriding private method
-export class VitestModuleRunner extends ModuleRunner {
+export class VitestModuleRunner extends viteModuleRunner.ModuleRunner {
   public mocker: VitestMocker
   public moduleExecutionInfo: ModuleExecutionInfo
 
-  constructor(private options: VitestModuleRunnerOptions) {
+  constructor(private vitestOptions: VitestModuleRunnerOptions) {
+    const options = vitestOptions
     const transport = new VitestTransport(options.transport)
     const evaluatedModules = options.evaluatedModules
     super(
@@ -24,6 +32,9 @@ export class VitestModuleRunner extends ModuleRunner {
         hmr: false,
         evaluatedModules,
         sourcemapInterceptor: 'prepareStackTrace',
+        // eslint-disable-next-line ts/ban-ts-comment
+        // @ts-ignore
+        createImportMeta: vitestOptions.createImportMeta,
       },
       options.evaluator,
     )
@@ -56,7 +67,7 @@ export class VitestModuleRunner extends ModuleRunner {
   }
 
   public async import(rawId: string): Promise<any> {
-    const resolved = await this.options.transport.resolveId(rawId)
+    const resolved = await this.vitestOptions.transport.resolveId(rawId)
     if (!resolved) {
       return super.import(rawId)
     }
@@ -145,6 +156,7 @@ export interface VitestModuleRunnerOptions {
   mocker?: VitestMocker
   vm?: VitestVmOptions
   spyModule?: typeof import('@vitest/spy')
+  createImportMeta?: CreateImportMeta
 }
 
 export interface VitestVmOptions {
diff --git a/packages/vitest/src/runtime/moduleRunner/startModuleRunner.ts b/packages/vitest/src/runtime/moduleRunner/startModuleRunner.ts
@@ -2,6 +2,7 @@ import type vm from 'node:vm'
 import type { EvaluatedModules } from 'vite/module-runner'
 import type { WorkerGlobalState } from '../../types/worker'
 import type { ExternalModulesExecutor } from '../external-executor'
+import type { CreateImportMeta } from './moduleRunner'
 import fs from 'node:fs'
 import { isBuiltin } from 'node:module'
 import { isBareImport } from '@vitest/utils'
@@ -26,6 +27,7 @@ export interface ContextModuleRunnerOptions {
   externalModulesExecutor?: ExternalModulesExecutor
   state: WorkerGlobalState
   spyModule?: typeof import('@vitest/spy')
+  createImportMeta?: CreateImportMeta
 }
 
 const cwd = process.cwd()
@@ -161,6 +163,7 @@ export function startVitestModuleRunner(options: ContextModuleRunnerOptions): Vi
     },
     getWorkerState: state,
     vm,
+    createImportMeta: options.createImportMeta,
   })
 
   // await moduleRunner.import('/@vite/env')
diff --git a/packages/vitest/src/runtime/workers/base.ts b/packages/vitest/src/runtime/workers/base.ts
@@ -4,6 +4,7 @@ import type { ContextModuleRunnerOptions } from '../moduleRunner/startModuleRunn
 import { runInThisContext } from 'node:vm'
 import * as spyModule from '@vitest/spy'
 import { EvaluatedModules } from 'vite/module-runner'
+import { createNodeImportMeta } from '../moduleRunner/moduleRunner'
 import { startVitestModuleRunner } from '../moduleRunner/startModuleRunner'
 import { run } from '../runBaseTests'
 import { provideWorkerState } from '../utils'
@@ -52,6 +53,7 @@ export async function runBaseTests(method: 'run' | 'collect', state: WorkerGloba
     state,
     evaluatedModules: state.evaluatedModules,
     spyModule,
+    createImportMeta: createNodeImportMeta,
   })
   const fileSpecs = ctx.files.map(f =>
     typeof f === 'string'
diff --git a/packages/vitest/src/runtime/workers/vm.ts b/packages/vitest/src/runtime/workers/vm.ts
@@ -7,6 +7,7 @@ import { distDir } from '../../paths'
 import { createCustomConsole } from '../console'
 import { ExternalModulesExecutor } from '../external-executor'
 import { getDefaultRequestStubs } from '../moduleRunner/moduleEvaluator'
+import { createNodeImportMeta } from '../moduleRunner/moduleRunner'
 import { startVitestModuleRunner, VITEST_VM_CONTEXT_SYMBOL } from '../moduleRunner/startModuleRunner'
 import { provideWorkerState } from '../utils'
 import { FileMap } from '../vm/file-map'
@@ -80,6 +81,7 @@ export async function runVmTests(method: 'run' | 'collect', state: WorkerGlobalS
     evaluatedModules: state.evaluatedModules,
     state,
     externalModulesExecutor,
+    createImportMeta: createNodeImportMeta,
   })
 
   Object.defineProperty(context, VITEST_VM_CONTEXT_SYMBOL, {
diff --git a/test/core/test/import-meta-resolve.test.ts b/test/core/test/import-meta-resolve.test.ts
@@ -0,0 +1,33 @@
+import { createRequire } from 'node:module'
+import { pathToFileURL } from 'node:url'
+import * as vite from 'vite'
+import { expect, test } from 'vitest'
+
+const require = createRequire(import.meta.url)
+
+// requires Vite 7.1
+const [major, minor] = vite.version.split('.').map(Number)
+const supported = (major > 7 || (major === 7 && minor >= 1))
+
+test('import.meta.resolve relative', () => {
+  try {
+    expect(import.meta.resolve('./import-meta-resolve.test.ts')).toBe(import.meta.url)
+    expect(supported).toBe(true)
+  }
+  catch (e: any) {
+    expect(e.message).toContain(`"import.meta.resolve" is not supported`)
+    expect(supported).toBe(false)
+  }
+})
+
+test('import.meta.resolve package', () => {
+  try {
+    const expected = pathToFileURL(require.resolve('react')).href
+    expect(import.meta.resolve('react')).toBe(expected)
+    expect(supported).toBe(true)
+  }
+  catch (e: any) {
+    expect(e.message).toContain(`"import.meta.resolve" is not supported`)
+    expect(supported).toBe(false)
+  }
+})
