From 92b5e048d3c7a3b818f7bad67d7aca089cf150ac Mon Sep 17 00:00:00 2001
From: Sheraff <me@florianpellet.com>
Date: Fri, 14 Aug 2026 15:00:15 +0200
Subject: [PATCH] bundle(react-router): direct export of CatchBoundary class
 component, remove function wrapper

---
 .changeset/whole-bikes-grin.md              |  5 +++++
 packages/react-router/src/CatchBoundary.tsx | 11 +----------
 2 files changed, 6 insertions(+), 10 deletions(-)
 create mode 100644 .changeset/whole-bikes-grin.md

diff --git a/.changeset/whole-bikes-grin.md b/.changeset/whole-bikes-grin.md
new file mode 100644
index 00000000000..de2c2ddce70
--- /dev/null
+++ b/.changeset/whole-bikes-grin.md
@@ -0,0 +1,5 @@
+---
+'@tanstack/react-router': patch
+---
+
+direct export of CatchBoundary class component, remove function wrapper
diff --git a/packages/react-router/src/CatchBoundary.tsx b/packages/react-router/src/CatchBoundary.tsx
index f459ef3fce2..f55a250ab1d 100644
--- a/packages/react-router/src/CatchBoundary.tsx
+++ b/packages/react-router/src/CatchBoundary.tsx
@@ -5,16 +5,7 @@ import { wrapInNonRouteComponentContext } from './nonRouteComponentContext'
 import type { ErrorRouteComponent } from './route'
 import type { ErrorInfo } from 'react'
 
-export function CatchBoundary(props: {
-  getResetKey: () => unknown
-  children: React.ReactNode
-  errorComponent?: ErrorRouteComponent
-  onCatch?: (error: Error, errorInfo: ErrorInfo) => void
-}) {
-  return <CatchBoundaryImpl {...props} />
-}
-
-class CatchBoundaryImpl extends React.Component<{
+export class CatchBoundary extends React.Component<{
   getResetKey: () => unknown
   children: React.ReactNode
   errorComponent?: ErrorRouteComponent