From 69aec1ea8274a1d2f51946691eea1646cc689073 Mon Sep 17 00:00:00 2001
From: Locria Cyber <74560659+locriacyber@users.noreply.github.com>
Date: Tue, 26 Apr 2022 03:48:51 +0800
Subject: [PATCH 1/2] fix: relative base code generation (previously generated
 as ./)

---
 packages/vite/package.json                            | 1 +
 packages/vite/src/node/plugins/importAnalysisBuild.ts | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/vite/package.json b/packages/vite/package.json
index eeecf5b2160544..b7f8b29c27e853 100644
--- a/packages/vite/package.json
+++ b/packages/vite/package.json
@@ -80,6 +80,7 @@
     "acorn": "^8.7.0",
     "cac": "6.7.9",
     "chokidar": "^3.5.3",
+    "colorette": "^2.0.16",
     "connect": "^3.7.0",
     "connect-history-api-fallback": "^1.6.0",
     "convert-source-map": "^1.8.0",
diff --git a/packages/vite/src/node/plugins/importAnalysisBuild.ts b/packages/vite/src/node/plugins/importAnalysisBuild.ts
index 896de968dd504d..4fc02a8b237b56 100644
--- a/packages/vite/src/node/plugins/importAnalysisBuild.ts
+++ b/packages/vite/src/node/plugins/importAnalysisBuild.ts
@@ -98,7 +98,7 @@ export function buildImportAnalysisPlugin(config: ResolvedConfig): Plugin {
     ? `'modulepreload'`
     : `(${detectScriptRel.toString()})()`
   const assetsURL = hasCustomAssetFileNames
-    ? config.base
+    ? JSON.stringify(config.base)
     : isRelativeBase(config.base)
     ? `new URL('./',import.meta.url).pathname`
     : JSON.stringify(path.posix.join(config.base, config.build.assetsDir, '/'))

From e7c98c74cdbaa0137241b1eb87b1d38c8f3641e0 Mon Sep 17 00:00:00 2001
From: Locria Cyber <74560659+locriacyber@users.noreply.github.com>
Date: Tue, 26 Apr 2022 04:22:41 +0800
Subject: [PATCH 2/2] fix: update pnpm lock file

---
 pnpm-lock.yaml | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index fbc05e51fbfc7a..24fc8536473b05 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -849,6 +849,7 @@ importers:
       acorn: ^8.7.0
       cac: 6.7.9
       chokidar: ^3.5.3
+      colorette: ^2.0.16
       connect: ^3.7.0
       connect-history-api-fallback: ^1.6.0
       convert-source-map: ^1.8.0
@@ -927,6 +928,7 @@ importers:
       acorn: 8.7.0
       cac: 6.7.9
       chokidar: 3.5.3
+      colorette: 2.0.16
       connect: 3.7.0
       connect-history-api-fallback: 1.6.0
       convert-source-map: 1.8.0
@@ -5111,6 +5113,19 @@ packages:
     peerDependenciesMeta:
       debug:
         optional: true
+    dev: false
+
+  /follow-redirects/1.14.6_debug@4.3.4:
+    resolution: {integrity: sha512-fhUl5EwSJbbl8AR+uYL2KQDxLkdSjZGR36xy46AO7cOMTrCMON6Sa28FmAnC2tRTDbd/Uuzz3aJBv7EBN7JH8A==}
+    engines: {node: '>=4.0'}
+    peerDependencies:
+      debug: '*'
+    peerDependenciesMeta:
+      debug:
+        optional: true
+    dependencies:
+      debug: 4.3.4
+    dev: true
 
   /form-data/3.0.1:
     resolution: {integrity: sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==}
@@ -5511,7 +5526,7 @@ packages:
     engines: {node: '>=8.0.0'}
     dependencies:
       eventemitter3: 4.0.7
-      follow-redirects: 1.14.6
+      follow-redirects: 1.14.6_debug@4.3.4
       requires-port: 1.0.0
     transitivePeerDependencies:
       - debug