react-router 7.6.1-pre.2 → 7.6.2

package/CHANGELOG.md

@@ -1,18 +1,13 @@
 # `react-router`
 
-## 7.6.1-pre.2
+## 7.6.2
 
 ### Patch Changes
 
-- [REMOVE] Revert tsup changes ([#13667](https://github.com/remix-run/react-router/pull/13667))
+- Avoid additional `with-props` chunk in Framework Mode by moving route module component prop logic from the Vite plugin to `react-router` ([#13650](https://github.com/remix-run/react-router/pull/13650))
+- \[INTERNAL] Slight refactor of internal `headers()` function processing for use with RSC ([#13639](https://github.com/remix-run/react-router/pull/13639))
 
-## 7.6.1-pre.1
-
-### Patch Changes
-
-- [REMOVE] test changeset to force prerelease ([`d79c4fcac`](https://github.com/remix-run/react-router/commit/d79c4fcac236fd3bd5041ba706b2c52370337915))
-
-## 7.6.1-pre.0
+## 7.6.1
 
 ### Patch Changes
 
@@ -21,6 +16,7 @@
   This is primarily for cases where a route `loader` threw an error to it's own `ErrorBoundary`. but it also arises in the case of a 404 which renders the root `ErrorBoundary`/`meta` but the root loader did not run because not routes matched.
 
 - Partially revert optimization added in `7.1.4` to reduce calls to `matchRoutes` because it surfaced other issues ([#13562](https://github.com/remix-run/react-router/pull/13562))
+
 - Fix typegen when same route is used at multiple paths ([#13574](https://github.com/remix-run/react-router/pull/13574))
 
   For example, `routes/route.tsx` is used at 4 different paths here:
@@ -50,7 +46,7 @@
 
   export default [
     route("parent/:p", "routes/parent.tsx", [
-      route("route/:r", "routes/route.tsx", [
+      route("layout/:l", "routes/layout.tsx", [
         route("child1/:c1a/:c1b", "routes/child1.tsx"),
         route("child2/:c2a/:c2b", "routes/child2.tsx"),
       ]),
@@ -58,9 +54,9 @@
   ] satisfies RouteConfig;
   ```
 
-  Previously, `params` for `routes/route` were calculated as `{ p: string, r: string }`.
+  Previously, `params` for the `routes/layout.tsx` route were calculated as `{ p: string, l: string }`.
   This incorrectly ignores params that could come from child routes.
-  If visiting `/parent/1/route/2/child1/3/4`, the actual params passed to `routes/route` will have a type of `{ p: string, r: string, c1a: string, c1b: string }`.
+  If visiting `/parent/1/layout/2/child1/3/4`, the actual params passed to `routes/layout.tsx` will have a type of `{ p: string, l: string, c1a: string, c1b: string }`.
 
   Now, `params` are aware of child routes and autocompletion will include child params as optionals:
 
@@ -68,21 +64,21 @@
   params.|
   //     ^ cursor is here and you ask for autocompletion
   // p: string
-  // r: string
+  // l: string
   // c1a?: string
   // c1b?: string
   // c2a?: string
   // c2b?: string
   ```
 
-  You can also narrow the types for `params` as it is implemented as a normalized union of params for each page that includes `routes/route`:
+  You can also narrow the types for `params` as it is implemented as a normalized union of params for each page that includes `routes/layout.tsx`:
 
   ```ts
   if (typeof params.c1a === 'string') {
     params.|
     //     ^ cursor is here and you ask for autocompletion
     // p: string
-    // r: string
+    // l: string
     // c1a: string
     // c1b: string
   }
@@ -94,7 +90,7 @@
   UNSTABLE: removed `Info` export from generated `+types/*` files
 
 - Avoid initial fetcher execution 404 error when Lazy Route Discovery is interrupted by a navigation ([#13564](https://github.com/remix-run/react-router/pull/13564))
-- Remove hashes from files in `dist/` for easier usage with `patch-package` ([#13567](https://github.com/remix-run/react-router/pull/13567))
+
 - href replaces splats `*` ([#13593](https://github.com/remix-run/react-router/pull/13593))
 
   ```ts
@@ -508,8 +504,6 @@
 
   For library and framework authors using `unstable_SerializesTo`, you may need to add `as unknown` casts before casting to `unstable_SerializesTo`.
 
-- \[REMOVE] Remove middleware depth logic and always call middlware for all matches ([#13172](https://github.com/remix-run/react-router/pull/13172))
-
 - Fix single fetch `_root.data` requests when a `basename` is used ([#12898](https://github.com/remix-run/react-router/pull/12898))
 
 - Add `context` support to client side data routers (unstable) ([#12941](https://github.com/remix-run/react-router/pull/12941))

package/dist/development/{chunk-H4Y5ODCL.mjs → chunk-NL6KNZEE.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v7.6.1-pre.2
+ * react-router v7.6.2
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -5920,6 +5920,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
 import * as React10 from "react";
@@ -8685,7 +8717,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-pre.2";
+    window.__reactRouterVersion = "7.6.2";
   }
 } catch (e) {
 }
@@ -9879,37 +9911,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) {
@@ -10428,6 +10429,13 @@ function createServerHandoffString(serverHandoff) {
 // lib/server-runtime/headers.ts
 import { splitCookiesString } from "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;
@@ -10445,14 +10453,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);
@@ -10462,12 +10468,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);
@@ -11509,6 +11515,9 @@ export {
   createRoutesFromChildren,
   createRoutesFromElements,
   renderMatches,
+  withComponentProps,
+  withHydrateFallbackProps,
+  withErrorBoundaryProps,
   createSearchParams,
   SingleFetchRedirectSymbol,
   getTurboStreamSingleFetchDataStrategy,

package/dist/development/dom-export.d.mts

@@ -1,6 +1,6 @@
 import * as React from 'react';
-import { R as RouterProviderProps$1 } from './lib-B8x_tOvL.mjs';
-import { R as RouterInit } from './route-data-WyrduLgj.mjs';
+import { R as RouterProviderProps$1 } from './lib-C1JSsICm.mjs';
+import { R as RouterInit } from './route-data-ByAYLHuM.mjs';
 
 type RouterProviderProps = Omit<RouterProviderProps$1, "flushSync">;
 declare function RouterProvider(props: Omit<RouterProviderProps, "flushSync">): React.JSX.Element;

package/dist/development/dom-export.js

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

package/dist/development/dom-export.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v7.6.1-pre.2
+ * react-router v7.6.2
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -25,7 +25,7 @@ import {
   invariant,
   mapRouteProperties,
   useFogOFWarDiscovery
-} from "./chunk-H4Y5ODCL.mjs";
+} from "./chunk-NL6KNZEE.mjs";
 
 // lib/dom-export/dom-router-provider.tsx
 import * as React from "react";