fixup! [dev-overlay] Remove unused code

Author: eps1lon

packages/next/src/client/app-index.tsx

@@ -1,8 +1,7 @@
 // imports polyfill from `@next/polyfill-module` after build.
 import '../build/polyfills/polyfill-module'
 
-import './components/globals/patch-console'
-import './components/globals/handle-global-errors'
+import './components/react-dev-overlay/app/app-dev-overlay-setup'
 
 import ReactDOMClient from 'react-dom/client'
 import React, { use } from 'react'

packages/next/src/client/app-next-dev.ts

@@ -7,7 +7,7 @@ import { appBootstrap } from './app-bootstrap'
 import {
   getComponentStack,
   getOwnerStack,
-} from './components/errors/stitched-error'
+} from './components/react-dev-overlay/app/errors/stitched-error'
 import { isRecoverableError } from './react-client-callbacks/on-recoverable-error'
 
 // eslint-disable-next-line @next/internal/typechecked-require

packages/next/src/client/app-next-turbopack.ts

@@ -2,7 +2,7 @@ import { appBootstrap } from './app-bootstrap'
 import {
   getComponentStack,
   getOwnerStack,
-} from './components/errors/stitched-error'
+} from './components/react-dev-overlay/app/errors/stitched-error'
 import { isRecoverableError } from './react-client-callbacks/on-recoverable-error'
 
 window.next.version += '-turbo'

packages/next/src/client/components/globals/handle-global-errors.ts

@@ -1,6 +1,6 @@
 import { PureComponent } from 'react'
 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 DefaultGlobalError, {
   type GlobalErrorComponent,

packages/next/src/client/components/globals/patch-console.ts

@@ -0,0 +1,5 @@
+import { patchConsoleError } from './errors/intercept-console-error'
+import { handleGlobalErrors } from './errors/use-error-handler'
+
+handleGlobalErrors()
+patchConsoleError()

packages/next/src/client/components/react-dev-overlay/app/app-dev-overlay-error-boundary.tsx

@@ -1,7 +1,7 @@
-import isError from '../../../lib/is-error'
-import { isNextRouterError } from '../is-next-router-error'
-import { handleConsoleError } from '../errors/use-error-handler'
-import { parseConsoleArgs } from '../../lib/console'
+import isError from '../../../../../lib/is-error'
+import { isNextRouterError } from '../../../is-next-router-error'
+import { handleConsoleError } from './use-error-handler'
+import { parseConsoleArgs } from '../../../../lib/console'
 
 export const originConsoleError = globalThis.console.error
 

packages/next/src/client/components/react-dev-overlay/app/app-dev-overlay-setup.ts

@@ -1,7 +1,7 @@
 import { useEffect } from 'react'
-import { handleClientError } from '../../errors/use-error-handler'
-import { isNextRouterError } from '../../is-next-router-error'
-import { MISSING_ROOT_TAGS_ERROR } from '../../../../shared/lib/errors/constants'
+import { handleClientError } from './use-error-handler'
+import { isNextRouterError } from '../../../is-next-router-error'
+import { MISSING_ROOT_TAGS_ERROR } from '../../../../../shared/lib/errors/constants'
 
 function readSsrError(): (Error & { digest?: string }) | null {
   if (typeof document === 'undefined') {

packages/next/src/client/components/errors/console-error.ts renamed to packages/next/src/client/components/react-dev-overlay/app/errors/console-error.ts

@@ -1,5 +1,5 @@
 import React from 'react'
-import isError from '../../../lib/is-error'
+import isError from '../../../../../lib/is-error'
 
 const ownerStacks = new WeakMap<Error, string | null>()
 const componentStacks = new WeakMap<Error, string>()

packages/next/src/client/components/globals/intercept-console-error.ts renamed to packages/next/src/client/components/react-dev-overlay/app/errors/intercept-console-error.ts

@@ -1,9 +1,9 @@
 import { useEffect } from 'react'
-import { isNextRouterError } from '../is-next-router-error'
-import { formatConsoleArgs, parseConsoleArgs } from '../../lib/console'
-import isError from '../../../lib/is-error'
+import { isNextRouterError } from '../../../is-next-router-error'
+import { formatConsoleArgs, parseConsoleArgs } from '../../../../lib/console'
+import isError from '../../../../../lib/is-error'
 import { createConsoleError } from './console-error'
-import { coerceError, setOwnerStackIfAvailable } from '../errors/stitched-error'
+import { coerceError, setOwnerStackIfAvailable } from './stitched-error'
 
 const queueMicroTask =
   globalThis.queueMicrotask || ((cb: () => void) => Promise.resolve().then(cb))

packages/next/src/client/components/react-dev-overlay/app/replay-ssr-only-errors.tsx renamed to packages/next/src/client/components/react-dev-overlay/app/errors/replay-ssr-only-errors.tsx

@@ -1,10 +1,53 @@
+import React from 'react'
+import { renderPagesDevOverlay } from 'next/dist/compiled/next-devtools'
 import { dispatcher } from 'next/dist/compiled/next-devtools'
 import {
   attachHydrationErrorState,
   storeHydrationErrorStateFromConsoleArgs,
 } from './hydration-error-state'
-import type { VersionInfo } from '../../../../server/dev/parse-version-info'
-import type { DevIndicatorServerState } from '../../../../server/dev/dev-indicator-server-state'
+import { Router } from '../../../router'
+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
 
@@ -69,42 +112,3 @@ export function register() {
   window.addEventListener('unhandledrejection', onUnhandledRejection)
   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'

packages/next/src/client/components/errors/stitched-error.ts renamed to packages/next/src/client/components/react-dev-overlay/app/errors/stitched-error.ts

@@ -16,7 +16,6 @@ import {
   type OriginalStackFramesResponse,
 } from './shared'
 import { middlewareResponse } from './middleware-response'
-export { getServerError } from '../utils/node-stack-frames'
 export { parseStack } from '../utils/parse-stack'
 export { getSourceMapFromFile }
 

packages/next/src/client/components/errors/use-error-handler.ts renamed to packages/next/src/client/components/react-dev-overlay/app/errors/use-error-handler.ts

@@ -6,7 +6,7 @@ import { parseComponentStack } from './utils/parse-component-stack'
 import type { DebugInfo } from './types'
 import type { DevIndicatorServerState } from '../../../server/dev/dev-indicator-server-state'
 import { parseStack } from './utils/parse-stack'
-import { isConsoleError } from '../errors/console-error'
+import { isConsoleError } from './app/errors/console-error'
 
 type FastRefreshState =
   /** No refresh in progress. */

packages/next/src/client/components/react-dev-overlay/pages/hooks.ts

@@ -5,7 +5,7 @@ import {
   type ErrorSourceType,
 } from '../../../../shared/lib/error-source'
 
-export function getFilesystemFrame(frame: StackFrame): StackFrame {
+function getFilesystemFrame(frame: StackFrame): StackFrame {
   const f: StackFrame = { ...frame }
 
   if (typeof f.file === 'string') {

packages/next/src/client/components/react-dev-overlay/pages/pages-dev-overlay-bridge.tsx

@@ -5,13 +5,16 @@ import { useEffect, startTransition, useRef } from 'react'
 import stripAnsi from 'next/dist/compiled/strip-ansi'
 import formatWebpackMessages from '../../../components/react-dev-overlay/utils/format-webpack-messages'
 import { useRouter } from '../../../components/navigation'
-import { REACT_REFRESH_FULL_RELOAD } from '../shared'
-import { reportInvalidHmrMessage } from '../shared'
+import {
+  REACT_REFRESH_FULL_RELOAD,
+  REACT_REFRESH_FULL_RELOAD_FROM_ERROR,
+  reportInvalidHmrMessage,
+} from '../shared'
 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 { useErrorHandler } from '../../../components/errors/use-error-handler'
-import { RuntimeErrorHandler } from '../../../components/errors/runtime-error-handler'
+import { useErrorHandler } from '../../../components/react-dev-overlay/app/errors/use-error-handler'
+import { RuntimeErrorHandler } from '../../../components/react-dev-overlay/runtime-error-handler'
 import {
   useSendMessage,
   useTurbopack,
@@ -23,7 +26,6 @@ import type {
   HMR_ACTION_TYPES,
   TurbopackMsgToBrowser,
 } from '../../../../server/dev/hot-reloader-types'
-import { REACT_REFRESH_FULL_RELOAD_FROM_ERROR } from '../shared'
 import { useUntrackedPathname } from '../../../components/navigation-untracked'
 import type { GlobalErrorComponent } from '../../../components/global-error'
 import reportHmrLatency from '../../../components/react-dev-overlay/utils/report-hmr-latency'