From d586af7ec103a6360839540051e63cd3b395b2b6 Mon Sep 17 00:00:00 2001
From: Oliver Tsang <517578480@qq.com>
Date: Sun, 20 Feb 2022 22:58:54 +0800
Subject: [PATCH] refactor(scan): use incremental scriptId for each html-like
 file

---
 packages/vite/src/node/optimizer/scan.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/vite/src/node/optimizer/scan.ts b/packages/vite/src/node/optimizer/scan.ts
index f530b40d12764a..5532294de11edd 100644
--- a/packages/vite/src/node/optimizer/scan.ts
+++ b/packages/vite/src/node/optimizer/scan.ts
@@ -187,7 +187,6 @@ function esbuildScanPlugin(
     name: 'vite:dep-scan',
     setup(build) {
       const scripts: Record<string, OnLoadResult> = {}
-      let scriptId = 0
 
       // external urls
       build.onResolve({ filter: externalRE }, ({ path }) => ({
@@ -233,7 +232,7 @@ function esbuildScanPlugin(
           const regex = isHtml ? scriptModuleRE : scriptRE
           regex.lastIndex = 0
           let js = ''
-          let loader: Loader = 'js'
+          let scriptId = 0
           let match: RegExpExecArray | null
           while ((match = regex.exec(raw))) {
             const [, openTag, content] = match
@@ -254,6 +253,7 @@ function esbuildScanPlugin(
             ) {
               continue
             }
+            let loader: Loader = 'js'
             if (lang === 'ts' || lang === 'tsx' || lang === 'jsx') {
               loader = lang
             }
@@ -294,7 +294,7 @@ function esbuildScanPlugin(
                 }
               }
 
-              js += `import ${JSON.stringify(virtualModulePrefix + key)};\n`
+              js += `import ${JSON.stringify(virtualModulePrefix + key)}\n`
             }
           }
 
@@ -307,7 +307,7 @@ function esbuildScanPlugin(
           }
 
           return {
-            loader,
+            loader: 'js',
             contents: js
           }
         }