Merge branch 'lemieux-fix-url-in-value'

Author: sokra

lib/processCss.js

@@ -77,31 +77,39 @@ var parserPlugin = postcss.plugin("css-loader-parser", function(options) {
 exports[exportName] = replaceImportsInString(exports[exportName]);
 });
 
+function processNode(item) {
+switch (item.type) {
+case "value":
+item.nodes.forEach(processNode);
+break;
+case "nested-item":
+item.nodes.forEach(processNode);
+break;
+case "item":
+var importIndex = imports["$" + item.name];
+if (typeof importIndex === "number") {
+item.name = "___CSS_LOADER_IMPORT___" + importIndex + "___";
+}
+break;
+case "url":
+if (!/^#/.test(item.url) && loaderUtils.isUrlRequest(item.url, options.root)) {
+item.stringType = "";
+delete item.innerSpacingBefore;
+delete item.innerSpacingAfter;
+var url = item.url;
+item.url = "___CSS_LOADER_URL___" + urlItems.length + "___";
+urlItems.push({
+url: url
+});
+}
+break;
+}
+}
+
 css.walkDecls(function(decl) {
 var values = Tokenizer.parseValues(decl.value);
 values.nodes.forEach(function(value) {
-value.nodes.forEach(function(item) {
-switch(item.type) {
-case "item":
-var importIndex = imports["$" + item.name];
-if(typeof importIndex === "number") {
-item.name = "___CSS_LOADER_IMPORT___" + importIndex + "___";
-}
-break;
-case "url":
-if(!/^#/.test(item.url) && loaderUtils.isUrlRequest(item.url, options.root)) {
-item.stringType = "";
-delete item.innerSpacingBefore;
-delete item.innerSpacingAfter;
-var url = item.url;
-item.url = "___CSS_LOADER_URL___" + urlItems.length + "___";
-urlItems.push({
-url: url
-});
-}
-break;
-}
-});
+value.nodes.forEach(processNode);
 });
 decl.value = Tokenizer.stringifyValues(values);
 });

package.json

@@ -11,7 +11,7 @@
  "lodash.camelcase": "^3.0.1",
  "postcss": "^5.0.6",
  "postcss-modules-extract-imports": "^1.0.0",
- "postcss-modules-local-by-default": "^1.0.0",
+ "postcss-modules-local-by-default": "^1.0.1",
  "postcss-modules-scope": "^1.0.0",
  "postcss-modules-values": "^1.1.0",
  "source-list-map": "^0.1.4"

test/urlTest.js

@@ -50,4 +50,7 @@ describe("url", function() {
 test("keyframe background img", "@keyframes anim { background: green url('img.png') xyz }", [
 [1, "@keyframes anim { background: green url({./img.png}) xyz }", ""]
 ]);
+test("-webkit-image-set", ".a { background-image: -webkit-image-set(url('url1x.png') 1x, url('url2x.png') 2x) }", [
+[1, ".a { background-image: -webkit-image-set(url({./url1x.png}) 1x, url({./url2x.png}) 2x) }", ""]
+]);
 });