react-router 7.6.1 → 7.6.3-pre.0

package/dist/development/index.js

@@ -1,5 +1,5 @@
 /**
- * react-router v7.6.1
+ * react-router v7.6.3-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -98,6 +98,9 @@ __export(react_router_exports, {
   UNSAFE_shouldHydrateRouteLoader: () => shouldHydrateRouteLoader,
   UNSAFE_useFogOFWarDiscovery: () => useFogOFWarDiscovery,
   UNSAFE_useScrollRestoration: () => useScrollRestoration,
+  UNSAFE_withComponentProps: () => withComponentProps,
+  UNSAFE_withErrorBoundaryProps: () => withErrorBoundaryProps,
+  UNSAFE_withHydrateFallbackProps: () => withHydrateFallbackProps,
   createBrowserRouter: () => createBrowserRouter,
   createCookie: () => createCookie,
   createCookieSessionStorage: () => createCookieSessionStorage,
@@ -6070,6 +6073,38 @@ var createRoutesFromElements = createRoutesFromChildren;
 function renderMatches(matches) {
   return _renderMatches(matches);
 }
+function withComponentProps(Component4) {
+  return function WithComponentProps() {
+    const props = {
+      params: useParams(),
+      loaderData: useLoaderData(),
+      actionData: useActionData(),
+      matches: useMatches()
+    };
+    return React3.createElement(Component4, props);
+  };
+}
+function withHydrateFallbackProps(HydrateFallback) {
+  return function WithHydrateFallbackProps() {
+    const props = {
+      params: useParams(),
+      loaderData: useLoaderData(),
+      actionData: useActionData()
+    };
+    return React3.createElement(HydrateFallback, props);
+  };
+}
+function withErrorBoundaryProps(ErrorBoundary) {
+  return function WithErrorBoundaryProps() {
+    const props = {
+      params: useParams(),
+      loaderData: useLoaderData(),
+      actionData: useActionData(),
+      error: useRouteError()
+    };
+    return React3.createElement(ErrorBoundary, props);
+  };
+}
 
 // lib/dom/lib.tsx
 var React10 = __toESM(require("react"));
@@ -8835,7 +8870,7 @@ function mergeRefs(...refs) {
 var isBrowser = typeof window !== "undefined" && typeof window.document !== "undefined" && typeof window.document.createElement !== "undefined";
 try {
   if (isBrowser) {
-    window.__reactRouterVersion = "7.6.1";
+    window.__reactRouterVersion = "7.6.3-pre.0";
   }
 } catch (e) {
 }
@@ -10029,37 +10064,6 @@ function createRoutesStub(routes, unstable_getContext) {
     return /* @__PURE__ */ React13.createElement(FrameworkContext.Provider, { value: remixContextRef.current }, /* @__PURE__ */ React13.createElement(RouterProvider, { router: routerRef.current }));
   };
 }
-function withComponentProps(Component4) {
-  return function Wrapped() {
-    return React13.createElement(Component4, {
-      params: useParams(),
-      loaderData: useLoaderData(),
-      actionData: useActionData(),
-      matches: useMatches()
-    });
-  };
-}
-function withHydrateFallbackProps(HydrateFallback) {
-  return function Wrapped() {
-    const props = {
-      params: useParams(),
-      loaderData: useLoaderData(),
-      actionData: useActionData()
-    };
-    return React13.createElement(HydrateFallback, props);
-  };
-}
-function withErrorBoundaryProps(ErrorBoundary) {
-  return function Wrapped() {
-    const props = {
-      params: useParams(),
-      loaderData: useLoaderData(),
-      actionData: useActionData(),
-      error: useRouteError()
-    };
-    return React13.createElement(ErrorBoundary, props);
-  };
-}
 function processRoutes(routes, manifest, routeModules, parentId) {
   return routes.map((route) => {
     if (!route.id) {
@@ -10578,6 +10582,13 @@ function createServerHandoffString(serverHandoff) {
 // lib/server-runtime/headers.ts
 var import_set_cookie_parser = require("set-cookie-parser");
 function getDocumentHeaders(build, context) {
+  return getDocumentHeadersImpl(context, (m) => {
+    let route = build.routes[m.route.id];
+    invariant3(route, `Route with id "${m.route.id}" not found in build`);
+    return route.module.headers;
+  });
+}
+function getDocumentHeadersImpl(context, getRouteHeadersFn) {
   let boundaryIdx = context.errors ? context.matches.findIndex((m) => context.errors[m.route.id]) : -1;
   let matches = boundaryIdx >= 0 ? context.matches.slice(0, boundaryIdx + 1) : context.matches;
   let errorHeaders;
@@ -10595,14 +10606,12 @@ function getDocumentHeaders(build, context) {
   }
   return matches.reduce((parentHeaders, match, idx) => {
     let { id } = match.route;
-    let route = build.routes[id];
-    invariant3(route, `Route with id "${id}" not found in build`);
-    let routeModule = route.module;
     let loaderHeaders = context.loaderHeaders[id] || new Headers();
     let actionHeaders = context.actionHeaders[id] || new Headers();
     let includeErrorHeaders = errorHeaders != null && idx === matches.length - 1;
     let includeErrorCookies = includeErrorHeaders && errorHeaders !== loaderHeaders && errorHeaders !== actionHeaders;
-    if (routeModule.headers == null) {
+    let headersFn = getRouteHeadersFn(match);
+    if (headersFn == null) {
       let headers2 = new Headers(parentHeaders);
       if (includeErrorCookies) {
         prependCookies(errorHeaders, headers2);
@@ -10612,12 +10621,12 @@ function getDocumentHeaders(build, context) {
       return headers2;
     }
     let headers = new Headers(
-      routeModule.headers ? typeof routeModule.headers === "function" ? routeModule.headers({
+      typeof headersFn === "function" ? headersFn({
         loaderHeaders,
         parentHeaders,
         actionHeaders,
         errorHeaders: includeErrorHeaders ? errorHeaders : void 0
-      }) : routeModule.headers : void 0
+      }) : headersFn
     );
     if (includeErrorCookies) {
       prependCookies(errorHeaders, headers);
@@ -11648,6 +11657,9 @@ function getHydrationData(state, routes, getRouteInfo, location, basename, isSpa
   UNSAFE_shouldHydrateRouteLoader,
   UNSAFE_useFogOFWarDiscovery,
   UNSAFE_useScrollRestoration,
+  UNSAFE_withComponentProps,
+  UNSAFE_withErrorBoundaryProps,
+  UNSAFE_withHydrateFallbackProps,
   createBrowserRouter,
   createCookie,
   createCookieSessionStorage,

package/dist/development/index.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v7.6.1
+ * react-router v7.6.3-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -124,8 +124,11 @@ import {
   useScrollRestoration,
   useSearchParams,
   useSubmit,
-  useViewTransitionState
-} from "./chunk-DQRVZFIR.mjs";
+  useViewTransitionState,
+  withComponentProps,
+  withErrorBoundaryProps,
+  withHydrateFallbackProps
+} from "./chunk-CCB6XHGW.mjs";
 export {
   Await,
   BrowserRouter,
@@ -179,6 +182,9 @@ export {
   shouldHydrateRouteLoader as UNSAFE_shouldHydrateRouteLoader,
   useFogOFWarDiscovery as UNSAFE_useFogOFWarDiscovery,
   useScrollRestoration as UNSAFE_useScrollRestoration,
+  withComponentProps as UNSAFE_withComponentProps,
+  withErrorBoundaryProps as UNSAFE_withErrorBoundaryProps,
+  withHydrateFallbackProps as UNSAFE_withHydrateFallbackProps,
   createBrowserRouter,
   createCookie,
   createCookieSessionStorage,

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

@@ -1,4 +1,4 @@
-import { aE as LinkDescriptor, aV as RouteModule, L as Location, aB as MetaDescriptor, aW as unstable_MiddlewareNextFunction, aX as ServerDataFrom, ac as unstable_RouterContextProvider, r as MiddlewareEnabled, s as AppLoadContext, aY as Pretty, aZ as GetLoaderData, a_ as Normalize, a$ as GetActionData } from '../../route-data-WyrduLgj.mjs';
+import { aV as RouteModule, aD as LinkDescriptor, L as Location, aW as Pretty, aA as MetaDescriptor, aX as GetLoaderData, aY as ServerDataFunctionArgs, aZ as unstable_MiddlewareNextFunction, a_ as ClientDataFunctionArgs, a$ as ServerDataFrom, b0 as Normalize, b1 as GetActionData } from '../../route-data-D7Xbr_Ww.mjs';
 import { a as RouteFiles, P as Pages } from '../../register-DeIo2iHO.mjs';
 import 'react';
 
@@ -45,79 +45,15 @@ type HeadersArgs = {
     actionHeaders: Headers;
     errorHeaders: Headers | undefined;
 };
-type ClientDataFunctionArgs<T extends RouteInfo> = {
-    /**
-     * A {@link https://developer.mozilla.org/en-US/docs/Web/API/Request Fetch Request instance} which you can use to read the URL, the method, the "content-type" header, and the request body from the request.
-     *
-     * @note Because client data functions are called before a network request is made, the Request object does not include the headers which the browser automatically adds. React Router infers the "content-type" header from the enc-type of the form that performed the submission.
-     **/
-    request: Request;
-    /**
-     * {@link https://reactrouter.com/start/framework/routing#dynamic-segments Dynamic route params} for the current route.
-     * @example
-     * // app/routes.ts
-     * route("teams/:teamId", "./team.tsx"),
-     *
-     * // app/team.tsx
-     * export function clientLoader({
-     *   params,
-     * }: Route.ClientLoaderArgs) {
-     *   params.teamId;
-     *   //        ^ string
-     * }
-     **/
-    params: T["params"];
-    /**
-     * When `future.unstable_middleware` is not enabled, this is undefined.
-     *
-     * When `future.unstable_middleware` is enabled, this is an instance of
-     * `unstable_RouterContextProvider` and can be used to access context values
-     * from your route middlewares.  You may pass in initial context values in your
-     * `<HydratedRouter unstable_getContext>` prop
-     */
-    context: unstable_RouterContextProvider;
-};
-type ServerDataFunctionArgs<T extends RouteInfo> = {
-    /** A {@link https://developer.mozilla.org/en-US/docs/Web/API/Request Fetch Request instance} which you can use to read the url, method, headers (such as cookies), and request body from the request. */
-    request: Request;
-    /**
-     * {@link https://reactrouter.com/start/framework/routing#dynamic-segments Dynamic route params} for the current route.
-     * @example
-     * // app/routes.ts
-     * route("teams/:teamId", "./team.tsx"),
-     *
-     * // app/team.tsx
-     * export function loader({
-     *   params,
-     * }: Route.LoaderArgs) {
-     *   params.teamId;
-     *   //        ^ string
-     * }
-     **/
-    params: T["params"];
-    /**
-     * Without `future.unstable_middleware` enabled, this is the context passed in
-     * to your server adapter's `getLoadContext` function. It's a way to bridge the
-     * gap between the adapter's request/response API with your React Router app.
-     * It is only applicable if you are using a custom server adapter.
-     *
-     * With `future.unstable_middleware` enabled, this is an instance of
-     * `unstable_RouterContextProvider` and can be used for type-safe access to
-     * context value set in your route middlewares.  If you are using a custom
-     * server adapter, you may provide an initial set of context values from your
-     * `getLoadContext` function.
-     */
-    context: MiddlewareEnabled extends true ? unstable_RouterContextProvider : AppLoadContext;
-};
-type CreateServerMiddlewareFunction<T extends RouteInfo> = (args: ServerDataFunctionArgs<T>, next: unstable_MiddlewareNextFunction<Response>) => MaybePromise<Response | void>;
-type CreateClientMiddlewareFunction<T extends RouteInfo> = (args: ClientDataFunctionArgs<T>, next: unstable_MiddlewareNextFunction<undefined>) => MaybePromise<void>;
-type CreateServerLoaderArgs<T extends RouteInfo> = ServerDataFunctionArgs<T>;
-type CreateClientLoaderArgs<T extends RouteInfo> = ClientDataFunctionArgs<T> & {
+type CreateServerMiddlewareFunction<T extends RouteInfo> = (args: ServerDataFunctionArgs<T["params"]>, next: unstable_MiddlewareNextFunction<Response>) => MaybePromise<Response | void>;
+type CreateClientMiddlewareFunction<T extends RouteInfo> = (args: ClientDataFunctionArgs<T["params"]>, next: unstable_MiddlewareNextFunction<undefined>) => MaybePromise<void>;
+type CreateServerLoaderArgs<T extends RouteInfo> = ServerDataFunctionArgs<T["params"]>;
+type CreateClientLoaderArgs<T extends RouteInfo> = ClientDataFunctionArgs<T["params"]> & {
     /** This is an asynchronous function to get the data from the server loader for this route. On client-side navigations, this will make a {@link https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API fetch} call to the React Router server loader. If you opt-into running your clientLoader on hydration, then this function will return the data that was already loaded on the server (via Promise.resolve). */
     serverLoader: () => Promise<ServerDataFrom<T["module"]["loader"]>>;
 };
-type CreateServerActionArgs<T extends RouteInfo> = ServerDataFunctionArgs<T>;
-type CreateClientActionArgs<T extends RouteInfo> = ClientDataFunctionArgs<T> & {
+type CreateServerActionArgs<T extends RouteInfo> = ServerDataFunctionArgs<T["params"]>;
+type CreateClientActionArgs<T extends RouteInfo> = ClientDataFunctionArgs<T["params"]> & {
     /** 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"]>>;
 };

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

@@ -1,4 +1,4 @@
-import { aI as LinkDescriptor, aX as RouteModule, e as Location, aG as MetaDescriptor, aY as unstable_MiddlewareNextFunction, aZ as ServerDataFrom, u as unstable_RouterContextProvider, M as MiddlewareEnabled, i as AppLoadContext, a_ as Pretty, a$ as GetLoaderData, b0 as RouteFiles, b1 as Normalize, _ as Pages, b2 as GetActionData } from '../../register-BkDIKxVz.js';
+import { aX as RouteModule, aI as LinkDescriptor, i as Location, aY as Pretty, aG as MetaDescriptor, aZ as GetLoaderData, a_ as ServerDataFunctionArgs, a$ as unstable_MiddlewareNextFunction, b0 as ClientDataFunctionArgs, b1 as ServerDataFrom, b2 as RouteFiles, b3 as Normalize, _ as Pages, b4 as GetActionData } from '../../register-COAKzST_.js';
 import 'react';
 
 type MaybePromise<T> = T | Promise<T>;
@@ -44,79 +44,15 @@ type HeadersArgs = {
     actionHeaders: Headers;
     errorHeaders: Headers | undefined;
 };
-type ClientDataFunctionArgs<T extends RouteInfo> = {
-    /**
-     * A {@link https://developer.mozilla.org/en-US/docs/Web/API/Request Fetch Request instance} which you can use to read the URL, the method, the "content-type" header, and the request body from the request.
-     *
-     * @note Because client data functions are called before a network request is made, the Request object does not include the headers which the browser automatically adds. React Router infers the "content-type" header from the enc-type of the form that performed the submission.
-     **/
-    request: Request;
-    /**
-     * {@link https://reactrouter.com/start/framework/routing#dynamic-segments Dynamic route params} for the current route.
-     * @example
-     * // app/routes.ts
-     * route("teams/:teamId", "./team.tsx"),
-     *
-     * // app/team.tsx
-     * export function clientLoader({
-     *   params,
-     * }: Route.ClientLoaderArgs) {
-     *   params.teamId;
-     *   //        ^ string
-     * }
-     **/
-    params: T["params"];
-    /**
-     * When `future.unstable_middleware` is not enabled, this is undefined.
-     *
-     * When `future.unstable_middleware` is enabled, this is an instance of
-     * `unstable_RouterContextProvider` and can be used to access context values
-     * from your route middlewares.  You may pass in initial context values in your
-     * `<HydratedRouter unstable_getContext>` prop
-     */
-    context: unstable_RouterContextProvider;
-};
-type ServerDataFunctionArgs<T extends RouteInfo> = {
-    /** A {@link https://developer.mozilla.org/en-US/docs/Web/API/Request Fetch Request instance} which you can use to read the url, method, headers (such as cookies), and request body from the request. */
-    request: Request;
-    /**
-     * {@link https://reactrouter.com/start/framework/routing#dynamic-segments Dynamic route params} for the current route.
-     * @example
-     * // app/routes.ts
-     * route("teams/:teamId", "./team.tsx"),
-     *
-     * // app/team.tsx
-     * export function loader({
-     *   params,
-     * }: Route.LoaderArgs) {
-     *   params.teamId;
-     *   //        ^ string
-     * }
-     **/
-    params: T["params"];
-    /**
-     * Without `future.unstable_middleware` enabled, this is the context passed in
-     * to your server adapter's `getLoadContext` function. It's a way to bridge the
-     * gap between the adapter's request/response API with your React Router app.
-     * It is only applicable if you are using a custom server adapter.
-     *
-     * With `future.unstable_middleware` enabled, this is an instance of
-     * `unstable_RouterContextProvider` and can be used for type-safe access to
-     * context value set in your route middlewares.  If you are using a custom
-     * server adapter, you may provide an initial set of context values from your
-     * `getLoadContext` function.
-     */
-    context: MiddlewareEnabled extends true ? unstable_RouterContextProvider : AppLoadContext;
-};
-type CreateServerMiddlewareFunction<T extends RouteInfo> = (args: ServerDataFunctionArgs<T>, next: unstable_MiddlewareNextFunction<Response>) => MaybePromise<Response | void>;
-type CreateClientMiddlewareFunction<T extends RouteInfo> = (args: ClientDataFunctionArgs<T>, next: unstable_MiddlewareNextFunction<undefined>) => MaybePromise<void>;
-type CreateServerLoaderArgs<T extends RouteInfo> = ServerDataFunctionArgs<T>;
-type CreateClientLoaderArgs<T extends RouteInfo> = ClientDataFunctionArgs<T> & {
+type CreateServerMiddlewareFunction<T extends RouteInfo> = (args: ServerDataFunctionArgs<T["params"]>, next: unstable_MiddlewareNextFunction<Response>) => MaybePromise<Response | void>;
+type CreateClientMiddlewareFunction<T extends RouteInfo> = (args: ClientDataFunctionArgs<T["params"]>, next: unstable_MiddlewareNextFunction<undefined>) => MaybePromise<void>;
+type CreateServerLoaderArgs<T extends RouteInfo> = ServerDataFunctionArgs<T["params"]>;
+type CreateClientLoaderArgs<T extends RouteInfo> = ClientDataFunctionArgs<T["params"]> & {
     /** This is an asynchronous function to get the data from the server loader for this route. On client-side navigations, this will make a {@link https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API fetch} call to the React Router server loader. If you opt-into running your clientLoader on hydration, then this function will return the data that was already loaded on the server (via Promise.resolve). */
     serverLoader: () => Promise<ServerDataFrom<T["module"]["loader"]>>;
 };
-type CreateServerActionArgs<T extends RouteInfo> = ServerDataFunctionArgs<T>;
-type CreateClientActionArgs<T extends RouteInfo> = ClientDataFunctionArgs<T> & {
+type CreateServerActionArgs<T extends RouteInfo> = ServerDataFunctionArgs<T["params"]>;
+type CreateClientActionArgs<T extends RouteInfo> = ClientDataFunctionArgs<T["params"]> & {
     /** 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"]>>;
 };

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

@@ -1,5 +1,5 @@
 /**
- * react-router v7.6.1
+ * react-router v7.6.3-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *

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

@@ -1,5 +1,5 @@
 /**
- * react-router v7.6.1
+ * react-router v7.6.3-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *