Skip to content

fix: html tag hydration: regard empty claimed_nodes array as content mismatch. fixes #6832 #9184

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 4 commits into from
Nov 10, 2023
Merged

fix: html tag hydration: regard empty claimed_nodes array as content mismatch. fixes #6832 #9184

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f59bf85
fix html tag hydration
kelvinsjk Oct 19, 2023
b4c1695
fix linting/formatting with prettier
kelvinsjk Oct 19, 2023
778ef8d
Update packages/svelte/test/hydration/samples/html-tag-hydration/_bef…
dummdidumm Nov 10, 2023
23688da
Update packages/svelte/test/hydration/samples/html-tag-hydration/_bef…
dummdidumm Nov 10, 2023
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/spicy-shrimps-divide.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'svelte': patch
---

fix: more robust hydration of html tag
3 changes: 3 additions & 0 deletions packages/svelte/src/runtime/internal/dom.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -807,6 +807,9 @@ export function claim_html_tag(nodes, is_svg) {
detach(html_tag_nodes[0]);
detach(html_tag_nodes[html_tag_nodes.length - 1]);
const claimed_nodes = html_tag_nodes.slice(1, html_tag_nodes.length - 1);
if (claimed_nodes.length === 0) {
return new HtmlTagHydration(is_svg);
}
for (const n of claimed_nodes) {
n.claim_order = nodes.claim_info.total_claimed;
nodes.claim_info.total_claimed += 1;
Expand Down
1 change: 1 addition & 0 deletions packages/svelte/test/hydration/samples/html-tag-hydration/_after.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1 2 3
3 changes: 3 additions & 0 deletions packages/svelte/test/hydration/samples/html-tag-hydration/_before.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
1
<!-- HTML_TAG_START -->2<!-- HTML_TAG_END -->
3
5 changes: 5 additions & 0 deletions packages/svelte/test/hydration/samples/html-tag-hydration/main.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<script>
const a = 1, b=2, c=3;
</script>

{a} {@html b} {c}