feat: ssr sourcemap + stacktrace fix

vitejs · Jan 18, 2021 · 6cb04fa · 6cb04fa
1 parent 1673fb6
commit 6cb04fa
Show file tree

Hide file tree

Showing 5 changed files with 71 additions and 4 deletions.
diff --git a/packages/vite/package.json b/packages/vite/package.json
@@ -112,6 +112,7 @@
     "selfsigned": "^1.10.8",
     "sirv": "^1.0.10",
     "slash": "^3.0.0",
+    "source-map": "^0.6.1",
     "source-map-support": "^0.5.19",
     "strip-ansi": "^6.0.0",
     "terser": "^5.5.1",

diff --git a/packages/vite/src/node/server/index.ts b/packages/vite/src/node/server/index.ts
@@ -43,6 +43,7 @@ import { TransformOptions as EsbuildTransformOptions } from 'esbuild'
 import { DepOptimizationMetadata, optimizeDeps } from '../optimizer'
 import { ssrLoadModule } from './ssrModuleLoader'
 import { resolveSSRExternal } from '../ssrExternal'
+import { ssrRewriteStacktrace } from './ssrStacktrace'
 
 export interface ServerOptions {
   host?: string
@@ -187,6 +188,10 @@ export interface ViteDevServer {
    * Load a given URL as an instantiated module for SSR.
    */
   ssrLoadModule(url: string): Promise<Record<string, any>>
+  /**
+   * Fix ssr error stacktrace
+   */
+  ssrFixStacktrace(e: Error): void
   /**
    * Start the server.
    */
@@ -255,6 +260,11 @@ export async function createServer(
       }
       return ssrLoadModule(url, server)
     },
+    ssrFixStacktrace(e) {
+      if (e.stack) {
+        e.stack = ssrRewriteStacktrace(e.stack, moduleGraph)
+      }
+    },
     listen(port?: number) {
       return startServer(server, port)
     },

diff --git a/packages/vite/src/node/server/ssrModuleLoader.ts b/packages/vite/src/node/server/ssrModuleLoader.ts
@@ -1,6 +1,7 @@
 import path from 'path'
 import { ViteDevServer } from '..'
 import { resolveFrom } from '../utils'
+import { ssrRewriteStacktrace } from './ssrStacktrace'
 import {
   ssrExportAllKey,
   ssrModuleExportsKey,
@@ -92,10 +93,10 @@ export async function ssrLoadModule(
       ssrImportKey,
       ssrDynamicImportKey,
       ssrExportAllKey,
-      result.code
+      result.code + `\n//# sourceURL=${mod.url}`
     )(ssrModule, ssrImportMeta, ssrImport, ssrDynamicImport, ssrExportAll)
   } catch (e) {
-    // TODO source map
+    e.stack = ssrRewriteStacktrace(e.stack, moduleGraph)
     server.config.logger.error(
       `Error when evaluating SSR module ${url}:\n${e.stack}`,
       {

diff --git a/packages/vite/src/node/server/ssrStacktrace.ts b/packages/vite/src/node/server/ssrStacktrace.ts
@@ -0,0 +1,46 @@
+import { SourceMapConsumer, RawSourceMap } from 'source-map'
+import { ModuleGraph } from './moduleGraph'
+
+export function ssrRewriteStacktrace(stack: string, moduleGraph: ModuleGraph) {
+  return stack
+    .split('\n')
+    .map((line) => {
+      return line.replace(
+        /^ {4}at (?:(.+?)\s+\()?(?:(.+?):(\d+)(?::(\d+))?)\)?/,
+        (input, varName, url, line, column) => {
+          if (!url) return input
+
+          const mod = moduleGraph.urlToModuleMap.get(url)
+          const rawSourceMap = mod?.ssrTransformResult?.map
+
+          if (!rawSourceMap) {
+            return input
+          }
+
+          const consumer = new SourceMapConsumer(
+            (rawSourceMap as any) as RawSourceMap
+          )
+
+          const pos = consumer.originalPositionFor({
+            // source map lines generated via new Function() in Node.js is always
+            // incremented by 2 - no idea why
+            line: Number(line) - 2,
+            column: Number(column),
+            bias: SourceMapConsumer.LEAST_UPPER_BOUND
+          })
+
+          if (!pos.source) {
+            return input
+          }
+
+          const source = `${pos.source}:${pos.line || 0}:${pos.column || 0}`
+          if (!varName || varName === 'eval') {
+            return `    at ${source}`
+          } else {
+            return `    at ${varName} (${source})`
+          }
+        }
+      )
+    })
+    .join('\n')
+}
diff --git a/packages/vite/src/node/server/ssrTransform.ts b/packages/vite/src/node/server/ssrTransform.ts
@@ -10,6 +10,7 @@ import {
 } from 'estree'
 import { extract_names as extractNames } from 'periscopic'
 import { walk as eswalk } from 'estree-walker'
+import merge from 'merge-source-map'
 
 type Node = _Node & {
   start: number
@@ -157,10 +158,18 @@ export async function ssrTransform(
     }
   })
 
+  let map = s.generateMap({ hires: true })
+  if (inMap) {
+    map = merge(inMap, {
+      ...map,
+      sources: inMap.sources,
+      sourcesContent: inMap.sourcesContent
+    }) as SourceMap
+  }
+
   return {
     code: s.toString(),
-    // TODO handle inMap
-    map: null, //s.generateMap({ hires: true }),
+    map,
     deps: [...deps]
   }
 }