react-router 7.9.0 → 7.9.1

package/dist/production/index.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v7.9.0
+ * react-router v7.9.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -31,7 +31,7 @@ import {
   isSession,
   routeRSCServerRequest,
   setDevServerHooks
-} from "./chunk-WOZJCBVO.mjs";
+} from "./chunk-RCAZODXZ.mjs";
 import {
   Action,
   Await,
@@ -141,7 +141,7 @@ import {
   withComponentProps,
   withErrorBoundaryProps,
   withHydrateFallbackProps
-} from "./chunk-MOZTWV63.mjs";
+} from "./chunk-P25HWPOZ.mjs";
 export {
   Await,
   BrowserRouter,

package/dist/production/lib/types/internal.d.mts

@@ -1,5 +1,5 @@
-import { R as RouteModule, L as LinkDescriptor, F as Func, P as Pretty, M as MetaDescriptor, G as GetLoaderData, S as ServerDataFunctionArgs, C as ClientDataFunctionArgs, a as ServerDataFrom, N as Normalize, b as GetActionData } from '../../route-data-BQkq8Erj.mjs';
-import { L as Location, M as MiddlewareNextFunction, D as DataStrategyResult } from '../../context-BH6Jwdoy.mjs';
+import { R as RouteModule, L as LinkDescriptor, F as Func, P as Pretty, M as MetaDescriptor, G as GetLoaderData, S as ServerDataFunctionArgs, C as ClientDataFunctionArgs, a as ServerDataFrom, N as Normalize, b as GetActionData } from '../../route-data-Bpm4liR_.mjs';
+import { L as Location, M as MiddlewareNextFunction, D as DataStrategyResult } from '../../context-CIdFp11b.mjs';
 import { R as RouteFiles, P as Pages } from '../../register-DiOIlEq5.mjs';
 import 'react';
 
@@ -69,11 +69,22 @@ type CreateClientActionArgs<T extends RouteInfo> = ClientDataFunctionArgs<T["par
     /** This is an asynchronous function that makes the {@link https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API fetch} call to the React Router server action for this route. */
     serverAction: () => Promise<ServerDataFrom<T["module"]["action"]>>;
 };
-type CreateHydrateFallbackProps<T extends RouteInfo> = {
+type IsServerFirstRoute<T extends RouteInfo, RSCEnabled extends boolean> = RSCEnabled extends true ? T["module"] extends {
+    ServerComponent: Func;
+} ? true : false : false;
+type CreateHydrateFallbackProps<T extends RouteInfo, RSCEnabled extends boolean> = {
     params: T["params"];
+} & (IsServerFirstRoute<T, RSCEnabled> extends true ? {
+    /** The data returned from the `loader` */
+    loaderData?: ServerDataFrom<T["module"]["loader"]>;
+    /** The data returned from the `action` following an action submission. */
+    actionData?: ServerDataFrom<T["module"]["action"]>;
+} : {
+    /** The data returned from the `loader` or `clientLoader` */
     loaderData?: T["loaderData"];
+    /** The data returned from the `action` or `clientAction` following an action submission. */
     actionData?: T["actionData"];
-};
+});
 type Match<T extends MatchInfo> = Pretty<{
     id: T["id"];
     params: Record<string, string | undefined>;
@@ -84,7 +95,7 @@ type Match<T extends MatchInfo> = Pretty<{
     handle: unknown;
 }>;
 type Matches<T extends Array<MatchInfo>> = T extends [infer F extends MatchInfo, ...infer R extends Array<MatchInfo>] ? [Match<F>, ...Matches<R>] : Array<Match<MatchInfo> | undefined>;
-type CreateComponentProps<T extends RouteInfo> = {
+type CreateComponentProps<T extends RouteInfo, RSCEnabled extends boolean> = {
     /**
      * {@link https://reactrouter.com/start/framework/routing#dynamic-segments Dynamic route params} for the current route.
      * @example
@@ -100,14 +111,20 @@ type CreateComponentProps<T extends RouteInfo> = {
      * }
      **/
     params: T["params"];
+    /** An array of the current {@link https://api.reactrouter.com/v7/interfaces/react_router.UIMatch.html route matches}, including parent route matches. */
+    matches: Matches<T["matches"]>;
+} & (IsServerFirstRoute<T, RSCEnabled> extends true ? {
+    /** The data returned from the `loader` */
+    loaderData: ServerDataFrom<T["module"]["loader"]>;
+    /** The data returned from the `action` following an action submission. */
+    actionData?: ServerDataFrom<T["module"]["action"]>;
+} : {
     /** The data returned from the `loader` or `clientLoader` */
     loaderData: T["loaderData"];
     /** The data returned from the `action` or `clientAction` following an action submission. */
     actionData?: T["actionData"];
-    /** An array of the current {@link https://api.reactrouter.com/v7/interfaces/react_router.UIMatch.html route matches}, including parent route matches. */
-    matches: Matches<T["matches"]>;
-};
-type CreateErrorBoundaryProps<T extends RouteInfo> = {
+});
+type CreateErrorBoundaryProps<T extends RouteInfo, RSCEnabled extends boolean> = {
     /**
      * {@link https://reactrouter.com/start/framework/routing#dynamic-segments Dynamic route params} for the current route.
      * @example
@@ -124,10 +141,18 @@ type CreateErrorBoundaryProps<T extends RouteInfo> = {
      **/
     params: T["params"];
     error: unknown;
+} & (IsServerFirstRoute<T, RSCEnabled> extends true ? {
+    /** The data returned from the `loader` */
+    loaderData?: ServerDataFrom<T["module"]["loader"]>;
+    /** The data returned from the `action` following an action submission. */
+    actionData?: ServerDataFrom<T["module"]["action"]>;
+} : {
+    /** The data returned from the `loader` or `clientLoader` */
     loaderData?: T["loaderData"];
+    /** The data returned from the `action` or `clientAction` following an action submission. */
     actionData?: T["actionData"];
-};
-type GetAnnotations<Info extends RouteInfo> = {
+});
+type GetAnnotations<Info extends RouteInfo, RSCEnabled extends boolean> = {
     LinkDescriptors: LinkDescriptor[];
     LinksFunction: () => LinkDescriptor[];
     MetaArgs: CreateMetaArgs<Info>;
@@ -141,9 +166,9 @@ type GetAnnotations<Info extends RouteInfo> = {
     ClientLoaderArgs: CreateClientLoaderArgs<Info>;
     ActionArgs: CreateServerActionArgs<Info>;
     ClientActionArgs: CreateClientActionArgs<Info>;
-    HydrateFallbackProps: CreateHydrateFallbackProps<Info>;
-    ComponentProps: CreateComponentProps<Info>;
-    ErrorBoundaryProps: CreateErrorBoundaryProps<Info>;
+    HydrateFallbackProps: CreateHydrateFallbackProps<Info, RSCEnabled>;
+    ComponentProps: CreateComponentProps<Info, RSCEnabled>;
+    ErrorBoundaryProps: CreateErrorBoundaryProps<Info, RSCEnabled>;
 };
 
 type Params<RouteFile extends keyof RouteFiles> = Normalize<Pages[RouteFiles[RouteFile]["page"]]["params"]>;

package/dist/production/lib/types/internal.d.ts

@@ -1,4 +1,4 @@
-import { R as RouteModule, L as LinkDescriptor, a as Location, F as Func, P as Pretty, M as MetaDescriptor, G as GetLoaderData, S as ServerDataFunctionArgs, b as MiddlewareNextFunction, C as ClientDataFunctionArgs, D as DataStrategyResult, c as ServerDataFrom, N as Normalize, d as GetActionData } from '../../routeModules-DSKAn01V.js';
+import { R as RouteModule, L as LinkDescriptor, a as Location, F as Func, P as Pretty, M as MetaDescriptor, G as GetLoaderData, S as ServerDataFunctionArgs, b as MiddlewareNextFunction, C as ClientDataFunctionArgs, D as DataStrategyResult, c as ServerDataFrom, N as Normalize, d as GetActionData } from '../../routeModules-DnUHijGz.js';
 import { R as RouteFiles, P as Pages } from '../../register-DiOIlEq5.js';
 import 'react';
 
@@ -68,11 +68,22 @@ type CreateClientActionArgs<T extends RouteInfo> = ClientDataFunctionArgs<T["par
     /** This is an asynchronous function that makes the {@link https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API fetch} call to the React Router server action for this route. */
     serverAction: () => Promise<ServerDataFrom<T["module"]["action"]>>;
 };
-type CreateHydrateFallbackProps<T extends RouteInfo> = {
+type IsServerFirstRoute<T extends RouteInfo, RSCEnabled extends boolean> = RSCEnabled extends true ? T["module"] extends {
+    ServerComponent: Func;
+} ? true : false : false;
+type CreateHydrateFallbackProps<T extends RouteInfo, RSCEnabled extends boolean> = {
     params: T["params"];
+} & (IsServerFirstRoute<T, RSCEnabled> extends true ? {
+    /** The data returned from the `loader` */
+    loaderData?: ServerDataFrom<T["module"]["loader"]>;
+    /** The data returned from the `action` following an action submission. */
+    actionData?: ServerDataFrom<T["module"]["action"]>;
+} : {
+    /** The data returned from the `loader` or `clientLoader` */
     loaderData?: T["loaderData"];
+    /** The data returned from the `action` or `clientAction` following an action submission. */
     actionData?: T["actionData"];
-};
+});
 type Match<T extends MatchInfo> = Pretty<{
     id: T["id"];
     params: Record<string, string | undefined>;
@@ -83,7 +94,7 @@ type Match<T extends MatchInfo> = Pretty<{
     handle: unknown;
 }>;
 type Matches<T extends Array<MatchInfo>> = T extends [infer F extends MatchInfo, ...infer R extends Array<MatchInfo>] ? [Match<F>, ...Matches<R>] : Array<Match<MatchInfo> | undefined>;
-type CreateComponentProps<T extends RouteInfo> = {
+type CreateComponentProps<T extends RouteInfo, RSCEnabled extends boolean> = {
     /**
      * {@link https://reactrouter.com/start/framework/routing#dynamic-segments Dynamic route params} for the current route.
      * @example
@@ -99,14 +110,20 @@ type CreateComponentProps<T extends RouteInfo> = {
      * }
      **/
     params: T["params"];
+    /** An array of the current {@link https://api.reactrouter.com/v7/interfaces/react_router.UIMatch.html route matches}, including parent route matches. */
+    matches: Matches<T["matches"]>;
+} & (IsServerFirstRoute<T, RSCEnabled> extends true ? {
+    /** The data returned from the `loader` */
+    loaderData: ServerDataFrom<T["module"]["loader"]>;
+    /** The data returned from the `action` following an action submission. */
+    actionData?: ServerDataFrom<T["module"]["action"]>;
+} : {
     /** The data returned from the `loader` or `clientLoader` */
     loaderData: T["loaderData"];
     /** The data returned from the `action` or `clientAction` following an action submission. */
     actionData?: T["actionData"];
-    /** An array of the current {@link https://api.reactrouter.com/v7/interfaces/react_router.UIMatch.html route matches}, including parent route matches. */
-    matches: Matches<T["matches"]>;
-};
-type CreateErrorBoundaryProps<T extends RouteInfo> = {
+});
+type CreateErrorBoundaryProps<T extends RouteInfo, RSCEnabled extends boolean> = {
     /**
      * {@link https://reactrouter.com/start/framework/routing#dynamic-segments Dynamic route params} for the current route.
      * @example
@@ -123,10 +140,18 @@ type CreateErrorBoundaryProps<T extends RouteInfo> = {
      **/
     params: T["params"];
     error: unknown;
+} & (IsServerFirstRoute<T, RSCEnabled> extends true ? {
+    /** The data returned from the `loader` */
+    loaderData?: ServerDataFrom<T["module"]["loader"]>;
+    /** The data returned from the `action` following an action submission. */
+    actionData?: ServerDataFrom<T["module"]["action"]>;
+} : {
+    /** The data returned from the `loader` or `clientLoader` */
     loaderData?: T["loaderData"];
+    /** The data returned from the `action` or `clientAction` following an action submission. */
     actionData?: T["actionData"];
-};
-type GetAnnotations<Info extends RouteInfo> = {
+});
+type GetAnnotations<Info extends RouteInfo, RSCEnabled extends boolean> = {
     LinkDescriptors: LinkDescriptor[];
     LinksFunction: () => LinkDescriptor[];
     MetaArgs: CreateMetaArgs<Info>;
@@ -140,9 +165,9 @@ type GetAnnotations<Info extends RouteInfo> = {
     ClientLoaderArgs: CreateClientLoaderArgs<Info>;
     ActionArgs: CreateServerActionArgs<Info>;
     ClientActionArgs: CreateClientActionArgs<Info>;
-    HydrateFallbackProps: CreateHydrateFallbackProps<Info>;
-    ComponentProps: CreateComponentProps<Info>;
-    ErrorBoundaryProps: CreateErrorBoundaryProps<Info>;
+    HydrateFallbackProps: CreateHydrateFallbackProps<Info, RSCEnabled>;
+    ComponentProps: CreateComponentProps<Info, RSCEnabled>;
+    ErrorBoundaryProps: CreateErrorBoundaryProps<Info, RSCEnabled>;
 };
 
 type Params<RouteFile extends keyof RouteFiles> = Normalize<Pages[RouteFiles[RouteFile]["page"]]["params"]>;

package/dist/production/lib/types/internal.js

@@ -1,5 +1,5 @@
 "use strict";/**
- * react-router v7.9.0
+ * react-router v7.9.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/lib/types/internal.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v7.9.0
+ * react-router v7.9.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/{route-data-BQkq8Erj.d.mts → route-data-Bpm4liR_.d.mts}

@@ -1,5 +1,5 @@
 import { ComponentType, ReactElement } from 'react';
-import { A as ActionFunctionArgs, b as LoaderFunctionArgs, c as ActionFunction, d as LoaderFunction, P as Params, L as Location, e as DataRouteMatch, f as MiddlewareFunction, D as DataStrategyResult, S as ShouldRevalidateFunction, g as RouterContextProvider, h as DataWithResponseInit, i as MiddlewareEnabled } from './context-BH6Jwdoy.mjs';
+import { A as ActionFunctionArgs, b as LoaderFunctionArgs, c as ActionFunction, d as LoaderFunction, P as Params, L as Location, e as DataRouteMatch, f as MiddlewareFunction, D as DataStrategyResult, S as ShouldRevalidateFunction, g as RouterContextProvider, h as DataWithResponseInit, i as MiddlewareEnabled } from './context-CIdFp11b.mjs';
 
 /**
  * An object of unknown type for route loaders and actions provided by the

package/dist/production/{routeModules-DSKAn01V.d.ts → routeModules-DnUHijGz.d.ts}

@@ -213,7 +213,7 @@ type UrlHistoryOptions = {
 interface Future {
 }
 type MiddlewareEnabled = Future extends {
-    middleware: infer T extends boolean;
+    v8_middleware: infer T extends boolean;
 } ? T : false;
 
 type MaybePromise<T> = T | Promise<T>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-router",
-  "version": "7.9.0",
+  "version": "7.9.1",
   "description": "Declarative routing for React",
   "keywords": [
     "react",