From 4d4595ed4eab5dd7b00702cbada48ae51aa948ae Mon Sep 17 00:00:00 2001
From: Golden <35162802+Littlegolden@users.noreply.github.com>
Date: Fri, 22 Jul 2022 23:15:29 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E9=9D=99=E6=80=81=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E6=9C=AA=E9=80=9A=E8=BF=87=20vite=20=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/core/src/htmlPlugin.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/core/src/htmlPlugin.ts b/packages/core/src/htmlPlugin.ts
index d8282e8..ec7cb7c 100644
--- a/packages/core/src/htmlPlugin.ts
+++ b/packages/core/src/htmlPlugin.ts
@@ -337,6 +337,9 @@ function createRewire(
       if (excludeBaseUrl === '/') {
         return template
       }
+      if (/^\/(?:[^/]+\/)*[^/]+$/.test(excludeBaseUrl)) {
+        return excludeBaseUrl
+      }
       const isApiUrl = proxyUrlKeys.some((item) =>
         pathname.startsWith(path.resolve(baseUrl, item)),
       )

From a8306426dad62e0024716a1344c1eb3c5f2327a6 Mon Sep 17 00:00:00 2001
From: Golden <35162802+Littlegolden@users.noreply.github.com>
Date: Sat, 23 Jul 2022 00:35:00 +0800
Subject: [PATCH 2/4] move condition

---
 packages/core/src/htmlPlugin.ts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/core/src/htmlPlugin.ts b/packages/core/src/htmlPlugin.ts
index ec7cb7c..27d975d 100644
--- a/packages/core/src/htmlPlugin.ts
+++ b/packages/core/src/htmlPlugin.ts
@@ -337,13 +337,11 @@ function createRewire(
       if (excludeBaseUrl === '/') {
         return template
       }
-      if (/^\/(?:[^/]+\/)*[^/]+$/.test(excludeBaseUrl)) {
-        return excludeBaseUrl
-      }
       const isApiUrl = proxyUrlKeys.some((item) =>
         pathname.startsWith(path.resolve(baseUrl, item)),
       )
-      return isApiUrl ? excludeBaseUrl : template
+      const isStatic = /^\/(?:[^/]+\/)*[^/]+$/.test(excludeBaseUrl)
+      return isApiUrl || isStatic ? excludeBaseUrl : template;
     },
   }
 }

From d56a13be3eaffbb94f137f17408eb397db17a934 Mon Sep 17 00:00:00 2001
From: Golden <35162802+littlegolden@users.noreply.github.com>
Date: Sat, 23 Jul 2022 09:36:42 +0800
Subject: [PATCH 3/4] fix: rewrite error when vite base path is not '/'

---
 packages/core/src/htmlPlugin.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/core/src/htmlPlugin.ts b/packages/core/src/htmlPlugin.ts
index 27d975d..a93f171 100644
--- a/packages/core/src/htmlPlugin.ts
+++ b/packages/core/src/htmlPlugin.ts
@@ -337,11 +337,14 @@ function createRewire(
       if (excludeBaseUrl === '/') {
         return template
       }
+      const isStatic = /^\/(?:[^/]+\/)*[^/]+$/.test(excludeBaseUrl)
+      if (isStatic) {
+        return pathname
+      }
       const isApiUrl = proxyUrlKeys.some((item) =>
         pathname.startsWith(path.resolve(baseUrl, item)),
       )
-      const isStatic = /^\/(?:[^/]+\/)*[^/]+$/.test(excludeBaseUrl)
-      return isApiUrl || isStatic ? excludeBaseUrl : template;
+      return isApiUrl ? excludeBaseUrl : template;
     },
   }
 }

From f4abd233b0d780b26d2d32ef7b1c123e450dc1bc Mon Sep 17 00:00:00 2001
From: Golden <35162802+littlegolden@users.noreply.github.com>
Date: Sat, 23 Jul 2022 09:44:25 +0800
Subject: [PATCH 4/4] pref: remove semicolon

---
 packages/core/src/htmlPlugin.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/src/htmlPlugin.ts b/packages/core/src/htmlPlugin.ts
index a93f171..e23e6af 100644
--- a/packages/core/src/htmlPlugin.ts
+++ b/packages/core/src/htmlPlugin.ts
@@ -344,7 +344,7 @@ function createRewire(
       const isApiUrl = proxyUrlKeys.some((item) =>
         pathname.startsWith(path.resolve(baseUrl, item)),
       )
-      return isApiUrl ? excludeBaseUrl : template;
+      return isApiUrl ? excludeBaseUrl : template
     },
   }
 }