fix(ssr): format ssrTransform parse error (#18644)

Co-authored-by: Bjorn Lu <bjornlu.dev@gmail.com>
vitejs · Nov 14, 2024 · d9be921 · d9be921
1 parent 33b0d5a
commit d9be921
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 18 deletions.
diff --git a/packages/vite/src/node/ssr/__tests__/__snapshots__/ssrLoadModule.spec.ts.snap b/packages/vite/src/node/ssr/__tests__/__snapshots__/ssrLoadModule.spec.ts.snap
@@ -21,10 +21,17 @@ Expected ";" but found "code"
 
 exports[`parse error 2`] = `
 {
-  "frame": "",
-  "id": "",
-  "loc": undefined,
-  "message": "Expected ';', '}' or <eof>",
+  "frame": "1  |  invalid code
+   |          ^
+2  |  ",
+  "id": "/fixtures/errors/syntax-error.js",
+  "loc": {
+    "column": 9,
+    "file": "/fixtures/errors/syntax-error.js",
+    "line": 1,
+  },
+  "message": "Parse failure: Expected ';', '}' or <eof>
+At file: /fixtures/errors/syntax-error.js:1:9",
 }
 `;
 
@@ -49,9 +56,16 @@ Expected ";" but found "code"
 
 exports[`parse error 4`] = `
 {
-  "frame": "",
-  "id": "",
-  "loc": undefined,
-  "message": "Expected ';', '}' or <eof>",
+  "frame": "1  |  invalid code
+   |          ^
+2  |  ",
+  "id": "/fixtures/errors/syntax-error.js",
+  "loc": {
+    "column": 9,
+    "file": "/fixtures/errors/syntax-error.js",
+    "line": 1,
+  },
+  "message": "Parse failure: Expected ';', '}' or <eof>
+At file: /fixtures/errors/syntax-error.js:1:9",
 }
 `;
diff --git a/packages/vite/src/node/ssr/ssrTransform.ts b/packages/vite/src/node/ssr/ssrTransform.ts
@@ -19,7 +19,12 @@ import { walk as eswalk } from 'estree-walker'
 import type { RawSourceMap } from '@ampproject/remapping'
 import { parseAstAsync as rollupParseAstAsync } from 'rollup/parseAst'
 import type { TransformResult } from '../server/transformRequest'
-import { combineSourcemaps, isDefined } from '../utils'
+import {
+  combineSourcemaps,
+  generateCodeFrame,
+  isDefined,
+  numberToPos,
+} from '../utils'
 import { isJSONRequest } from '../plugins/json'
 import type { DefineImportMetadata } from '../../shared/ssrTransform'
 
@@ -81,15 +86,21 @@ async function ssrTransformScript(
   try {
     ast = await rollupParseAstAsync(code)
   } catch (err) {
-    if (!err.loc || !err.loc.line) throw err
-    const line = err.loc.line
-    throw new Error(
-      `Parse failure: ${
-        err.message
-      }\nAt file: ${url}\nContents of line ${line}: ${
-        code.split('\n')[line - 1]
-      }`,
-    )
+    // enhance known rollup errors
+    // https://github.com/rollup/rollup/blob/42e587e0e37bc0661aa39fe7ad6f1d7fd33f825c/src/utils/bufferToAst.ts#L17-L22
+    if (err.code === 'PARSE_ERROR') {
+      err.message = `Parse failure: ${err.message}\n`
+      err.id = url
+      if (typeof err.pos === 'number') {
+        err.loc = numberToPos(code, err.pos)
+        err.loc.file = url
+        err.frame = generateCodeFrame(code, err.pos)
+        err.message += `At file: ${url}:${err.loc.line}:${err.loc.column}`
+      } else {
+        err.message += `At file: ${url}`
+      }
+    }
+    throw err
   }
 
   let uid = 0