fix: inject dev only script tags directly

...to avoid injecting into commented out scripts, fix #161
vitejs · May 18, 2020 · 89ac245 · 89ac245
1 parent d16f567
commit 89ac245
Showing 1 changed file with 23 additions and 23 deletions.
diff --git a/src/node/server/serverPluginModuleRewrite.ts b/src/node/server/serverPluginModuleRewrite.ts
@@ -60,30 +60,30 @@ export const moduleRewritePlugin: ServerPlugin = ({
 
   async function rewriteIndex(importer: string, html: string) {
     await initLexer
-    let hasInjectedDevFlag = false
-    return html!.replace(scriptRE, (matched, openTag, script) => {
-      const devFlag = hasInjectedDevFlag ? `` : devInjectionCode
-      hasInjectedDevFlag = true
-      if (script) {
-        return `${devFlag}${openTag}${rewriteImports(
-          root,
-          script,
-          importer,
-          resolver
-        )}</script>`
-      } else {
-        const srcAttr = openTag.match(srcRE)
-        if (srcAttr) {
-          // register script as a import dep for hmr
-          const importee = cleanUrl(
-            slash(path.resolve('/', srcAttr[1] || srcAttr[2]))
-          )
-          debugHmr(`        ${importer} imports ${importee}`)
-          ensureMapEntry(importerMap, importee).add(importer)
+    return (
+      devInjectionCode +
+      html!.replace(scriptRE, (matched, openTag, script) => {
+        if (script) {
+          return `${openTag}${rewriteImports(
+            root,
+            script,
+            importer,
+            resolver
+          )}</script>`
+        } else {
+          const srcAttr = openTag.match(srcRE)
+          if (srcAttr) {
+            // register script as a import dep for hmr
+            const importee = cleanUrl(
+              slash(path.resolve('/', srcAttr[1] || srcAttr[2]))
+            )
+            debugHmr(`        ${importer} imports ${importee}`)
+            ensureMapEntry(importerMap, importee).add(importer)
+          }
+          return matched
         }
-        return `${devFlag}${matched}`
-      }
-    })
+      })
+    )
   }
 
   app.use(async (ctx, next) => {