Skip to content

Save bytes on hydration 2.0 #4894

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
JoviDeCroock merged 5 commits into from
Aug 22, 2025
+23 −21
Merged

Save bytes on hydration 2.0 #4894

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4280a9e
Save bytes on hydration 2.0
JoviDeCroock Aug 20, 2025
a728eef
Check truthy instead
JoviDeCroock Aug 20, 2025
c287114
We already assign to newvnode._dom in catch
JoviDeCroock Aug 20, 2025
83827a5
Always remove comments from excessDomChildren
JoviDeCroock Aug 20, 2025
86dedc6
Save 1 byte by not casting
JoviDeCroock Aug 20, 2025
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
44 changes: 23 additions & 21 deletions src/diff/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,14 @@ export function diff(
if (newVNode.constructor != UNDEFINED) return NULL;

// If the previous diff bailed out, resume creating/hydrating.
if (oldVNode._flags & MODE_SUSPENDED) {
isHydrating = !!(oldVNode._flags & MODE_HYDRATE);
if (oldVNode._component._excess) {
Copy link
Member

@rschristian rschristian Aug 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have yet to dig into an attempt to reproduce but the removal of this check is causing CI failures in iso. Was it intentionally removed? I'd think we'd still need it.

excessDomChildren = oldVNode._component._excess;
oldDom = newVNode._dom = oldVNode._dom = excessDomChildren[0];
oldVNode._component._excess = null;
}
if (
oldVNode._flags & MODE_SUSPENDED &&
// @ts-expect-error This is 1 or 0 (true or false)
(isHydrating = oldVNode._flags & MODE_HYDRATE)
) {
excessDomChildren = oldVNode._component._excess;
oldDom = excessDomChildren[0];
oldVNode._component._excess = NULL;
}

if ((tmp = options._diff)) tmp(newVNode);
Expand Down Expand Up @@ -311,7 +312,7 @@ export function diff(
if (isHydrating || excessDomChildren != NULL) {
if (e.then) {
let commentMarkersToFind = 0,
done = false;
done;

newVNode._flags |= isHydrating
? MODE_HYDRATE | MODE_SUSPENDED
Expand All @@ -329,21 +330,22 @@ export function diff(
// We exclude the open and closing marker from
// the future excessDomChildren but any nested one
// needs to be included for future suspensions.
if (child.nodeType == 8 && child.data == '$s') {
if (commentMarkersToFind > 0) {
newVNode._component._excess.push(child);
}
commentMarkersToFind++;
excessDomChildren[i] = NULL;
} else if (child.nodeType == 8 && child.data == '/$s') {
commentMarkersToFind--;
if (commentMarkersToFind > 0) {
newVNode._component._excess.push(child);
if (child.nodeType == 8) {
if (child.data == '$s') {
if (commentMarkersToFind) {
newVNode._component._excess.push(child);
}
commentMarkersToFind++;
} else if (child.data == '/$s') {
commentMarkersToFind--;
if (commentMarkersToFind) {
newVNode._component._excess.push(child);
}
done = commentMarkersToFind == 0;
oldDom = excessDomChildren[i];
}
done = commentMarkersToFind === 0;
oldDom = excessDomChildren[i];
excessDomChildren[i] = NULL;
} else if (commentMarkersToFind > 0) {
} else if (commentMarkersToFind) {
newVNode._component._excess.push(child);
excessDomChildren[i] = NULL;
}
Expand Down
Loading