Remove implementation from createRouter

Author: brophdawg11

packages/react-router/index.ts

@@ -12,7 +12,6 @@ export type {
   StaticHandler,
   GetScrollPositionFunction,
   GetScrollRestorationKeyFunction,
-  unstable_HandleErrorFunction,
   StaticHandlerContext,
   Fetcher,
   Navigation,
@@ -98,6 +97,7 @@ export type {
 export type {
   AwaitProps,
   IndexRouteProps,
+  unstable_HandleErrorFunction,
   LayoutRouteProps,
   MemoryRouterOpts,
   MemoryRouterProps,

packages/react-router/lib/components.tsx

@@ -21,7 +21,6 @@ import type {
   RouterState,
   RouterSubscriber,
   RouterInit,
-  unstable_HandleErrorFunction,
 } from "./router/router";
 import { createRouter } from "./router/router";
 import type {
@@ -178,29 +177,6 @@ export interface MemoryRouterOpts {
    * Lazily define portions of the route tree on navigations.
    */
   patchRoutesOnNavigation?: PatchRoutesOnNavigationFunction;
-  /**
-   * An error handler function that will be called for any loader/action/render
-   * errors that are encountered in your application.  This is useful for
-   * logging or reporting errors instead of the `ErrorBoundary` because it's not
-   * subject to re-rendering and will only run one time per error.
-   *
-   * The `errorInfo` parameter is passed along from
-   * [`componentDidCatch`](https://react.dev/reference/react/Component#componentdidcatch)
-   * and is only present for render errors.
-   *
-   * ```tsx
-   * let router = createMemoryRouter(routes, {
-   *   unstable_handleError(error, { location, errorInfo }) {
-   *     console.log(
-   *       `Error at location ${location.pathname}`,
-   *       error,
-   *       errorInfo
-   *     );
-   *   }
-   * );
-   * ```
-   */
-  unstable_handleError?: unstable_HandleErrorFunction;
 }
 
 /**
@@ -217,7 +193,6 @@ export interface MemoryRouterOpts {
  * @param {MemoryRouterOpts.dataStrategy} opts.dataStrategy n/a
  * @param {MemoryRouterOpts.future} opts.future n/a
  * @param {MemoryRouterOpts.unstable_getContext} opts.unstable_getContext n/a
- * @param {MemoryRouterOpts.unstable_handleError} opts.unstable_handleError n/a
  * @param {MemoryRouterOpts.hydrationData} opts.hydrationData n/a
  * @param {MemoryRouterOpts.initialEntries} opts.initialEntries n/a
  * @param {MemoryRouterOpts.initialIndex} opts.initialIndex n/a
@@ -236,7 +211,6 @@ export function createMemoryRouter(
       initialEntries: opts?.initialEntries,
       initialIndex: opts?.initialIndex,
     }),
-    unstable_handleError: opts?.unstable_handleError,
     hydrationData: opts?.hydrationData,
     routes,
     hydrationRouteProperties,
@@ -271,6 +245,20 @@ class Deferred<T> {
   }
 }
 
+/**
+ * Function signature for client side error handling for loader/actions errors
+ * and rendering errors via `componentDidCatch`
+ */
+export interface unstable_HandleErrorFunction {
+  (
+    error: unknown,
+    info: {
+      location: Location;
+      errorInfo?: React.ErrorInfo;
+    },
+  ): void;
+}
+
 /**
  * @category Types
  */

packages/react-router/lib/dom-export/hydrated-router.tsx

@@ -6,6 +6,7 @@ import type {
   DataRouter,
   HydrationState,
   RouterInit,
+  unstable_HandleErrorFunction,
 } from "react-router";
 import {
   UNSAFE_getHydrationData as getHydrationData,
@@ -77,10 +78,8 @@ function initSsrInfo(): void {
 
 function createHydratedRouter({
   unstable_getContext,
-  unstable_handleError,
 }: {
   unstable_getContext?: RouterInit["unstable_getContext"];
-  unstable_handleError?: RouterInit["unstable_handleError"];
 }): DataRouter {
   initSsrInfo();
 
@@ -171,7 +170,6 @@ function createHydratedRouter({
     history: createBrowserHistory(),
     basename: ssrInfo.context.basename,
     unstable_getContext,
-    unstable_handleError,
     hydrationData,
     hydrationRouteProperties,
     mapRouteProperties,
@@ -245,7 +243,7 @@ export interface HydratedRouterProps {
    * }} />
    * ```
    */
-  unstable_handleError?: RouterInit["unstable_handleError"];
+  unstable_handleError?: unstable_HandleErrorFunction;
 }
 
 /**
@@ -264,7 +262,6 @@ export function HydratedRouter(props: HydratedRouterProps) {
   if (!router) {
     router = createHydratedRouter({
       unstable_getContext: props.unstable_getContext,
-      unstable_handleError: props.unstable_handleError,
     });
   }
 

packages/react-router/lib/dom/lib.tsx

@@ -24,7 +24,6 @@ import type {
   RelativeRoutingType,
   Router as DataRouter,
   RouterInit,
-  unstable_HandleErrorFunction,
 } from "../router/router";
 import { IDLE_FETCHER, createRouter } from "../router/router";
 import type {
@@ -720,29 +719,6 @@ export interface DOMRouterOpts {
    * </details>
    */
   patchRoutesOnNavigation?: PatchRoutesOnNavigationFunction;
-  /**
-   * An error handler function that will be called for any loader/action/render
-   * errors that are encountered in your application.  This is useful for
-   * logging or reporting errors instead of the `ErrorBoundary` because it's not
-   * subject to re-rendering and will only run one time per error.
-   *
-   * The `errorInfo` parameter is passed along from
-   * [`componentDidCatch`](https://react.dev/reference/react/Component#componentdidcatch)
-   * and is only present for render errors.
-   *
-   * ```tsx
-   * let router = createBrowserRouter(routes, {
-   *   unstable_handleError(error, { location, errorInfo }) {
-   *     console.log(
-   *       `Error at location ${location.pathname}`,
-   *       error,
-   *       errorInfo
-   *     );
-   *   }
-   * );
-   * ```
-   */
-  unstable_handleError?: unstable_HandleErrorFunction;
   /**
    * [`Window`](https://developer.mozilla.org/en-US/docs/Web/API/Window) object
    * override. Defaults to the global `window` instance.
@@ -764,7 +740,6 @@ export interface DOMRouterOpts {
  * @param {DOMRouterOpts.dataStrategy} opts.dataStrategy n/a
  * @param {DOMRouterOpts.future} opts.future n/a
  * @param {DOMRouterOpts.unstable_getContext} opts.unstable_getContext n/a
- * @param {DOMRouterOpts.unstable_handleError} opts.unstable_handleError n/a
  * @param {DOMRouterOpts.hydrationData} opts.hydrationData n/a
  * @param {DOMRouterOpts.patchRoutesOnNavigation} opts.patchRoutesOnNavigation n/a
  * @param {DOMRouterOpts.window} opts.window n/a
@@ -779,7 +754,6 @@ export function createBrowserRouter(
     unstable_getContext: opts?.unstable_getContext,
     future: opts?.future,
     history: createBrowserHistory({ window: opts?.window }),
-    unstable_handleError: opts?.unstable_handleError,
     hydrationData: opts?.hydrationData || parseHydrationData(),
     routes,
     mapRouteProperties,
@@ -802,7 +776,6 @@ export function createBrowserRouter(
  * @param {DOMRouterOpts.basename} opts.basename n/a
  * @param {DOMRouterOpts.future} opts.future n/a
  * @param {DOMRouterOpts.unstable_getContext} opts.unstable_getContext n/a
- * @param {DOMRouterOpts.unstable_handleError} opts.unstable_handleError n/a
  * @param {DOMRouterOpts.hydrationData} opts.hydrationData n/a
  * @param {DOMRouterOpts.dataStrategy} opts.dataStrategy n/a
  * @param {DOMRouterOpts.patchRoutesOnNavigation} opts.patchRoutesOnNavigation n/a
@@ -818,7 +791,6 @@ export function createHashRouter(
     unstable_getContext: opts?.unstable_getContext,
     future: opts?.future,
     history: createHashHistory({ window: opts?.window }),
-    unstable_handleError: opts?.unstable_handleError,
     hydrationData: opts?.hydrationData || parseHydrationData(),
     routes,
     mapRouteProperties,

packages/react-router/lib/dom/server.tsx

@@ -484,9 +484,6 @@ export function createStaticRouter(
     patchRoutes() {
       throw msg("patchRoutes");
     },
-    _internalHandleError() {
-      throw msg("_internalHandleError");
-    },
     _internalFetchControllers: new Map(),
     _internalSetRoutes() {
       throw msg("_internalSetRoutes");

packages/react-router/lib/hooks.tsx

@@ -30,7 +30,6 @@ import type {
   Router as DataRouter,
   RevalidationState,
   Navigation,
-  unstable_HandleErrorFunction,
 } from "./router/router";
 import { IDLE_BLOCKER } from "./router/router";
 import type {
@@ -52,6 +51,7 @@ import {
   stripBasename,
 } from "./router/utils";
 import type { SerializeFrom } from "./types/route-data";
+import { unstable_HandleErrorFunction } from "./components";
 
 /**
  * Resolves a URL against the current {@link Location}.

packages/react-router/lib/router/router.ts

@@ -271,14 +271,6 @@ export interface Router {
     unstable_allowElementMutations?: boolean,
   ): void;
 
-  /**
-   * @private
-   * PRIVATE - DO NOT USE
-   *
-   * Error handler exposed for wiring up to `ErrorBoundary` `componentDidCatch`
-   */
-  _internalHandleError: unstable_HandleErrorFunction | undefined;
-
   /**
    * @private
    * PRIVATE - DO NOT USE
@@ -413,7 +405,6 @@ export interface RouterInit {
   window?: Window;
   dataStrategy?: DataStrategyFunction;
   patchRoutesOnNavigation?: AgnosticPatchRoutesOnNavigationFunction;
-  unstable_handleError?: unstable_HandleErrorFunction;
 }
 
 /**
@@ -482,20 +473,6 @@ export interface RouterSubscriber {
   ): void;
 }
 
-/**
- * Function signature for client side error handling for loader/actions errors
- * and rendering errors via `componentDidCatch`
- */
-export interface unstable_HandleErrorFunction {
-  (
-    error: unknown,
-    info: {
-      location: Location;
-      errorInfo?: React.ErrorInfo;
-    },
-  ): void;
-}
-
 /**
  * Function signature for determining the key to be used in scroll restoration
  * for a given location
@@ -880,7 +857,6 @@ export function createRouter(init: RouterInit): Router {
 
   let hydrationRouteProperties = init.hydrationRouteProperties || [];
   let mapRouteProperties = init.mapRouteProperties || defaultMapRouteProperties;
-  let unstable_handleError = init.unstable_handleError;
 
   // Routes keyed by ID
   let manifest: RouteManifest = {};
@@ -3475,7 +3451,6 @@ export function createRouter(init: RouterInit): Router {
     getBlocker,
     deleteBlocker,
     patchRoutes,
-    _internalHandleError: unstable_handleError,
     _internalFetchControllers: fetchControllers,
     // TODO: Remove setRoutes, it's temporary to avoid dealing with
     // updating the tree while validating the update algorithm.