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

fix: don't use EnsureResources for development 404 page #10625

Merged
merged 1 commit into from
Dec 24, 2018
Merged

fix: don't use EnsureResources for development 404 page #10625

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
34 changes: 17 additions & 17 deletions packages/gatsby/cache-dir/root.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,27 +64,27 @@ class RouteHandler extends React.Component {
)
} else {
const dev404Page = pages.find(p => /^\/dev-404-page\/?$/.test(p.path))
const custom404 = locationAndPageResources =>
loader.getPage(`/404.html`) ? (
<JSONStore
pages={pages}
{...this.props}
{...locationAndPageResources}
/>
) : null
const Dev404Page = syncRequires.components[dev404Page.componentChunkName]

if (!loader.getPage(`/404.html`)) {
return <Dev404Page pages={pages} {...this.props} />
}

return (
<EnsureResources location={location}>
{locationAndPageResources =>
createElement(
syncRequires.components[dev404Page.componentChunkName],
{
pages,
custom404: custom404(locationAndPageResources),
...this.props,
{locationAndPageResources => (
<Dev404Page
pages={pages}
custom404={
<JSONStore
pages={pages}
{...this.props}
{...locationAndPageResources}
/>
}
)
}
{...this.props}
/>
)}
</EnsureResources>
)
}
Expand Down