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

fix(gatsby): Always render the body component to ensure needed head & pre/post body components are added #29077

Merged
merged 2 commits into from
Jan 18, 2021
Merged

fix(gatsby): Always render the body component to ensure needed head & pre/post body components are added #29077

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4dc93b
fix(gatsby): Always render the body component to ensure needed head &…
KyleAMathews Jan 18, 2021
e759217
fix lint
KyleAMathews Jan 18, 2021
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
20 changes: 15 additions & 5 deletions packages/gatsby/cache-dir/ssr-develop-static-entry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,10 +193,20 @@ export default (pagePath, isClientOnlyPage, callback) => {
: undefined,
}

const pageElement = createElement(
syncRequires.ssrComponents[componentChunkName],
props
)
let pageElement
if (
syncRequires.ssrComponents[componentChunkName] &&
!isClientOnlyPage
) {
pageElement = createElement(
syncRequires.ssrComponents[componentChunkName],
props
)
} else {
// If this is a client-only page or the pageComponent didn't finish
// compiling yet, just render an empty component.
pageElement = () => null
}

const wrappedPage = apiRunner(
`wrapPageElement`,
Expand Down Expand Up @@ -276,7 +286,7 @@ export default (pagePath, isClientOnlyPage, callback) => {
return bodyHtml
}

const bodyStr = isClientOnlyPage ? `` : generateBodyHTML()
const bodyStr = generateBodyHTML()

const htmlElement = React.createElement(Html, {
...bodyProps,
Expand Down