fix(define): allow define process.env (#15173)

vitejs · Nov 29, 2023 · ec401da · ec401da
1 parent 642f9bc
commit ec401da
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/packages/vite/src/node/plugins/define.ts b/packages/vite/src/node/plugins/define.ts
@@ -14,15 +14,12 @@ export function definePlugin(config: ResolvedConfig): Plugin {
 
   // ignore replace process.env in lib build
   const processEnv: Record<string, string> = {}
-  const processNodeEnv: Record<string, string> = {}
   if (!isBuildLib) {
     const nodeEnv = process.env.NODE_ENV || config.mode
     Object.assign(processEnv, {
       'process.env': `{}`,
       'global.process.env': `{}`,
       'globalThis.process.env': `{}`,
-    })
-    Object.assign(processNodeEnv, {
       'process.env.NODE_ENV': JSON.stringify(nodeEnv),
       'global.process.env.NODE_ENV': JSON.stringify(nodeEnv),
       'globalThis.process.env.NODE_ENV': JSON.stringify(nodeEnv),
@@ -60,11 +57,10 @@ export function definePlugin(config: ResolvedConfig): Plugin {
     const replaceProcessEnv = !ssr || config.ssr?.target === 'webworker'
 
     const define: Record<string, string> = {
-      ...(replaceProcessEnv ? processNodeEnv : {}),
+      ...(replaceProcessEnv ? processEnv : {}),
       ...importMetaKeys,
       ...userDefine,
       ...importMetaFallbackKeys,
-      ...(replaceProcessEnv ? processEnv : {}),
     }
 
     // Additional define fixes based on `ssr` value

diff --git a/playground/define/__tests__/define.spec.ts b/playground/define/__tests__/define.spec.ts
@@ -19,6 +19,9 @@ test('string', async () => {
   expect(await page.textContent('.process-node-env')).toBe(
     JSON.parse(defines['process.env.NODE_ENV']),
   )
+  expect(await page.textContent('.process-env')).toBe(
+    JSON.stringify(defines['process.env'], null, 2),
+  )
   expect(await page.textContent('.env-var')).toBe(
     JSON.parse(defines['process.env.SOMEVAR']),
   )

diff --git a/playground/define/index.html b/playground/define/index.html
@@ -10,6 +10,7 @@ <h1>Define</h1>
 <p>Object <span class="pre object"></span></p>
 <p>Env Var <code class="env-var"></code></p>
 <p>process node env: <code class="process-node-env"></code></p>
+<p>process env: <code class="process-env"></code></p>
 <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>
@@ -68,6 +69,7 @@ <h2>Define replaces constants in template literal expressions</h2>
   text('.undefined', __UNDEFINED__)
   text('.object', JSON.stringify(__OBJ__, null, 2))
   text('.process-node-env', process.env.NODE_ENV)
+  text('.process-env', JSON.stringify(process.env, null, 2))
   text('.env-var', process.env.SOMEVAR)
   text('.process-as-property', __OBJ__.process.env.SOMEVAR)
   text(

diff --git a/playground/define/vite.config.js b/playground/define/vite.config.js
@@ -20,6 +20,11 @@ export default defineConfig({
     },
     'process.env.NODE_ENV': '"dev"',
     'process.env.SOMEVAR': '"SOMEVAR"',
+    'process.env': {
+      NODE_ENV: 'dev',
+      SOMEVAR: 'SOMEVAR',
+      OTHER: 'works',
+    },
     $DOLLAR: 456,
     ÖUNICODE_LETTERɵ: 789,
     __VAR_NAME__: false,