fix(ssr): fix ssrTransform catch clause error (fix #2667) (#2966)

vitejs · Apr 13, 2021 · c9e0bcf · c9e0bcf
1 parent 705a2b3
commit c9e0bcf
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/packages/vite/src/node/ssr/__tests__/ssrTransform.spec.ts b/packages/vite/src/node/ssr/__tests__/ssrTransform.spec.ts
@@ -156,6 +156,21 @@ test('do not rewrite method definition', async () => {
   `)
 })
 
+test('do not rewrite catch clause', async () => {
+  expect(
+    (
+      await ssrTransform(
+        `import {error} from './dependency';try {} catch(error) {}`,
+        null,
+        null
+      )
+    ).code
+  ).toMatchInlineSnapshot(`
+    "const __vite_ssr_import_0__ = __vite_ssr_import__(\\"./dependency\\")
+    try {} catch(error) {}"
+  `)
+})
+
 // #2221
 test('should declare variable for imported super class', async () => {
   expect(

diff --git a/packages/vite/src/node/ssr/ssrTransform.ts b/packages/vite/src/node/ssr/ssrTransform.ts
@@ -322,9 +322,10 @@ function walk(
 function isRefIdentifier(id: Identifier, parent: _Node, parentStack: _Node[]) {
   // declaration id
   if (
-    (parent.type === 'VariableDeclarator' ||
+    parent.type === 'CatchClause' ||
+    ((parent.type === 'VariableDeclarator' ||
       parent.type === 'ClassDeclaration') &&
-    parent.id === id
+      parent.id === id)
   ) {
     return false
   }