Skip to content

Fix broken composition with class names that contain characters other than [A-Za-z0-9_] #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 14, 2015
Merged

Fix broken composition with class names that contain characters other than [A-Za-z0-9_] #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/processCss.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ var parserPlugin = postcss.plugin("css-loader-parser", function(options) {
var urlItems = [];

function replaceImportsInString(str) {
var tokens = str.split(/(\w+)/);
var tokens = str.split(/(\S+)/);
tokens = tokens.map(function(token) {
var importIndex = imports["$" + token];
if(typeof importIndex === "number") {
Expand Down
27 changes: 27 additions & 0 deletions test/localTest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,33 @@ describe("local", function() {
return r;
}())
});
testLocal("composes class with hyphen from module", [
":local(.c1) { composes: c-2 from \"./module\"; b: 1; }",
":local(.c3) { composes: c1; b: 3; }",
":local(.c5) { composes: c-2 c4 from \"./module\"; b: 5; }"
].join("\n"), [
[2, ".test{c: d}", ""],
[1, [
"._c1 { b: 1; }",
"._c3 { b: 3; }",
"._c5 { b: 5; }"
].join("\n"), ""]
], {
c1: "_c1 imported-c-2",
c3: "_c3 _c1 imported-c-2",
c5: "_c5 imported-c-2 imported-c4"
}, "?localIdentName=_[local]", {
"./module": (function() {
var r = [
[2, ".test{c: d}", ""]
];
r.locals = {
"c-2": "imported-c-2",
c4: "imported-c4"
};
return r;
}())
});
testLocal("composes class from module with import", [
"@import url(\"module\");",
":local(.c1) { composes: c2 c3 from \"./module\"; composes: c4 from \"./module\"; b: 1; }"
Expand Down