react-router 7.8.0-pre.2 → 7.8.0

package/dist/production/{chunk-IEIDJVF4.mjs → chunk-SIHON65V.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v7.8.0-pre.2
+ * react-router v7.8.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -3920,12 +3920,36 @@ async function defaultDataStrategyWithMiddleware(args) {
   if (!args.matches.some((m) => m.route.unstable_middleware)) {
     return defaultDataStrategy(args);
   }
+  let didCallHandler = false;
   return runClientMiddlewarePipeline(
     args,
-    () => defaultDataStrategy(args),
-    (error, routeId) => ({ [routeId]: { type: "error", result: error } })
+    () => {
+      didCallHandler = true;
+      return defaultDataStrategy(args);
+    },
+    (error, routeId) => clientMiddlewareErrorHandler(
+      error,
+      routeId,
+      args.matches,
+      didCallHandler
+    )
   );
 }
+function clientMiddlewareErrorHandler(error, routeId, matches, didCallHandler) {
+  if (didCallHandler) {
+    return {
+      [routeId]: { type: "error", result: error }
+    };
+  } else {
+    let boundaryRouteId = findNearestBoundary(
+      matches,
+      matches.find((m) => m.route.id === routeId || m.route.loader)?.route.id || routeId
+    ).route.id;
+    return {
+      [boundaryRouteId]: { type: "error", result: error }
+    };
+  }
+}
 async function runServerMiddlewarePipeline(args, handler, errorHandler) {
   let { matches, request, params, context } = args;
   let tuples = matches.flatMap(
@@ -4200,20 +4224,27 @@ async function callDataStrategyImpl(dataStrategyImpl, request, matches, fetcherK
     );
   } : (cb) => {
     let typedDataStrategyArgs = dataStrategyArgs;
+    let didCallHandler = false;
     return runClientMiddlewarePipeline(
       typedDataStrategyArgs,
-      () => cb({
-        ...typedDataStrategyArgs,
-        fetcherKey,
-        unstable_runClientMiddleware: () => {
-          throw new Error(
-            "Cannot call `unstable_runClientMiddleware()` from within an `unstable_runClientMiddleware` handler"
-          );
-        }
-      }),
-      (error, routeId) => ({
-        [routeId]: { type: "error", result: error }
-      })
+      () => {
+        didCallHandler = true;
+        return cb({
+          ...typedDataStrategyArgs,
+          fetcherKey,
+          unstable_runClientMiddleware: () => {
+            throw new Error(
+              "Cannot call `unstable_runClientMiddleware()` from within an `unstable_runClientMiddleware` handler"
+            );
+          }
+        });
+      },
+      (error, routeId) => clientMiddlewareErrorHandler(
+        error,
+        routeId,
+        matches,
+        didCallHandler
+      )
     );
   };
   let results = await dataStrategyImpl({
@@ -8941,7 +8972,7 @@ var isBrowser = typeof window !== "undefined" && typeof window.document !== "und
 try {
   if (isBrowser) {
     window.__reactRouterVersion = // @ts-expect-error
-    "7.8.0-pre.2";
+    "7.8.0";
   }
 } catch (e) {
 }

package/dist/production/{chunk-Q6IGLNPQ.mjs → chunk-XPGU3ZMH.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v7.8.0-pre.2
+ * react-router v7.8.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -57,7 +57,7 @@ import {
   withComponentProps,
   withErrorBoundaryProps,
   withHydrateFallbackProps
-} from "./chunk-IEIDJVF4.mjs";
+} from "./chunk-SIHON65V.mjs";
 
 // lib/dom/ssr/server.tsx
 import * as React from "react";

package/dist/production/dom-export.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 _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.8.0-pre.2
+ * react-router v7.8.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -11,7 +11,7 @@
 "use client";
 
 
-var _chunkDDK3XFL6js = require('./chunk-DDK3XFL6.js');
+var _chunkBOD6JCOUjs = require('./chunk-BOD6JCOU.js');
 
 // lib/dom-export/dom-router-provider.tsx
 var _react = require('react'); var React = _interopRequireWildcard(_react); var React2 = _interopRequireWildcard(_react);
@@ -180,7 +180,7 @@ function HydratedRouter(props) {
   }, []);
   React2.useEffect(() => {
     if (process.env.NODE_ENV === "development" && criticalCss === void 0) {
-      document.querySelectorAll(`[${_chunkDDK3XFL6js.CRITICAL_CSS_DATA_ATTRIBUTE}]`).forEach((element) => element.remove());
+      document.querySelectorAll(`[${_chunkBOD6JCOUjs.CRITICAL_CSS_DATA_ATTRIBUTE}]`).forEach((element) => element.remove());
     }
   }, [criticalCss]);
   let [location, setLocation] = React2.useState(router.state.location);

package/dist/production/dom-export.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v7.8.0-pre.2
+ * react-router v7.8.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -12,7 +12,7 @@
 import {
   deserializeErrors,
   getHydrationData
-} from "./chunk-Q6IGLNPQ.mjs";
+} from "./chunk-XPGU3ZMH.mjs";
 import {
   CRITICAL_CSS_DATA_ATTRIBUTE,
   FrameworkContext,
@@ -29,7 +29,7 @@ import {
   invariant,
   mapRouteProperties,
   useFogOFWarDiscovery
-} from "./chunk-IEIDJVF4.mjs";
+} from "./chunk-SIHON65V.mjs";
 
 // lib/dom-export/dom-router-provider.tsx
 import * as React from "react";

package/dist/production/index-react-server-client.js

@@ -1,5 +1,5 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});/**
- * react-router v7.8.0-pre.2
+ * react-router v7.8.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -30,11 +30,11 @@
 
 
 
-var _chunkGSF7DANIjs = require('./chunk-GSF7DANI.js');
+var _chunkO6DRQPUDjs = require('./chunk-O6DRQPUD.js');
 
 
 
-var _chunkDDK3XFL6js = require('./chunk-DDK3XFL6.js');
+var _chunkBOD6JCOUjs = require('./chunk-BOD6JCOU.js');
 
 
 
@@ -58,4 +58,4 @@ var _chunkDDK3XFL6js = require('./chunk-DDK3XFL6.js');
 
 
 
-exports.Await = _chunkGSF7DANIjs.Await; exports.BrowserRouter = _chunkGSF7DANIjs.BrowserRouter; exports.Form = _chunkGSF7DANIjs.Form; exports.HashRouter = _chunkGSF7DANIjs.HashRouter; exports.Link = _chunkGSF7DANIjs.Link; exports.Links = _chunkDDK3XFL6js.Links; exports.MemoryRouter = _chunkGSF7DANIjs.MemoryRouter; exports.Meta = _chunkDDK3XFL6js.Meta; exports.NavLink = _chunkGSF7DANIjs.NavLink; exports.Navigate = _chunkGSF7DANIjs.Navigate; exports.Outlet = _chunkGSF7DANIjs.Outlet; exports.Route = _chunkGSF7DANIjs.Route; exports.Router = _chunkGSF7DANIjs.Router; exports.RouterProvider = _chunkGSF7DANIjs.RouterProvider; exports.Routes = _chunkGSF7DANIjs.Routes; exports.ScrollRestoration = _chunkGSF7DANIjs.ScrollRestoration; exports.StaticRouter = _chunkGSF7DANIjs.StaticRouter; exports.StaticRouterProvider = _chunkGSF7DANIjs.StaticRouterProvider; exports.UNSAFE_WithComponentProps = _chunkGSF7DANIjs.WithComponentProps; exports.UNSAFE_WithErrorBoundaryProps = _chunkGSF7DANIjs.WithErrorBoundaryProps; exports.UNSAFE_WithHydrateFallbackProps = _chunkGSF7DANIjs.WithHydrateFallbackProps; exports.unstable_HistoryRouter = _chunkGSF7DANIjs.HistoryRouter;
+exports.Await = _chunkO6DRQPUDjs.Await; exports.BrowserRouter = _chunkO6DRQPUDjs.BrowserRouter; exports.Form = _chunkO6DRQPUDjs.Form; exports.HashRouter = _chunkO6DRQPUDjs.HashRouter; exports.Link = _chunkO6DRQPUDjs.Link; exports.Links = _chunkBOD6JCOUjs.Links; exports.MemoryRouter = _chunkO6DRQPUDjs.MemoryRouter; exports.Meta = _chunkBOD6JCOUjs.Meta; exports.NavLink = _chunkO6DRQPUDjs.NavLink; exports.Navigate = _chunkO6DRQPUDjs.Navigate; exports.Outlet = _chunkO6DRQPUDjs.Outlet; exports.Route = _chunkO6DRQPUDjs.Route; exports.Router = _chunkO6DRQPUDjs.Router; exports.RouterProvider = _chunkO6DRQPUDjs.RouterProvider; exports.Routes = _chunkO6DRQPUDjs.Routes; exports.ScrollRestoration = _chunkO6DRQPUDjs.ScrollRestoration; exports.StaticRouter = _chunkO6DRQPUDjs.StaticRouter; exports.StaticRouterProvider = _chunkO6DRQPUDjs.StaticRouterProvider; exports.UNSAFE_WithComponentProps = _chunkO6DRQPUDjs.WithComponentProps; exports.UNSAFE_WithErrorBoundaryProps = _chunkO6DRQPUDjs.WithErrorBoundaryProps; exports.UNSAFE_WithHydrateFallbackProps = _chunkO6DRQPUDjs.WithHydrateFallbackProps; exports.unstable_HistoryRouter = _chunkO6DRQPUDjs.HistoryRouter;

package/dist/production/index-react-server-client.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v7.8.0-pre.2
+ * react-router v7.8.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -32,7 +32,7 @@ import {
   WithComponentProps,
   WithErrorBoundaryProps,
   WithHydrateFallbackProps
-} from "./chunk-IEIDJVF4.mjs";
+} from "./chunk-SIHON65V.mjs";
 export {
   Await,
   BrowserRouter,

package/dist/production/index-react-server.js

@@ -27,7 +27,7 @@ function _interopNamespace(e) {
 var React2__namespace = /*#__PURE__*/_interopNamespace(React2);
 
 /**
- * react-router v7.8.0-pre.2
+ * react-router v7.8.0
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/index-react-server.mjs

@@ -6,7 +6,7 @@ export { Await, BrowserRouter, Form, HashRouter, Link, Links, MemoryRouter, Meta
 import { serialize, parse } from 'cookie';
 
 /**
- * react-router v7.8.0-pre.2
+ * react-router v7.8.0
  *
  * Copyright (c) Remix Software Inc.
  *