From eb2e41b098fb3d5f367c1f4fdfcad12f7538ac16 Mon Sep 17 00:00:00 2001
From: krystal <krystalnumber@gmail.com>
Date: Thu, 1 Jul 2021 08:21:06 +0800
Subject: [PATCH] fix: fix esbuild break when importRe matches multiline import
 (#4054)

Co-authored-by: taylorliu <liufeichun@bilibili.com>
---
 packages/vite/src/node/__tests__/scan.spec.ts | 34 ++++++++++++++++++-
 packages/vite/src/node/optimizer/scan.ts      |  4 +--
 2 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/packages/vite/src/node/__tests__/scan.spec.ts b/packages/vite/src/node/__tests__/scan.spec.ts
index a1f360c035085b..32ff26118b78da 100644
--- a/packages/vite/src/node/__tests__/scan.spec.ts
+++ b/packages/vite/src/node/__tests__/scan.spec.ts
@@ -1,4 +1,4 @@
-import { scriptRE, commentRE } from '../optimizer/scan'
+import { scriptRE, commentRE, importsRE } from '../optimizer/scan'
 
 describe('optimizer-scan:script-test', () => {
   const scriptContent = `import { defineComponent } from 'vue'
@@ -64,4 +64,36 @@ describe('optimizer-scan:script-test', () => {
     expect(tag1).toEqual('<script>')
     expect(content1).toEqual('var test = null')
   })
+
+  test('imports regex should work', () => {
+    const shouldMatchArray = [
+      `import 'vue'`,
+      `import { foo } from 'vue'`,
+      `import foo from 'vue'`,
+      `;import foo from 'vue'`,
+      `   import foo from 'vue'`,
+      `import { foo
+      } from 'vue'`,
+      `import bar, { foo } from 'vue'`,
+      `import foo from 'vue';`,
+      `*/ import foo from 'vue';`,
+      `import foo from 'vue';//comment`,
+      `import foo from 'vue';/*comment
+      */`
+    ]
+
+    shouldMatchArray.forEach((str) => {
+      importsRE.lastIndex = 0
+      expect(importsRE.exec(str)[1]).toEqual("'vue'")
+    })
+
+    const shouldFailArray = [
+      `testMultiline("import", {
+        body: "ok" });`,
+      `import type, {foo} from 'vue'`
+    ]
+    shouldFailArray.forEach((str) => {
+      expect(importsRE.test(str)).toBe(false)
+    })
+  })
 })
diff --git a/packages/vite/src/node/optimizer/scan.ts b/packages/vite/src/node/optimizer/scan.ts
index 0de531bcd5b5bb..dc05371f3bfff2 100644
--- a/packages/vite/src/node/optimizer/scan.ts
+++ b/packages/vite/src/node/optimizer/scan.ts
@@ -37,8 +37,8 @@ const htmlTypesRE = /\.(html|vue|svelte)$/
 // use Acorn because it's slow. Luckily this doesn't have to be bullet proof
 // since even missed imports can be caught at runtime, and false positives will
 // simply be ignored.
-const importsRE =
-  /\bimport(?!\s+type)(?:[\w*{}\n\r\t, ]+from\s*)?\s*("[^"]+"|'[^']+')/gm
+export const importsRE =
+  /(?:^|;|\*\/)\s*import(?!\s+type)(?:[\w*{}\n\r\t, ]+from\s*)?\s*("[^"]+"|'[^']+')\s*(?:$|;|\/\/|\/\*)/gm
 
 export async function scanImports(config: ResolvedConfig): Promise<{
   deps: Record<string, string>