Unverified Commit 81d4a8bd authored by Sebastian "Sebbie" Silbermann's avatar Sebastian "Sebbie" Silbermann Committed by GitHub

[dev-overlay] Move app/pages related features closers together (#80280)

pages/ and app/ now have a designated "setup" file. Makes it easier to spot their differences.

The error handling would ideally be the same between App and Pages router but it's unlikely we'll have time porting the new App Router goodies with regards to error reporting to Pages Router.
parent ea691aa5
// imports polyfill from `@next/polyfill-module` after build. // imports polyfill from `@next/polyfill-module` after build.
import '../build/polyfills/polyfill-module' import '../build/polyfills/polyfill-module'
import './components/globals/patch-console' import './components/react-dev-overlay/app/app-dev-overlay-setup'
import './components/globals/handle-global-errors'
import ReactDOMClient from 'react-dom/client' import ReactDOMClient from 'react-dom/client'
import React, { use } from 'react' import React, { use } from 'react'
......
...@@ -7,7 +7,7 @@ import { appBootstrap } from './app-bootstrap' ...@@ -7,7 +7,7 @@ import { appBootstrap } from './app-bootstrap'
import { import {
getComponentStack, getComponentStack,
getOwnerStack, getOwnerStack,
} from './components/errors/stitched-error' } from './components/react-dev-overlay/app/errors/stitched-error'
import { isRecoverableError } from './react-client-callbacks/on-recoverable-error' import { isRecoverableError } from './react-client-callbacks/on-recoverable-error'
// eslint-disable-next-line @next/internal/typechecked-require // eslint-disable-next-line @next/internal/typechecked-require
......
...@@ -2,7 +2,7 @@ import { appBootstrap } from './app-bootstrap' ...@@ -2,7 +2,7 @@ import { appBootstrap } from './app-bootstrap'
import { import {
getComponentStack, getComponentStack,
getOwnerStack, getOwnerStack,
} from './components/errors/stitched-error' } from './components/react-dev-overlay/app/errors/stitched-error'
import { isRecoverableError } from './react-client-callbacks/on-recoverable-error' import { isRecoverableError } from './react-client-callbacks/on-recoverable-error'
window.next.version += '-turbo' window.next.version += '-turbo'
......
import { handleGlobalErrors } from '../errors/use-error-handler'
handleGlobalErrors()
import { patchConsoleError } from './intercept-console-error'
patchConsoleError()
import { PureComponent } from 'react' import { PureComponent } from 'react'
import { dispatcher } from 'next/dist/compiled/next-devtools' import { dispatcher } from 'next/dist/compiled/next-devtools'
import { RuntimeErrorHandler } from '../../errors/runtime-error-handler' import { RuntimeErrorHandler } from '../runtime-error-handler'
import { ErrorBoundary } from '../../error-boundary' import { ErrorBoundary } from '../../error-boundary'
import DefaultGlobalError, { import DefaultGlobalError, {
type GlobalErrorComponent, type GlobalErrorComponent,
......
import { patchConsoleError } from './errors/intercept-console-error'
import { handleGlobalErrors } from './errors/use-error-handler'
handleGlobalErrors()
patchConsoleError()
import isError from '../../../lib/is-error' import isError from '../../../../../lib/is-error'
import { isNextRouterError } from '../is-next-router-error' import { isNextRouterError } from '../../../is-next-router-error'
import { handleConsoleError } from '../errors/use-error-handler' import { handleConsoleError } from './use-error-handler'
import { parseConsoleArgs } from '../../lib/console' import { parseConsoleArgs } from '../../../../lib/console'
export const originConsoleError = globalThis.console.error export const originConsoleError = globalThis.console.error
......
import { useEffect } from 'react' import { useEffect } from 'react'
import { handleClientError } from '../../errors/use-error-handler' import { handleClientError } from './use-error-handler'
import { isNextRouterError } from '../../is-next-router-error' import { isNextRouterError } from '../../../is-next-router-error'
import { MISSING_ROOT_TAGS_ERROR } from '../../../../shared/lib/errors/constants' import { MISSING_ROOT_TAGS_ERROR } from '../../../../../shared/lib/errors/constants'
function readSsrError(): (Error & { digest?: string }) | null { function readSsrError(): (Error & { digest?: string }) | null {
if (typeof document === 'undefined') { if (typeof document === 'undefined') {
......
import React from 'react' import React from 'react'
import isError from '../../../lib/is-error' import isError from '../../../../../lib/is-error'
const ownerStacks = new WeakMap<Error, string | null>() const ownerStacks = new WeakMap<Error, string | null>()
const componentStacks = new WeakMap<Error, string>() const componentStacks = new WeakMap<Error, string>()
......
import { useEffect } from 'react' import { useEffect } from 'react'
import { isNextRouterError } from '../is-next-router-error' import { isNextRouterError } from '../../../is-next-router-error'
import { formatConsoleArgs, parseConsoleArgs } from '../../lib/console' import { formatConsoleArgs, parseConsoleArgs } from '../../../../lib/console'
import isError from '../../../lib/is-error' import isError from '../../../../../lib/is-error'
import { createConsoleError } from './console-error' import { createConsoleError } from './console-error'
import { coerceError, setOwnerStackIfAvailable } from '../errors/stitched-error' import { coerceError, setOwnerStackIfAvailable } from './stitched-error'
const queueMicroTask = const queueMicroTask =
globalThis.queueMicrotask || ((cb: () => void) => Promise.resolve().then(cb)) globalThis.queueMicrotask || ((cb: () => void) => Promise.resolve().then(cb))
......
import React from 'react'
import { Router } from '../../../router'
import { renderPagesDevOverlay } from 'next/dist/compiled/next-devtools'
import { getComponentStack, getOwnerStack } from '../../errors/stitched-error'
import { isRecoverableError } from '../../../react-client-callbacks/on-recoverable-error'
import { getSquashedHydrationErrorDetails } from './hydration-error-state'
export const usePagesDevOverlayBridge = () => {
React.useInsertionEffect(() => {
// NDT uses a different React instance so it's not technically a state update
// scheduled from useInsertionEffect.
renderPagesDevOverlay(
getComponentStack,
getOwnerStack,
getSquashedHydrationErrorDetails,
isRecoverableError
)
}, [])
React.useEffect(() => {
const { handleStaticIndicator } =
require('../../../dev/hot-reloader/pages/hot-reloader-pages') as typeof import('../../../dev/hot-reloader/pages/hot-reloader-pages')
Router.events.on('routeChangeComplete', handleStaticIndicator)
return function () {
Router.events.off('routeChangeComplete', handleStaticIndicator)
}
}, [])
}
import { PagesDevOverlayErrorBoundary } from './pages-dev-overlay-error-boundary'
import { usePagesDevOverlayBridge } from './hooks'
export type ErrorType = 'runtime' | 'build'
export type PagesDevOverlayBridgeType = typeof PagesDevOverlayBridge
interface PagesDevOverlayBridgeProps {
children?: React.ReactNode
}
export function PagesDevOverlayBridge({
children,
}: PagesDevOverlayBridgeProps) {
usePagesDevOverlayBridge()
return <PagesDevOverlayErrorBoundary>{children}</PagesDevOverlayErrorBoundary>
}
import React from 'react'
import { renderPagesDevOverlay } from 'next/dist/compiled/next-devtools'
import { dispatcher } from 'next/dist/compiled/next-devtools' import { dispatcher } from 'next/dist/compiled/next-devtools'
import { import {
attachHydrationErrorState, attachHydrationErrorState,
storeHydrationErrorStateFromConsoleArgs, storeHydrationErrorStateFromConsoleArgs,
} from './hydration-error-state' } from './hydration-error-state'
import type { VersionInfo } from '../../../../server/dev/parse-version-info' import { Router } from '../../../router'
import type { DevIndicatorServerState } from '../../../../server/dev/dev-indicator-server-state' import { getComponentStack, getOwnerStack } from '../app/errors/stitched-error'
import { isRecoverableError } from '../../../react-client-callbacks/on-recoverable-error'
import { getSquashedHydrationErrorDetails } from './hydration-error-state'
import { PagesDevOverlayErrorBoundary } from './pages-dev-overlay-error-boundary'
const usePagesDevOverlayBridge = () => {
React.useInsertionEffect(() => {
// NDT uses a different React instance so it's not technically a state update
// scheduled from useInsertionEffect.
renderPagesDevOverlay(
getComponentStack,
getOwnerStack,
getSquashedHydrationErrorDetails,
isRecoverableError
)
}, [])
React.useEffect(() => {
const { handleStaticIndicator } =
require('../../../dev/hot-reloader/pages/hot-reloader-pages') as typeof import('../../../dev/hot-reloader/pages/hot-reloader-pages')
Router.events.on('routeChangeComplete', handleStaticIndicator)
return function () {
Router.events.off('routeChangeComplete', handleStaticIndicator)
}
}, [])
}
export type PagesDevOverlayBridgeType = typeof PagesDevOverlayBridge
interface PagesDevOverlayBridgeProps {
children?: React.ReactNode
}
export function PagesDevOverlayBridge({
children,
}: PagesDevOverlayBridgeProps) {
usePagesDevOverlayBridge()
return <PagesDevOverlayErrorBoundary>{children}</PagesDevOverlayErrorBoundary>
}
let isRegistered = false let isRegistered = false
...@@ -69,42 +112,3 @@ export function register() { ...@@ -69,42 +112,3 @@ export function register() {
window.addEventListener('unhandledrejection', onUnhandledRejection) window.addEventListener('unhandledrejection', onUnhandledRejection)
window.console.error = nextJsHandleConsoleError window.console.error = nextJsHandleConsoleError
} }
export function onBuildOk() {
dispatcher.onBuildOk()
}
export function onBuildError(message: string) {
dispatcher.onBuildError(message)
}
export function onRefresh() {
dispatcher.onRefresh()
}
export function onBeforeRefresh() {
dispatcher.onBeforeRefresh()
}
export function onVersionInfo(versionInfo: VersionInfo) {
dispatcher.onVersionInfo(versionInfo)
}
export function onStaticIndicator(isStatic: boolean) {
dispatcher.onStaticIndicator(isStatic)
}
export function onDevIndicator(devIndicatorsState: DevIndicatorServerState) {
dispatcher.onDevIndicator(devIndicatorsState)
}
export function buildingIndicatorShow() {
dispatcher.buildingIndicatorShow()
}
export function buildingIndicatorHide() {
dispatcher.buildingIndicatorHide()
}
export { getErrorByType } from '../utils/get-error-by-type'
export { getServerError } from '../utils/node-stack-frames'
...@@ -16,7 +16,6 @@ import { ...@@ -16,7 +16,6 @@ import {
type OriginalStackFramesResponse, type OriginalStackFramesResponse,
} from './shared' } from './shared'
import { middlewareResponse } from './middleware-response' import { middlewareResponse } from './middleware-response'
export { getServerError } from '../utils/node-stack-frames'
export { parseStack } from '../utils/parse-stack' export { parseStack } from '../utils/parse-stack'
export { getSourceMapFromFile } export { getSourceMapFromFile }
......
...@@ -6,7 +6,7 @@ import { parseComponentStack } from './utils/parse-component-stack' ...@@ -6,7 +6,7 @@ import { parseComponentStack } from './utils/parse-component-stack'
import type { DebugInfo } from './types' import type { DebugInfo } from './types'
import type { DevIndicatorServerState } from '../../../server/dev/dev-indicator-server-state' import type { DevIndicatorServerState } from '../../../server/dev/dev-indicator-server-state'
import { parseStack } from './utils/parse-stack' import { parseStack } from './utils/parse-stack'
import { isConsoleError } from '../errors/console-error' import { isConsoleError } from './app/errors/console-error'
type FastRefreshState = type FastRefreshState =
/** No refresh in progress. */ /** No refresh in progress. */
......
...@@ -5,7 +5,7 @@ import { ...@@ -5,7 +5,7 @@ import {
type ErrorSourceType, type ErrorSourceType,
} from '../../../../shared/lib/error-source' } from '../../../../shared/lib/error-source'
export function getFilesystemFrame(frame: StackFrame): StackFrame { function getFilesystemFrame(frame: StackFrame): StackFrame {
const f: StackFrame = { ...frame } const f: StackFrame = { ...frame }
if (typeof f.file === 'string') { if (typeof f.file === 'string') {
......
...@@ -5,13 +5,16 @@ import { useEffect, startTransition, useRef } from 'react' ...@@ -5,13 +5,16 @@ import { useEffect, startTransition, useRef } from 'react'
import stripAnsi from 'next/dist/compiled/strip-ansi' import stripAnsi from 'next/dist/compiled/strip-ansi'
import formatWebpackMessages from '../../../components/react-dev-overlay/utils/format-webpack-messages' import formatWebpackMessages from '../../../components/react-dev-overlay/utils/format-webpack-messages'
import { useRouter } from '../../../components/navigation' import { useRouter } from '../../../components/navigation'
import { REACT_REFRESH_FULL_RELOAD } from '../shared' import {
import { reportInvalidHmrMessage } from '../shared' REACT_REFRESH_FULL_RELOAD,
REACT_REFRESH_FULL_RELOAD_FROM_ERROR,
reportInvalidHmrMessage,
} from '../shared'
import { dispatcher } from 'next/dist/compiled/next-devtools' import { dispatcher } from 'next/dist/compiled/next-devtools'
import { ReplaySsrOnlyErrors } from '../../../components/react-dev-overlay/app/replay-ssr-only-errors' import { ReplaySsrOnlyErrors } from '../../../components/react-dev-overlay/app/errors/replay-ssr-only-errors'
import { AppDevOverlayErrorBoundary } from '../../../components/react-dev-overlay/app/app-dev-overlay-error-boundary' import { AppDevOverlayErrorBoundary } from '../../../components/react-dev-overlay/app/app-dev-overlay-error-boundary'
import { useErrorHandler } from '../../../components/errors/use-error-handler' import { useErrorHandler } from '../../../components/react-dev-overlay/app/errors/use-error-handler'
import { RuntimeErrorHandler } from '../../../components/errors/runtime-error-handler' import { RuntimeErrorHandler } from '../../../components/react-dev-overlay/runtime-error-handler'
import { import {
useSendMessage, useSendMessage,
useTurbopack, useTurbopack,
...@@ -23,7 +26,6 @@ import type { ...@@ -23,7 +26,6 @@ import type {
HMR_ACTION_TYPES, HMR_ACTION_TYPES,
TurbopackMsgToBrowser, TurbopackMsgToBrowser,
} from '../../../../server/dev/hot-reloader-types' } from '../../../../server/dev/hot-reloader-types'
import { REACT_REFRESH_FULL_RELOAD_FROM_ERROR } from '../shared'
import { useUntrackedPathname } from '../../../components/navigation-untracked' import { useUntrackedPathname } from '../../../components/navigation-untracked'
import type { GlobalErrorComponent } from '../../../components/global-error' import type { GlobalErrorComponent } from '../../../components/global-error'
import reportHmrLatency from '../../../components/react-dev-overlay/utils/report-hmr-latency' import reportHmrLatency from '../../../components/react-dev-overlay/utils/report-hmr-latency'
......
...@@ -32,18 +32,8 @@ ...@@ -32,18 +32,8 @@
/// <reference types="webpack/module.d.ts" /> /// <reference types="webpack/module.d.ts" />
import { import { dispatcher } from 'next/dist/compiled/next-devtools'
register, import { register } from '../../../components/react-dev-overlay/pages/pages-dev-overlay-setup'
onBuildError,
onBuildOk,
onBeforeRefresh,
onRefresh,
onVersionInfo,
onStaticIndicator,
onDevIndicator,
buildingIndicatorHide,
buildingIndicatorShow,
} from '../../../components/react-dev-overlay/pages/client'
import stripAnsi from 'next/dist/compiled/strip-ansi' import stripAnsi from 'next/dist/compiled/strip-ansi'
import { addMessageListener, sendMessage } from './websocket' import { addMessageListener, sendMessage } from './websocket'
import formatWebpackMessages from '../../../components/react-dev-overlay/utils/format-webpack-messages' import formatWebpackMessages from '../../../components/react-dev-overlay/utils/format-webpack-messages'
...@@ -52,10 +42,12 @@ import type { ...@@ -52,10 +42,12 @@ import type {
HMR_ACTION_TYPES, HMR_ACTION_TYPES,
TurbopackMsgToBrowser, TurbopackMsgToBrowser,
} from '../../../../server/dev/hot-reloader-types' } from '../../../../server/dev/hot-reloader-types'
import { REACT_REFRESH_FULL_RELOAD } from '../shared' import {
import { REACT_REFRESH_FULL_RELOAD_FROM_ERROR } from '../shared' REACT_REFRESH_FULL_RELOAD,
import { reportInvalidHmrMessage } from '../shared' REACT_REFRESH_FULL_RELOAD_FROM_ERROR,
import { RuntimeErrorHandler } from '../../../components/errors/runtime-error-handler' reportInvalidHmrMessage,
} from '../shared'
import { RuntimeErrorHandler } from '../../../components/react-dev-overlay/runtime-error-handler'
import reportHmrLatency from '../../../components/react-dev-overlay/utils/report-hmr-latency' import reportHmrLatency from '../../../components/react-dev-overlay/utils/report-hmr-latency'
import { TurbopackHmr } from '../../../components/react-dev-overlay/utils/turbopack-hot-reloader-common' import { TurbopackHmr } from '../../../components/react-dev-overlay/utils/turbopack-hot-reloader-common'
...@@ -142,7 +134,7 @@ function handleSuccess() { ...@@ -142,7 +134,7 @@ function handleSuccess() {
hmrUpdate.hasUpdates hmrUpdate.hasUpdates
) )
} }
onBuildOk() dispatcher.onBuildOk()
} else { } else {
const isHotUpdate = const isHotUpdate =
!isFirstCompilation || !isFirstCompilation ||
...@@ -209,7 +201,7 @@ function handleErrors(errors: any) { ...@@ -209,7 +201,7 @@ function handleErrors(errors: any) {
// Only show the first error. // Only show the first error.
onBuildError(formatted.errors[0]) dispatcher.onBuildError(formatted.errors[0])
// Also log them to the console. // Also log them to the console.
if (typeof console !== 'undefined' && typeof console.error === 'function') { if (typeof console !== 'undefined' && typeof console.error === 'function') {
...@@ -255,7 +247,7 @@ export function handleStaticIndicator() { ...@@ -255,7 +247,7 @@ export function handleStaticIndicator() {
window.location.pathname in isrManifest || window.location.pathname in isrManifest ||
(!isDynamicPage && !hasAppGetInitialProps) (!isDynamicPage && !hasAppGetInitialProps)
onStaticIndicator(isPageStatic) dispatcher.onStaticIndicator(isPageStatic)
} }
} }
...@@ -272,7 +264,7 @@ function processMessage(obj: HMR_ACTION_TYPES) { ...@@ -272,7 +264,7 @@ function processMessage(obj: HMR_ACTION_TYPES) {
break break
} }
case HMR_ACTIONS_SENT_TO_BROWSER.BUILDING: { case HMR_ACTIONS_SENT_TO_BROWSER.BUILDING: {
buildingIndicatorShow() dispatcher.buildingIndicatorShow()
if (process.env.TURBOPACK) { if (process.env.TURBOPACK) {
turbopackHmr!.onBuilding() turbopackHmr!.onBuilding()
...@@ -284,15 +276,15 @@ function processMessage(obj: HMR_ACTION_TYPES) { ...@@ -284,15 +276,15 @@ function processMessage(obj: HMR_ACTION_TYPES) {
} }
case HMR_ACTIONS_SENT_TO_BROWSER.BUILT: case HMR_ACTIONS_SENT_TO_BROWSER.BUILT:
case HMR_ACTIONS_SENT_TO_BROWSER.SYNC: { case HMR_ACTIONS_SENT_TO_BROWSER.SYNC: {
buildingIndicatorHide() dispatcher.buildingIndicatorHide()
if (obj.hash) handleAvailableHash(obj.hash) if (obj.hash) handleAvailableHash(obj.hash)
const { errors, warnings } = obj const { errors, warnings } = obj
// Is undefined when it's a 'built' event // Is undefined when it's a 'built' event
if ('versionInfo' in obj) onVersionInfo(obj.versionInfo) if ('versionInfo' in obj) dispatcher.onVersionInfo(obj.versionInfo)
if ('devIndicator' in obj) onDevIndicator(obj.devIndicator) if ('devIndicator' in obj) dispatcher.onDevIndicator(obj.devIndicator)
const hasErrors = Boolean(errors && errors.length) const hasErrors = Boolean(errors && errors.length)
if (hasErrors) { if (hasErrors) {
...@@ -355,7 +347,7 @@ function processMessage(obj: HMR_ACTION_TYPES) { ...@@ -355,7 +347,7 @@ function processMessage(obj: HMR_ACTION_TYPES) {
} }
case HMR_ACTIONS_SENT_TO_BROWSER.TURBOPACK_MESSAGE: { case HMR_ACTIONS_SENT_TO_BROWSER.TURBOPACK_MESSAGE: {
turbopackHmr!.onTurbopackMessage(obj) turbopackHmr!.onTurbopackMessage(obj)
onBeforeRefresh() dispatcher.onBeforeRefresh()
for (const listener of turbopackMessageListeners) { for (const listener of turbopackMessageListeners) {
listener({ listener({
type: HMR_ACTIONS_SENT_TO_BROWSER.TURBOPACK_MESSAGE, type: HMR_ACTIONS_SENT_TO_BROWSER.TURBOPACK_MESSAGE,
...@@ -366,7 +358,7 @@ function processMessage(obj: HMR_ACTION_TYPES) { ...@@ -366,7 +358,7 @@ function processMessage(obj: HMR_ACTION_TYPES) {
console.warn(REACT_REFRESH_FULL_RELOAD_FROM_ERROR) console.warn(REACT_REFRESH_FULL_RELOAD_FROM_ERROR)
performFullReload(null) performFullReload(null)
} }
onRefresh() dispatcher.onRefresh()
break break
} }
default: { default: {
...@@ -415,7 +407,7 @@ function tryApplyUpdatesWebpack() { ...@@ -415,7 +407,7 @@ function tryApplyUpdatesWebpack() {
} }
if (!isUpdateAvailable() || !canApplyUpdates()) { if (!isUpdateAvailable() || !canApplyUpdates()) {
onBuildOk() dispatcher.onBuildOk()
return return
} }
...@@ -433,7 +425,7 @@ function tryApplyUpdatesWebpack() { ...@@ -433,7 +425,7 @@ function tryApplyUpdatesWebpack() {
return return
} }
onBuildOk() dispatcher.onBuildOk()
if (isUpdateAvailable()) { if (isUpdateAvailable()) {
// While we were updating, there was a new update! Do it again. // While we were updating, there was a new update! Do it again.
...@@ -441,7 +433,7 @@ function tryApplyUpdatesWebpack() { ...@@ -441,7 +433,7 @@ function tryApplyUpdatesWebpack() {
return return
} }
onRefresh() dispatcher.onRefresh()
reportHmrLatency( reportHmrLatency(
sendMessage, sendMessage,
updatedModules, updatedModules,
...@@ -470,7 +462,7 @@ function tryApplyUpdatesWebpack() { ...@@ -470,7 +462,7 @@ function tryApplyUpdatesWebpack() {
// We should always handle an update, even if updatedModules is empty (but // We should always handle an update, even if updatedModules is empty (but
// non-null) for any reason. That's what webpack would normally do: // non-null) for any reason. That's what webpack would normally do:
// https://github.com/webpack/webpack/blob/3aa6b6bc3a64/lib/hmr/HotModuleReplacement.runtime.js#L296-L298 // https://github.com/webpack/webpack/blob/3aa6b6bc3a64/lib/hmr/HotModuleReplacement.runtime.js#L296-L298
onBeforeRefresh() dispatcher.onBeforeRefresh()
// https://webpack.js.org/api/hot-module-replacement/#apply // https://webpack.js.org/api/hot-module-replacement/#apply
return module.hot.apply() return module.hot.apply()
}) })
......
...@@ -180,7 +180,7 @@ class Container extends React.Component<{ ...@@ -180,7 +180,7 @@ class Container extends React.Component<{
return this.props.children return this.props.children
} else { } else {
const { PagesDevOverlayBridge } = const { PagesDevOverlayBridge } =
require('./components/react-dev-overlay/pages/pages-dev-overlay-bridge') as typeof import('./components/react-dev-overlay/pages/pages-dev-overlay-bridge') require('./components/react-dev-overlay/pages/pages-dev-overlay-setup') as typeof import('./components/react-dev-overlay/pages/pages-dev-overlay-setup')
return ( return (
<PagesDevOverlayBridge>{this.props.children}</PagesDevOverlayBridge> <PagesDevOverlayBridge>{this.props.children}</PagesDevOverlayBridge>
) )
...@@ -917,10 +917,9 @@ export async function hydrate(opts?: { beforeRender?: () => Promise<void> }) { ...@@ -917,10 +917,9 @@ export async function hydrate(opts?: { beforeRender?: () => Promise<void> }) {
} }
if (process.env.NODE_ENV === 'development') { if (process.env.NODE_ENV === 'development') {
const getServerError: typeof import('./components/react-dev-overlay/pages/client').getServerError = const getServerError = (
( require('./components/react-dev-overlay/utils/node-stack-frames') as typeof import('./components/react-dev-overlay/utils/node-stack-frames')
require('./components/react-dev-overlay/pages/client') as typeof import('./components/react-dev-overlay/pages/client') ).getServerError
).getServerError
// Server-side runtime errors need to be re-thrown on the client-side so // Server-side runtime errors need to be re-thrown on the client-side so
// that the overlay is rendered. // that the overlay is rendered.
if (initialErr) { if (initialErr) {
......
...@@ -11,13 +11,10 @@ import { ...@@ -11,13 +11,10 @@ import {
urlQueryToSearchParams, urlQueryToSearchParams,
} from '../shared/lib/router/utils/querystring' } from '../shared/lib/router/utils/querystring'
import { HMR_ACTIONS_SENT_TO_BROWSER } from '../server/dev/hot-reloader-types' import { HMR_ACTIONS_SENT_TO_BROWSER } from '../server/dev/hot-reloader-types'
import { RuntimeErrorHandler } from './components/errors/runtime-error-handler' import { RuntimeErrorHandler } from './components/react-dev-overlay/runtime-error-handler'
import { REACT_REFRESH_FULL_RELOAD_FROM_ERROR } from './dev/hot-reloader/shared' import { REACT_REFRESH_FULL_RELOAD_FROM_ERROR } from './dev/hot-reloader/shared'
import { performFullReload } from './dev/hot-reloader/pages/hot-reloader-pages' import { performFullReload } from './dev/hot-reloader/pages/hot-reloader-pages'
import { import { dispatcher } from 'next/dist/compiled/next-devtools'
buildingIndicatorHide,
buildingIndicatorShow,
} from './components/react-dev-overlay/pages/client'
export function pageBootstrap(assetPrefix: string) { export function pageBootstrap(assetPrefix: string) {
connectHMR({ assetPrefix, path: '/_next/webpack-hmr' }) connectHMR({ assetPrefix, path: '/_next/webpack-hmr' })
...@@ -93,8 +90,8 @@ export function pageBootstrap(assetPrefix: string) { ...@@ -93,8 +90,8 @@ export function pageBootstrap(assetPrefix: string) {
if (!router.clc && pages.includes(router.pathname)) { if (!router.clc && pages.includes(router.pathname)) {
console.log('Refreshing page data due to server-side change') console.log('Refreshing page data due to server-side change')
buildingIndicatorShow() dispatcher.buildingIndicatorShow()
const clearIndicator = buildingIndicatorHide const clearIndicator = dispatcher.buildingIndicatorHide
router router
.replace( .replace(
......
...@@ -5,12 +5,12 @@ import { ...@@ -5,12 +5,12 @@ import {
setOwnerStackIfAvailable, setOwnerStackIfAvailable,
setComponentStack, setComponentStack,
coerceError, coerceError,
} from '../components/errors/stitched-error' } from '../components/react-dev-overlay/app/errors/stitched-error'
import { handleClientError } from '../components/errors/use-error-handler' import { handleClientError } from '../components/react-dev-overlay/app/errors/use-error-handler'
import { isNextRouterError } from '../components/is-next-router-error' import { isNextRouterError } from '../components/is-next-router-error'
import { isBailoutToCSRError } from '../../shared/lib/lazy-dynamic/bailout-to-csr' import { isBailoutToCSRError } from '../../shared/lib/lazy-dynamic/bailout-to-csr'
import { reportGlobalError } from './report-global-error' import { reportGlobalError } from './report-global-error'
import { originConsoleError } from '../components/globals/intercept-console-error' import { originConsoleError } from '../components/react-dev-overlay/app/errors/intercept-console-error'
import { ErrorBoundaryHandler } from '../components/error-boundary' import { ErrorBoundaryHandler } from '../components/error-boundary'
import DefaultErrorBoundary from '../components/global-error' import DefaultErrorBoundary from '../components/global-error'
......
...@@ -6,7 +6,7 @@ import { ...@@ -6,7 +6,7 @@ import {
setOwnerStackIfAvailable, setOwnerStackIfAvailable,
setComponentStack, setComponentStack,
coerceError, coerceError,
} from '../components/errors/stitched-error' } from '../components/react-dev-overlay/app/errors/stitched-error'
import isError from '../../lib/is-error' import isError from '../../lib/is-error'
import { reportGlobalError } from './report-global-error' import { reportGlobalError } from './report-global-error'
......
...@@ -68,7 +68,7 @@ import type { ServerOnInstrumentationRequestError } from '../app-render/types' ...@@ -68,7 +68,7 @@ import type { ServerOnInstrumentationRequestError } from '../app-render/types'
import type { ServerComponentsHmrCache } from '../response-cache' import type { ServerComponentsHmrCache } from '../response-cache'
import { logRequests } from './log-requests' import { logRequests } from './log-requests'
import { FallbackMode } from '../../lib/fallback' import { FallbackMode } from '../../lib/fallback'
import type { PagesDevOverlayBridgeType } from '../../client/components/react-dev-overlay/pages/pages-dev-overlay-bridge' import type { PagesDevOverlayBridgeType } from '../../client/components/react-dev-overlay/pages/pages-dev-overlay-setup'
import { import {
ensureInstrumentationRegistered, ensureInstrumentationRegistered,
getInstrumentationModule, getInstrumentationModule,
...@@ -79,7 +79,7 @@ let PagesDevOverlayBridgeImpl: PagesDevOverlayBridgeType ...@@ -79,7 +79,7 @@ let PagesDevOverlayBridgeImpl: PagesDevOverlayBridgeType
const ReactDevOverlay: PagesDevOverlayBridgeType = (props) => { const ReactDevOverlay: PagesDevOverlayBridgeType = (props) => {
if (PagesDevOverlayBridgeImpl === undefined) { if (PagesDevOverlayBridgeImpl === undefined) {
PagesDevOverlayBridgeImpl = ( PagesDevOverlayBridgeImpl = (
require('../../client/components/react-dev-overlay/pages/pages-dev-overlay-bridge') as typeof import('../../client/components/react-dev-overlay/pages/pages-dev-overlay-bridge') require('../../client/components/react-dev-overlay/pages/pages-dev-overlay-setup') as typeof import('../../client/components/react-dev-overlay/pages/pages-dev-overlay-setup')
).PagesDevOverlayBridge ).PagesDevOverlayBridge
} }
return React.createElement(PagesDevOverlayBridgeImpl, props) return React.createElement(PagesDevOverlayBridgeImpl, props)
......
...@@ -103,7 +103,7 @@ import { ReflectAdapter } from './web/spec-extension/adapters/reflect' ...@@ -103,7 +103,7 @@ import { ReflectAdapter } from './web/spec-extension/adapters/reflect'
import { getCacheControlHeader } from './lib/cache-control' import { getCacheControlHeader } from './lib/cache-control'
import { getErrorSource } from '../shared/lib/error-source' import { getErrorSource } from '../shared/lib/error-source'
import type { DeepReadonly } from '../shared/lib/deep-readonly' import type { DeepReadonly } from '../shared/lib/deep-readonly'
import type { PagesDevOverlayBridgeType } from '../client/components/react-dev-overlay/pages/pages-dev-overlay-bridge' import type { PagesDevOverlayBridgeType } from '../client/components/react-dev-overlay/pages/pages-dev-overlay-setup'
import { getScriptNonceFromHeader } from './app-render/get-script-nonce-from-header' import { getScriptNonceFromHeader } from './app-render/get-script-nonce-from-header'
let tryGetPreviewData: typeof import('./api-utils/node/try-get-preview-data').tryGetPreviewData let tryGetPreviewData: typeof import('./api-utils/node/try-get-preview-data').tryGetPreviewData
......
...@@ -7,7 +7,7 @@ import type { CloneableBody } from './body-streams' ...@@ -7,7 +7,7 @@ import type { CloneableBody } from './body-streams'
import type { RouteMatch } from './route-matches/route-match' import type { RouteMatch } from './route-matches/route-match'
import type { NEXT_RSC_UNION_QUERY } from '../client/components/app-router-headers' import type { NEXT_RSC_UNION_QUERY } from '../client/components/app-router-headers'
import type { ServerComponentsHmrCache } from './response-cache' import type { ServerComponentsHmrCache } from './response-cache'
import type { PagesDevOverlayBridgeType } from '../client/components/react-dev-overlay/pages/pages-dev-overlay-bridge' import type { PagesDevOverlayBridgeType } from '../client/components/react-dev-overlay/pages/pages-dev-overlay-setup'
// FIXME: (wyattjoh) this is a temporary solution to allow us to pass data between bundled modules // FIXME: (wyattjoh) this is a temporary solution to allow us to pass data between bundled modules
export const NEXT_REQUEST_META = Symbol.for('NextInternalRequestMeta') export const NEXT_REQUEST_META = Symbol.for('NextInternalRequestMeta')
......
...@@ -33,19 +33,19 @@ interface ModuleContext { ...@@ -33,19 +33,19 @@ interface ModuleContext {
warnedEvals: Set<string> warnedEvals: Set<string>
} }
let getServerError: typeof import('../../../client/components/react-dev-overlay/server/middleware-webpack').getServerError let getServerError: typeof import('../../../client/components/react-dev-overlay/utils/node-stack-frames').getServerError
let decorateServerError: typeof import('../../../shared/lib/error-source').decorateServerError let decorateServerError: typeof import('../../../shared/lib/error-source').decorateServerError
if (process.env.NODE_ENV === 'development') { if (process.env.NODE_ENV === 'development') {
const middleware = getServerError = (
require('../../../client/components/react-dev-overlay/server/middleware-webpack') as typeof import('../../../client/components/react-dev-overlay/server/middleware-webpack') require('../../../client/components/react-dev-overlay/utils/node-stack-frames') as typeof import('../../../client/components/react-dev-overlay/utils/node-stack-frames') as typeof import('../../../client/components/react-dev-overlay/utils/node-stack-frames')
getServerError = middleware.getServerError ).getServerError
decorateServerError = ( decorateServerError = (
require('../../../shared/lib/error-source') as typeof import('../../../shared/lib/error-source') require('../../../shared/lib/error-source') as typeof import('../../../shared/lib/error-source')
).decorateServerError ).decorateServerError
} else { } else {
getServerError = (error: Error, _: string) => error getServerError = (error) => error
decorateServerError = (_: Error, __: string) => {} decorateServerError = () => {}
} }
/** /**
......
...@@ -44,7 +44,7 @@ type RunnerFn = (params: RunnerFnParams) => Promise<FetchEventResult> ...@@ -44,7 +44,7 @@ type RunnerFn = (params: RunnerFnParams) => Promise<FetchEventResult>
function withTaggedErrors(fn: RunnerFn): RunnerFn { function withTaggedErrors(fn: RunnerFn): RunnerFn {
if (process.env.NODE_ENV === 'development') { if (process.env.NODE_ENV === 'development') {
const { getServerError } = const { getServerError } =
require('../../../client/components/react-dev-overlay/server/middleware-webpack') as typeof import('../../../client/components/react-dev-overlay/server/middleware-webpack') require('../../../client/components/react-dev-overlay/utils/node-stack-frames') as typeof import('../../../client/components/react-dev-overlay/utils/node-stack-frames')
return (params) => return (params) =>
fn(params) fn(params)
......
...@@ -37,10 +37,33 @@ describe('browser-chunks', () => { ...@@ -37,10 +37,33 @@ describe('browser-chunks', () => {
it('must not bundle any dev overlay into browser chunks', () => { it('must not bundle any dev overlay into browser chunks', () => {
const devOverlaySources = sources.filter((source) => { const devOverlaySources = sources.filter((source) => {
return ( return (
/webpack:\/\/_N_E\/(\.\.\/)*src\/client\/components\/react-dev-overlay\//.test( (/webpack:\/\/_N_E\/(\.\.\/)*src\/client\/components\/react-dev-overlay\//.test(
source source
) || ) ||
/next\/dist\/(esm\/)?client\/components\/react-dev-overlay/.test(source) /next\/dist\/(esm\/)?client\/components\/react-dev-overlay/.test(
source
)) &&
!(
// This is not dev-overlay frontend code.
// TODO: Move code into dedicated folder to make distinction clearer.
(
source.endsWith(
'client/components/react-dev-overlay/app/errors/use-error-handler.ts'
) ||
source.endsWith(
'client/components/react-dev-overlay/app/errors/stitched-error.ts'
) ||
source.endsWith(
'client/components/react-dev-overlay/app/app-dev-overlay-setup.ts'
) ||
source.endsWith(
'client/components/react-dev-overlay/app/errors/console-error.ts'
) ||
source.endsWith(
'client/components/react-dev-overlay/app/errors/intercept-console-error.ts'
)
)
)
) )
}) })
......
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