fix: avoid excessive quote in css public urls

close #1399
vitejs · Jan 7, 2021 · 1437129 · 1437129
1 parent 11c407a
commit 1437129
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/packages/playground/assets/css/css-url.css b/packages/playground/assets/css/css-url.css
diff --git a/packages/vite/src/node/plugins/asset.ts b/packages/vite/src/node/plugins/asset.ts
@@ -9,7 +9,11 @@ import { FS_PREFIX } from '../constants'
 import { PluginContext } from 'rollup'
 import MagicString from 'magic-string'
 
-export const assetUrlRE = /"__VITE_ASSET__(\w+)(?:__(.*)__)?"/g
+export const assetUrlRE = /__VITE_ASSET__([a-z\d]+)(?:__(.*)__)?/g
+
+// urls in JS must be quoted as strings, so when replacing them we need
+// a different regex
+const assetUrlQuotedRE = /"__VITE_ASSET__([a-z\d]+)(?:__(.*)__)?"/g
 
 /**
  * Also supports loading plain strings with import text from './foo.txt?raw'
@@ -51,7 +55,7 @@ export function assetPlugin(config: ResolvedConfig): Plugin {
     renderChunk(code) {
       let match
       let s
-      while ((match = assetUrlRE.exec(code))) {
+      while ((match = assetUrlQuotedRE.exec(code))) {
         s = s || (s = new MagicString(code))
         const [full, fileHandle, postfix = ''] = match
         const outputFilepath =

diff --git a/packages/vite/src/node/plugins/css.ts b/packages/vite/src/node/plugins/css.ts
@@ -120,7 +120,7 @@ export function cssPlugin(config: ResolvedConfig): Plugin {
         if (cssUrlRE.test(css)) {
           css = await rewriteCssUrls(css, async (url) => {
             url = await urlToBuiltUrl(url, id, config, this)
-            return isDataUrl(url) ? url : JSON.stringify(url)
+            return url
           })
         }
       }