Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
33 changes: 21 additions & 12 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -137,21 +137,28 @@ const plugin = (options = {}) => {
case "selector":
node.nodes = node.map((item) => localizeNode(item));
return node;
case "class":
case "class": {
const scopedName = exportScopedName(
node.value,
node.raws && node.raws.value ? node.raws.value : null,
node
);

return selectorParser.className({
value: exportScopedName(
node.value,
node.raws && node.raws.value ? node.raws.value : null,
node
),
value: unescape(scopedName),
raws: { value: scopedName },
});
}
case "id": {
const scopedName = exportScopedName(
node.value,
node.raws && node.raws.value ? node.raws.value : null,
node
);

return selectorParser.id({
value: exportScopedName(
node.value,
node.raws && node.raws.value ? node.raws.value : null,
node
),
value: unescape(scopedName),
raws: { value: scopedName },
});
}
case "attribute": {
Expand Down Expand Up @@ -190,7 +197,9 @@ const plugin = (options = {}) => {
nextNode &&
nextNode.type === "combinator" &&
nextNode.value === " " &&
/\\[A-F0-9]{1,6}$/.test(selector.last.value)
/\\[A-F0-9]{1,6}$/.test(
selector.last.stringifyProperty("value")
)
) {
selector.last.spaces.after = " ";
}
Expand Down
29 changes: 29 additions & 0 deletions test/test-cases/escaped-scoped-names/expected.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
.a\+x\/y\=\= {
color: red;
}

#b\+x\/y\=\= {
color: red;
}

.a\+x\/y\=\= .c\+x\/y\=\= {
color: red;
}

.a\+x\/y\=\=.c\+x\/y\=\= {
color: red;
}

.a\+x\/y\=\= > #b\+x\/y\=\= {
color: red;
}

.global .a\+x\/y\=\= .global {
color: red;
}

:export {
a: a+x/y==;
b: b+x/y==;
c: c+x/y==;
}
6 changes: 6 additions & 0 deletions test/test-cases/escaped-scoped-names/options.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
module.exports = {
// Return names that are already escaped for CSS, as css-loader does.
generateScopedName: function (name) {
return String.raw`${name}\+x\/y\=\=`;
},
};
23 changes: 23 additions & 0 deletions test/test-cases/escaped-scoped-names/source.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
:local(.a) {
color: red;
}

:local(#b) {
color: red;
}

:local(.a) :local(.c) {
color: red;
}

:local(.a):local(.c) {
color: red;
}

:local(.a) > :local(#b) {
color: red;
}

.global :local(.a) .global {
color: red;
}