8000 fixed PR and bug in dependency · RomandevJavaScript/css-loader@a0ec195 · GitHub
Skip to content

Commit a0ec195

Browse files
sokrasokra
committed
fixed PR and bug in dependency
1 parent 184810d commit a0ec195

File tree

3 files changed

+8
-25
lines changed

3 files changed

+8
-25
lines changed

‎lib/processCss.js‎

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -77,17 +77,13 @@ var parserPlugin = postcss.plugin("css-loader-parser", function(options) {
7777
exports[exportName] = replaceImportsInString(exports[exportName]);
7878
});
7979

80-
function processNode(item, isValue) {
80+
function processNode(item) {
8181
switch (item.type) {
8282
case "value":
83-
item.nodes.forEach(function(node){
84-
processNode(node, true);
85-
});
83+
item.nodes.forEach(processNode);
8684
break;
8785
case "nested-item":
88-
item.nodes.forEach(function(node){
89-
processNode(node);
90-
});
86+
item.nodes.forEach(processNode);
9187
break;
9288
case "item":
9389
var importIndex = imports["$" + item.name];
@@ -100,18 +96,7 @@ var parserPlugin = postcss.plugin("css-loader-parser", function(options) {
10096
item.stringType = "";
10197
delete item.innerSpacingBefore;
10298
delete item.innerSpacingAfter;
103-
var url;
104-
105-
if(isValue) {
106-
if(loaderUtils.isUrlRequest(url, options.root) && options.mode === "global") {
107-
url = loaderUtils.urlToRequest(item.url, options.root);
108-
} else {
109-
url = item.url;
110-
}
111-
} else {
112-
url = item.url;
113-
}
114-
99+
var url = item.url;
115100
item.url = "___CSS_LOADER_URL___" + urlItems.length + "___";
116101
urlItems.push({
117102
url: url
@@ -124,9 +109,7 @@ var parserPlugin = postcss.plugin("css-loader-parser", function(options) {
124109
css.walkDecls(function(decl) {
125110
var values = Tokenizer.parseValues(decl.value);
126111
values.nodes.forEach(function(value) {
127-
value.nodes.forEach(function(node){
128-
processNode(node);
129-
});
112+
value.nodes.forEach(processNode);
130113
});
131114
decl.value = Tokenizer.stringifyValues(values);
132115
});

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"lodash.camelcase": "^3.0.1",
1212
"postcss": "^5.0.6",
1313
"postcss-modules-extract-imports": "^1.0.0",
14-
"postcss-modules-local-by-default": "^1.0.0",
14+
"postcss-modules-local-by-default": "^1.0.1",
1515
"postcss-modules-scope": "^1.0.0",
1616
"postcss-modules-values": "^1.1.0",
1717
"source-list-map": "^0.1.4"

‎test/urlTest.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ describe("url", function() {
5050
test("keyframe background img", "@keyframes anim { background: green url('img.png') xyz }", [
5151
[1, "@keyframes anim { background: green url({./img.png}) xyz }", ""]
5252
]);
53-
test("-webkit-image-set", "background-image: -webkit-image-set(url('url1x.png') 1x, url('url2x.png') 2x)", [
54-
[1, "background-image: -webkit-image-set(url({./url1x.png}) 1x, url({./url2x.png}) 2x)", ""]
53+
test("-webkit-image-set", ".a { background-image: -webkit-image-set(url('url1x.png') 1x, url('url2x.png') 2x) }", [
54+
[1, ".a { background-image: -webkit-image-set(url({./url1x.png}) 1x, url({./url2x.png}) 2x) }", ""]
5555
]);
5656
});

0 commit comments

Comments
 (0)