fix: encode URLs correctly

vitejs · Dec 11, 2023 · c667958 · c667958
1 parent 25d7924
commit c667958
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/packages/vite/src/node/plugins/asset.ts b/packages/vite/src/node/plugins/asset.ts
@@ -96,7 +96,7 @@ export function renderAssetUrlInJS(
     chunk.viteMetadata!.importedAssets.add(cleanUrl(file))
     const filename = file + postfix
     const replacement = toOutputFilePathInJS(
-      filename,
+      encodeURI(filename),
       'asset',
       chunk.fileName,
       'js',
@@ -275,7 +275,7 @@ function fileToDevUrl(id: string, config: ResolvedConfig) {
     rtn = path.posix.join(FS_PREFIX, id)
   }
   const base = joinUrlSegments(config.server?.origin ?? '', config.base)
-  return joinUrlSegments(base, removeLeadingSlash(rtn))
+  return encodeURI(joinUrlSegments(base, removeLeadingSlash(rtn)))
 }
 
 export function getPublicAssetFilename(

diff --git a/packages/vite/src/node/plugins/css.ts b/packages/vite/src/node/plugins/css.ts
@@ -572,7 +572,7 @@ export function cssPostPlugin(config: ResolvedConfig): Plugin {
           const filename = this.getFileName(fileHash) + postfix
           chunk.viteMetadata!.importedAssets.add(cleanUrl(filename))
           return toOutputFilePathInCss(
-            filename,
+            encodeURI(filename),
             'asset',
             cssAssetName,
             'css',

diff --git a/packages/vite/src/node/plugins/importAnalysis.ts b/packages/vite/src/node/plugins/importAnalysis.ts
@@ -401,7 +401,8 @@ export function importAnalysisPlugin(config: ResolvedConfig): Plugin {
           url = joinUrlSegments(base, url)
         }
 
-        return [url, resolved.id]
+        // only encode if the url can't be parsed
+        return [encodeURI(url), resolved.id]
       }
 
       const orderedImportedUrls = new Array<string | undefined>(imports.length)

diff --git a/playground/assets/__tests__/assets.spec.ts b/playground/assets/__tests__/assets.spec.ts
@@ -370,7 +370,7 @@ describe('unicode url', () => {
         ? `data:application/javascript;base64,${Buffer.from(src).toString(
             'base64',
           )}`
-        : `/foo/bar/テスト-測試-white space.js`,
+        : encodeURI(`/foo/bar/テスト-測試-white space.js`),
     )
   })
 })

diff --git a/playground/ssr/__tests__/ssr.spec.ts b/playground/ssr/__tests__/ssr.spec.ts
@@ -32,7 +32,7 @@ test('should restart ssr', async () => {
 
 test.runIf(isServe)('html proxy is encoded', async () => {
   await page.goto(
-    `${url}?%22%3E%3C/script%3E%3Cscript%3Econsole.log(%27html proxy is not encoded%27)%3C/script%3E`,
+    `${url}?"></script><script>console.log('html proxy is not encoded')</script>`,
   )
 
   expect(browserLogs).not.toContain('html proxy is not encoded')