Skip to content

fix(gatsby): React 18 Hydration with offline plugin #35319

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
LekoArts merged 1 commit into from
Apr 4, 2022
Merged

fix(gatsby): React 18 Hydration with offline plugin #35319

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 14 additions & 1 deletion packages/gatsby/cache-dir/production-app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,15 @@ setLoader(loader)
loader.setApiRunner(apiRunner)

let reactHydrate
let reactRender
if (HAS_REACT_18) {
const reactDomClient = require(`react-dom/client`)
reactRender = (Component, el) =>
reactDomClient.createRoot(el).render(Component)
reactHydrate = (Component, el) => reactDomClient.hydrateRoot(el, Component)
} else {
const reactDomClient = require(`react-dom`)
reactRender = reactDomClient.render
reactHydrate = reactDomClient.hydrate
}

Expand Down Expand Up @@ -258,10 +262,19 @@ apiRunnerAsync(`onClientEntry`).then(() => {
return <GatsbyRoot>{SiteRoot}</GatsbyRoot>
}

const focusEl = document.getElementById(`gatsby-focus-wrapper`)

// Client only pages have any empty body so we just do a normal
// render to avoid React complaining about hydration mis-matches.
let defaultRenderer = reactRender
if (focusEl && focusEl.children.length) {
defaultRenderer = reactHydrate
}

const renderer = apiRunner(
`replaceHydrateFunction`,
undefined,
reactHydrate
defaultRenderer
)[0]

function runRender() {
Expand Down