fix(ssr): fix semicolon injection by ssr transform (#19097)

TheAlexLichter · hi-ogawa · web-flow · commit 1c102d517de5 · 2025-01-02T20:44:14.000+01:00
Co-authored-by: Hiroshi Ogawa &lt;hi.ogawa.zz@gmail.com&gt;
diff --git a/packages/vite/src/node/ssr/__tests__/ssrTransform.spec.ts b/packages/vite/src/node/ssr/__tests__/ssrTransform.spec.ts
@@ -1285,6 +1285,14 @@ switch (1) {
     f()
     break
 }
+
+if(0){}f()
+
+if(0){}else{}f()
+
+switch(1){}f()
+
+{}f(1)
 `),
   ).toMatchInlineSnapshot(`
     "
@@ -1346,7 +1354,34 @@ switch (1) {
         x;
         (0,__vite_ssr_import_0__.f)();
         break
-    }
+    };
+
+    if(0){};(0,__vite_ssr_import_0__.f)();
+
+    if(0){}else{};(0,__vite_ssr_import_0__.f)();
+
+    switch(1){};(0,__vite_ssr_import_0__.f)();
+
+    {}(0,__vite_ssr_import_0__.f)(1)
     "
   `)
 })
+
+test('does not break minified code', async () => {
+  // Based on https://unpkg.com/@headlessui/vue@1.7.23/dist/components/transitions/transition.js
+  expect(
+    await ssrTransformSimpleCode(
+      `import O from 'a';
+const c = () => {
+  if(true){return}O(1,{})
+}`,
+    ),
+  ).toMatchInlineSnapshot(
+    `
+    "const __vite_ssr_import_0__ = await __vite_ssr_import__("a", {"importedNames":["default"]});
+    const c = () => {
+      if(true){return};(0,__vite_ssr_import_0__.default)(1,{})
+    }"
+  `,
+  )
+})
diff --git a/packages/vite/src/node/ssr/ssrTransform.ts b/packages/vite/src/node/ssr/ssrTransform.ts
@@ -364,7 +364,7 @@ async function ssrTransformScript(
           stmt.type !== 'BlockStatement' &&
           stmt.type !== 'ImportDeclaration'
         ) {
-          s.appendRight(stmt.end, ';')
+          s.appendLeft(stmt.end, ';')
         }
       }
     },

Original file line number	Diff line number	Diff line change
`@@ -364,7 +364,7 @@ async function ssrTransformScript(`
`364`	`364`	`stmt.type !== 'BlockStatement' &&`
`365`	`365`	`stmt.type !== 'ImportDeclaration'`
`366`	`366`	`) {`
`367`		`- s.appendRight(stmt.end, ';')`
	`367`	`+ s.appendLeft(stmt.end, ';')`
`368`	`368`	`}`
`369`	`369`	`}`
`370`	`370`	`},`