Skip to content

refactor: evaluate values before extracting imports #403

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

Closed
wants to merge 1 commit into from
Closed

refactor: evaluate values before extracting imports #403

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 @@ -164,8 +164,8 @@ module.exports = function processCss(inputSource, inputMap, options, callback) {
return url;
}
}),
extractImports(),
modulesValues,
extractImports(),
modulesScope({
generateScopedName: function generateScopedName (exportName) {
return customGetLocalIdent(options.loaderContext, localIdentName, exportName, {
Expand Down
31 changes: 31 additions & 0 deletions test/localTest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,37 @@ describe("local", function() {
}
}
});
testLocal("composes from import in @value", "@value colors: './colors.css';.className { composes: blue from colors; text-align: right; }", [
[2, "._blue { color: blue; }", ""],
[1, "._className { text-align: right; }", ""]
], {
"colors": "'./colors.css'",
"className": "_className _blue"
}, "?module&localIdentName=_[local]", {
"./colors.css": (function() {
var r = [ [2, "._blue { color: blue; }", ""] ];
r.locals = {
blue: "_blue"
};
return r;
}())
});
testLocal("composes from @value imported in @value", "@value colors: './colors.css';@value blue from colors;.className { composes: blue; text-align: right; }", [
[2, "._blue { color: blue; }", ""],
[1, "._className { text-align: right; }", ""]
], {
"colors": "'./colors.css'",
"blue": "_blue",
"className": "_className _blue"
}, "?module&localIdentName=_[local]", {
"./colors.css": (function() {
var r = [ [2, "._blue { color: blue; }", ""] ];
r.locals = {
blue: "_blue"
};
return r;
}())
});
testLocal("issue-109", ".bar-1 { color: red; }", [
[1, ".file--bar-1--2JvfJ { color: red; }", ""]
], {
Expand Down