fix: resolving url outside of first order place

Closes #126
Anidetrix · Dec 28, 2020 · c61f0ce · c61f0ce
1 parent 91d4ca2
commit c61f0ce
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 1 deletion.
diff --git a/__tests__/__snapshots__/index.test.ts.snap b/__tests__/__snapshots__/index.test.ts.snap
@@ -194,6 +194,12 @@ exports[`basic resolvers: css 1`] = `
   color: magenta;
   background-image: url(\\"https://via.placeholder.com/1920x1080\\"); }
 
+@font-face {
+  font-family: \\"Demo\\";
+  font-style: normal;
+  font-weight: 400;
+  src: local(\\"Demo\\"), local(\\"Demo-Regular\\"), url(\\"/pubpath/Demo-webfont.woff\\") format(\\"woff\\"); }
+
 .ignore-data-uri {
   background-image: url(/pubpath/bg2.png);
   background-image: url(\\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABkBAMAAACCzIhnAAAAG1BMVEXMzMyWlpacnJy+vr6jo6PFxcW3t7eqqqqxsbHbm8QuAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAAiklEQVRYhe3QMQ6EIBAF0C+GSInF9mYTs+1ewRsQbmBlayysKefYO2asXbbYxvxHQj6ECQMAEREREf2NQ/fCtp5Zky6vtRMkSJEzhyISynWJnzH6Z8oQlzS7lEc/fLmmQUSvc16OrCPqRl1JePxQYo1ZSWVj9nxrrOb5esw+eXdvzTWfTERERHRXH4tWFZGswQ2yAAAAAElFTkSuQmCC\\"); }
@@ -236,6 +242,12 @@ exports[`basic resolvers-hash: css 1`] = `
   color: magenta;
   background-image: url(\\"https://via.placeholder.com/1920x1080\\"); }
 
+@font-face {
+  font-family: \\"Demo\\";
+  font-style: normal;
+  font-weight: 400;
+  src: local(\\"Demo\\"), local(\\"Demo-Regular\\"), url(\\"/pubpath/Demo-webfont-423f69d5.woff\\") format(\\"woff\\"); }
+
 .ignore-data-uri {
   background-image: url(/pubpath/bg-086af782.png);
   background-image: url(\\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABkBAMAAACCzIhnAAAAG1BMVEXMzMyWlpacnJy+vr6jo6PFxcW3t7eqqqqxsbHbm8QuAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAAiklEQVRYhe3QMQ6EIBAF0C+GSInF9mYTs+1ewRsQbmBlayysKefYO2asXbbYxvxHQj6ECQMAEREREf2NQ/fCtp5Zky6vtRMkSJEzhyISynWJnzH6Z8oQlzS7lEc/fLmmQUSvc16OrCPqRl1JePxQYo1ZSWVj9nxrrOb5esw+eXdvzTWfTERERHRXH4tWFZGswQ2yAAAAAElFTkSuQmCC\\"); }
@@ -278,6 +290,12 @@ exports[`basic resolvers-url-inline: css 1`] = `
   color: magenta;
   background-image: url(\\"https://via.placeholder.com/1920x1080\\"); }
 
+@font-face {
+  font-family: \\"Demo\\";
+  font-style: normal;
+  font-weight: 400;
+  src: local(\\"Demo\\"), local(\\"Demo-Regular\\"), url(\\"data:font/woff;base64,TmVxdWVwb3Jyb3F1aXNxdWFtZXN0cXVpZG9sb3JlbWlwc3VtcXVpYWRvbG9yc2l0YW1ldGNvbnNlY3RldHVyYWRpcGlzY2l2ZWxpdA==\\") format(\\"woff\\"); }
+
 .ignore-data-uri {
   background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGwAAABsBAMAAAB9SEr+AAAAG1BMVEXMzMyWlpacnJy3t7ejo6O+vr6qqqqxsbHFxcUT5ek+AAAACXBIWXMAAA7EAAAOxAGVKw4bAAAAsklEQVRYhe3RMQuCQBjG8cek88YzFBo1SRwlHBqLhhrLvoC0uEaINZoFfe3OyNlbmnp+2zP8uRcFiIiIiIj+TiDicTjvB05FPtkPV5mqxSVd9MMpysgOhrOjSuRsqbOrSPUYNW30MMigFHzXB0ZZNyxYB9fgyC7zbhVg+99s+1qZZIkMmzvgfDJ95FQqk6wWVaoPbPNu6E+ysY1eE7Fc74BSnPXQP+DpNQYZEREREdHPvQFNvRay9sR69AAAAABJRU5ErkJggg==);
   background-image: url(\\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABkBAMAAACCzIhnAAAAG1BMVEXMzMyWlpacnJy+vr6jo6PFxcW3t7eqqqqxsbHbm8QuAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAAiklEQVRYhe3QMQ6EIBAF0C+GSInF9mYTs+1ewRsQbmBlayysKefYO2asXbbYxvxHQj6ECQMAEREREf2NQ/fCtp5Zky6vtRMkSJEzhyISynWJnzH6Z8oQlzS7lEc/fLmmQUSvc16OrCPqRl1JePxQYo1ZSWVj9nxrrOb5esw+eXdvzTWfTERERHRXH4tWFZGswQ2yAAAAAElFTkSuQmCC\\"); }

diff --git a/__tests__/fixtures/resolvers/fonts/Demo-webfont.woff b/__tests__/fixtures/resolvers/fonts/Demo-webfont.woff
@@ -0,0 +1 @@
+Nequeporroquisquamestquidoloremipsumquiadolorsitametconsecteturadipiscivelit
diff --git a/__tests__/fixtures/resolvers/style.scss b/__tests__/fixtures/resolvers/style.scss
@@ -1,6 +1,13 @@
 @import "@/foo.css";
 @import "features2/bar";
 
+@font-face {
+  font-family: "Demo";
+  font-style: normal;
+  font-weight: 400;
+  src: local("Demo"), local("Demo-Regular"), url("fonts/Demo-webfont.woff") format("woff");
+}
+
 .ignore-data-uri {
   background-image: url(bg.png);
   background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABkBAMAAACCzIhnAAAAG1BMVEXMzMyWlpacnJy+vr6jo6PFxcW3t7eqqqqxsbHbm8QuAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAAiklEQVRYhe3QMQ6EIBAF0C+GSInF9mYTs+1ewRsQbmBlayysKefYO2asXbbYxvxHQj6ECQMAEREREf2NQ/fCtp5Zky6vtRMkSJEzhyISynWJnzH6Z8oQlzS7lEc/fLmmQUSvc16OrCPqRl1JePxQYo1ZSWVj9nxrrOb5esw+eXdvzTWfTERERHRXH4tWFZGswQ2yAAAAAElFTkSuQmCC");

diff --git a/src/loaders/postcss/url/utils.ts b/src/loaders/postcss/url/utils.ts
@@ -5,7 +5,7 @@ const urlFuncRe = /^url$/i;
 const imageSetFuncRe = /^(?:-webkit-)?image-set$/i;
 
 export const isDeclWithUrl = (decl: Declaration): boolean =>
-  /^(?:url|(?:-webkit-)?image-set)\(/i.test(decl.value);
+  /(?:url|(?:-webkit-)?image-set)\(/i.test(decl.value);
 
 export const walkUrls = (
   parsed: ParsedValue,