vitest-dev · sheremet-va · Oct 21, 2025 · Oct 18, 2025
diff --git a/packages/vitest/src/public/index.ts b/packages/vitest/src/public/index.ts
@@ -21,6 +21,7 @@ export type {
   SerializedCoverageConfig,
 } from '../runtime/config'
 
+export { VitestEvaluatedModules as EvaluatedModules } from '../runtime/moduleRunner/evaluatedModules'
 export type {
   BenchFactory,
   BenchFunction,
@@ -134,5 +135,3 @@ export type {
 export type { SerializedError } from '@vitest/utils'
 export type { SerializedTestSpecification }
 export type { DiffOptions } from '@vitest/utils/diff'
-
-export { EvaluatedModules } from 'vite/module-runner'
diff --git a/packages/vitest/src/runtime/moduleRunner/evaluatedModules.ts b/packages/vitest/src/runtime/moduleRunner/evaluatedModules.ts
@@ -0,0 +1,15 @@
+import { dirname, resolve } from 'pathe'
+import { EvaluatedModules } from 'vite/module-runner'
+
+// TODO: this is not needed in Vite 7.2+
+export class VitestEvaluatedModules extends EvaluatedModules {
+  getModuleSourceMapById(id: string): any { /** the return type is not exposed by Vite */
+    const map = super.getModuleSourceMapById(id)
+    if (map != null && !('_patched' in map)) {
+      ;(map as any)._patched = true
+      const dir = dirname(map.url)
+      map.resolvedSources = (map.map.sources || []).map(s => resolve(dir, s || ''))
+    }
+    return map
+  }
+}
diff --git a/packages/vitest/src/runtime/worker.ts b/packages/vitest/src/runtime/worker.ts
@@ -2,9 +2,9 @@ import type { ModuleRunner } from 'vite/module-runner'
 import type { ContextRPC, WorkerGlobalState } from '../types/worker'
 import type { VitestWorker } from './workers/types'
 import { createStackString, parseStacktrace } from '@vitest/utils/source-map'
-import { EvaluatedModules } from 'vite/module-runner'
 import { loadEnvironment } from '../integrations/env/loader'
 import { setupInspect } from './inspector'
+import { VitestEvaluatedModules } from './moduleRunner/evaluatedModules'
 import { createRuntimeRpc, rpcDone } from './rpc'
 import { isChildProcess } from './utils'
 import { disposeInternalListeners } from './workers/utils'
@@ -67,7 +67,7 @@ export async function execute(method: 'run' | 'collect', ctx: ContextRPC, worker
     const state = {
       ctx,
       // here we create a new one, workers can reassign this if they need to keep it non-isolated
-      evaluatedModules: new EvaluatedModules(),
+      evaluatedModules: new VitestEvaluatedModules(),
       resolvingModules,
       moduleExecutionInfo: new Map(),
       config: ctx.config,

diff --git a/packages/vitest/src/runtime/workers/base.ts b/packages/vitest/src/runtime/workers/base.ts
@@ -3,15 +3,15 @@ import type { VitestModuleRunner } from '../moduleRunner/moduleRunner'
 import type { ContextModuleRunnerOptions } from '../moduleRunner/startModuleRunner'
 import { runInThisContext } from 'node:vm'
 import * as spyModule from '@vitest/spy'
-import { EvaluatedModules } from 'vite/module-runner'
+import { VitestEvaluatedModules } from '../moduleRunner/evaluatedModules'
 import { createNodeImportMeta } from '../moduleRunner/moduleRunner'
 import { startVitestModuleRunner } from '../moduleRunner/startModuleRunner'
 import { run } from '../runBaseTests'
 import { provideWorkerState } from '../utils'
 
 let _moduleRunner: VitestModuleRunner
 
-const evaluatedModules = new EvaluatedModules()
+const evaluatedModules = new VitestEvaluatedModules()
 const moduleExecutionInfo = new Map()
 
 function startModuleRunner(options: ContextModuleRunnerOptions) {

diff --git a/test/cli/test/__snapshots__/stacktraces.test.ts.snap b/test/cli/test/__snapshots__/stacktraces.test.ts.snap
@@ -119,23 +119,29 @@ Error: __TEST_STACK_TS__
 
  FAIL  error-in-package.test.js > transpiled
 Error: __TEST_STACK_TRANSPILED__
- ❯ innerTestStack (NODE_MODULES)/@test/test-dep-error/transpiled.js:22:9
-      7|   throw new Error("__TEST_STACK_TRANSPILED__");
-      8| }
-     10| 
- ❯ testStack (NODE_MODULES)/@test/test-dep-error/transpiled.js:12:3
+ ❯ innerTestStack (NODE_MODULES)/@test/test-dep-error/transpiled.ts:22:9
+ ❯ testStack (NODE_MODULES)/@test/test-dep-error/transpiled.ts:12:3
  ❯ error-in-package.test.js:16:22
+     14| 
+     15| test('transpiled', () => {
+     16|   testStackTranspiled()
+       |                      ^
+     17| })
+     18| 
 
 ⎯⎯[3/4]⎯
 
  FAIL  error-in-package.test.js > transpiled inline
 Error: __TEST_STACK_TRANSPILED_INLINE__
- ❯ innerTestStack (NODE_MODULES)/@test/test-dep-error/transpiled-inline.js:22:9
-      7|   throw new Error("__TEST_STACK_TRANSPILED_INLINE__");
-      8| }
-     10| 
- ❯ testStack (NODE_MODULES)/@test/test-dep-error/transpiled-inline.js:12:3
+ ❯ innerTestStack (NODE_MODULES)/@test/test-dep-error/transpiled-inline.ts:22:9
+ ❯ testStack (NODE_MODULES)/@test/test-dep-error/transpiled-inline.ts:12:3
  ❯ error-in-package.test.js:20:28
+     18| 
+     19| test('transpiled inline', () => {
+     20|   testStackTranspiledInline()
+       |                            ^
+     21| })
+     22| 
 
 ⎯⎯[4/4]⎯