Unverified Commit 13a9fb99 authored by Jiachi Liu's avatar Jiachi Liu Committed by GitHub

Align onRecoverableError callback between pages and app dir (#44161)

Should not re-throw the error on client for errors from
`onRecoverableError` callback in pages, this PR share it as a same
callback between pages and app dir

follow up for #42589
parent 6827b586
...@@ -7,7 +7,7 @@ import { createFromReadableStream } from 'next/dist/compiled/react-server-dom-we ...@@ -7,7 +7,7 @@ import { createFromReadableStream } from 'next/dist/compiled/react-server-dom-we
import { HeadManagerContext } from '../shared/lib/head-manager-context' import { HeadManagerContext } from '../shared/lib/head-manager-context'
import { GlobalLayoutRouterContext } from '../shared/lib/app-router-context' import { GlobalLayoutRouterContext } from '../shared/lib/app-router-context'
import { NEXT_DYNAMIC_NO_SSR_CODE } from '../shared/lib/no-ssr-error' import onRecoverableError from './on-recoverable-error'
/// <reference types="react-dom/experimental" /> /// <reference types="react-dom/experimental" />
...@@ -130,23 +130,6 @@ if (document.readyState === 'loading') { ...@@ -130,23 +130,6 @@ if (document.readyState === 'loading') {
DOMContentLoaded() DOMContentLoaded()
} }
function onRecoverableError(err: any) {
// Using default react onRecoverableError
// x-ref: https://github.com/facebook/react/blob/d4bc16a7d69eb2ea38a88c8ac0b461d5f72cdcab/packages/react-dom/src/client/ReactDOMRoot.js#L83
const defaultOnRecoverableError =
typeof reportError === 'function'
? // In modern browsers, reportError will dispatch an error event,
// emulating an uncaught JavaScript error.
reportError
: (error: any) => {
window.console.error(error)
}
// Skip certain custom errors which are not expected to be reported on client
if (err.digest === NEXT_DYNAMIC_NO_SSR_CODE) return
defaultOnRecoverableError(err)
}
const nextServerDataLoadingGlobal = ((self as any).__next_f = const nextServerDataLoadingGlobal = ((self as any).__next_f =
(self as any).__next_f || []) (self as any).__next_f || [])
nextServerDataLoadingGlobal.forEach(nextServerDataCallback) nextServerDataLoadingGlobal.forEach(nextServerDataCallback)
......
...@@ -43,7 +43,7 @@ import { ...@@ -43,7 +43,7 @@ import {
PathnameContextProviderAdapter, PathnameContextProviderAdapter,
} from '../shared/lib/router/adapters' } from '../shared/lib/router/adapters'
import { SearchParamsContext } from '../shared/lib/hooks-client-context' import { SearchParamsContext } from '../shared/lib/hooks-client-context'
import { NEXT_DYNAMIC_NO_SSR_CODE } from '../shared/lib/no-ssr-error' import onRecoverableError from './on-recoverable-error'
/// <reference types="react-dom/experimental" /> /// <reference types="react-dom/experimental" />
...@@ -507,11 +507,7 @@ function renderReactElement( ...@@ -507,11 +507,7 @@ function renderReactElement(
if (!reactRoot) { if (!reactRoot) {
// Unlike with createRoot, you don't need a separate root.render() call here // Unlike with createRoot, you don't need a separate root.render() call here
reactRoot = ReactDOM.hydrateRoot(domEl, reactEl, { reactRoot = ReactDOM.hydrateRoot(domEl, reactEl, {
onRecoverableError(err: any) { onRecoverableError,
// Skip certain custom errors which are not expected to throw on client
if (err.message === NEXT_DYNAMIC_NO_SSR_CODE) return
throw err
},
}) })
// TODO: Remove shouldHydrate variable when React 18 is stable as it can depend on `reactRoot` existing // TODO: Remove shouldHydrate variable when React 18 is stable as it can depend on `reactRoot` existing
shouldHydrate = false shouldHydrate = false
......
import { NEXT_DYNAMIC_NO_SSR_CODE } from '../shared/lib/no-ssr-error'
export default function onRecoverableError(err: any) {
// Using default react onRecoverableError
// x-ref: https://github.com/facebook/react/blob/d4bc16a7d69eb2ea38a88c8ac0b461d5f72cdcab/packages/react-dom/src/client/ReactDOMRoot.js#L83
const defaultOnRecoverableError =
typeof reportError === 'function'
? // In modern browsers, reportError will dispatch an error event,
// emulating an uncaught JavaScript error.
reportError
: (error: any) => {
window.console.error(error)
}
// Skip certain custom errors which are not expected to be reported on client
if (err.digest === NEXT_DYNAMIC_NO_SSR_CODE) return
defaultOnRecoverableError(err)
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment