chore: Create a single error boundary that catches any ui error

packages/next/src/client/components/dev-root-ui-error-boundary.tsx

@@ -1,7 +1,7 @@
 'use client'
 
 import React from 'react'
-import { ForbiddenBoundary, NotFoundBoundary } from './ui-errors-boundaries'
+import { UIErrorsBoundary } from './ui-errors-boundaries'
 import type { UIErrorHelper } from '../../shared/lib/ui-error-types'
 
 export function bailOnUIError(uiError: UIErrorHelper) {
@@ -24,10 +24,11 @@ export function DevRootUIErrorsBoundary({
   children: React.ReactNode
 }) {
   return (
-    <ForbiddenBoundary uiComponent={<NotAllowedRootForbiddenError />}>
-      <NotFoundBoundary uiComponent={<NotAllowedRootNotFoundError />}>
-        {children}
-      </NotFoundBoundary>
-    </ForbiddenBoundary>
+    <UIErrorsBoundary
+      not-found={<NotAllowedRootNotFoundError />}
+      forbidden={<NotAllowedRootForbiddenError />}
+    >
+      {children}
+    </UIErrorsBoundary>
   )
 }

packages/next/src/client/components/layout-router.tsx

@@ -35,7 +35,7 @@ import { RedirectBoundary } from './redirect-boundary'
 import { getSegmentValue } from './router-reducer/reducers/get-segment-value'
 import { createRouterCacheKey } from './router-reducer/create-router-cache-key'
 import { hasInterceptionRouteInCurrentTree } from './router-reducer/reducers/has-interception-route-in-current-tree'
-import { ForbiddenBoundary, NotFoundBoundary } from './ui-errors-boundaries'
+import { UIErrorsBoundary } from './ui-errors-boundaries'
 
 /**
  * Add refetch marker to router state at the point of the current layout segment.
@@ -575,29 +575,30 @@ export default function OuterLayoutRouter({
                     loadingStyles={loading?.[1]}
                     loadingScripts={loading?.[2]}
                   >
-                    <ForbiddenBoundary
-                      uiComponent={forbidden}
-                      uiComponentStyles={forbiddenStyles}
+                    <UIErrorsBoundary
+                      not-found={{
+                        component: notFound,
+                        styles: notFoundStyles,
+                      }}
+                      forbidden={{
+                        component: forbidden,
+                        styles: forbiddenStyles,
+                      }}
                     >
-                      <NotFoundBoundary
-                        uiComponent={notFound}
-                        uiComponentStyles={notFoundStyles}
-                      >
-                        <RedirectBoundary>
-                          <InnerLayoutRouter
-                            parallelRouterKey={parallelRouterKey}
-                            url={url}
-                            tree={tree}
-                            childNodes={childNodesForParallelRouter!}
-                            segmentPath={segmentPath}
-                            cacheKey={cacheKey}
-                            isActive={
-                              currentChildSegmentValue === preservedSegmentValue
-                            }
-                          />
-                        </RedirectBoundary>
-                      </NotFoundBoundary>
-                    </ForbiddenBoundary>
+                      <RedirectBoundary>
+                        <InnerLayoutRouter
+                          parallelRouterKey={parallelRouterKey}
+                          url={url}
+                          tree={tree}
+                          childNodes={childNodesForParallelRouter!}
+                          segmentPath={segmentPath}
+                          cacheKey={cacheKey}
+                          isActive={
+                            currentChildSegmentValue === preservedSegmentValue
+                          }
+                        />
+                      </RedirectBoundary>
+                    </UIErrorsBoundary>
                   </LoadingBoundary>
                 </ErrorBoundary>
               </ScrollAndFocusHandler>

packages/next/src/client/components/ui-error-boundary.tsx

@@ -4,17 +4,21 @@ import React, { useContext } from 'react'
 import { warnOnce } from '../../shared/lib/utils/warn-once'
 import { usePathname } from './navigation'
 import { MissingSlotContext } from '../../shared/lib/app-router-context.shared-runtime'
-import type { UIErrorFileType } from '../../shared/lib/ui-error-types'
+import {
+  uiErrorFileTypes,
+  type UIErrorFileType,
+} from '../../shared/lib/ui-error-types'
 
-interface UIErrorBoundaryProps {
-  uiComponent?: React.ReactNode
-  uiComponentStyles?: React.ReactNode
+interface UIErrorBoundaryProps
+  extends Record<
+    UIErrorFileType,
+    React.ReactNode | { component: React.ReactNode; styles: React.ReactNode }
+  > {
   forceTrigger?: boolean
   children: React.ReactNode
   pathname: string
-  matcher: (error: unknown) => boolean
+  matcher: (error: unknown) => UIErrorFileType | undefined
   missingSlots?: Set<string>
-  nextError: UIErrorFileType
 }
 
 interface UIErrorBoundaryState {
@@ -39,11 +43,11 @@ class UIErrorBoundary extends React.Component<
     if (
       process.env.NODE_ENV === 'development' &&
       this.props.missingSlots &&
-      // A missing children slot is the typical not-found case, so no need to warn
+      // A missing children slot is the typical ui-error case, so no need to warn
       !this.props.missingSlots.has('children')
     ) {
       let warningMessage =
-        `No default component was found for a parallel route rendered on this page. Falling back to nearest ${this.props.nextError} boundary.
+        `No default component was found for a parallel route rendered on this page. Falling back to nearest ${this.props.matcher(this.state.error)} boundary.
 ` +
         'Learn more: https://nextjs.org/docs/app/building-your-application/routing/parallel-routes#defaultjs\n\n'
 
@@ -87,19 +91,71 @@ class UIErrorBoundary extends React.Component<
     }
   }
 
+  objectToComponent(componentName: UIErrorFileType): React.ReactNode {
+    if (
+      this.props[componentName] !== null &&
+      typeof this.props[componentName] === 'object' &&
+      'component' in this.props[componentName]
+    ) {
+      return this.props[componentName].component
+    }
+    return this.props[componentName]
+  }
+
+  assertUIComponents() {
+    uiErrorFileTypes.forEach((type) => {
+      if (
+        this.props.matcher(this.state.error) === type &&
+        !this.objectToComponent(type)
+      ) {
+        throw this.state.error
+      }
+    })
+  }
+
+  renderUIComponent(componentName: UIErrorFileType | undefined) {
+    if (
+      !componentName ||
+      this.props.matcher(this.state.error) !== componentName
+    ) {
+      return
+    }
+
+    if (
+      this.props[componentName] !== null &&
+      typeof this.props[componentName] === 'object' &&
+      'component' in this.props[componentName]
+    ) {
+      return (
+        <>
+          {this.props[componentName].component}
+          {this.props[componentName].styles}
+        </>
+      )
+    }
+
+    return this.props[componentName]
+  }
+
   render() {
     if (this.state.didCatch) {
       if (!this.props.forceTrigger && !this.props.matcher(this.state.error)) {
         throw this.state.error
       }
+
+      this.assertUIComponents()
+
       return (
         <>
           <meta name="robots" content="noindex" />
           {process.env.NODE_ENV === 'development' && (
-            <meta name="next-error" content={this.props.nextError} />
+            <meta
+              name="next-error"
+              content={this.props.matcher(this.state.error)}
+            />
           )}
-          {this.props.uiComponentStyles}
-          {this.props.uiComponent}
+
+          {this.renderUIComponent(this.props.matcher(this.state.error))}
         </>
       )
     }
@@ -114,22 +170,14 @@ export type UIErrorBoundaryWrapperProps = Omit<
 >
 
 export function UIErrorBoundaryWrapper({
-  uiComponent,
   children,
   ...rest
 }: UIErrorBoundaryWrapperProps) {
   const pathname = usePathname()
   const missingSlots = useContext(MissingSlotContext)
-  return uiComponent ? (
-    <UIErrorBoundary
-      pathname={pathname}
-      missingSlots={missingSlots}
-      uiComponent={uiComponent}
-      {...rest}
-    >
+  return (
+    <UIErrorBoundary pathname={pathname} missingSlots={missingSlots} {...rest}>
       {children}
     </UIErrorBoundary>
-  ) : (
-    <>{children}</>
   )
 }

packages/next/src/client/components/ui-errors-boundaries.tsx

@@ -1,7 +1,5 @@
 'use client'
 
-import React from 'react'
-
 import {
   UIErrorBoundaryWrapper,
   type UIErrorBoundaryWrapperProps,
@@ -11,25 +9,18 @@ import { isNotFoundError } from './not-found'
 
 type BoundaryConsumerProps = Pick<
   UIErrorBoundaryWrapperProps,
-  'uiComponent' | 'uiComponentStyles' | 'children'
+  'forbidden' | 'not-found' | 'children'
 >
 
-export function ForbiddenBoundary(props: BoundaryConsumerProps) {
-  return (
-    <UIErrorBoundaryWrapper
-      nextError={'forbidden'}
-      matcher={isForbiddenError}
-      {...props}
-    />
-  )
+const matcher = (err: unknown) => {
+  if (isForbiddenError(err)) {
+    return 'forbidden'
+  }
+  if (isNotFoundError(err)) {
+    return 'not-found'
+  }
 }
 
-export function NotFoundBoundary(props: BoundaryConsumerProps) {
-  return (
-    <UIErrorBoundaryWrapper
-      nextError={'not-found'}
-      matcher={isNotFoundError}
-      {...props}
-    />
-  )
+export function UIErrorsBoundary(props: BoundaryConsumerProps) {
+  return <UIErrorBoundaryWrapper matcher={matcher} {...props} />
 }

packages/next/src/server/app-render/create-component-tree.tsx

@@ -87,8 +87,7 @@ async function createComponentTreeInternal({
     renderOpts: { nextConfigOutput, experimental },
     staticGenerationStore,
     componentMod: {
-      NotFoundBoundary,
-      ForbiddenBoundary,
+      UIErrorsBoundary,
       LayoutRouter,
       RenderFromTemplateContext,
       ClientPageRoot,
@@ -296,19 +295,34 @@ async function createComponentTreeInternal({
   const parallelKeys = Object.keys(parallelRoutes)
   const hasSlotKey = parallelKeys.length > 1
 
-  // TODO-APP: This is a hack to support unmatched parallel routes, which will throw `notFound()`.
-  // This ensures that a `NotFoundBoundary` is available for when that happens,
-  // but it's not ideal, as it needlessly invokes the `NotFound` component and renders the `RootLayout` twice.
+  // TODO-APP: This is a hack to support unmatched parallel routes, which will throw `notFound()` or `forbidden()`.
+  // This ensures that a `UIErrorsBoundary` is available for when that happens,
+  // but it's not ideal, as it needlessly invokes the appropriate UIError component and renders the `RootLayout` twice.
   // We should instead look into handling the fallback behavior differently in development mode so that it doesn't
-  // rely on the `NotFound` behavior.
+  // rely on the `UIErrorsBoundary` behavior.
   if (hasSlotKey && rootLayoutAtThisLevel && LayoutOrPage) {
     Component = (componentProps: { params: Params }) => {
       const NotFoundComponent = NotFound
       const ForbiddenComponent = Forbidden
       const RootLayoutComponent = LayoutOrPage
       return (
-        <ForbiddenBoundary
-          uiComponent={
+        <UIErrorsBoundary
+          not-found={
+            NotFoundComponent ? (
+              <>
+                {layerAssets}
+                {/*
+                 * We are intentionally only forwarding params to the root layout, as passing any of the parallel route props
+                 * might trigger `notFound()`, which is not currently supported in the root layout.
+                 */}
+                <RootLayoutComponent params={componentProps.params}>
+                  {notFoundStyles}
+                  <NotFoundComponent />
+                </RootLayoutComponent>
+              </>
+            ) : undefined
+          }
+          forbidden={
             ForbiddenComponent ? (
               <>
                 {layerAssets}
@@ -324,26 +338,8 @@ async function createComponentTreeInternal({
             ) : undefined
           }
         >
-          <NotFoundBoundary
-            uiComponent={
-              NotFoundComponent ? (
-                <>
-                  {layerAssets}
-                  {/*
-                   * We are intentionally only forwarding params to the root layout, as passing any of the parallel route props
-                   * might trigger `notFound()`, which is not currently supported in the root layout.
-                   */}
-                  <RootLayoutComponent params={componentProps.params}>
-                    {notFoundStyles}
-                    <NotFoundComponent />
-                  </RootLayoutComponent>
-                </>
-              ) : undefined
-            }
-          >
-            <RootLayoutComponent {...componentProps} />
-          </NotFoundBoundary>
-        </ForbiddenBoundary>
+          <RootLayoutComponent {...componentProps} />
+        </UIErrorsBoundary>
       )
     }
   }

packages/next/src/server/app-render/entry-base.ts

@@ -28,10 +28,7 @@ import {
 } from '../../server/app-render/rsc/preloads'
 import { Postpone } from '../../server/app-render/rsc/postpone'
 import { taintObjectReference } from '../../server/app-render/rsc/taint'
-import {
-  ForbiddenBoundary,
-  NotFoundBoundary,
-} from '../../client/components/ui-errors-boundaries'
+import { UIErrorsBoundary } from '../../client/components/ui-errors-boundaries'
 
 import * as React from 'react'
 import {
@@ -64,8 +61,7 @@ export {
   Postpone,
   taintObjectReference,
   ClientPageRoot,
-  NotFoundBoundary,
-  ForbiddenBoundary,
+  UIErrorsBoundary,
   patchFetch,
   createCacheScope,
   patchCacheScopeSupportIntoReact,

test/development/acceptance-app/hydration-error.test.ts

@@ -834,7 +834,7 @@ describe('Error overlay for hydration errors', () => {
     if (isTurbopack) {
       expect(fullPseudoHtml).toMatchInlineSnapshot(`
         "...
-          <NotFoundErrorBoundary pathname="/" notFound={[...]} notFoundStyles={[...]} asNotFound={undefined} missingSlots={Set}>
+          <UIErrorBoundary pathname="/" missingSlots={Set} matcher={function matcher} not-found={{...}} forbidden={{...}}>
             <RedirectBoundary>
               <RedirectErrorBoundary router={{...}}>
                 <InnerLayoutRouter parallelRouterKey="children" url="/" tree={[...]} childNodes={Map} segmentPath={[...]} ...>
@@ -854,7 +854,7 @@ describe('Error overlay for hydration errors', () => {
     } else {
       expect(fullPseudoHtml).toMatchInlineSnapshot(`
         "...
-          <NotFoundErrorBoundary pathname="/" notFound={[...]} notFoundStyles={[...]} asNotFound={undefined} missingSlots={Set}>
+          <UIErrorBoundary pathname="/" missingSlots={Set} matcher={function matcher} not-found={{...}} forbidden={{...}}>
             <RedirectBoundary>
               <RedirectErrorBoundary router={{...}}>
                 <InnerLayoutRouter parallelRouterKey="children" url="/" tree={[...]} childNodes={Map} segmentPath={[...]} ...>