Skip to content
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

Jump to bottom

Hydrate using SuspenseComponent as the parent #22582

Merged
merged 6 commits into from
Oct 19, 2021
Merged

Hydrate using SuspenseComponent as the parent #22582

merged 6 commits into from
Oct 19, 2021

Commits on Oct 18, 2021

  1. Add a failing test for Suspense hydration

    @gaearon @sebmarkbage
    gaearon authored and sebmarkbage committed Oct 18, 2021
    Configuration menu
    Copy the full SHA
    547f9b9 View commit details
    Browse the repository at this point in the history

  2. Include salazarm's changes to the test

    @sebmarkbage
    sebmarkbage committed Oct 18, 2021
    Configuration menu
    Copy the full SHA
    3323e34 View commit details
    Browse the repository at this point in the history

  3. The hydration parent of a suspense boundary should be the boundary it… 

    …self

This eventually got set when we popped back out of its children but it
doesn't start out that way.

This fixes it so that the boundary parent is always the suspense boundary.
    @sebmarkbage
    sebmarkbage committed Oct 18, 2021
    Configuration menu
    Copy the full SHA
    561ad73 View commit details
    Browse the repository at this point in the history

  4. We now need to log errors with a suspense boundary as a parent 

    For now, we just log this with commentNode.parentNode as the parent for
purposes of the error message.
    @sebmarkbage
    sebmarkbage committed Oct 18, 2021
    Configuration menu
    Copy the full SHA
    eb4bf18 View commit details
    Browse the repository at this point in the history

  5. Make a special getFirstHydratableChildWithinSuspenseInstance 

    We currently call getNextHydratableSibling but conceptually it's the child
of the boundary. It just happens to be that when we use comment nodes, we
need to call nextSibling in the DOM.

This makes this separation a bit clearer.
    @sebmarkbage
    sebmarkbage committed Oct 18, 2021
    Configuration menu
    Copy the full SHA
    aaaf984 View commit details
    Browse the repository at this point in the history

  6. Sync old fork

    @sebmarkbage
    sebmarkbage committed Oct 18, 2021
    Configuration menu
    Copy the full SHA
    593e5d1 View commit details
    Browse the repository at this point in the history