Skip to content

fix: ensure comma is also pruned if necessary #14032

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
Oct 30, 2024
+43 −11
Merged

fix: ensure comma is also pruned if necessary #14032

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
12 changes: 8 additions & 4 deletions packages/svelte/src/compiler/phases/3-transform/css/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,11 +214,15 @@ const visitors = {
state.code.overwrite(i, i + 1, '*/');
}
} else {
prune_start = selector.start;

if (!state.minify) {
if (i === 0) {
if (i === 0) {
if (state.minify) {
prune_start = selector.start;
} else {
state.code.prependRight(selector.start, '/* (unused) ');
}
} else {
if (state.minify) {
prune_start = last;
} else {
state.code.overwrite(last, selector.start, ' /* (unused) ');
}
Expand Down
8 changes: 8 additions & 0 deletions packages/svelte/tests/server-side-rendering/samples/css-injected-options-minify/_config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { test } from '../../test';

export default test({
// test checks that minification works correctly
compileOptions: {
css: 'external'
}
});
1 change: 1 addition & 0 deletions ...ges/svelte/tests/server-side-rendering/samples/css-injected-options-minify/_expected.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<!--[--><div class="foo svelte-mnmfn6">foo</div><!--]-->
1 change: 1 addition & 0 deletions ...velte/tests/server-side-rendering/samples/css-injected-options-minify/_expected_head.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<style id="svelte-mnmfn6">.foo.svelte-mnmfn6 {color:green;}.foo.svelte-mnmfn6 {color:green;}</style>
23 changes: 23 additions & 0 deletions packages/svelte/tests/server-side-rendering/samples/css-injected-options-minify/main.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<svelte:options css="injected" />

<div class="foo">foo</div>

<style>
.foo {
color: green;
}
.unused {
color: red;
}
.unused {
.nested-unused {
color: red;
}
}
.unused:has(.unused) {
color: red;
}
.foo, .unused {
color: green;
}
</style>
5 changes: 0 additions & 5 deletions ...ages/svelte/tests/server-side-rendering/samples/css-injected-options-nested/Nested.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,4 @@
.bar {
color: red;
}
.unused {
.also-unused {
color: green;
}
}
</style>
2 changes: 1 addition & 1 deletion ...ges/svelte/tests/server-side-rendering/samples/css-injected-options-nested/_expected.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!--[--><div class="bar svelte-1fs6vx">bar</div><!----> <div class="foo svelte-sg04hs">foo</div><!--]-->
<!--[--><div class="bar svelte-ievf05">bar</div><!----> <div class="foo svelte-sg04hs">foo</div><!--]-->
2 changes: 1 addition & 1 deletion ...velte/tests/server-side-rendering/samples/css-injected-options-nested/_expected_head.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<style id="svelte-1fs6vx">.bar.svelte-1fs6vx {color:red;}</style>
<style id="svelte-ievf05">.bar.svelte-ievf05 {color:red;}</style>