msb-public
/
svelte
mirror of https://github.com/sveltejs/svelte
1
0
Code Issues Projects Releases Wiki Activity

fix some stuff

Browse Source
pull/14456/head
Rich Harris 2 years ago
parent bef6c15f69
commit 3d961f5db5
7 changed files with 38 additions and 40 deletions
Show Stats Download Patch File Download Diff File

8
packages/svelte/src/compiler/phases/2-analyze/css/css-prune.js
Unescape View File

@ -898,6 +898,14 @@ function get_possible_element_siblings(node, adjacent_only) {
if (!current) break; if (!current) break;
if (
current.type === 'Component' ||
current.type === 'SvelteComponent' ||
current.type === 'SvelteSelf'
) {
continue;
}
if (current.type === 'SnippetBlock') { if (current.type === 'SnippetBlock') {
for (const site of current.metadata.sites) { for (const site of current.metadata.sites) {
const siblings = get_possible_element_siblings(site, adjacent_only); const siblings = get_possible_element_siblings(site, adjacent_only);

22
packages/svelte/tests/css/samples/general-siblings-combinator-slot/_config.js
Unescape View File

@ -2,12 +2,6 @@ import { test } from '../../test';
export default test({ export default test({
warnings: [ warnings: [
{
code: 'css_unused_selector',
message: 'Unused CSS selector ".a ~ .b"',
start: { character: 110, column: 1, line: 10 },
end: { character: 117, column: 8, line: 10 }
},
{ {
code: 'css_unused_selector', code: 'css_unused_selector',
message: 'Unused CSS selector ".b ~ .c"', message: 'Unused CSS selector ".b ~ .c"',
@ -17,26 +11,26 @@ export default test({
{ {
code: 'css_unused_selector', code: 'css_unused_selector',
message: 'Unused CSS selector ".c ~ .f"', message: 'Unused CSS selector ".c ~ .f"',
start: { character: 164, column: 1, line: 12 }, start: { character: 162, column: 1, line: 12 },
end: { character: 171, column: 8, line: 12 } end: { character: 169, column: 8, line: 12 }
}, },
{ {
code: 'css_unused_selector', code: 'css_unused_selector',
message: 'Unused CSS selector ".f ~ .g"', message: 'Unused CSS selector ".f ~ .g"',
start: { character: 191, column: 1, line: 13 }, start: { character: 187, column: 1, line: 13 },
end: { character: 198, column: 8, line: 13 } end: { character: 194, column: 8, line: 13 }
}, },
{ {
code: 'css_unused_selector', code: 'css_unused_selector',
message: 'Unused CSS selector ".b ~ .f"', message: 'Unused CSS selector ".b ~ .f"',
start: { character: 218, column: 1, line: 14 }, start: { character: 212, column: 1, line: 14 },
end: { character: 225, column: 8, line: 14 } end: { character: 219, column: 8, line: 14 }
}, },
{ {
code: 'css_unused_selector', code: 'css_unused_selector',
message: 'Unused CSS selector ".b ~ .g"', message: 'Unused CSS selector ".b ~ .g"',
start: { character: 245, column: 1, line: 15 }, start: { character: 237, column: 1, line: 15 },
end: { character: 252, column: 8, line: 15 } end: { character: 244, column: 8, line: 15 }
} }
] ]
}); });

13
packages/svelte/tests/css/samples/general-siblings-combinator-slot/expected.css
Unescape View File

@ -1,10 +1,11 @@
.d.svelte-xyz ~ .e:where(.svelte-xyz) { color: green; } .d.svelte-xyz ~ .e:where(.svelte-xyz) { color: green; }
.a.svelte-xyz ~ .g:where(.svelte-xyz) { color: green; } .a.svelte-xyz ~ .g:where(.svelte-xyz) { color: green; }
.a.svelte-xyz ~ .b:where(.svelte-xyz) { color: green; }
/* no match */ /* no match */
/* (unused) .a ~ .b { color: green; }*/ /* (unused) .b ~ .c { color: red; }*/
/* (unused) .b ~ .c { color: green; }*/ /* (unused) .c ~ .f { color: red; }*/
/* (unused) .c ~ .f { color: green; }*/ /* (unused) .f ~ .g { color: red; }*/
/* (unused) .f ~ .g { color: green; }*/ /* (unused) .b ~ .f { color: red; }*/
/* (unused) .b ~ .f { color: green; }*/ /* (unused) .b ~ .g { color: red; }*/
/* (unused) .b ~ .g { color: green; }*/

12
packages/svelte/tests/css/samples/general-siblings-combinator-slot/input.svelte
Unescape View File

@ -5,14 +5,14 @@
<style> <style>
.d ~ .e { color: green; } .d ~ .e { color: green; }
.a ~ .g { color: green; } .a ~ .g { color: green; }
.a ~ .b { color: green; }
/* no match */ /* no match */
.a ~ .b { color: green; } .b ~ .c { color: red; }
.b ~ .c { color: green; } .c ~ .f { color: red; }
.c ~ .f { color: green; } .f ~ .g { color: red; }
.f ~ .g { color: green; } .b ~ .f { color: red; }
.b ~ .f { color: green; } .b ~ .g { color: red; }
.b ~ .g { color: green; }
</style> </style>
<div class="a"></div> <div class="a"></div>

10
packages/svelte/tests/css/samples/siblings-combinator-slot/_config.js
Unescape View File

@ -2,12 +2,6 @@ import { test } from '../../test';
export default test({ export default test({
warnings: [ warnings: [
{
code: 'css_unused_selector',
message: 'Unused CSS selector ".a + .b"',
start: { character: 83, column: 1, line: 9 },
end: { character: 90, column: 8, line: 9 }
},
{ {
code: 'css_unused_selector', code: 'css_unused_selector',
message: 'Unused CSS selector ".b + .c"', message: 'Unused CSS selector ".b + .c"',
@ -17,8 +11,8 @@ export default test({
{ {
code: 'css_unused_selector', code: 'css_unused_selector',
message: 'Unused CSS selector ".c + .f"', message: 'Unused CSS selector ".c + .f"',
start: { character: 137, column: 1, line: 11 }, start: { character: 135, column: 1, line: 11 },
end: { character: 144, column: 8, line: 11 } end: { character: 142, column: 8, line: 11 }
} }
] ]
}); });

7
packages/svelte/tests/css/samples/siblings-combinator-slot/expected.css
Unescape View File

@ -1,6 +1,7 @@
.d.svelte-xyz + .e:where(.svelte-xyz) { color: green; } .d.svelte-xyz + .e:where(.svelte-xyz) { color: green; }
.a.svelte-xyz + .b:where(.svelte-xyz) { color: green; }
/* no match */ /* no match */
/* (unused) .a + .b { color: green; }*/ /* (unused) .b + .c { color: red; }*/
/* (unused) .b + .c { color: green; }*/ /* (unused) .c + .f { color: red; }*/
/* (unused) .c + .f { color: green; }*/

6
packages/svelte/tests/css/samples/siblings-combinator-slot/input.svelte
Unescape View File

@ -4,11 +4,11 @@
<style> <style>
.d + .e { color: green; } .d + .e { color: green; }
.a + .b { color: green; }
/* no match */ /* no match */
.a + .b { color: green; } .b + .c { color: red; }
.b + .c { color: green; } .c + .f { color: red; }
.c + .f { color: green; }
</style> </style>
<div class="a"></div> <div class="a"></div>

Write Preview
Loading…
Cancel
Save