react-router 7.7.0 → 7.7.1

package/dist/development/index-react-server-client.d.mts

@@ -1,4 +1,4 @@
-export { f as Await, g as MemoryRouter, h as Navigate, i as Outlet, j as Route, k as Router, l as RouterProvider, m as Routes, W as UNSAFE_WithComponentProps, v as UNSAFE_WithErrorBoundaryProps, t as UNSAFE_WithHydrateFallbackProps } from './components-DzqPLVI1.mjs';
-export { l as BrowserRouter, q as Form, m as HashRouter, n as Link, X as Links, W as Meta, p as NavLink, r as ScrollRestoration, T as StaticRouter, V as StaticRouterProvider, o as unstable_HistoryRouter } from './index-react-server-client-CUidsuu_.mjs';
-import './route-data-DjzmHYNR.mjs';
+export { f as Await, g as MemoryRouter, h as Navigate, i as Outlet, j as Route, k as Router, l as RouterProvider, m as Routes, W as UNSAFE_WithComponentProps, v as UNSAFE_WithErrorBoundaryProps, t as UNSAFE_WithHydrateFallbackProps } from './components-CjQijYga.mjs';
+export { l as BrowserRouter, q as Form, m as HashRouter, n as Link, X as Links, W as Meta, p as NavLink, r as ScrollRestoration, T as StaticRouter, V as StaticRouterProvider, o as unstable_HistoryRouter } from './index-react-server-client-KLg-U4nr.mjs';
+import './route-data-CqEmXQub.mjs';
 import 'react';

package/dist/development/index-react-server-client.d.ts

@@ -1,3 +1,3 @@
-export { h as Await, V as BrowserRouter, _ as Form, W as HashRouter, X as Link, am as Links, i as MemoryRouter, al as Meta, Z as NavLink, j as Navigate, k as Outlet, l as Route, m as Router, n as RouterProvider, o as Routes, $ as ScrollRestoration, aj as StaticRouter, ak as StaticRouterProvider, aw as UNSAFE_WithComponentProps, aA as UNSAFE_WithErrorBoundaryProps, ay as UNSAFE_WithHydrateFallbackProps, Y as unstable_HistoryRouter } from './index-react-server-client-kY8DvDF3.js';
-import './routeModules-g5PTiDfO.js';
+export { h as Await, V as BrowserRouter, _ as Form, W as HashRouter, X as Link, am as Links, i as MemoryRouter, al as Meta, Z as NavLink, j as Navigate, k as Outlet, l as Route, m as Router, n as RouterProvider, o as Routes, $ as ScrollRestoration, aj as StaticRouter, ak as StaticRouterProvider, ay as UNSAFE_WithComponentProps, aC as UNSAFE_WithErrorBoundaryProps, aA as UNSAFE_WithHydrateFallbackProps, Y as unstable_HistoryRouter } from './index-react-server-client-Bi_fx8qz.js';
+import './routeModules-BR2FO0ix.js';
 import 'react';

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

@@ -1,5 +1,5 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});/**
- * react-router v7.7.0
+ * react-router v7.7.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -30,11 +30,11 @@
 
 
 
-var _chunk4ADB4KIOjs = require('./chunk-4ADB4KIO.js');
+var _chunkR73PQUJUjs = require('./chunk-R73PQUJU.js');
 
 
 
-var _chunkV6PEDDZIjs = require('./chunk-V6PEDDZI.js');
+var _chunkK7YFBME3js = require('./chunk-K7YFBME3.js');
 
 
 
@@ -58,4 +58,4 @@ var _chunkV6PEDDZIjs = require('./chunk-V6PEDDZI.js');
 
 
 
-exports.Await = _chunk4ADB4KIOjs.Await; exports.BrowserRouter = _chunk4ADB4KIOjs.BrowserRouter; exports.Form = _chunk4ADB4KIOjs.Form; exports.HashRouter = _chunk4ADB4KIOjs.HashRouter; exports.Link = _chunk4ADB4KIOjs.Link; exports.Links = _chunkV6PEDDZIjs.Links; exports.MemoryRouter = _chunk4ADB4KIOjs.MemoryRouter; exports.Meta = _chunkV6PEDDZIjs.Meta; exports.NavLink = _chunk4ADB4KIOjs.NavLink; exports.Navigate = _chunk4ADB4KIOjs.Navigate; exports.Outlet = _chunk4ADB4KIOjs.Outlet; exports.Route = _chunk4ADB4KIOjs.Route; exports.Router = _chunk4ADB4KIOjs.Router; exports.RouterProvider = _chunk4ADB4KIOjs.RouterProvider; exports.Routes = _chunk4ADB4KIOjs.Routes; exports.ScrollRestoration = _chunk4ADB4KIOjs.ScrollRestoration; exports.StaticRouter = _chunk4ADB4KIOjs.StaticRouter; exports.StaticRouterProvider = _chunk4ADB4KIOjs.StaticRouterProvider; exports.UNSAFE_WithComponentProps = _chunk4ADB4KIOjs.WithComponentProps; exports.UNSAFE_WithErrorBoundaryProps = _chunk4ADB4KIOjs.WithErrorBoundaryProps; exports.UNSAFE_WithHydrateFallbackProps = _chunk4ADB4KIOjs.WithHydrateFallbackProps; exports.unstable_HistoryRouter = _chunk4ADB4KIOjs.HistoryRouter;
+exports.Await = _chunkR73PQUJUjs.Await; exports.BrowserRouter = _chunkR73PQUJUjs.BrowserRouter; exports.Form = _chunkR73PQUJUjs.Form; exports.HashRouter = _chunkR73PQUJUjs.HashRouter; exports.Link = _chunkR73PQUJUjs.Link; exports.Links = _chunkK7YFBME3js.Links; exports.MemoryRouter = _chunkR73PQUJUjs.MemoryRouter; exports.Meta = _chunkK7YFBME3js.Meta; exports.NavLink = _chunkR73PQUJUjs.NavLink; exports.Navigate = _chunkR73PQUJUjs.Navigate; exports.Outlet = _chunkR73PQUJUjs.Outlet; exports.Route = _chunkR73PQUJUjs.Route; exports.Router = _chunkR73PQUJUjs.Router; exports.RouterProvider = _chunkR73PQUJUjs.RouterProvider; exports.Routes = _chunkR73PQUJUjs.Routes; exports.ScrollRestoration = _chunkR73PQUJUjs.ScrollRestoration; exports.StaticRouter = _chunkR73PQUJUjs.StaticRouter; exports.StaticRouterProvider = _chunkR73PQUJUjs.StaticRouterProvider; exports.UNSAFE_WithComponentProps = _chunkR73PQUJUjs.WithComponentProps; exports.UNSAFE_WithErrorBoundaryProps = _chunkR73PQUJUjs.WithErrorBoundaryProps; exports.UNSAFE_WithHydrateFallbackProps = _chunkR73PQUJUjs.WithHydrateFallbackProps; exports.unstable_HistoryRouter = _chunkR73PQUJUjs.HistoryRouter;

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

@@ -1,5 +1,5 @@
 /**
- * react-router v7.7.0
+ * react-router v7.7.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -32,7 +32,7 @@ import {
   WithComponentProps,
   WithErrorBoundaryProps,
   WithHydrateFallbackProps
-} from "./chunk-EF7DTUVF.mjs";
+} from "./chunk-C37GKA54.mjs";
 export {
   Await,
   BrowserRouter,

package/dist/development/index-react-server.d.mts

@@ -405,14 +405,56 @@ interface DataStrategyMatch extends AgnosticRouteMatch<string, AgnosticDataRoute
         handler: Promise<void> | undefined;
         route: Promise<void> | undefined;
     };
+    /**
+     * A boolean value indicating whether this route handler should be called in this pass.
+     *
+     * The `matches` array always includes _all_ matched routes even when only _some_
+     * route handlers need to be called so that things like middleware can be implemented.
+     *
+     * `shouldLoad` is usually only interesting if you are skipping the route handler
+     * entirely and implementing custom handler logic - since it lets you determine
+     * if that custom logic should run for this route or not.
+     *
+     * For example:
+     *  - If you are on `/parent/child/a` and you navigate to `/parent/child/b` -
+     *    you'll get an array of three matches (`[parent, child, b]`), but only `b`
+     *    will have `shouldLoad=true` because the data for `parent` and `child` is
+     *    already loaded
+     *  - If you are on `/parent/child/a` and you submit to `a`'s `action`, then only
+     *    `a` will have `shouldLoad=true` for the action execution of `dataStrategy`
+     *  - After the `action`, `dataStrategy` will be called again for the `loader`
+     *    revalidation, and all matches will have `shouldLoad=true` (assuming no custom
+     *   `shouldRevalidate` implementations)
+     */
     shouldLoad: boolean;
     unstable_shouldRevalidateArgs: ShouldRevalidateFunctionArgs | null;
     unstable_shouldCallHandler(defaultShouldRevalidate?: boolean): boolean;
+    /**
+     * An async function that will resolve any `route.lazy` implementations and
+     * execute the route's handler (if necessary), returning a `DataStrategyResult`
+     *
+     * - Calling `match.resolve` does not mean you're calling the `loader`/`action`
+     *   (the "handler") - `resolve` will only call the `handler` internally if
+     *   needed _and_ if you don't pass your own `handlerOverride` function parameter
+     * - It is safe to call `match.resolve` for all matches, even if they have
+     *   `shouldLoad=false`, and it will no-op if no loading is required
+     * - You should generally always call `match.resolve()` for `shouldLoad:true`
+     *   routes to ensure that any `route.lazy` implementations are processed
+     * - See the examples below for how to implement custom handler execution via
+     *   `match.resolve`
+     */
     resolve: (handlerOverride?: (handler: (ctx?: unknown) => DataFunctionReturnValue) => DataFunctionReturnValue) => Promise<DataStrategyResult>;
 }
 interface DataStrategyFunctionArgs<Context = DefaultContext> extends DataFunctionArgs<Context> {
+    /**
+     * Matches for this route extended with Data strategy APIs
+     */
     matches: DataStrategyMatch[];
     unstable_runClientMiddleware: (cb: DataStrategyFunction<Context>) => Promise<Record<string, DataStrategyResult>>;
+    /**
+     * The key of the fetcher we are calling `dataStrategy` for, otherwise `null`
+     * for navigational executions
+     */
     fetcherKey: string | null;
 }
 /**
@@ -947,8 +989,12 @@ interface GetScrollPositionFunction {
     (): number;
 }
 /**
-  - "route": relative to the route hierarchy so `..` means remove all segments of the current route even if it has many. For example, a `route("posts/:id")` would have both `:id` and `posts` removed from the url.
-  - "path": relative to the pathname so `..` means remove one segment of the pathname. For example, a `route("posts/:id")` would have only `:id` removed from the url.
+ * - "route": relative to the route hierarchy so `..` means remove all segments
+ * of the current route even if it has many. For example, a `route("posts/:id")`
+ * would have both `:id` and `posts` removed from the url.
+ * - "path": relative to the pathname so `..` means remove one segment of the
+ * pathname. For example, a `route("posts/:id")` would have only `:id` removed
+ * from the url.
  */
 type RelativeRoutingType = "route" | "path";
 type BaseNavigateOrFetchOptions = {
@@ -1614,6 +1660,67 @@ type DecodeReplyFunction = (reply: FormData | string, { temporaryReferences }: {
     temporaryReferences: unknown;
 }) => Promise<unknown[]>;
 type LoadServerActionFunction = (id: string) => Promise<Function>;
+/**
+ * Matches the given routes to a Request and returns a RSC Response encoding an
+ * `RSCPayload` for consumption by a RSC enabled client router.
+ *
+ * @example
+ * import {
+ *   createTemporaryReferenceSet,
+ *   decodeAction,
+ *   decodeReply,
+ *   loadServerAction,
+ *   renderToReadableStream,
+ * } from "@vitejs/plugin-rsc/rsc";
+ * import { unstable_matchRSCServerRequest as matchRSCServerRequest } from "react-router";
+ *
+ * matchRSCServerRequest({
+ *   createTemporaryReferenceSet,
+ *   decodeAction,
+ *   decodeFormState,
+ *   decodeReply,
+ *   loadServerAction,
+ *   request,
+ *   routes: routes(),
+ *   generateResponse(match) {
+ *     return new Response(
+ *       renderToReadableStream(match.payload),
+ *       {
+ *         status: match.statusCode,
+ *         headers: match.headers,
+ *       }
+ *     );
+ *   },
+ * });
+ *
+ * @name unstable_matchRSCServerRequest
+ * @public
+ * @category RSC
+ * @mode data
+ * @param opts Options
+ * @param opts.basename The basename to use when matching the request.
+ * @param opts.decodeAction Your `react-server-dom-xyz/server`'s `decodeAction`
+ * function, responsible for loading a server action.
+ * @param opts.decodeReply Your `react-server-dom-xyz/server`'s `decodeReply`
+ * function, used to decode the server function's arguments and bind them to the
+ * implementation for invocation by the router.
+ * @param opts.decodeFormState A function responsible for decoding form state for
+ * progressively enhanceable forms with `useActionState` using your
+ * `react-server-dom-xyz/server`'s `decodeFormState`.
+ * @param opts.generateResponse A function responsible for using your
+ * `renderToReadableStream` to generate a Response encoding the `RSCPayload`.
+ * @param opts.loadServerAction Your `react-server-dom-xyz/server`'s
+ * `loadServerAction` function, used to load a server action by ID.
+ * @param opts.request The request to match against.
+ * @param opts.requestContext An instance of `unstable_RouterContextProvider`
+ * that should be created per request, to be passed to loaders, actions and middleware.
+ * @param opts.routes Your route definitions.
+ * @param opts.createTemporaryReferenceSet A function that returns a temporary
+ * reference set for the request, used to track temporary references in the RSC stream.
+ * @param opts.onError An optional error handler that will be called with any
+ * errors that occur during the request processing.
+ * @returns A Response that contains the RSC data for hydration.
+ */
 declare function matchRSCServerRequest({ createTemporaryReferenceSet, basename, decodeReply, requestContext, loadServerAction, decodeAction, decodeFormState, onError, request, routes, generateResponse, }: {
     createTemporaryReferenceSet: () => unknown;
     basename?: string;

package/dist/development/index-react-server.d.ts

@@ -405,14 +405,56 @@ interface DataStrategyMatch extends AgnosticRouteMatch<string, AgnosticDataRoute
         handler: Promise<void> | undefined;
         route: Promise<void> | undefined;
     };
+    /**
+     * A boolean value indicating whether this route handler should be called in this pass.
+     *
+     * The `matches` array always includes _all_ matched routes even when only _some_
+     * route handlers need to be called so that things like middleware can be implemented.
+     *
+     * `shouldLoad` is usually only interesting if you are skipping the route handler
+     * entirely and implementing custom handler logic - since it lets you determine
+     * if that custom logic should run for this route or not.
+     *
+     * For example:
+     *  - If you are on `/parent/child/a` and you navigate to `/parent/child/b` -
+     *    you'll get an array of three matches (`[parent, child, b]`), but only `b`
+     *    will have `shouldLoad=true` because the data for `parent` and `child` is
+     *    already loaded
+     *  - If you are on `/parent/child/a` and you submit to `a`'s `action`, then only
+     *    `a` will have `shouldLoad=true` for the action execution of `dataStrategy`
+     *  - After the `action`, `dataStrategy` will be called again for the `loader`
+     *    revalidation, and all matches will have `shouldLoad=true` (assuming no custom
+     *   `shouldRevalidate` implementations)
+     */
     shouldLoad: boolean;
     unstable_shouldRevalidateArgs: ShouldRevalidateFunctionArgs | null;
     unstable_shouldCallHandler(defaultShouldRevalidate?: boolean): boolean;
+    /**
+     * An async function that will resolve any `route.lazy` implementations and
+     * execute the route's handler (if necessary), returning a `DataStrategyResult`
+     *
+     * - Calling `match.resolve` does not mean you're calling the `loader`/`action`
+     *   (the "handler") - `resolve` will only call the `handler` internally if
+     *   needed _and_ if you don't pass your own `handlerOverride` function parameter
+     * - It is safe to call `match.resolve` for all matches, even if they have
+     *   `shouldLoad=false`, and it will no-op if no loading is required
+     * - You should generally always call `match.resolve()` for `shouldLoad:true`
+     *   routes to ensure that any `route.lazy` implementations are processed
+     * - See the examples below for how to implement custom handler execution via
+     *   `match.resolve`
+     */
     resolve: (handlerOverride?: (handler: (ctx?: unknown) => DataFunctionReturnValue) => DataFunctionReturnValue) => Promise<DataStrategyResult>;
 }
 interface DataStrategyFunctionArgs<Context = DefaultContext> extends DataFunctionArgs<Context> {
+    /**
+     * Matches for this route extended with Data strategy APIs
+     */
     matches: DataStrategyMatch[];
     unstable_runClientMiddleware: (cb: DataStrategyFunction<Context>) => Promise<Record<string, DataStrategyResult>>;
+    /**
+     * The key of the fetcher we are calling `dataStrategy` for, otherwise `null`
+     * for navigational executions
+     */
     fetcherKey: string | null;
 }
 /**
@@ -947,8 +989,12 @@ interface GetScrollPositionFunction {
     (): number;
 }
 /**
-  - "route": relative to the route hierarchy so `..` means remove all segments of the current route even if it has many. For example, a `route("posts/:id")` would have both `:id` and `posts` removed from the url.
-  - "path": relative to the pathname so `..` means remove one segment of the pathname. For example, a `route("posts/:id")` would have only `:id` removed from the url.
+ * - "route": relative to the route hierarchy so `..` means remove all segments
+ * of the current route even if it has many. For example, a `route("posts/:id")`
+ * would have both `:id` and `posts` removed from the url.
+ * - "path": relative to the pathname so `..` means remove one segment of the
+ * pathname. For example, a `route("posts/:id")` would have only `:id` removed
+ * from the url.
  */
 type RelativeRoutingType = "route" | "path";
 type BaseNavigateOrFetchOptions = {
@@ -1614,6 +1660,67 @@ type DecodeReplyFunction = (reply: FormData | string, { temporaryReferences }: {
     temporaryReferences: unknown;
 }) => Promise<unknown[]>;
 type LoadServerActionFunction = (id: string) => Promise<Function>;
+/**
+ * Matches the given routes to a Request and returns a RSC Response encoding an
+ * `RSCPayload` for consumption by a RSC enabled client router.
+ *
+ * @example
+ * import {
+ *   createTemporaryReferenceSet,
+ *   decodeAction,
+ *   decodeReply,
+ *   loadServerAction,
+ *   renderToReadableStream,
+ * } from "@vitejs/plugin-rsc/rsc";
+ * import { unstable_matchRSCServerRequest as matchRSCServerRequest } from "react-router";
+ *
+ * matchRSCServerRequest({
+ *   createTemporaryReferenceSet,
+ *   decodeAction,
+ *   decodeFormState,
+ *   decodeReply,
+ *   loadServerAction,
+ *   request,
+ *   routes: routes(),
+ *   generateResponse(match) {
+ *     return new Response(
+ *       renderToReadableStream(match.payload),
+ *       {
+ *         status: match.statusCode,
+ *         headers: match.headers,
+ *       }
+ *     );
+ *   },
+ * });
+ *
+ * @name unstable_matchRSCServerRequest
+ * @public
+ * @category RSC
+ * @mode data
+ * @param opts Options
+ * @param opts.basename The basename to use when matching the request.
+ * @param opts.decodeAction Your `react-server-dom-xyz/server`'s `decodeAction`
+ * function, responsible for loading a server action.
+ * @param opts.decodeReply Your `react-server-dom-xyz/server`'s `decodeReply`
+ * function, used to decode the server function's arguments and bind them to the
+ * implementation for invocation by the router.
+ * @param opts.decodeFormState A function responsible for decoding form state for
+ * progressively enhanceable forms with `useActionState` using your
+ * `react-server-dom-xyz/server`'s `decodeFormState`.
+ * @param opts.generateResponse A function responsible for using your
+ * `renderToReadableStream` to generate a Response encoding the `RSCPayload`.
+ * @param opts.loadServerAction Your `react-server-dom-xyz/server`'s
+ * `loadServerAction` function, used to load a server action by ID.
+ * @param opts.request The request to match against.
+ * @param opts.requestContext An instance of `unstable_RouterContextProvider`
+ * that should be created per request, to be passed to loaders, actions and middleware.
+ * @param opts.routes Your route definitions.
+ * @param opts.createTemporaryReferenceSet A function that returns a temporary
+ * reference set for the request, used to track temporary references in the RSC stream.
+ * @param opts.onError An optional error handler that will be called with any
+ * errors that occur during the request processing.
+ * @returns A Response that contains the RSC data for hydration.
+ */
 declare function matchRSCServerRequest({ createTemporaryReferenceSet, basename, decodeReply, requestContext, loadServerAction, decodeAction, decodeFormState, onError, request, routes, generateResponse, }: {
     createTemporaryReferenceSet: () => unknown;
     basename?: string;

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

@@ -27,7 +27,7 @@ function _interopNamespace(e) {
 var React2__namespace = /*#__PURE__*/_interopNamespace(React2);
 
 /**
- * react-router v7.7.0
+ * react-router v7.7.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -1697,7 +1697,10 @@ async function callDataStrategyImpl(dataStrategyImpl, request, matches, fetcherK
   });
   try {
     await Promise.all(
-      matches.flatMap((m) => [m._lazyPromises?.handler, m._lazyPromises?.route])
+      matches.flatMap((m) => [
+        m._lazyPromises?.handler,
+        m._lazyPromises?.route
+      ])
     );
   } catch (e) {
   }
@@ -2130,6 +2133,7 @@ function prependCookies(parentHeaders, childHeaders) {
   }
 }
 var SINGLE_FETCH_REDIRECT_STATUS = 202;
+var Outlet = reactServerClient.Outlet;
 var WithComponentProps = reactServerClient.UNSAFE_WithComponentProps;
 var WithErrorBoundaryProps = reactServerClient.UNSAFE_WithErrorBoundaryProps;
 var WithHydrateFallbackProps = reactServerClient.UNSAFE_WithHydrateFallbackProps;
@@ -2532,7 +2536,11 @@ async function generateStaticContextResponse(routes, basename, generateResponse,
     );
   }
   staticContext.matches.forEach((m) => {
-    if (staticContext.loaderData[m.route.id] === void 0) {
+    const routeHasNoLoaderData = staticContext.loaderData[m.route.id] === void 0;
+    const routeHasError = Boolean(
+      staticContext.errors && m.route.id in staticContext.errors
+    );
+    if (routeHasNoLoaderData && !routeHasError) {
       staticContext.loaderData[m.route.id] = null;
     }
   });
@@ -2627,23 +2635,23 @@ async function getRSCRouteMatch(staticContext, match, shouldRenderComponent, par
   const loaderData = staticContext.loaderData[match.route.id];
   const actionData = staticContext.actionData?.[match.route.id];
   const params = match.params;
-  const element = Component && shouldRenderComponent ? React2__namespace.createElement(
-    Layout,
-    null,
-    isClientReference(Component) ? React2__namespace.createElement(WithComponentProps, {
-      children: React2__namespace.createElement(Component)
-    }) : React2__namespace.createElement(Component, {
-      loaderData,
-      actionData,
-      params,
-      matches: staticContext.matches.map(
-        (match2) => convertRouteMatchToUiMatch(match2, staticContext.loaderData)
-      )
-    })
-  ) : (
-    // TODO: Render outlet instead?
-    void 0
-  );
+  let element = void 0;
+  if (Component) {
+    element = shouldRenderComponent ? React2__namespace.createElement(
+      Layout,
+      null,
+      isClientReference(Component) ? React2__namespace.createElement(WithComponentProps, {
+        children: React2__namespace.createElement(Component)
+      }) : React2__namespace.createElement(Component, {
+        loaderData,
+        actionData,
+        params,
+        matches: staticContext.matches.map(
+          (match2) => convertRouteMatchToUiMatch(match2, staticContext.loaderData)
+        )
+      })
+    ) : React2__namespace.createElement(Outlet);
+  }
   let error = void 0;
   if (ErrorBoundary && staticContext.errors) {
     error = staticContext.errors[match.route.id];

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

@@ -1,12 +1,12 @@
 import { AsyncLocalStorage } from 'node:async_hooks';
 import * as React2 from 'react';
 import { splitCookiesString } from 'set-cookie-parser';
-import { UNSAFE_WithComponentProps, UNSAFE_WithErrorBoundaryProps, UNSAFE_WithHydrateFallbackProps } from 'react-router/internal/react-server-client';
+import { UNSAFE_WithComponentProps, Outlet as Outlet$1, UNSAFE_WithErrorBoundaryProps, UNSAFE_WithHydrateFallbackProps } from 'react-router/internal/react-server-client';
 export { Await, BrowserRouter, Form, HashRouter, Link, Links, MemoryRouter, Meta, NavLink, Navigate, Outlet, Route, Router, RouterProvider, Routes, ScrollRestoration, StaticRouter, StaticRouterProvider, unstable_HistoryRouter } from 'react-router/internal/react-server-client';
 import { serialize, parse } from 'cookie';
 
 /**
- * react-router v7.7.0
+ * react-router v7.7.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -1676,7 +1676,10 @@ async function callDataStrategyImpl(dataStrategyImpl, request, matches, fetcherK
   });
   try {
     await Promise.all(
-      matches.flatMap((m) => [m._lazyPromises?.handler, m._lazyPromises?.route])
+      matches.flatMap((m) => [
+        m._lazyPromises?.handler,
+        m._lazyPromises?.route
+      ])
     );
   } catch (e) {
   }
@@ -2109,6 +2112,7 @@ function prependCookies(parentHeaders, childHeaders) {
   }
 }
 var SINGLE_FETCH_REDIRECT_STATUS = 202;
+var Outlet = Outlet$1;
 var WithComponentProps = UNSAFE_WithComponentProps;
 var WithErrorBoundaryProps = UNSAFE_WithErrorBoundaryProps;
 var WithHydrateFallbackProps = UNSAFE_WithHydrateFallbackProps;
@@ -2511,7 +2515,11 @@ async function generateStaticContextResponse(routes, basename, generateResponse,
     );
   }
   staticContext.matches.forEach((m) => {
-    if (staticContext.loaderData[m.route.id] === void 0) {
+    const routeHasNoLoaderData = staticContext.loaderData[m.route.id] === void 0;
+    const routeHasError = Boolean(
+      staticContext.errors && m.route.id in staticContext.errors
+    );
+    if (routeHasNoLoaderData && !routeHasError) {
       staticContext.loaderData[m.route.id] = null;
     }
   });
@@ -2606,23 +2614,23 @@ async function getRSCRouteMatch(staticContext, match, shouldRenderComponent, par
   const loaderData = staticContext.loaderData[match.route.id];
   const actionData = staticContext.actionData?.[match.route.id];
   const params = match.params;
-  const element = Component && shouldRenderComponent ? React2.createElement(
-    Layout,
-    null,
-    isClientReference(Component) ? React2.createElement(WithComponentProps, {
-      children: React2.createElement(Component)
-    }) : React2.createElement(Component, {
-      loaderData,
-      actionData,
-      params,
-      matches: staticContext.matches.map(
-        (match2) => convertRouteMatchToUiMatch(match2, staticContext.loaderData)
-      )
-    })
-  ) : (
-    // TODO: Render outlet instead?
-    void 0
-  );
+  let element = void 0;
+  if (Component) {
+    element = shouldRenderComponent ? React2.createElement(
+      Layout,
+      null,
+      isClientReference(Component) ? React2.createElement(WithComponentProps, {
+        children: React2.createElement(Component)
+      }) : React2.createElement(Component, {
+        loaderData,
+        actionData,
+        params,
+        matches: staticContext.matches.map(
+          (match2) => convertRouteMatchToUiMatch(match2, staticContext.loaderData)
+        )
+      })
+    ) : React2.createElement(Outlet);
+  }
   let error = void 0;
   if (ErrorBoundary && staticContext.errors) {
     error = staticContext.errors[match.route.id];