chore: fix merge error

vitejs · Nov 28, 2022 · 017c018 · 017c018
1 parent 665ccb2
commit 017c018
Showing 1 changed file with 9 additions and 2 deletions.
diff --git 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