fix(indexHtml): decode html URI (#13581)

vitejs · Jun 22, 2023 · f8868af · f8868af
1 parent 17c63fe
commit f8868af
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 1 deletion.
diff --git a/packages/vite/src/node/plugins/html.ts b/packages/vite/src/node/plugins/html.ts
@@ -97,7 +97,7 @@ export function htmlInlineProxyPlugin(config: ResolvedConfig): Plugin {
         const index = Number(proxyMatch[1])
         const file = cleanUrl(id)
         const url = file.replace(normalizePath(config.root), '')
-        const result = htmlProxyMap.get(config)!.get(url)![index]
+        const result = htmlProxyMap.get(config)!.get(url)?.[index]
         if (result) {
           return result
         } else {

diff --git a/packages/vite/src/node/server/middlewares/indexHtml.ts b/packages/vite/src/node/server/middlewares/indexHtml.ts
@@ -150,6 +150,7 @@ const devHtmlHook: IndexHtmlTransformHook = async (
 ) => {
   const { config, moduleGraph, watcher } = server!
   const base = config.base || '/'
+  htmlPath = decodeURI(htmlPath)
 
   let proxyModulePath: string
   let proxyModuleUrl: string

diff --git a/playground/html/__tests__/html.spec.ts b/playground/html/__tests__/html.spec.ts
@@ -303,3 +303,13 @@ describe('side-effects', () => {
     expect(browserLogs).toContain('message from sideEffects script')
   })
 })
+
+describe('special character', () => {
+  beforeAll(async () => {
+    await page.goto(viteTestUrl + '/a á.html')
+  })
+
+  test('should fetch html proxy', async () => {
+    expect(browserLogs).toContain('special character')
+  })
+})
diff --git a/playground/html/a á.html b/playground/html/a á.html
@@ -0,0 +1,5 @@
+<h1>Special Character</h1>
+
+<script type="module">
+  console.log('special character')
+</script>
diff --git a/playground/html/vite.config.js b/playground/html/vite.config.js
@@ -29,6 +29,7 @@ export default defineConfig({
         importmapOrder: resolve(__dirname, 'importmapOrder.html'),
         env: resolve(__dirname, 'env.html'),
         sideEffects: resolve(__dirname, 'side-effects/index.html'),
+        'a á': resolve(__dirname, 'a á.html'),
       },
     },
   },