Skip to content
Merged
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
5 changes: 5 additions & 0 deletions .changeset/eighty-icons-fold.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'svelte': patch
---

fix: preserve the separator between selectors when an unused selector is in between
16 changes: 12 additions & 4 deletions packages/svelte/src/compiler/phases/3-transform/css/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -196,12 +196,13 @@ const visitors = {
SelectorList(node, { state, next, path }) {
// Only add comments if we're not inside a complex selector that itself is unused
if (!path.find((n) => n.type === 'ComplexSelector' && !n.metadata.used)) {
const children = node.children;
let pruning = false;
let prune_start = node.children[0].start;
let prune_start = children[0].start;
let last = prune_start;

for (let i = 0; i < node.children.length; i += 1) {
const selector = node.children[i];
for (let i = 0; i < children.length; i += 1) {
const selector = children[i];

if (selector.metadata.used === pruning) {
if (pruning) {
Expand All @@ -221,10 +222,17 @@ const visitors = {
state.code.prependRight(selector.start, '/* (unused) ');
}
} else {
// If this is not the last selector add a separator
const separator = i !== children.length - 1 ? ',' : '';

if (state.minify) {
prune_start = last;
if (separator) {
while (state.code.original[prune_start - 1] !== ',') prune_start++;
state.code.update(last, prune_start, separator);
}
} else {
state.code.overwrite(last, selector.start, ' /* (unused) ');
state.code.overwrite(last, selector.start, `${separator} /* (unused) `);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import { test } from '../../test';

export default test({
warnings: [
{
code: 'css_unused_selector',
end: {
character: 72,
column: 3,
line: 10
},
message: 'Unused CSS selector "h4"',
start: {
character: 70,
column: 1,
line: 10
}
}
]
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@

h1.svelte-xyz,
h2.svelte-xyz,
h3.svelte-xyz, /* (unused) h4*/
p.svelte-xyz {
color: red;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<h1>h1</h1>
<h2>h2</h2>
<h3>h3</h3>
<p>p</p>

<style>
h1,
h2,
h3,
h4,
p {
color: red;
}
</style>
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!--[--><div class="foo svelte-mnmfn6">foo</div><!--]-->
<!--[--><div class="foo svelte-gfnjhw">foo</div><!--]-->
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<style id="svelte-mnmfn6">.foo.svelte-mnmfn6 {color:green;}.foo.svelte-mnmfn6 {color:green;}</style>
<style id="svelte-gfnjhw">.foo.svelte-gfnjhw {color:green;}.foo.svelte-gfnjhw {color:green;} .foo.svelte-gfnjhw {color:green;}.foo.svelte-gfnjhw, .foo.svelte-gfnjhw {color:green;}</style>
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,10 @@
.foo, .unused {
color: green;
}
.unused, .foo {
color: green;
}
.foo, .unused, .foo {
color: green;
}
</style>