fix: html env replacement plugin position (#12404)

vitejs · Mar 15, 2023 · 96f36a9 · 96f36a9
1 parent fe1d61a
commit 96f36a9
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/packages/vite/src/node/plugins/html.ts b/packages/vite/src/node/plugins/html.ts
@@ -286,7 +286,7 @@ export function buildHtmlPlugin(config: ResolvedConfig): Plugin {
     config.plugins,
   )
   preHooks.unshift(preImportMapHook(config))
-  normalHooks.unshift(htmlEnvHook(config))
+  preHooks.push(htmlEnvHook(config))
   postHooks.push(postImportMapHook())
   const processedHtml = new Map<string, string>()
   const isExcludedUrl = (url: string) =>

diff --git a/playground/html/.env b/playground/html/.env
@@ -1 +1,2 @@
 VITE_FOO=bar
+VITE_FAVICON_URL=/sprite.svg
diff --git a/playground/html/__tests__/html.spec.ts b/playground/html/__tests__/html.spec.ts
@@ -273,6 +273,11 @@ describe('env', () => {
     expect(await page.textContent('.env-bar')).toBeTruthy()
     expect(await page.textContent('.env-prod')).toBe(isBuild + '')
     expect(await page.textContent('.env-dev')).toBe(isServe + '')
+
+    const iconLink = await page.$('link[rel=icon]')
+    expect(await iconLink.getAttribute('href')).toBe(
+      `${isBuild ? './' : '/'}sprite.svg`,
+    )
   })
 })
 

diff --git a/playground/html/env.html b/playground/html/env.html
@@ -3,3 +3,4 @@
 <p class="env-%VITE_FOO%">class name should be env-bar</p>
 <p class="env-prod">%PROD%</p>
 <p class="env-dev">%DEV%</p>
+<link rel="icon" href="%VITE_FAVICON_URL%" />