fix(define): should not stringify vite internal env

vitejs · Feb 20, 2023 · 55221ad · 55221ad
1 parent 5f7f5dc
commit 55221ad
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 1 deletion.
diff --git a/packages/vite/src/node/plugins/define.ts b/packages/vite/src/node/plugins/define.ts
@@ -8,6 +8,7 @@ import { isHTMLRequest } from './html'
 const nonJsRe = /\.json(?:$|\?)/
 const metaEnvRe = /import\.meta\.env\.(.+)/
 const isNonJsRequest = (request: string): boolean => nonJsRe.test(request)
+const internalEnvs = ['__VITE_IS_LEGACY__']
 
 export function definePlugin(config: ResolvedConfig): Plugin {
   const isBuild = config.command === 'build'
@@ -56,9 +57,14 @@ export function definePlugin(config: ResolvedConfig): Plugin {
     for (const key in env) {
       importMetaKeys[`import.meta.env.${key}`] = JSON.stringify(env[key])
     }
+
     Object.assign(importMetaFallbackKeys, {
       'import.meta.env.': `({}).`,
-      'import.meta.env': JSON.stringify(env),
+      // make sure vite internal env won't be stringify
+      'import.meta.env': JSON.stringify(env).replaceAll(
+        new RegExp(`"(${internalEnvs.join('|')})"`, 'g'),
+        '$1',
+      ),
     })
   }
 

diff --git a/playground/legacy/__tests__/legacy.spec.ts b/playground/legacy/__tests__/legacy.spec.ts
@@ -23,6 +23,7 @@ test('import.meta.env.LEGACY', async () => {
     isBuild ? 'true' : 'false',
     true,
   )
+  await untilUpdated(() => page.textContent('#env-equal'), 'true', true)
 })
 
 // https://github.com/vitejs/vite/issues/3400

diff --git a/playground/legacy/index.html b/playground/legacy/index.html
@@ -1,5 +1,6 @@
 <h1 id="app"></h1>
 <div id="env"></div>
+<div id="env-equal"></div>
 <div id="iterators"></div>
 <div id="features-after-corejs-3"></div>
 <div id="async-generator"></div>

diff --git a/playground/legacy/main.js b/playground/legacy/main.js
@@ -20,6 +20,9 @@ if (import.meta.env.LEGACY) {
 
 text('#env', `is legacy: ${isLegacy}`)
 
+const metaEnvObj = import.meta.env
+text('#env-equal', import.meta.env.LEGACY === metaEnvObj.LEGACY)
+
 // Iterators
 text('#iterators', [...new Set(['hello'])].join(''))