From 017c018594f8432793933a28434742c5da7fe374 Mon Sep 17 00:00:00 2001
From: bluwy <bjornlu.dev@gmail.com>
Date: Tue, 29 Nov 2022 01:56:51 +0800
Subject: [PATCH] chore: fix merge error

---
 packages/vite/src/node/env.ts | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/packages/vite/src/node/env.ts b/packages/vite/src/node/env.ts
index 6c75d6fa3fea49..21bdb0169791ae 100644
--- a/packages/vite/src/node/env.ts
+++ b/packages/vite/src/node/env.ts
@@ -36,10 +36,17 @@ export function loadEnv(
   )
 
   // let environment variables use each other
-  expand({
-    parsed,
+  const expandParsed = expand({
+    parsed: {
+      ...(process.env as any),
+      ...parsed
+    },
     // prevent process.env mutation
     ignoreProcessEnv: true
+  }).parsed!
+
+  Object.keys(parsed).forEach((key) => {
+    parsed[key] = expandParsed[key]
   })
 
   // only keys that start with prefix are exposed to client