From acc255e0cbcad3e7f40c4bb2600d999ac613247d Mon Sep 17 00:00:00 2001
From: poyoho <907415276@qq.com>
Date: Tue, 18 Jan 2022 00:03:58 +0800
Subject: [PATCH 1/5] wip: serve mode replace define variable in index.html

---
 packages/playground/define/index.html    | 1 +
 packages/vite/src/node/plugins/define.ts | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/packages/playground/define/index.html b/packages/playground/define/index.html
index bf6a9c59689396..4788ec9f2d2a57 100644
--- a/packages/playground/define/index.html
+++ b/packages/playground/define/index.html
@@ -9,6 +9,7 @@ <h1>Define</h1>
 <p>process as property: <code class="process-as-property"></code></p>
 <p>spread object: <code class="spread-object"></code></p>
 <p>spread array: <code class="spread-array"></code></p>
+<p>define variable in html: <code class="exp-define">__EXP__</code></p>
 
 <script type="module">
   const __VAR_NAME__ = true // ensure define doesn't replace var name
diff --git a/packages/vite/src/node/plugins/define.ts b/packages/vite/src/node/plugins/define.ts
index f26df9e4d99405..752a7db020a527 100644
--- a/packages/vite/src/node/plugins/define.ts
+++ b/packages/vite/src/node/plugins/define.ts
@@ -80,6 +80,14 @@ export function definePlugin(config: ResolvedConfig): Plugin {
 
   return {
     name: 'vite:define',
+
+    transformIndexHtml(html) {
+      const [replacements, pattern] = defaultPattern
+      return html.replace(pattern, (_, match) => {
+        return '' + replacements[match]
+      })
+    },
+
     transform(code, id, options) {
       const ssr = options?.ssr === true
       if (!ssr && !isBuild) {

From 1f846e9009cbf3ccd2d21b707ad43b1083039a48 Mon Sep 17 00:00:00 2001
From: poyoho <907415276@qq.com>
Date: Tue, 18 Jan 2022 13:13:41 +0800
Subject: [PATCH 2/5] test: define html serve

---
 packages/playground/define/__tests__/define.spec.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/playground/define/__tests__/define.spec.ts b/packages/playground/define/__tests__/define.spec.ts
index f5eb78ea4e2766..601bccce9b9e6b 100644
--- a/packages/playground/define/__tests__/define.spec.ts
+++ b/packages/playground/define/__tests__/define.spec.ts
@@ -20,4 +20,5 @@ test('string', async () => {
   expect(await page.textContent('.spread-array')).toBe(
     JSON.stringify([...defines.__STRING__])
   )
+  expect(await page.textContent('.exp-define')).toBe(String(defines.__EXP__))
 })

From 2ca45af47ddacf7dc930b90f5795fd1b7849fd30 Mon Sep 17 00:00:00 2001
From: poyoho <907415276@qq.com>
Date: Fri, 28 Jan 2022 09:45:38 +0800
Subject: [PATCH 3/5] fix: expect output

---
 packages/playground/define/__tests__/define.spec.ts | 3 ++-
 packages/vite/src/node/plugins/define.ts            | 7 -------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/packages/playground/define/__tests__/define.spec.ts b/packages/playground/define/__tests__/define.spec.ts
index 601bccce9b9e6b..93ba1ca198fbcc 100644
--- a/packages/playground/define/__tests__/define.spec.ts
+++ b/packages/playground/define/__tests__/define.spec.ts
@@ -20,5 +20,6 @@ test('string', async () => {
   expect(await page.textContent('.spread-array')).toBe(
     JSON.stringify([...defines.__STRING__])
   )
-  expect(await page.textContent('.exp-define')).toBe(String(defines.__EXP__))
+  // html would't need to define replacement
+  expect(await page.textContent('.exp-define')).toBe('__EXP__')
 })
diff --git a/packages/vite/src/node/plugins/define.ts b/packages/vite/src/node/plugins/define.ts
index 752a7db020a527..8b52689e97f7e7 100644
--- a/packages/vite/src/node/plugins/define.ts
+++ b/packages/vite/src/node/plugins/define.ts
@@ -81,13 +81,6 @@ export function definePlugin(config: ResolvedConfig): Plugin {
   return {
     name: 'vite:define',
 
-    transformIndexHtml(html) {
-      const [replacements, pattern] = defaultPattern
-      return html.replace(pattern, (_, match) => {
-        return '' + replacements[match]
-      })
-    },
-
     transform(code, id, options) {
       const ssr = options?.ssr === true
       if (!ssr && !isBuild) {

From ed4af2db023d58a1876582602152f5dda20e74e8 Mon Sep 17 00:00:00 2001
From: poyoho <907415276@qq.com>
Date: Fri, 28 Jan 2022 10:17:00 +0800
Subject: [PATCH 4/5] feat: define plugins ignore html file

---
 packages/vite/src/node/plugins/define.ts | 4 +++-
 packages/vite/src/node/plugins/html.ts   | 5 +++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/vite/src/node/plugins/define.ts b/packages/vite/src/node/plugins/define.ts
index 8b52689e97f7e7..a8a776a2919563 100644
--- a/packages/vite/src/node/plugins/define.ts
+++ b/packages/vite/src/node/plugins/define.ts
@@ -3,6 +3,7 @@ import type { TransformResult } from 'rollup'
 import type { ResolvedConfig } from '../config'
 import type { Plugin } from '../plugin'
 import { isCSSRequest } from './css'
+import { isHTMLRequest } from './html'
 
 export function definePlugin(config: ResolvedConfig): Plugin {
   const isBuild = config.command === 'build'
@@ -90,7 +91,8 @@ export function definePlugin(config: ResolvedConfig): Plugin {
       }
 
       if (
-        // exclude css and static assets for performance
+        // exclude html, css and static assets for performance
+        isHTMLRequest(id) ||
         isCSSRequest(id) ||
         config.assetsInclude(id)
       ) {
diff --git a/packages/vite/src/node/plugins/html.ts b/packages/vite/src/node/plugins/html.ts
index 8ddf77aac37f1d..7142e8f54b1f11 100644
--- a/packages/vite/src/node/plugins/html.ts
+++ b/packages/vite/src/node/plugins/html.ts
@@ -37,8 +37,13 @@ import { NodeTypes } from '@vue/compiler-dom'
 
 const htmlProxyRE = /\?html-proxy[&inline\-css]*&index=(\d+)\.(js|css)$/
 const inlineCSSRE = /__VITE_INLINE_CSS__([^_]+_\d+)__/g
+const htmlLangRE = /.(html|htm)$/
+
 export const isHTMLProxy = (id: string): boolean => htmlProxyRE.test(id)
 
+export const isHTMLRequest = (request: string): boolean =>
+  htmlLangRE.test(request)
+
 // HTML Proxy Caches are stored by config -> filePath -> index
 export const htmlProxyMap = new WeakMap<
   ResolvedConfig,

From 9e4df7a0f45e885fabc1fdc6a76bb23996c8c247 Mon Sep 17 00:00:00 2001
From: poyoho <907415276@qq.com>
Date: Sat, 29 Jan 2022 20:07:38 +0800
Subject: [PATCH 5/5] fix: html re

Co-authored-by: ygj6 <7699524+ygj6@users.noreply.github.com>
---
 packages/vite/src/node/plugins/html.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/vite/src/node/plugins/html.ts b/packages/vite/src/node/plugins/html.ts
index 8cc65619fd81cd..ae3f56c6bd7dff 100644
--- a/packages/vite/src/node/plugins/html.ts
+++ b/packages/vite/src/node/plugins/html.ts
@@ -43,7 +43,7 @@ interface ScriptAssetsUrl {
 
 const htmlProxyRE = /\?html-proxy[&inline\-css]*&index=(\d+)\.(js|css)$/
 const inlineCSSRE = /__VITE_INLINE_CSS__([^_]+_\d+)__/g
-const htmlLangRE = /.(html|htm)$/
+const htmlLangRE = /\.(html|htm)$/
 const inlineImportRE = /\bimport\s*\(("[^"]*"|'[^']*')\)/g
 
 export const isHTMLProxy = (id: string): boolean => htmlProxyRE.test(id)