From 5b26918a811c3b930dd0d91a2a7e5e7e898a7275 Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Sun, 6 Mar 2022 20:10:33 -0800
Subject: [PATCH 1/2] fix: handle files with multiple comments

---
 packages/vite/src/node/optimizer/scan.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/vite/src/node/optimizer/scan.ts b/packages/vite/src/node/optimizer/scan.ts
index 473673ce93a861..e720bec73583bd 100644
--- a/packages/vite/src/node/optimizer/scan.ts
+++ b/packages/vite/src/node/optimizer/scan.ts
@@ -143,7 +143,7 @@ function globEntries(pattern: string | string[], config: ResolvedConfig) {
 const scriptModuleRE =
   /(<script\b[^>]*type\s*=\s*(?:"module"|'module')[^>]*>)(.*?)<\/script>/gims
 export const scriptRE = /(<script\b(?:\s[^>]*>|>))(.*?)<\/script>/gims
-export const commentRE = /<!--(.|[\r\n])*?-->/
+export const commentRE = /<!--(.|[\r\n])*?-->/g
 const srcRE = /\bsrc\s*=\s*(?:"([^"]+)"|'([^']+)'|([^\s'">]+))/im
 const typeRE = /\btype\s*=\s*(?:"([^"]+)"|'([^']+)'|([^\s'">]+))/im
 const langRE = /\blang\s*=\s*(?:"([^"]+)"|'([^']+)'|([^\s'">]+))/im

From 20e664cf91a0fe66628532c6ab3c743a04eb45f9 Mon Sep 17 00:00:00 2001
From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Sun, 6 Mar 2022 21:41:40 -0800
Subject: [PATCH 2/2] test: update test

---
 packages/vite/src/node/__tests__/scan.spec.ts | 3 ++-
 packages/vite/src/node/optimizer/scan.ts      | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/vite/src/node/__tests__/scan.spec.ts b/packages/vite/src/node/__tests__/scan.spec.ts
index e54361861bbdc5..db11bcc45b284c 100644
--- a/packages/vite/src/node/__tests__/scan.spec.ts
+++ b/packages/vite/src/node/__tests__/scan.spec.ts
@@ -30,7 +30,8 @@ describe('optimizer-scan:script-test', () => {
     scriptRE.lastIndex = 0
     const ret = scriptRE.exec(
       `<template>
-        <!--  <script >var test = null</script> -->
+        <!--  <script >var test1 = null</script> -->
+        <!--  <script >var test2 = null</script> -->
       </template>`.replace(commentRE, '')
     )
     expect(ret).toEqual(null)
diff --git a/packages/vite/src/node/optimizer/scan.ts b/packages/vite/src/node/optimizer/scan.ts
index e720bec73583bd..dfffbc5cfdcd2b 100644
--- a/packages/vite/src/node/optimizer/scan.ts
+++ b/packages/vite/src/node/optimizer/scan.ts
@@ -143,7 +143,7 @@ function globEntries(pattern: string | string[], config: ResolvedConfig) {
 const scriptModuleRE =
   /(<script\b[^>]*type\s*=\s*(?:"module"|'module')[^>]*>)(.*?)<\/script>/gims
 export const scriptRE = /(<script\b(?:\s[^>]*>|>))(.*?)<\/script>/gims
-export const commentRE = /<!--(.|[\r\n])*?-->/g
+export const commentRE = /<!--.*?-->/gs
 const srcRE = /\bsrc\s*=\s*(?:"([^"]+)"|'([^']+)'|([^\s'">]+))/im
 const typeRE = /\btype\s*=\s*(?:"([^"]+)"|'([^']+)'|([^\s'">]+))/im
 const langRE = /\blang\s*=\s*(?:"([^"]+)"|'([^']+)'|([^\s'">]+))/im