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

Skip client-side data-fetching after ssr error #51377

Merged
merged 11 commits into from
Feb 8, 2024
Merged

Skip client-side data-fetching after ssr error #51377

Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d0c3989
remove error message from renderError
tills13 Jun 15, 2023
9ce50de
feat: skip error page re-render for ssr errors
tills13 Jun 16, 2023
4c3b553
feat: error hydration tests
tills13 Jun 26, 2023
4c090aa
Merge branch 'canary' into remove-error-page-debug
tills13 Aug 18, 2023
265306c
Merge branch 'canary' into remove-error-page-debug
tills13 Sep 27, 2023
f3c8e7c
Merge branch 'canary' into remove-error-page-debug
tills13 Sep 27, 2023
30c7c36
Merge branch 'canary' into remove-error-page-debug
tills13 Oct 17, 2023
2fa566d
Merge branch 'canary' into remove-error-page-debug
ijjk Feb 7, 2024
f34ac34
fix(WIP): top-level error results in no Component
tills13 Feb 7, 2024
4bdbb25
fix: tests
tills13 Feb 7, 2024
8710a55
Merge branch 'canary' into remove-error-page-debug
ijjk Feb 7, 2024
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
8 changes: 7 additions & 1 deletion packages/next/src/client/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ __webpack_require__.miniCssF = addChunkSuffix(getMiniCssFilename)
type RenderRouteInfo = PrivateRouteInfo & {
App: AppComponent
scroll?: { x: number; y: number } | null
isHydratePass?: boolean
}
type RenderErrorProps = Omit<RenderRouteInfo, 'Component' | 'styleSheets'>
type RegisterFn = (input: [string, () => void]) => void
Expand Down Expand Up @@ -761,7 +762,11 @@ function doRender(input: RenderRouteInfo): Promise<any> {
}

async function render(renderingProps: RenderRouteInfo): Promise<void> {
if (renderingProps.err) {
// if an error occurs in a server-side page (e.g. in getInitialProps),
// skip re-rendering the error page client-side as data-fetching operations
// will already have been done on the server and NEXT_DATA contains the correct
// data for straight-forward hydration of the error page
if (renderingProps.err && !renderingProps.isHydratePass) {
await renderError(renderingProps)
return
}
Expand Down Expand Up @@ -930,6 +935,7 @@ export async function hydrate(opts?: { beforeRender?: () => Promise<void> }) {
Component: CachedComponent,
props: initialData.props,
err: initialErr,
isHydratePass: true,
}

if (opts?.beforeRender) {
Expand Down