Skip to content

Commit 3c0b7f0

Browse files
jhefferman-sfdcjhefferman-sfdc
authored
fix: dudupe light scoped issue, hydration coverage (#5438)
* fix: dudupe light scoped issue, hydration coverage * fix: prettier, dedicated dedupe test * fix: missing tests * fix: review comments
1 parent 081ce3f commit 3c0b7f0

File tree

19 files changed

+131
-73
lines changed

19 files changed

+131
-73
lines changed

‎packages/@lwc/engine-server/src/__tests__/fixtures/attribute-class/with-scoped-styles-only-in-child/dynamic/expected.html‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</x-child>
1818
<x-child class="lwc-5h3d35cke7v-host" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
1919
<template shadowrootmode="open">
20-
<lwc-style style-id="lwc-style--0">
20+
<lwc-style class="lwc-5h3d35cke7v" style-id="lwc-style--0">
2121
</lwc-style>
2222
<div class="lwc-5h3d35cke7v">
2323
</div>
@@ -29,7 +29,7 @@
2929
</x-child>
3030
<x-child class="lwc-5h3d35cke7v-host" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
3131
<template shadowrootmode="open">
32-
<lwc-style style-id="lwc-style--0">
32+
<lwc-style class="lwc-5h3d35cke7v" style-id="lwc-style--0">
3333
</lwc-style>
3434
<div class="lwc-5h3d35cke7v">
3535
</div>
@@ -41,7 +41,7 @@
4141
</x-child>
4242
<x-child class="lwc-5h3d35cke7v-host" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
4343
<template shadowrootmode="open">
44-
<lwc-style style-id="lwc-style--0">
44+
<lwc-style class="lwc-5h3d35cke7v" style-id="lwc-style--0">
4545
</lwc-style>
4646
<div class="lwc-5h3d35cke7v">
4747
</div>
@@ -53,7 +53,7 @@
5353
</x-child>
5454
<x-child class="lwc-5h3d35cke7v-host" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
5555
<template shadowrootmode="open">
56-
<lwc-style style-id="lwc-style--0">
56+
<lwc-style class="lwc-5h3d35cke7v" style-id="lwc-style--0">
5757
</lwc-style>
5858
<div class="lwc-5h3d35cke7v">
5959
</div>
@@ -65,7 +65,7 @@
6565
</x-child>
6666
<x-child class="lwc-5h3d35cke7v-host" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
6767
<template shadowrootmode="open">
68-
<lwc-style style-id="lwc-style--0">
68+
<lwc-style class="lwc-5h3d35cke7v" style-id="lwc-style--0">
6969
</lwc-style>
7070
<div class="lwc-5h3d35cke7v">
7171
</div>
@@ -77,7 +77,7 @@
7777
</x-child>
7878
<x-child class="lwc-5h3d35cke7v-host" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
7979
<template shadowrootmode="open">
80-
<lwc-style style-id="lwc-style--0">
80+
<lwc-style class="lwc-5h3d35cke7v" style-id="lwc-style--0">
8181
</lwc-style>
8282
<div class="lwc-5h3d35cke7v">
8383
</div>
@@ -89,7 +89,7 @@
8989
</x-child>
9090
<x-child class="lwc-5h3d35cke7v-host" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
9191
<template shadowrootmode="open">
92-
<lwc-style style-id="lwc-style--0">
92+
<lwc-style class="lwc-5h3d35cke7v" style-id="lwc-style--0">
9393
</lwc-style>
9494
<div class="lwc-5h3d35cke7v">
9595
</div>
@@ -101,7 +101,7 @@
101101
</x-child>
102102
<x-child class="lwc-5h3d35cke7v-host" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
103103
<template shadowrootmode="open">
104-
<lwc-style style-id="lwc-style--0">
104+
<lwc-style class="lwc-5h3d35cke7v" style-id="lwc-style--0">
105105
</lwc-style>
106106
<div class="lwc-5h3d35cke7v">
107107
</div>
@@ -113,7 +113,7 @@
113113
</x-child>
114114
<x-child class="lwc-5h3d35cke7v-host" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
115115
<template shadowrootmode="open">
116-
<lwc-style style-id="lwc-style--0">
116+
<lwc-style class="lwc-5h3d35cke7v" style-id="lwc-style--0">
117117
</lwc-style>
118118
<div class="lwc-5h3d35cke7v">
119119
</div>
@@ -125,7 +125,7 @@
125125
</x-child>
126126
<x-child class="lwc-5h3d35cke7v-host" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
127127
<template shadowrootmode="open">
128-
<lwc-style style-id="lwc-style--0">
128+
<lwc-style class="lwc-5h3d35cke7v" style-id="lwc-style--0">
129129
</lwc-style>
130130
<div class="bar foo lwc-5h3d35cke7v">
131131
</div>
@@ -137,7 +137,7 @@
137137
</x-child>
138138
<x-child class="lwc-5h3d35cke7v-host" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
139139
<template shadowrootmode="open">
140-
<lwc-style style-id="lwc-style--0">
140+
<lwc-style class="lwc-5h3d35cke7v" style-id="lwc-style--0">
141141
</lwc-style>
142142
<div class="baz foo lwc-5h3d35cke7v">
143143
</div>
@@ -149,7 +149,7 @@
149149
</x-child>
150150
<x-child class="lwc-5h3d35cke7v-host" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
151151
<template shadowrootmode="open">
152-
<lwc-style style-id="lwc-style--0">
152+
<lwc-style class="lwc-5h3d35cke7v" style-id="lwc-style--0">
153153
</lwc-style>
154154
<div class="bar foo lwc-5h3d35cke7v">
155155
</div>
@@ -161,7 +161,7 @@
161161
</x-child>
162162
<x-child class="lwc-5h3d35cke7v-host" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
163163
<template shadowrootmode="open">
164-
<lwc-style style-id="lwc-style--0">
164+
<lwc-style class="lwc-5h3d35cke7v" style-id="lwc-style--0">
165165
</lwc-style>
166166
<div class="bar foo lwc-5h3d35cke7v">
167167
</div>
@@ -173,7 +173,7 @@
173173
</x-child>
174174
<x-child class="lwc-5h3d35cke7v-host" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
175175
<template shadowrootmode="open">
176-
<lwc-style style-id="lwc-style--0">
176+
<lwc-style class="lwc-5h3d35cke7v" style-id="lwc-style--0">
177177
</lwc-style>
178178
<div class="BaR FOO lwc-5h3d35cke7v">
179179
</div>
@@ -185,7 +185,7 @@
185185
</x-child>
186186
<x-child class="lwc-5h3d35cke7v-host" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
187187
<template shadowrootmode="open">
188-
<lwc-style style-id="lwc-style--0">
188+
<lwc-style class="lwc-5h3d35cke7v" style-id="lwc-style--0">
189189
</lwc-style>
190190
<div class="foo lwc-5h3d35cke7v">
191191
</div>
@@ -197,7 +197,7 @@
197197
</x-child>
198198
<x-child class="lwc-5h3d35cke7v-host" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
199199
<template shadowrootmode="open">
200-
<lwc-style style-id="lwc-style--0">
200+
<lwc-style class="lwc-5h3d35cke7v" style-id="lwc-style--0">
201201
</lwc-style>
202202
<div class="foo lwc-5h3d35cke7v">
203203
</div>
@@ -209,7 +209,7 @@
209209
</x-child>
210210
<x-child class="lwc-5h3d35cke7v-host" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
211211
<template shadowrootmode="open">
212-
<lwc-style style-id="lwc-style--0">
212+
<lwc-style class="lwc-5h3d35cke7v" style-id="lwc-style--0">
213213
</lwc-style>
214214
<div class="&quot;'<&amp; lwc-5h3d35cke7v">
215215
</div>

‎packages/@lwc/engine-server/src/__tests__/fixtures/attribute-class/with-scoped-styles-only-in-child/static/expected.html‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,71 +13,71 @@
1313
</x-child>
1414
<x-child class="lwc-5h3d35cke7v-host" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
1515
<template shadowrootmode="open">
16-
<lwc-style style-id="lwc-style--0">
16+
<lwc-style class="lwc-5h3d35cke7v" style-id="lwc-style--0">
1717
</lwc-style>
1818
<div class="lwc-5h3d35cke7v">
1919
</div>
2020
</template>
2121
</x-child>
2222
<x-child class="lwc-5h3d35cke7v-host" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
2323
<template shadowrootmode="open">
24-
<lwc-style style-id="lwc-style--0">
24+
<lwc-style class="lwc-5h3d35cke7v" style-id="lwc-style--0">
2525
</lwc-style>
2626
<div class="lwc-5h3d35cke7v">
2727
</div>
2828
</template>
2929
</x-child>
3030
<x-child class="foo lwc-5h3d35cke7v-host" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
3131
<template shadowrootmode="open">
32-
<lwc-style style-id="lwc-style--0">
32+
<lwc-style class="lwc-5h3d35cke7v" style-id="lwc-style--0">
3333
</lwc-style>
3434
<div class="lwc-5h3d35cke7v">
3535
</div>
3636
</template>
3737
</x-child>
3838
<x-child class="foo lwc-5h3d35cke7v-host" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
3939
<template shadowrootmode="open">
40-
<lwc-style style-id="lwc-style--0">
40+
<lwc-style class="lwc-5h3d35cke7v" style-id="lwc-style--0">
4141
</lwc-style>
4242
<div class="lwc-5h3d35cke7v">
4343
</div>
4444
</template>
4545
</x-child>
4646
<x-child class="bar foo lwc-5h3d35cke7v-host" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
4747
<template shadowrootmode="open">
48-
<lwc-style style-id="lwc-style--0">
48+
<lwc-style class="lwc-5h3d35cke7v" style-id="lwc-style--0">
4949
</lwc-style>
5050
<div class="lwc-5h3d35cke7v">
5151
</div>
5252
</template>
5353
</x-child>
5454
<x-child class="bar foo lwc-5h3d35cke7v-host" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
5555
<template shadowrootmode="open">
56-
<lwc-style style-id="lwc-style--0">
56+
<lwc-style class="lwc-5h3d35cke7v" style-id="lwc-style--0">
5757
</lwc-style>
5858
<div class="lwc-5h3d35cke7v">
5959
</div>
6060
</template>
6161
</x-child>
6262
<x-child class="BAR BaZ FoA lwc-5h3d35cke7v-host" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
6363
<template shadowrootmode="open">
64-
<lwc-style style-id="lwc-style--0">
64+
<lwc-style class="lwc-5h3d35cke7v" style-id="lwc-style--0">
6565
</lwc-style>
6666
<div class="lwc-5h3d35cke7v">
6767
</div>
6868
</template>
6969
</x-child>
7070
<x-child class="lwc-5h3d35cke7v-host tabs" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
7171
<template shadowrootmode="open">
72-
<lwc-style style-id="lwc-style--0">
72+
<lwc-style class="lwc-5h3d35cke7v" style-id="lwc-style--0">
7373
</lwc-style>
7474
<div class="lwc-5h3d35cke7v">
7575
</div>
7676
</template>
7777
</x-child>
7878
<x-child class="lwc-5h3d35cke7v-host newlines" data-lwc-host-scope-token="lwc-5h3d35cke7v-host">
7979
<template shadowrootmode="open">
80-
<lwc-style style-id="lwc-style--0">
80+
<lwc-style class="lwc-5h3d35cke7v" style-id="lwc-style--0">
8181
</lwc-style>
8282
<div class="lwc-5h3d35cke7v">
8383
</div>

0 commit comments

Comments
 (0)