Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,8 @@ export const usePagesDevOverlay = () => {
}
}, [dispatch])

const onComponentError = React.useCallback(
(_error: Error, _componentStack: string | null) => {
// TODO: special handling
},
[]
)

return {
state,
onComponentError,
dispatch,
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import React from 'react'

type PagesDevOverlayErrorBoundaryProps = {
children?: React.ReactNode
onError: (error: Error, componentStack: string | null) => void
}
type PagesDevOverlayErrorBoundaryState = { error: Error | null }

Expand All @@ -16,13 +15,7 @@ export class PagesDevOverlayErrorBoundary extends React.PureComponent<
return { error }
}

componentDidCatch(
error: Error,
// Loosely typed because it depends on the React version and was
// accidentally excluded in some versions.
errorInfo?: { componentStack?: string | null }
) {
this.props.onError(error, errorInfo?.componentStack || null)
componentDidCatch(error: Error) {
this.setState({ error })
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ interface PagesDevOverlayProps {
}

export function PagesDevOverlay({ children }: PagesDevOverlayProps) {
const { state, dispatch, onComponentError } = usePagesDevOverlay()
const { state, dispatch } = usePagesDevOverlay()

return (
<>
<PagesDevOverlayErrorBoundary onError={onComponentError}>
<PagesDevOverlayErrorBoundary>
{children ?? null}
</PagesDevOverlayErrorBoundary>

Expand Down
24 changes: 12 additions & 12 deletions test/development/acceptance/hydration-error.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ describe('Error overlay for hydration errors in Pages router', () => {
<AppContainer>
<Container fn={function fn}>
<PagesDevOverlay>
<PagesDevOverlayErrorBoundary onError={function usePagesDevOverlay.useCallback[onComponentError]}>
<PagesDevOverlayErrorBoundary>
<PathnameContextProviderAdapter router={{sdc:{},sbc:{}, ...}} isAutoExport={true}>
<App pageProps={{}} Component={function Mismatch} err={undefined} router={{sdc:{},sbc:{}, ...}}>
<Mismatch>
Expand Down Expand Up @@ -211,7 +211,7 @@ describe('Error overlay for hydration errors in Pages router', () => {
<AppContainer>
<Container fn={function fn}>
<PagesDevOverlay>
<PagesDevOverlayErrorBoundary onError={function usePagesDevOverlay.useCallback[onComponentError]}>
<PagesDevOverlayErrorBoundary>
<PathnameContextProviderAdapter router={{sdc:{},sbc:{}, ...}} isAutoExport={true}>
<App pageProps={{}} Component={function Mismatch} err={undefined} router={{sdc:{},sbc:{}, ...}}>
<Mismatch>
Expand Down Expand Up @@ -302,7 +302,7 @@ describe('Error overlay for hydration errors in Pages router', () => {
<AppContainer>
<Container fn={function fn}>
<PagesDevOverlay>
<PagesDevOverlayErrorBoundary onError={function usePagesDevOverlay.useCallback[onComponentError]}>
<PagesDevOverlayErrorBoundary>
<PathnameContextProviderAdapter router={{sdc:{},sbc:{}, ...}} isAutoExport={true}>
<App pageProps={{}} Component={function Mismatch} err={undefined} router={{sdc:{},sbc:{}, ...}}>
<Mismatch>
Expand Down Expand Up @@ -378,7 +378,7 @@ describe('Error overlay for hydration errors in Pages router', () => {
<AppContainer>
<Container fn={function fn}>
<PagesDevOverlay>
<PagesDevOverlayErrorBoundary onError={function usePagesDevOverlay.useCallback[onComponentError]}>
<PagesDevOverlayErrorBoundary>
<PathnameContextProviderAdapter router={{sdc:{},sbc:{}, ...}} isAutoExport={true}>
<App pageProps={{}} Component={function Mismatch} err={undefined} router={{sdc:{},sbc:{}, ...}}>
<Mismatch>
Expand Down Expand Up @@ -449,7 +449,7 @@ describe('Error overlay for hydration errors in Pages router', () => {
<AppContainer>
<Container fn={function fn}>
<PagesDevOverlay>
<PagesDevOverlayErrorBoundary onError={function usePagesDevOverlay.useCallback[onComponentError]}>
<PagesDevOverlayErrorBoundary>
<PathnameContextProviderAdapter router={{sdc:{},sbc:{}, ...}} isAutoExport={true}>
<App pageProps={{}} Component={function Mismatch} err={undefined} router={{sdc:{},sbc:{}, ...}}>
<Mismatch>
Expand Down Expand Up @@ -539,7 +539,7 @@ describe('Error overlay for hydration errors in Pages router', () => {
"componentStack": "...
<Container fn={function fn}>
<PagesDevOverlay>
<PagesDevOverlayErrorBoundary onError={function usePagesDevOverlay.useCallback[onComponentError]}>
<PagesDevOverlayErrorBoundary>
<PathnameContextProviderAdapter router={{sdc:{},sbc:{}, ...}} isAutoExport={true}>
<App pageProps={{}} Component={function Page} err={undefined} router={{sdc:{},sbc:{}, ...}}>
<Page>
Expand Down Expand Up @@ -628,7 +628,7 @@ describe('Error overlay for hydration errors in Pages router', () => {
<AppContainer>
<Container fn={function fn}>
<PagesDevOverlay>
<PagesDevOverlayErrorBoundary onError={function usePagesDevOverlay.useCallback[onComponentError]}>
<PagesDevOverlayErrorBoundary>
<PathnameContextProviderAdapter router={{sdc:{},sbc:{}, ...}} isAutoExport={true}>
<App pageProps={{}} Component={function Page} err={undefined} router={{sdc:{},sbc:{}, ...}}>
<Page>
Expand Down Expand Up @@ -722,7 +722,7 @@ describe('Error overlay for hydration errors in Pages router', () => {
{
"componentStack": "...
<PagesDevOverlay>
<PagesDevOverlayErrorBoundary onError={function usePagesDevOverlay.useCallback[onComponentError]}>
<PagesDevOverlayErrorBoundary>
<PathnameContextProviderAdapter router={{sdc:{},sbc:{}, ...}} isAutoExport={true}>
<App pageProps={{}} Component={function Mismatch} err={undefined} router={{sdc:{},sbc:{}, ...}}>
<Mismatch>
Expand Down Expand Up @@ -846,7 +846,7 @@ describe('Error overlay for hydration errors in Pages router', () => {
<AppContainer>
<Container fn={function fn}>
<PagesDevOverlay>
<PagesDevOverlayErrorBoundary onError={function usePagesDevOverlay.useCallback[onComponentError]}>
<PagesDevOverlayErrorBoundary>
<PathnameContextProviderAdapter router={{sdc:{},sbc:{}, ...}} isAutoExport={true}>
<App pageProps={{}} Component={function Page} err={undefined} router={{sdc:{},sbc:{}, ...}}>
<Page>
Expand Down Expand Up @@ -940,7 +940,7 @@ describe('Error overlay for hydration errors in Pages router', () => {
"componentStack": "...
<Container fn={function fn}>
<PagesDevOverlay>
<PagesDevOverlayErrorBoundary onError={function usePagesDevOverlay.useCallback[onComponentError]}>
<PagesDevOverlayErrorBoundary>
<PathnameContextProviderAdapter router={{sdc:{},sbc:{}, ...}} isAutoExport={true}>
<App pageProps={{}} Component={function Page} err={undefined} router={{sdc:{},sbc:{}, ...}}>
<Page>
Expand Down Expand Up @@ -1026,7 +1026,7 @@ describe('Error overlay for hydration errors in Pages router', () => {
<AppContainer>
<Container fn={function fn}>
<PagesDevOverlay>
<PagesDevOverlayErrorBoundary onError={function usePagesDevOverlay.useCallback[onComponentError]}>
<PagesDevOverlayErrorBoundary>
<PathnameContextProviderAdapter router={{sdc:{},sbc:{}, ...}} isAutoExport={true}>
<App pageProps={{}} Component={function Page} err={undefined} router={{sdc:{},sbc:{}, ...}}>
<Page>
Expand Down Expand Up @@ -1120,7 +1120,7 @@ describe('Error overlay for hydration errors in Pages router', () => {
<AppContainer>
<Container fn={function fn}>
<PagesDevOverlay>
<PagesDevOverlayErrorBoundary onError={function usePagesDevOverlay.useCallback[onComponentError]}>
<PagesDevOverlayErrorBoundary>
<PathnameContextProviderAdapter router={{sdc:{},sbc:{}, ...}} isAutoExport={true}>
<App pageProps={{}} Component={function Page} err={undefined} router={{sdc:{},sbc:{}, ...}}>
<Page>
Expand Down
Loading