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.
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'
......
......@@ -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
......
......@@ -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'
......
import { handleGlobalErrors } from '../errors/use-error-handler'
handleGlobalErrors()
import { patchConsoleError } from './intercept-console-error'
patchConsoleError()
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,
......
import { patchConsoleError } from './errors/intercept-console-error'
import { handleGlobalErrors } from './errors/use-error-handler'
handleGlobalErrors()
patchConsoleError()
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
......
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') {
......
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>()
......
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))
......
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 {
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'
......@@ -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 }
......
......@@ -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. */
......
......@@ -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') {
......
......@@ -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'
......
......@@ -32,18 +32,8 @@
/// <reference types="webpack/module.d.ts" />
import {
register,
onBuildError,
onBuildOk,
onBeforeRefresh,
onRefresh,
onVersionInfo,
onStaticIndicator,
onDevIndicator,
buildingIndicatorHide,
buildingIndicatorShow,
} from '../../../components/react-dev-overlay/pages/client'
import { dispatcher } from 'next/dist/compiled/next-devtools'
import { register } from '../../../components/react-dev-overlay/pages/pages-dev-overlay-setup'
import stripAnsi from 'next/dist/compiled/strip-ansi'
import { addMessageListener, sendMessage } from './websocket'
import formatWebpackMessages from '../../../components/react-dev-overlay/utils/format-webpack-messages'
......@@ -52,10 +42,12 @@ import type {
HMR_ACTION_TYPES,
TurbopackMsgToBrowser,
} from '../../../../server/dev/hot-reloader-types'
import { REACT_REFRESH_FULL_RELOAD } from '../shared'
import { REACT_REFRESH_FULL_RELOAD_FROM_ERROR } from '../shared'
import { reportInvalidHmrMessage } from '../shared'
import { RuntimeErrorHandler } from '../../../components/errors/runtime-error-handler'
import {
REACT_REFRESH_FULL_RELOAD,
REACT_REFRESH_FULL_RELOAD_FROM_ERROR,
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 { TurbopackHmr } from '../../../components/react-dev-overlay/utils/turbopack-hot-reloader-common'
......@@ -142,7 +134,7 @@ function handleSuccess() {
hmrUpdate.hasUpdates
)
}
onBuildOk()
dispatcher.onBuildOk()
} else {
const isHotUpdate =
!isFirstCompilation ||
......@@ -209,7 +201,7 @@ function handleErrors(errors: any) {
// Only show the first error.
onBuildError(formatted.errors[0])
dispatcher.onBuildError(formatted.errors[0])
// Also log them to the console.
if (typeof console !== 'undefined' && typeof console.error === 'function') {
......@@ -255,7 +247,7 @@ export function handleStaticIndicator() {
window.location.pathname in isrManifest ||
(!isDynamicPage && !hasAppGetInitialProps)
onStaticIndicator(isPageStatic)
dispatcher.onStaticIndicator(isPageStatic)
}
}
......@@ -272,7 +264,7 @@ function processMessage(obj: HMR_ACTION_TYPES) {
break
}
case HMR_ACTIONS_SENT_TO_BROWSER.BUILDING: {
buildingIndicatorShow()
dispatcher.buildingIndicatorShow()
if (process.env.TURBOPACK) {
turbopackHmr!.onBuilding()
......@@ -284,15 +276,15 @@ function processMessage(obj: HMR_ACTION_TYPES) {
}
case HMR_ACTIONS_SENT_TO_BROWSER.BUILT:
case HMR_ACTIONS_SENT_TO_BROWSER.SYNC: {
buildingIndicatorHide()
dispatcher.buildingIndicatorHide()
if (obj.hash) handleAvailableHash(obj.hash)
const { errors, warnings } = obj
// Is undefined when it's a 'built' event
if ('versionInfo' in obj) onVersionInfo(obj.versionInfo)
if ('devIndicator' in obj) onDevIndicator(obj.devIndicator)
if ('versionInfo' in obj) dispatcher.onVersionInfo(obj.versionInfo)
if ('devIndicator' in obj) dispatcher.onDevIndicator(obj.devIndicator)
const hasErrors = Boolean(errors && errors.length)
if (hasErrors) {
......@@ -355,7 +347,7 @@ function processMessage(obj: HMR_ACTION_TYPES) {
}
case HMR_ACTIONS_SENT_TO_BROWSER.TURBOPACK_MESSAGE: {
turbopackHmr!.onTurbopackMessage(obj)
onBeforeRefresh()
dispatcher.onBeforeRefresh()
for (const listener of turbopackMessageListeners) {
listener({
type: HMR_ACTIONS_SENT_TO_BROWSER.TURBOPACK_MESSAGE,
......@@ -366,7 +358,7 @@ function processMessage(obj: HMR_ACTION_TYPES) {
console.warn(REACT_REFRESH_FULL_RELOAD_FROM_ERROR)
performFullReload(null)
}
onRefresh()
dispatcher.onRefresh()
break
}
default: {
......@@ -415,7 +407,7 @@ function tryApplyUpdatesWebpack() {
}
if (!isUpdateAvailable() || !canApplyUpdates()) {
onBuildOk()
dispatcher.onBuildOk()
return
}
......@@ -433,7 +425,7 @@ function tryApplyUpdatesWebpack() {
return
}
onBuildOk()
dispatcher.onBuildOk()
if (isUpdateAvailable()) {
// While we were updating, there was a new update! Do it again.
......@@ -441,7 +433,7 @@ function tryApplyUpdatesWebpack() {
return
}
onRefresh()
dispatcher.onRefresh()
reportHmrLatency(
sendMessage,
updatedModules,
......@@ -470,7 +462,7 @@ function tryApplyUpdatesWebpack() {
// We should always handle an update, even if updatedModules is empty (but
// 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
onBeforeRefresh()
dispatcher.onBeforeRefresh()
// https://webpack.js.org/api/hot-module-replacement/#apply
return module.hot.apply()
})
......
......@@ -180,7 +180,7 @@ class Container extends React.Component<{
return this.props.children
} else {
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 (
<PagesDevOverlayBridge>{this.props.children}</PagesDevOverlayBridge>
)
......@@ -917,10 +917,9 @@ export async function hydrate(opts?: { beforeRender?: () => Promise<void> }) {
}
if (process.env.NODE_ENV === 'development') {
const getServerError: typeof import('./components/react-dev-overlay/pages/client').getServerError =
(
require('./components/react-dev-overlay/pages/client') as 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')
).getServerError
// Server-side runtime errors need to be re-thrown on the client-side so
// that the overlay is rendered.
if (initialErr) {
......
......@@ -11,13 +11,10 @@ import {
urlQueryToSearchParams,
} from '../shared/lib/router/utils/querystring'
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 { performFullReload } from './dev/hot-reloader/pages/hot-reloader-pages'
import {
buildingIndicatorHide,
buildingIndicatorShow,
} from './components/react-dev-overlay/pages/client'
import { dispatcher } from 'next/dist/compiled/next-devtools'
export function pageBootstrap(assetPrefix: string) {
connectHMR({ assetPrefix, path: '/_next/webpack-hmr' })
......@@ -93,8 +90,8 @@ export function pageBootstrap(assetPrefix: string) {
if (!router.clc && pages.includes(router.pathname)) {
console.log('Refreshing page data due to server-side change')
buildingIndicatorShow()
const clearIndicator = buildingIndicatorHide
dispatcher.buildingIndicatorShow()
const clearIndicator = dispatcher.buildingIndicatorHide
router
.replace(
......
......@@ -5,12 +5,12 @@ import {
setOwnerStackIfAvailable,
setComponentStack,
coerceError,
} from '../components/errors/stitched-error'
import { handleClientError } from '../components/errors/use-error-handler'
} from '../components/react-dev-overlay/app/errors/stitched-error'
import { handleClientError } from '../components/react-dev-overlay/app/errors/use-error-handler'
import { isNextRouterError } from '../components/is-next-router-error'
import { isBailoutToCSRError } from '../../shared/lib/lazy-dynamic/bailout-to-csr'
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 DefaultErrorBoundary from '../components/global-error'
......
......@@ -6,7 +6,7 @@ import {
setOwnerStackIfAvailable,
setComponentStack,
coerceError,
} from '../components/errors/stitched-error'
} from '../components/react-dev-overlay/app/errors/stitched-error'
import isError from '../../lib/is-error'
import { reportGlobalError } from './report-global-error'
......
......@@ -68,7 +68,7 @@ import type { ServerOnInstrumentationRequestError } from '../app-render/types'
import type { ServerComponentsHmrCache } from '../response-cache'
import { logRequests } from './log-requests'
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 {
ensureInstrumentationRegistered,
getInstrumentationModule,
......@@ -79,7 +79,7 @@ let PagesDevOverlayBridgeImpl: PagesDevOverlayBridgeType
const ReactDevOverlay: PagesDevOverlayBridgeType = (props) => {
if (PagesDevOverlayBridgeImpl === undefined) {
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
}
return React.createElement(PagesDevOverlayBridgeImpl, props)
......
......@@ -103,7 +103,7 @@ import { ReflectAdapter } from './web/spec-extension/adapters/reflect'
import { getCacheControlHeader } from './lib/cache-control'
import { getErrorSource } from '../shared/lib/error-source'
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'
let tryGetPreviewData: typeof import('./api-utils/node/try-get-preview-data').tryGetPreviewData
......
......@@ -7,7 +7,7 @@ import type { CloneableBody } from './body-streams'
import type { RouteMatch } from './route-matches/route-match'
import type { NEXT_RSC_UNION_QUERY } from '../client/components/app-router-headers'
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
export const NEXT_REQUEST_META = Symbol.for('NextInternalRequestMeta')
......
......@@ -33,19 +33,19 @@ interface ModuleContext {
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
if (process.env.NODE_ENV === 'development') {
const middleware =
require('../../../client/components/react-dev-overlay/server/middleware-webpack') as typeof import('../../../client/components/react-dev-overlay/server/middleware-webpack')
getServerError = middleware.getServerError
getServerError = (
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
decorateServerError = (
require('../../../shared/lib/error-source') as typeof import('../../../shared/lib/error-source')
).decorateServerError
} else {
getServerError = (error: Error, _: string) => error
decorateServerError = (_: Error, __: string) => {}
getServerError = (error) => error
decorateServerError = () => {}
}
/**
......
......@@ -44,7 +44,7 @@ type RunnerFn = (params: RunnerFnParams) => Promise<FetchEventResult>
function withTaggedErrors(fn: RunnerFn): RunnerFn {
if (process.env.NODE_ENV === 'development') {
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) =>
fn(params)
......
......@@ -37,10 +37,33 @@ describe('browser-chunks', () => {
it('must not bundle any dev overlay into browser chunks', () => {
const devOverlaySources = sources.filter((source) => {
return (
/webpack:\/\/_N_E\/(\.\.\/)*src\/client\/components\/react-dev-overlay\//.test(
(/webpack:\/\/_N_E\/(\.\.\/)*src\/client\/components\/react-dev-overlay\//.test(
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