refactor: use ssr environment module graph in ssrFixStacktrace

vitejs · Mar 28, 2024 · 5477972 · 5477972
1 parent 96e825a
commit 5477972
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/packages/vite/src/node/server/index.ts b/packages/vite/src/node/server/index.ts
@@ -583,10 +583,10 @@ export async function _createServer(
       )
     },
     ssrFixStacktrace(e) {
-      ssrFixStacktrace(e, server.moduleGraph)
+      ssrFixStacktrace(e, server.environments.ssr.moduleGraph)
     },
     ssrRewriteStacktrace(stack: string) {
-      return ssrRewriteStacktrace(stack, server.moduleGraph)
+      return ssrRewriteStacktrace(stack, server.environments.ssr.moduleGraph)
     },
     async reloadModule(module) {
       if (serverConfig.hmr !== false && module.file) {

diff --git a/packages/vite/src/node/ssr/ssrModuleLoader.ts b/packages/vite/src/node/ssr/ssrModuleLoader.ts
@@ -247,7 +247,7 @@ async function instantiateModule(
     const errorData = importErrors.get(e)
 
     if (e.stack && fixStacktrace) {
-      ssrFixStacktrace(e, server.moduleGraph)
+      ssrFixStacktrace(e, moduleGraph)
     }
 
     server.config.logger.error(

diff --git a/packages/vite/src/node/ssr/ssrStacktrace.ts b/packages/vite/src/node/ssr/ssrStacktrace.ts
@@ -1,6 +1,6 @@
 import path from 'node:path'
 import { TraceMap, originalPositionFor } from '@jridgewell/trace-mapping'
-import type { ModuleGraph } from '../server/mixedModuleGraph'
+import type { EnvironmentModuleGraph } from '..'
 
 let offset: number
 
@@ -22,7 +22,7 @@ function calculateOffsetOnce() {
 
 export function ssrRewriteStacktrace(
   stack: string,
-  moduleGraph: ModuleGraph,
+  moduleGraph: EnvironmentModuleGraph,
 ): string {
   calculateOffsetOnce()
   return stack
@@ -34,7 +34,7 @@ export function ssrRewriteStacktrace(
           if (!id) return input
 
           const mod = moduleGraph.getModuleById(id)
-          const rawSourceMap = mod?.ssrTransformResult?.map
+          const rawSourceMap = mod?.transformResult?.map
 
           if (!rawSourceMap) {
             return input
@@ -86,7 +86,10 @@ export function rebindErrorStacktrace(e: Error, stacktrace: string): void {
 
 const rewroteStacktraces = new WeakSet()
 
-export function ssrFixStacktrace(e: Error, moduleGraph: ModuleGraph): void {
+export function ssrFixStacktrace(
+  e: Error,
+  moduleGraph: EnvironmentModuleGraph,
+): void {
   if (!e.stack) return
   // stacktrace shouldn't be rewritten more than once
   if (rewroteStacktraces.has(e)) return