fix: correctly processing url with ?#hash (#803)

evilebottnawi · web-flow · commit 417d1052dce3 · 2018-11-26T16:34:06.000+03:00
diff --git a/lib/loader.js b/lib/loader.js
@@ -132,7 +132,7 @@ module.exports = function loader(content, map) {
             return `" + escape(require(${loaderUtils.stringifyRequest(
               this,
               urlRequest
-            )})) + "${url.substr(idx)}`;
+            )}) + "${url.substr(idx)}") + "`;
           }
           urlRequest = url;
           return `" + escape(require(${loaderUtils.stringifyRequest(
diff --git a/test/urlTest.js b/test/urlTest.js
@@ -99,11 +99,11 @@ describe('url', () => {
   );
   test(
     'font face',
-    "@font-face { src: url(regular.woff) format('woff'), url(~truetype/regular.ttf) format('truetype') }",
+    "@font-face { src: url(regular.woff) format('woff'), url(~truetype/regular.ttf) format('truetype'), url('Mark Simonson - Proxima Nova Alt Regular-webfont.eot?#iefix') format('embedded-opentype'), url('webfont.svg#svgFontName') format('svg'), url('webfont.woff2?foo=bar') format('woff2'); }",
     [
       [
         1,
-        "@font-face { src: url({./regular.woff}) format('woff'), url({truetype/regular.ttf}) format('truetype') }",
+        "@font-face { src: url({./regular.woff}) format('woff'), url({truetype/regular.ttf}) format('truetype'), url(\"{./Mark Simonson - Proxima Nova Alt Regular-webfont.eot}?#iefix\") format('embedded-opentype'), url({./webfont.svg}#svgFontName) format('svg'), url({./webfont.woff2?foo=bar}) format('woff2'); }",
         '',
       ],
     ]

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ module.exports = function loader(content, map) {`
`132`	`132`	return `" + escape(require(${loaderUtils.stringifyRequest(
`133`	`133`	`this,`
`134`	`134`	`urlRequest`
`135`		- )})) + "${url.substr(idx)}`;
	`135`	+ )}) + "${url.substr(idx)}") + "`;
`136`	`136`	`}`
`137`	`137`	`urlRequest = url;`
`138`	`138`	return `" + escape(require(${loaderUtils.stringifyRequest(
Original file line number	Diff line number	Diff line change
`@@ -99,11 +99,11 @@ describe('url', () => {`
`99`	`99`	`);`
`100`	`100`	`test(`
`101`	`101`	`'font face',`
`102`		`- "@font-face { src: url(regular.woff) format('woff'), url(~truetype/regular.ttf) format('truetype') }",`
	`102`	`+ "@font-face { src: url(regular.woff) format('woff'), url(~truetype/regular.ttf) format('truetype'), url('Mark Simonson - Proxima Nova Alt Regular-webfont.eot?#iefix') format('embedded-opentype'), url('webfont.svg#svgFontName') format('svg'), url('webfont.woff2?foo=bar') format('woff2'); }",`
`103`	`103`	`[`
`104`	`104`	`[`
`105`	`105`	`1,`
`106`		`- "@font-face { src: url({./regular.woff}) format('woff'), url({truetype/regular.ttf}) format('truetype') }",`
	`106`	`+ "@font-face { src: url({./regular.woff}) format('woff'), url({truetype/regular.ttf}) format('truetype'), url(\"{./Mark Simonson - Proxima Nova Alt Regular-webfont.eot}?#iefix\") format('embedded-opentype'), url({./webfont.svg}#svgFontName) format('svg'), url({./webfont.woff2?foo=bar}) format('woff2'); }",`
`107`	`107`	`'',`
`108`	`108`	`],`
`109`	`109`	`]`