react-router 7.9.5-pre.0 → 7.9.6-pre.0

package/dist/development/{register-c-dooqKE.d.ts → register-BpU9rFBJ.d.ts}

@@ -1,4 +1,4 @@
-import { R as RouteModule } from './instrumentation-iAqbU5Q4.js';
+import { R as RouteModule } from './instrumentation-Unc20tLk.js';
 
 /**
  * Apps can use this interface to "register" app-wide types for React Router via interface declaration merging and module augmentation.

package/dist/development/{register-_G476ptB.d.mts → register-QkB3HGjm.d.mts}

@@ -1,4 +1,4 @@
-import { R as RouteModule } from './router-DIAPGK5f.mjs';
+import { R as RouteModule } from './router-CAvh_Drx.mjs';
 
 /**
  * Apps can use this interface to "register" app-wide types for React Router via interface declaration merging and module augmentation.

package/dist/{production/router-DIAPGK5f.d.mts → development/router-CAvh_Drx.d.mts}

@@ -1178,7 +1178,11 @@ declare function createMemoryRouter(routes: RouteObject[], opts?: MemoryRouterOp
  * and rendering errors via `componentDidCatch`
  */
 interface unstable_ClientOnErrorFunction {
-    (error: unknown, errorInfo?: React.ErrorInfo): void;
+    (error: unknown, info: {
+        location: Location;
+        params: Params;
+        errorInfo?: React.ErrorInfo;
+    }): void;
 }
 /**
  * @category Types

package/dist/production/{browser-DM83uryY.d.ts → browser-BbBXFHbO.d.ts}

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { L as Location, C as ClientActionFunction, a as ClientLoaderFunction, b as LinksFunction, M as MetaFunction, S as ShouldRevalidateFunction, P as Params, c as RouterContextProvider, A as ActionFunction, H as HeadersFunction, d as LoaderFunction, e as RouterInit } from './instrumentation-iAqbU5Q4.js';
+import { L as Location, C as ClientActionFunction, a as ClientLoaderFunction, b as LinksFunction, M as MetaFunction, S as ShouldRevalidateFunction, P as Params, c as RouterContextProvider, A as ActionFunction, H as HeadersFunction, d as LoaderFunction, e as RouterInit } from './instrumentation-Unc20tLk.js';
 
 type RSCRouteConfigEntryBase = {
     action?: ActionFunction;

package/dist/production/{browser-DfMfSvsC.d.mts → browser-C07r42Tt.d.mts}

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { L as Location, C as ClientActionFunction, a as ClientLoaderFunction, b as LinksFunction, M as MetaFunction, S as ShouldRevalidateFunction, P as Params, c as RouterContextProvider, A as ActionFunction, H as HeadersFunction, d as LoaderFunction, e as RouterInit } from './router-DIAPGK5f.mjs';
+import { L as Location, C as ClientActionFunction, a as ClientLoaderFunction, b as LinksFunction, M as MetaFunction, S as ShouldRevalidateFunction, P as Params, c as RouterContextProvider, A as ActionFunction, H as HeadersFunction, d as LoaderFunction, e as RouterInit } from './router-CAvh_Drx.mjs';
 
 type RSCRouteConfigEntryBase = {
     action?: ActionFunction;

package/dist/{development/chunk-B6QYCHJF.mjs → production/chunk-4MBU4DF6.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v7.9.5-pre.0
+ * react-router v7.9.6-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -49,7 +49,7 @@ import {
   withComponentProps,
   withErrorBoundaryProps,
   withHydrateFallbackProps
-} from "./chunk-76L3QNAV.mjs";
+} from "./chunk-GG2LAVOQ.mjs";
 
 // lib/dom/ssr/server.tsx
 import * as React from "react";

package/dist/production/{chunk-7EXEUENX.mjs → chunk-GG2LAVOQ.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v7.9.5-pre.0
+ * react-router v7.9.6-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -2306,6 +2306,14 @@ function createRouter(init) {
       key
     );
     let actionResult = actionResults[match.route.id];
+    if (!actionResult) {
+      for (let match2 of fetchMatches) {
+        if (actionResults[match2.route.id]) {
+          actionResult = actionResults[match2.route.id];
+          break;
+        }
+      }
+    }
     if (fetchRequest.signal.aborted) {
       if (fetchControllers.get(key) === abortController) {
         fetchControllers.delete(key);
@@ -2962,23 +2970,43 @@ function createRouter(init) {
         return { type: "aborted" };
       }
       let newMatches = matchRoutes(routesToUse, pathname, basename);
+      let newPartialMatches = null;
       if (newMatches) {
-        return { type: "success", matches: newMatches };
+        if (Object.keys(newMatches[0].params).length === 0) {
+          return { type: "success", matches: newMatches };
+        } else {
+          newPartialMatches = matchRoutesImpl(
+            routesToUse,
+            pathname,
+            basename,
+            true
+          );
+          let matchedDeeper = newPartialMatches && partialMatches.length < newPartialMatches.length && compareMatches(
+            partialMatches,
+            newPartialMatches.slice(0, partialMatches.length)
+          );
+          if (!matchedDeeper) {
+            return { type: "success", matches: newMatches };
+          }
+        }
       }
-      let newPartialMatches = matchRoutesImpl(
-        routesToUse,
-        pathname,
-        basename,
-        true
-      );
-      if (!newPartialMatches || partialMatches.length === newPartialMatches.length && partialMatches.every(
-        (m, i) => m.route.id === newPartialMatches[i].route.id
-      )) {
+      if (!newPartialMatches) {
+        newPartialMatches = matchRoutesImpl(
+          routesToUse,
+          pathname,
+          basename,
+          true
+        );
+      }
+      if (!newPartialMatches || compareMatches(partialMatches, newPartialMatches)) {
         return { type: "success", matches: null };
       }
       partialMatches = newPartialMatches;
     }
   }
+  function compareMatches(a, b) {
+    return a.length === b.length && a.every((m, i) => m.route.id === b[i].route.id);
+  }
   function _internalSetRoutes(newRoutes) {
     manifest = {};
     inFlightDataRoutes = convertRoutesToDataRoutes(
@@ -5589,8 +5617,8 @@ var RenderErrorBoundary = class extends React2.Component {
     };
   }
   componentDidCatch(error, errorInfo) {
-    if (this.props.unstable_onError) {
-      this.props.unstable_onError(error, errorInfo);
+    if (this.props.onError) {
+      this.props.onError(error, errorInfo);
     } else {
       console.error(
         "React Router caught the following error during render",
@@ -5668,6 +5696,13 @@ function _renderMatches(matches, parentMatches = [], dataRouterState = null, uns
       }
     }
   }
+  let onError = dataRouterState && unstable_onError ? (error, errorInfo) => {
+    unstable_onError(error, {
+      location: dataRouterState.location,
+      params: dataRouterState.matches?.[0]?.params ?? {},
+      errorInfo
+    });
+  } : void 0;
   return renderedMatches.reduceRight(
     (outlet, match, index) => {
       let error;
@@ -5728,7 +5763,7 @@ function _renderMatches(matches, parentMatches = [], dataRouterState = null, uns
           error,
           children: getChildren(),
           routeContext: { outlet: null, matches: matches2, isDataRoute: true },
-          unstable_onError
+          onError
         }
       ) : getChildren();
     },
@@ -6140,7 +6175,10 @@ function RouterProvider({
         if (newState.errors && unstable_onError) {
           Object.entries(newState.errors).forEach(([routeId, error]) => {
             if (prevState.errors?.[routeId] !== error) {
-              unstable_onError(error);
+              unstable_onError(error, {
+                location: newState.location,
+                params: newState.matches[0]?.params ?? {}
+              });
             }
           });
         }
@@ -6469,12 +6507,25 @@ function Await({
   resolve
 }) {
   let dataRouterContext = React3.useContext(DataRouterContext);
+  let dataRouterStateContext = React3.useContext(DataRouterStateContext);
+  let onError = React3.useCallback(
+    (error, errorInfo) => {
+      if (dataRouterContext && dataRouterContext.unstable_onError && dataRouterStateContext) {
+        dataRouterContext.unstable_onError(error, {
+          location: dataRouterStateContext.location,
+          params: dataRouterStateContext.matches?.[0]?.params || {},
+          errorInfo
+        });
+      }
+    },
+    [dataRouterContext, dataRouterStateContext]
+  );
   return /* @__PURE__ */ React3.createElement(
     AwaitErrorBoundary,
     {
       resolve,
       errorElement,
-      unstable_onError: dataRouterContext?.unstable_onError
+      onError
     },
     /* @__PURE__ */ React3.createElement(ResolveAwait, null, children)
   );
@@ -6488,8 +6539,8 @@ var AwaitErrorBoundary = class extends React3.Component {
     return { error };
   }
   componentDidCatch(error, errorInfo) {
-    if (this.props.unstable_onError) {
-      this.props.unstable_onError(error, errorInfo);
+    if (this.props.onError) {
+      this.props.onError(error, errorInfo);
     } else {
       console.error(
         "<Await> caught the following error during render",
@@ -6523,7 +6574,7 @@ var AwaitErrorBoundary = class extends React3.Component {
       promise = resolve.then(
         (data2) => Object.defineProperty(resolve, "_data", { get: () => data2 }),
         (error) => {
-          this.props.unstable_onError?.(error);
+          this.props.onError?.(error);
           Object.defineProperty(resolve, "_error", { get: () => error });
         }
       );
@@ -9466,7 +9517,7 @@ var isBrowser = typeof window !== "undefined" && typeof window.document !== "und
 try {
   if (isBrowser) {
     window.__reactRouterVersion = // @ts-expect-error
-    "7.9.5-pre.0";
+    "7.9.6-pre.0";
   }
 } catch (e) {
 }

package/dist/production/{chunk-4SZHQXEM.js → chunk-MKF3AQDO.js}

@@ -1,5 +1,5 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }/**
- * react-router v7.9.5-pre.0
+ * react-router v7.9.6-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -14,7 +14,7 @@
 
 
 
-var _chunkARKB3I5Kjs = require('./chunk-ARKB3I5K.js');
+var _chunkRBZEEJIKjs = require('./chunk-RBZEEJIK.js');
 
 // lib/dom/ssr/hydration.tsx
 function getHydrationData({
@@ -29,12 +29,12 @@ function getHydrationData({
     ...state,
     loaderData: { ...state.loaderData }
   };
-  let initialMatches = _chunkARKB3I5Kjs.matchRoutes.call(void 0, routes, location, basename);
+  let initialMatches = _chunkRBZEEJIKjs.matchRoutes.call(void 0, routes, location, basename);
   if (initialMatches) {
     for (let match of initialMatches) {
       let routeId = match.route.id;
       let routeInfo = getRouteInfo(routeId);
-      if (_chunkARKB3I5Kjs.shouldHydrateRouteLoader.call(void 0, 
+      if (_chunkRBZEEJIKjs.shouldHydrateRouteLoader.call(void 0, 
         routeId,
         routeInfo.clientLoader,
         routeInfo.hasLoader,
@@ -112,7 +112,7 @@ function RSCDefaultRootErrorBoundaryImpl({
       }
     }
   );
-  if (_chunkARKB3I5Kjs.isRouteErrorResponse.call(void 0, error)) {
+  if (_chunkRBZEEJIKjs.isRouteErrorResponse.call(void 0, error)) {
     return /* @__PURE__ */ _react2.default.createElement(
       ErrorWrapper,
       {
@@ -120,7 +120,7 @@ function RSCDefaultRootErrorBoundaryImpl({
         title: "Unhandled Thrown Response!"
       },
       /* @__PURE__ */ _react2.default.createElement("h1", { style: { fontSize: "24px" } }, error.status, " ", error.statusText),
-      _chunkARKB3I5Kjs.ENABLE_DEV_WARNINGS ? heyDeveloper : null
+      _chunkRBZEEJIKjs.ENABLE_DEV_WARNINGS ? heyDeveloper : null
     );
   }
   let errorInstance;
@@ -146,7 +146,7 @@ function RSCDefaultRootErrorBoundaryImpl({
 function RSCDefaultRootErrorBoundary({
   hasRootLayout
 }) {
-  let error = _chunkARKB3I5Kjs.useRouteError.call(void 0, );
+  let error = _chunkRBZEEJIKjs.useRouteError.call(void 0, );
   if (hasRootLayout === void 0) {
     throw new Error("Missing 'hasRootLayout' prop");
   }

package/dist/production/{chunk-ARKB3I5K.js → chunk-RBZEEJIK.js}

@@ -1,5 +1,5 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }/**
- * react-router v7.9.5-pre.0
+ * react-router v7.9.6-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -2306,6 +2306,14 @@ function createRouter(init) {
       key
     );
     let actionResult = actionResults[match.route.id];
+    if (!actionResult) {
+      for (let match2 of fetchMatches) {
+        if (actionResults[match2.route.id]) {
+          actionResult = actionResults[match2.route.id];
+          break;
+        }
+      }
+    }
     if (fetchRequest.signal.aborted) {
       if (fetchControllers.get(key) === abortController) {
         fetchControllers.delete(key);
@@ -2962,23 +2970,43 @@ function createRouter(init) {
         return { type: "aborted" };
       }
       let newMatches = matchRoutes(routesToUse, pathname, basename);
+      let newPartialMatches = null;
       if (newMatches) {
-        return { type: "success", matches: newMatches };
+        if (Object.keys(newMatches[0].params).length === 0) {
+          return { type: "success", matches: newMatches };
+        } else {
+          newPartialMatches = matchRoutesImpl(
+            routesToUse,
+            pathname,
+            basename,
+            true
+          );
+          let matchedDeeper = newPartialMatches && partialMatches.length < newPartialMatches.length && compareMatches(
+            partialMatches,
+            newPartialMatches.slice(0, partialMatches.length)
+          );
+          if (!matchedDeeper) {
+            return { type: "success", matches: newMatches };
+          }
+        }
       }
-      let newPartialMatches = matchRoutesImpl(
-        routesToUse,
-        pathname,
-        basename,
-        true
-      );
-      if (!newPartialMatches || partialMatches.length === newPartialMatches.length && partialMatches.every(
-        (m, i) => m.route.id === newPartialMatches[i].route.id
-      )) {
+      if (!newPartialMatches) {
+        newPartialMatches = matchRoutesImpl(
+          routesToUse,
+          pathname,
+          basename,
+          true
+        );
+      }
+      if (!newPartialMatches || compareMatches(partialMatches, newPartialMatches)) {
         return { type: "success", matches: null };
       }
       partialMatches = newPartialMatches;
     }
   }
+  function compareMatches(a, b) {
+    return a.length === b.length && a.every((m, i) => m.route.id === b[i].route.id);
+  }
   function _internalSetRoutes(newRoutes) {
     manifest = {};
     inFlightDataRoutes = convertRoutesToDataRoutes(
@@ -6767,8 +6795,8 @@ var RenderErrorBoundary = class extends React3.Component {
     };
   }
   componentDidCatch(error, errorInfo) {
-    if (this.props.unstable_onError) {
-      this.props.unstable_onError(error, errorInfo);
+    if (this.props.onError) {
+      this.props.onError(error, errorInfo);
     } else {
       console.error(
         "React Router caught the following error during render",
@@ -6846,6 +6874,13 @@ function _renderMatches(matches, parentMatches = [], dataRouterState = null, uns
       }
     }
   }
+  let onError = dataRouterState && unstable_onError ? (error, errorInfo) => {
+    unstable_onError(error, {
+      location: dataRouterState.location,
+      params: _nullishCoalesce(_optionalChain([dataRouterState, 'access', _76 => _76.matches, 'optionalAccess', _77 => _77[0], 'optionalAccess', _78 => _78.params]), () => ( {})),
+      errorInfo
+    });
+  } : void 0;
   return renderedMatches.reduceRight(
     (outlet, match, index) => {
       let error;
@@ -6906,7 +6941,7 @@ function _renderMatches(matches, parentMatches = [], dataRouterState = null, uns
           error,
           children: getChildren(),
           routeContext: { outlet: null, matches: matches2, isDataRoute: true },
-          unstable_onError
+          onError
         }
       ) : getChildren();
     },
@@ -6988,15 +7023,15 @@ function useRouteError() {
   if (error !== void 0) {
     return error;
   }
-  return _optionalChain([state, 'access', _76 => _76.errors, 'optionalAccess', _77 => _77[routeId]]);
+  return _optionalChain([state, 'access', _79 => _79.errors, 'optionalAccess', _80 => _80[routeId]]);
 }
 function useAsyncValue() {
   let value = React3.useContext(AwaitContext);
-  return _optionalChain([value, 'optionalAccess', _78 => _78._data]);
+  return _optionalChain([value, 'optionalAccess', _81 => _81._data]);
 }
 function useAsyncError() {
   let value = React3.useContext(AwaitContext);
-  return _optionalChain([value, 'optionalAccess', _79 => _79._error]);
+  return _optionalChain([value, 'optionalAccess', _82 => _82._error]);
 }
 var blockerId = 0;
 function useBlocker(shouldBlock) {
@@ -7077,7 +7112,7 @@ function useRoute(...args) {
   return {
     handle: route.route.handle,
     loaderData: state.loaderData[id],
-    actionData: _optionalChain([state, 'access', _80 => _80.actionData, 'optionalAccess', _81 => _81[id]])
+    actionData: _optionalChain([state, 'access', _83 => _83.actionData, 'optionalAccess', _84 => _84[id]])
   };
 }
 
@@ -7122,7 +7157,7 @@ function getKeyedLinksForMatches(matches, routeModules, manifest) {
     let route = manifest.routes[match.route.id];
     return [
       route && route.css ? route.css.map((href) => ({ rel: "stylesheet", href })) : [],
-      _optionalChain([module, 'optionalAccess', _82 => _82.links, 'optionalCall', _83 => _83()]) || []
+      _optionalChain([module, 'optionalAccess', _85 => _85.links, 'optionalCall', _86 => _86()]) || []
     ];
   }).flat(2);
   let preloads = getModuleLinkHrefs(matches, manifest);
@@ -7223,7 +7258,7 @@ function getNewMatchesForLinks(page, nextMatches, currentMatches, manifest, loca
       // param change, /users/123 -> /users/456
       currentMatches[index].pathname !== match.pathname || // splat param changed, which is not present in match.path
       // e.g. /files/images/avatar.jpg -> files/finances.xls
-      _optionalChain([currentMatches, 'access', _84 => _84[index], 'access', _85 => _85.route, 'access', _86 => _86.path, 'optionalAccess', _87 => _87.endsWith, 'call', _88 => _88("*")]) && currentMatches[index].params["*"] !== match.params["*"]
+      _optionalChain([currentMatches, 'access', _87 => _87[index], 'access', _88 => _88.route, 'access', _89 => _89.path, 'optionalAccess', _90 => _90.endsWith, 'call', _91 => _91("*")]) && currentMatches[index].params["*"] !== match.params["*"]
     );
   };
   if (mode === "assets") {
@@ -7246,7 +7281,7 @@ function getNewMatchesForLinks(page, nextMatches, currentMatches, manifest, loca
             location.pathname + location.search + location.hash,
             window.origin
           ),
-          currentParams: _optionalChain([currentMatches, 'access', _89 => _89[0], 'optionalAccess', _90 => _90.params]) || {},
+          currentParams: _optionalChain([currentMatches, 'access', _92 => _92[0], 'optionalAccess', _93 => _93.params]) || {},
           nextUrl: new URL(page, window.origin),
           nextParams: match.params,
           defaultShouldRevalidate: true
@@ -7518,10 +7553,10 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
         )
       });
       let hasInitialData = initialState && initialState.loaderData && route.id in initialState.loaderData;
-      let initialData = hasInitialData ? _optionalChain([initialState, 'optionalAccess', _91 => _91.loaderData, 'optionalAccess', _92 => _92[route.id]]) : void 0;
+      let initialData = hasInitialData ? _optionalChain([initialState, 'optionalAccess', _94 => _94.loaderData, 'optionalAccess', _95 => _95[route.id]]) : void 0;
       let hasInitialError = initialState && initialState.errors && route.id in initialState.errors;
-      let initialError = hasInitialError ? _optionalChain([initialState, 'optionalAccess', _93 => _93.errors, 'optionalAccess', _94 => _94[route.id]]) : void 0;
-      let isHydrationRequest = needsRevalidation == null && (_optionalChain([routeModule, 'access', _95 => _95.clientLoader, 'optionalAccess', _96 => _96.hydrate]) === true || !route.hasLoader);
+      let initialError = hasInitialError ? _optionalChain([initialState, 'optionalAccess', _96 => _96.errors, 'optionalAccess', _97 => _97[route.id]]) : void 0;
+      let isHydrationRequest = needsRevalidation == null && (_optionalChain([routeModule, 'access', _98 => _98.clientLoader, 'optionalAccess', _99 => _99.hydrate]) === true || !route.hasLoader);
       dataRoute.loader = async ({ request, params, context, unstable_pattern }, singleFetch) => {
         try {
           let result = await prefetchStylesAndCallHandler(async () => {
@@ -7817,7 +7852,7 @@ function getPatchRoutesOnNavigationFunction(manifest, routeModules, ssr, routeDi
 function useFogOFWarDiscovery(router, manifest, routeModules, ssr, routeDiscovery, isSpaMode) {
   React6.useEffect(() => {
     if (!isFogOfWarEnabled(routeDiscovery, ssr) || // @ts-expect-error - TS doesn't know about this yet
-    _optionalChain([window, 'access', _97 => _97.navigator, 'optionalAccess', _98 => _98.connection, 'optionalAccess', _99 => _99.saveData]) === true) {
+    _optionalChain([window, 'access', _100 => _100.navigator, 'optionalAccess', _101 => _101.connection, 'optionalAccess', _102 => _102.saveData]) === true) {
       return;
     }
     function registerElement(el) {
@@ -7926,7 +7961,7 @@ async function fetchAndApplyManifestPatches(paths, errorReloadPath, manifest, ro
     }
     serverPatches = await res.json();
   } catch (e) {
-    if (_optionalChain([signal, 'optionalAccess', _100 => _100.aborted])) return;
+    if (_optionalChain([signal, 'optionalAccess', _103 => _103.aborted])) return;
     throw e;
   }
   let knownRoutes = new Set(Object.keys(manifest.routes));
@@ -8167,7 +8202,7 @@ function PrefetchPageLinksImpl({
       if (!manifestRoute || !manifestRoute.hasLoader) {
         return;
       }
-      if (!newMatchesForData.some((m2) => m2.route.id === m.route.id) && m.route.id in loaderData && _optionalChain([routeModules, 'access', _101 => _101[m.route.id], 'optionalAccess', _102 => _102.shouldRevalidate])) {
+      if (!newMatchesForData.some((m2) => m2.route.id === m.route.id) && m.route.id in loaderData && _optionalChain([routeModules, 'access', _104 => _104[m.route.id], 'optionalAccess', _105 => _105.shouldRevalidate])) {
         foundOptOutRoute = true;
       } else if (manifestRoute.hasClientLoader) {
         foundOptOutRoute = true;
@@ -8241,7 +8276,7 @@ function Meta() {
       error
     };
     matches[i] = match;
-    if (_optionalChain([routeModule, 'optionalAccess', _103 => _103.meta])) {
+    if (_optionalChain([routeModule, 'optionalAccess', _106 => _106.meta])) {
       routeMeta = typeof routeModule.meta === "function" ? routeModule.meta({
         data: data2,
         loaderData: data2,
@@ -8340,7 +8375,7 @@ function Scripts(scriptProps) {
     }
     let streamScript = "window.__reactRouterContext.stream = new ReadableStream({start(controller){window.__reactRouterContext.streamController = controller;}}).pipeThrough(new TextEncoderStream());";
     let contextScript = staticContext ? `window.__reactRouterContext = ${serverHandoffString};${streamScript}` : " ";
-    let routeModulesScript = !isStatic ? " " : `${_optionalChain([manifest, 'access', _104 => _104.hmr, 'optionalAccess', _105 => _105.runtime]) ? `import ${JSON.stringify(manifest.hmr.runtime)};` : ""}${!enableFogOfWar ? `import ${JSON.stringify(manifest.url)}` : ""};
+    let routeModulesScript = !isStatic ? " " : `${_optionalChain([manifest, 'access', _107 => _107.hmr, 'optionalAccess', _108 => _108.runtime]) ? `import ${JSON.stringify(manifest.hmr.runtime)};` : ""}${!enableFogOfWar ? `import ${JSON.stringify(manifest.url)}` : ""};
 ${matches.map((match, routeIndex) => {
       let routeVarName = `route${routeIndex}`;
       let manifestEntry = manifest.routes[match.route.id];
@@ -8570,7 +8605,7 @@ function BoundaryShell({
   children
 }) {
   let { routeModules } = useFrameworkContext();
-  if (_optionalChain([routeModules, 'access', _106 => _106.root, 'optionalAccess', _107 => _107.Layout]) && !isOutsideRemixApp) {
+  if (_optionalChain([routeModules, 'access', _109 => _109.root, 'optionalAccess', _110 => _110.Layout]) && !isOutsideRemixApp) {
     return children;
   }
   return /* @__PURE__ */ React8.createElement("html", { lang: "en" }, /* @__PURE__ */ React8.createElement("head", null, /* @__PURE__ */ React8.createElement("meta", { charSet: "utf-8" }), /* @__PURE__ */ React8.createElement(
@@ -8640,20 +8675,20 @@ var hydrationRouteProperties = [
 ];
 function createMemoryRouter(routes, opts) {
   return createRouter({
-    basename: _optionalChain([opts, 'optionalAccess', _108 => _108.basename]),
-    getContext: _optionalChain([opts, 'optionalAccess', _109 => _109.getContext]),
-    future: _optionalChain([opts, 'optionalAccess', _110 => _110.future]),
+    basename: _optionalChain([opts, 'optionalAccess', _111 => _111.basename]),
+    getContext: _optionalChain([opts, 'optionalAccess', _112 => _112.getContext]),
+    future: _optionalChain([opts, 'optionalAccess', _113 => _113.future]),
     history: createMemoryHistory({
-      initialEntries: _optionalChain([opts, 'optionalAccess', _111 => _111.initialEntries]),
-      initialIndex: _optionalChain([opts, 'optionalAccess', _112 => _112.initialIndex])
+      initialEntries: _optionalChain([opts, 'optionalAccess', _114 => _114.initialEntries]),
+      initialIndex: _optionalChain([opts, 'optionalAccess', _115 => _115.initialIndex])
     }),
-    hydrationData: _optionalChain([opts, 'optionalAccess', _113 => _113.hydrationData]),
+    hydrationData: _optionalChain([opts, 'optionalAccess', _116 => _116.hydrationData]),
     routes,
     hydrationRouteProperties,
     mapRouteProperties,
-    dataStrategy: _optionalChain([opts, 'optionalAccess', _114 => _114.dataStrategy]),
-    patchRoutesOnNavigation: _optionalChain([opts, 'optionalAccess', _115 => _115.patchRoutesOnNavigation]),
-    unstable_instrumentations: _optionalChain([opts, 'optionalAccess', _116 => _116.unstable_instrumentations])
+    dataStrategy: _optionalChain([opts, 'optionalAccess', _117 => _117.dataStrategy]),
+    patchRoutesOnNavigation: _optionalChain([opts, 'optionalAccess', _118 => _118.patchRoutesOnNavigation]),
+    unstable_instrumentations: _optionalChain([opts, 'optionalAccess', _119 => _119.unstable_instrumentations])
   }).initialize();
 }
 var Deferred2 = class {
@@ -8715,12 +8750,12 @@ function UNSTABLE_TransitionEnabledRouterProvider({
       go: (n) => router.navigate(n),
       push: (to, state2, opts) => router.navigate(to, {
         state: state2,
-        preventScrollReset: _optionalChain([opts, 'optionalAccess', _117 => _117.preventScrollReset])
+        preventScrollReset: _optionalChain([opts, 'optionalAccess', _120 => _120.preventScrollReset])
       }),
       replace: (to, state2, opts) => router.navigate(to, {
         replace: true,
         state: state2,
-        preventScrollReset: _optionalChain([opts, 'optionalAccess', _118 => _118.preventScrollReset])
+        preventScrollReset: _optionalChain([opts, 'optionalAccess', _121 => _121.preventScrollReset])
       })
     };
   }, [router]);
@@ -8807,8 +8842,11 @@ function RouterProvider({
       setStateImpl((prevState) => {
         if (newState.errors && unstable_onError) {
           Object.entries(newState.errors).forEach(([routeId, error]) => {
-            if (_optionalChain([prevState, 'access', _119 => _119.errors, 'optionalAccess', _120 => _120[routeId]]) !== error) {
-              unstable_onError(error);
+            if (_optionalChain([prevState, 'access', _122 => _122.errors, 'optionalAccess', _123 => _123[routeId]]) !== error) {
+              unstable_onError(error, {
+                location: newState.location,
+                params: _nullishCoalesce(_optionalChain([newState, 'access', _124 => _124.matches, 'access', _125 => _125[0], 'optionalAccess', _126 => _126.params]), () => ( {}))
+              });
             }
           });
         }
@@ -8942,12 +8980,12 @@ function RouterProvider({
       go: (n) => router.navigate(n),
       push: (to, state2, opts) => router.navigate(to, {
         state: state2,
-        preventScrollReset: _optionalChain([opts, 'optionalAccess', _121 => _121.preventScrollReset])
+        preventScrollReset: _optionalChain([opts, 'optionalAccess', _127 => _127.preventScrollReset])
       }),
       replace: (to, state2, opts) => router.navigate(to, {
         replace: true,
         state: state2,
-        preventScrollReset: _optionalChain([opts, 'optionalAccess', _122 => _122.preventScrollReset])
+        preventScrollReset: _optionalChain([opts, 'optionalAccess', _128 => _128.preventScrollReset])
       })
     };
   }, [router]);
@@ -9137,12 +9175,25 @@ function Await({
   resolve
 }) {
   let dataRouterContext = React9.useContext(DataRouterContext);
+  let dataRouterStateContext = React9.useContext(DataRouterStateContext);
+  let onError = React9.useCallback(
+    (error, errorInfo) => {
+      if (dataRouterContext && dataRouterContext.unstable_onError && dataRouterStateContext) {
+        dataRouterContext.unstable_onError(error, {
+          location: dataRouterStateContext.location,
+          params: _optionalChain([dataRouterStateContext, 'access', _129 => _129.matches, 'optionalAccess', _130 => _130[0], 'optionalAccess', _131 => _131.params]) || {},
+          errorInfo
+        });
+      }
+    },
+    [dataRouterContext, dataRouterStateContext]
+  );
   return /* @__PURE__ */ React9.createElement(
     AwaitErrorBoundary,
     {
       resolve,
       errorElement,
-      unstable_onError: _optionalChain([dataRouterContext, 'optionalAccess', _123 => _123.unstable_onError])
+      onError
     },
     /* @__PURE__ */ React9.createElement(ResolveAwait, null, children)
   );
@@ -9156,8 +9207,8 @@ var AwaitErrorBoundary = class extends React9.Component {
     return { error };
   }
   componentDidCatch(error, errorInfo) {
-    if (this.props.unstable_onError) {
-      this.props.unstable_onError(error, errorInfo);
+    if (this.props.onError) {
+      this.props.onError(error, errorInfo);
     } else {
       console.error(
         "<Await> caught the following error during render",
@@ -9191,7 +9242,7 @@ var AwaitErrorBoundary = class extends React9.Component {
       promise = resolve.then(
         (data2) => Object.defineProperty(resolve, "_data", { get: () => data2 }),
         (error) => {
-          _optionalChain([this, 'access', _124 => _124.props, 'access', _125 => _125.unstable_onError, 'optionalCall', _126 => _126(error)]);
+          _optionalChain([this, 'access', _132 => _132.props, 'access', _133 => _133.onError, 'optionalCall', _134 => _134(error)]);
           Object.defineProperty(resolve, "_error", { get: () => error });
         }
       );