react-router 7.6.0-pre.0 → 7.6.1-pre.0

package/CHANGELOG.md

@@ -1,6 +1,96 @@
 # `react-router`
 
-## 7.6.0-pre.0
+## 7.6.1-pre.0
+
+### Patch Changes
+
+- Update `Route.MetaArgs` to reflect that `data` can be potentially `undefined` ([#13563](https://github.com/remix-run/react-router/pull/13563))
+
+  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:
+
+  ```ts
+  import { type RouteConfig, route } from "@react-router/dev/routes";
+  export default [
+    route("base/:base", "routes/base.tsx", [
+      route("home/:home", "routes/route.tsx", { id: "home" }),
+      route("changelog/:changelog", "routes/route.tsx", { id: "changelog" }),
+      route("splat/*", "routes/route.tsx", { id: "splat" }),
+    ]),
+    route("other/:other", "routes/route.tsx", { id: "other" }),
+  ] satisfies RouteConfig;
+  ```
+
+  Previously, typegen would arbitrarily pick one of these paths to be the "winner" and generate types for the route module based on that path.
+  Now, typegen creates unions as necessary for alternate paths for the same route file.
+
+- Better types for `params` ([#13543](https://github.com/remix-run/react-router/pull/13543))
+
+  For example:
+
+  ```ts
+  // routes.ts
+  import { type RouteConfig, route } from "@react-router/dev/routes";
+
+  export default [
+    route("parent/:p", "routes/parent.tsx", [
+      route("route/:r", "routes/route.tsx", [
+        route("child1/:c1a/:c1b", "routes/child1.tsx"),
+        route("child2/:c2a/:c2b", "routes/child2.tsx"),
+      ]),
+    ]),
+  ] satisfies RouteConfig;
+  ```
+
+  Previously, `params` for `routes/route` were calculated as `{ p: string, r: 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 }`.
+
+  Now, `params` are aware of child routes and autocompletion will include child params as optionals:
+
+  ```ts
+  params.|
+  //     ^ cursor is here and you ask for autocompletion
+  // p: string
+  // r: 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`:
+
+  ```ts
+  if (typeof params.c1a === 'string') {
+    params.|
+    //     ^ cursor is here and you ask for autocompletion
+    // p: string
+    // r: string
+    // c1a: string
+    // c1b: string
+  }
+  ```
+
+  ***
+
+  UNSTABLE: renamed internal `react-router/route-module` export to `react-router/internal`
+  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
+  const a = href("/products/*", { "*": "/1/edit" });
+  // -> /products/1/edit
+  ```
+
+## 7.6.0
 
 ### Minor Changes
 
@@ -37,22 +127,35 @@
 ### Patch Changes
 
 - Fix `react-router` module augmentation for `NodeNext` ([#13498](https://github.com/remix-run/react-router/pull/13498))
+
 - Don't bundle `react-router` in `react-router/dom` CJS export ([#13497](https://github.com/remix-run/react-router/pull/13497))
+
 - Fix bug where a submitting `fetcher` would get stuck in a `loading` state if a revalidating `loader` redirected ([#12873](https://github.com/remix-run/react-router/pull/12873))
+
 - Fix hydration error if a server `loader` returned `undefined` ([#13496](https://github.com/remix-run/react-router/pull/13496))
+
 - Fix initial load 404 scenarios in data mode ([#13500](https://github.com/remix-run/react-router/pull/13500))
+
 - Stabilize `useRevalidator`'s `revalidate` function ([#13542](https://github.com/remix-run/react-router/pull/13542))
+
 - Preserve status code if a `clientAction` throws a `data()` result in framework mode ([#13522](https://github.com/remix-run/react-router/pull/13522))
+
 - Be defensive against leading double slashes in paths to avoid `Invalid URL` errors from the URL constructor ([#13510](https://github.com/remix-run/react-router/pull/13510))
 
   - Note we do not sanitize/normalize these paths - we only detect them so we can avoid the error that would be thrown by `new URL("//", window.location.origin)`
 
 - Remove `Navigator` declaration for `navigator.connection.saveData` to avoid messing with any other types beyond `saveData` in userland ([#13512](https://github.com/remix-run/react-router/pull/13512))
+
 - Fix `handleError` `params` values on `.data` requests for routes with a dynamic param as the last URL segment ([#13481](https://github.com/remix-run/react-router/pull/13481))
+
 - Don't trigger an `ErrorBoundary` UI before the reload when we detect a manifest verison mismatch in Lazy Route Discovery ([#13480](https://github.com/remix-run/react-router/pull/13480))
+
 - Inline `turbo-stream@2.4.1` dependency and fix decoding ordering of Map/Set instances ([#13518](https://github.com/remix-run/react-router/pull/13518))
+
 - Only render dev warnings in DEV mode ([#13461](https://github.com/remix-run/react-router/pull/13461))
+
 - UNSTABLE: Fix a few bugs with error bubbling in middleware use-cases ([#13538](https://github.com/remix-run/react-router/pull/13538))
+
 - Short circuit post-processing on aborted `dataStrategy` requests ([#13521](https://github.com/remix-run/react-router/pull/13521))
 
   - This resolves non-user-facing console errors of the form `Cannot read properties of undefined (reading 'result')`

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

@@ -1,6 +1,5 @@
 import * as React from 'react';
-import { R as RouterProviderProps$1 } from './lib-CCSAGgcP.mjs';
-import { R as RouterInit } from './route-data-C6QaL0wu.mjs';
+import { RouterProviderProps as RouterProviderProps$1, RouterInit } from 'react-router';
 
 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.0-pre.0
+ * react-router v7.6.1-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/development/dom-export.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v7.6.0-pre.0
+ * react-router v7.6.1-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -8,34 +8,34 @@
  *
  * @license MIT
  */
-import {
-  FrameworkContext,
-  RemixErrorBoundary,
-  RouterProvider,
-  createBrowserHistory,
-  createClientRoutes,
-  createClientRoutesWithHMRRevalidationOptOut,
-  createRouter,
-  decodeViaTurboStream,
-  deserializeErrors,
-  getHydrationData,
-  getPatchRoutesOnNavigationFunction,
-  getTurboStreamSingleFetchDataStrategy,
-  hydrationRouteProperties,
-  invariant,
-  mapRouteProperties,
-  useFogOFWarDiscovery
-} from "./chunk-RXI6MVY4.mjs";
 
 // lib/dom-export/dom-router-provider.tsx
 import * as React from "react";
 import * as ReactDOM from "react-dom";
-function RouterProvider2(props) {
-  return /* @__PURE__ */ React.createElement(RouterProvider, { flushSync: ReactDOM.flushSync, ...props });
+import { RouterProvider as BaseRouterProvider } from "react-router";
+function RouterProvider(props) {
+  return /* @__PURE__ */ React.createElement(BaseRouterProvider, { flushSync: ReactDOM.flushSync, ...props });
 }
 
 // lib/dom-export/hydrated-router.tsx
 import * as React2 from "react";
+import {
+  UNSAFE_getHydrationData as getHydrationData,
+  UNSAFE_invariant as invariant,
+  UNSAFE_FrameworkContext as FrameworkContext,
+  UNSAFE_decodeViaTurboStream as decodeViaTurboStream,
+  UNSAFE_RemixErrorBoundary as RemixErrorBoundary,
+  UNSAFE_createBrowserHistory as createBrowserHistory,
+  UNSAFE_createClientRoutes as createClientRoutes,
+  UNSAFE_createRouter as createRouter,
+  UNSAFE_deserializeErrors as deserializeErrors,
+  UNSAFE_getTurboStreamSingleFetchDataStrategy as getTurboStreamSingleFetchDataStrategy,
+  UNSAFE_getPatchRoutesOnNavigationFunction as getPatchRoutesOnNavigationFunction,
+  UNSAFE_useFogOFWarDiscovery as useFogOFWarDiscovery,
+  UNSAFE_mapRouteProperties as mapRouteProperties,
+  UNSAFE_hydrationRouteProperties as hydrationRouteProperties,
+  UNSAFE_createClientRoutesWithHMRRevalidationOptOut as createClientRoutesWithHMRRevalidationOptOut
+} from "react-router";
 var ssrInfo = null;
 var router = null;
 function initSsrInfo() {
@@ -215,11 +215,11 @@ function HydratedRouter(props) {
           routeDiscovery: ssrInfo.context.routeDiscovery
         }
       },
-      /* @__PURE__ */ React2.createElement(RemixErrorBoundary, { location }, /* @__PURE__ */ React2.createElement(RouterProvider2, { router }))
+      /* @__PURE__ */ React2.createElement(RemixErrorBoundary, { location }, /* @__PURE__ */ React2.createElement(RouterProvider, { router }))
     ), /* @__PURE__ */ React2.createElement(React2.Fragment, null))
   );
 }
 export {
   HydratedRouter,
-  RouterProvider2 as RouterProvider
+  RouterProvider
 };