fix: handling escaped urls

webpack-contrib · Dec 11, 2019 · afb048f · afb048f
1 parent e091d27
commit afb048f
Show file tree

Hide file tree

Showing 4 changed files with 69 additions and 11 deletions.
diff --git a/src/plugins/postcss-url-parser.js b/src/plugins/postcss-url-parser.js
@@ -2,6 +2,8 @@ import postcss from 'postcss';
 import valueParser from 'postcss-value-parser';
 import { urlToRequest } from 'loader-utils';
 
+import { unescape } from '../utils';
+
 const pluginName = 'postcss-url-parser';
 
 const isUrlFunc = /url/i;
@@ -78,23 +80,20 @@ function getUrlsFromValue(value, result, filter, decl) {
     }
 
     const splittedUrl = url.split(/(\?)?#/);
-    let normalizedUrl = urlToRequest(decodeURIComponent(splittedUrl[0]));
+    let [normalizedUrl] = splittedUrl;
     const [, singleQuery, hashValue] = splittedUrl;
     const hash =
       singleQuery || hashValue
         ? `${singleQuery ? '?' : ''}${hashValue ? `#${hashValue}` : ''}`
         : '';
 
-    // Remove extra escaping requirements for `require`
-    // See https://drafts.csswg.org/css-values-3/#urls
-    if (!isStringNode && /\\["'() \t\n]/.test(normalizedUrl)) {
-      normalizedUrl = normalizedUrl.replace(/\\(["'() \t\n])/g, '$1');
-    }
-    // https://drafts.csswg.org/css-values-4/#strings
-    else if (isStringNode && /\\[\n]/.test(normalizedUrl)) {
+    // See https://drafts.csswg.org/css-values-4/#strings
+    if (isStringNode && /\\[\n]/.test(normalizedUrl)) {
       normalizedUrl = normalizedUrl.replace(/\\[\n]/g, '');
     }
 
+    normalizedUrl = urlToRequest(decodeURIComponent(unescape(normalizedUrl)));
+
     urls.push({ node, url: normalizedUrl, hash, needQuotes });
   });
 

diff --git a/src/utils.js b/src/utils.js
@@ -395,6 +395,7 @@ function getExportCode(
 }
 
 export {
+  unescape,
   getFilter,
   getModulesPlugins,
   normalizeSourceMap,