Skip to content

feat: only traverse trailing static nodes during hydration #12935

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
Rich-Harris merged 2 commits into from
Aug 22, 2024
Merged

feat: only traverse trailing static nodes during hydration #12935

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4494268
feat: only traverse trailing static nodes during hydration
Rich-Harris Aug 20, 2024
8e28d5a
merge main
Rich-Harris Aug 21, 2024
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/quick-paws-wash.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'svelte': patch
---

feat: only traverse trailing static nodes during hydration
2 changes: 1 addition & 1 deletion packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/fragment.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ export function process_children(nodes, initial, is_element, { visit, state }) {
// traverse to the last (n - 1) one when hydrating
if (skipped > 1) {
skipped -= 1;
state.init.push(b.stmt(get_node(false)));
state.init.push(b.stmt(b.call('$.next', skipped !== 1 && b.literal(skipped))));
}
}

Expand Down
11 changes: 9 additions & 2 deletions packages/svelte/src/internal/client/dom/hydration.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,16 @@ export function hydrate_template(template) {
}
}

export function next() {
export function next(count = 1) {
if (hydrating) {
hydrate_next();
var i = count;
var node = hydrate_node;

while (i--) {
node = /** @type {TemplateNode} */ (get_next_sibling(node));
}

hydrate_node = node;
}
}

Expand Down
3 changes: 2 additions & 1 deletion packages/svelte/tests/snapshot/samples/skip-static-subtree/_expected/client/index.svelte.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import "svelte/internal/disclose-version";
import * as $ from "svelte/internal/client";

var root = $.template(`<header><nav><a href="/">Home</a> <a href="/away">Away</a></nav></header> <main><h1> </h1> <div class="static"><p>we don't need to traverse these nodes</p></div> <p>or</p> <p>these</p> <p>ones</p> <!></main> <cant-skip><custom-elements></custom-elements></cant-skip>`, 3);
var root = $.template(`<header><nav><a href="/">Home</a> <a href="/away">Away</a></nav></header> <main><h1> </h1> <div class="static"><p>we don't need to traverse these nodes</p></div> <p>or</p> <p>these</p> <p>ones</p> <!> <p>these</p> <p>trailing</p> <p>nodes</p> <p>can</p> <p>be</p> <p>completely</p> <p>ignored</p></main> <cant-skip><custom-elements></custom-elements></cant-skip>`, 3);

export default function Skip_static_subtree($$anchor, $$props) {
var fragment = root();
Expand All @@ -14,6 +14,7 @@ export default function Skip_static_subtree($$anchor, $$props) {
var node = $.sibling(h1, 10);

$.html(node, () => $$props.content, false, false);
$.next(14);
$.reset(main);

var cant_skip = $.sibling(main, 2);
Expand Down
2 changes: 1 addition & 1 deletion packages/svelte/tests/snapshot/samples/skip-static-subtree/_expected/server/index.svelte.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ import * as $ from "svelte/internal/server";
export default function Skip_static_subtree($$payload, $$props) {
let { title, content } = $$props;

$$payload.out += `<header><nav><a href="/">Home</a> <a href="/away">Away</a></nav></header> <main><h1>${$.escape(title)}</h1> <div class="static"><p>we don't need to traverse these nodes</p></div> <p>or</p> <p>these</p> <p>ones</p> ${$.html(content)}</main> <cant-skip><custom-elements with="attributes"></custom-elements></cant-skip>`;
$$payload.out += `<header><nav><a href="/">Home</a> <a href="/away">Away</a></nav></header> <main><h1>${$.escape(title)}</h1> <div class="static"><p>we don't need to traverse these nodes</p></div> <p>or</p> <p>these</p> <p>ones</p> ${$.html(content)} <p>these</p> <p>trailing</p> <p>nodes</p> <p>can</p> <p>be</p> <p>completely</p> <p>ignored</p></main> <cant-skip><custom-elements with="attributes"></custom-elements></cant-skip>`;
}
7 changes: 7 additions & 0 deletions packages/svelte/tests/snapshot/samples/skip-static-subtree/index.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,13 @@
<p>these</p>
<p>ones</p>
{@html content}
<p>these</p>
<p>trailing</p>
<p>nodes</p>
<p>can</p>
<p>be</p>
<p>completely</p>
<p>ignored</p>
</main>

<cant-skip>
Expand Down