Skip to content

Commit 2cd1944

Browse files
committed
Merge branch 'release-next'
2 parents 24f80ac + 7ff51c0 commit 2cd1944

39 files changed

+3864
-787
lines changed

contributors.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
- akamfoad
1010
- alany411
1111
- alberto
12+
- alexandernanberg
1213
- alexlbr
1314
- AmRo045
1415
- amsal

docs/hooks/use-location.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ title: useLocation
1111
declare function useLocation(): Location;
1212

1313
interface Location extends Path {
14-
state: unknown;
14+
state: any;
1515
key: Key;
1616
}
1717
```

examples/data-router/src/app.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,10 @@ import type { ActionFunctionArgs, LoaderFunctionArgs } from "react-router-dom";
33
import {
44
Await,
55
createBrowserRouter,
6-
createRoutesFromElements,
76
defer,
87
Form,
98
Link,
109
Outlet,
11-
Route,
1210
RouterProvider,
1311
useAsyncError,
1412
useAsyncValue,

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,19 +105,19 @@
105105
},
106106
"filesize": {
107107
"packages/router/dist/router.umd.min.js": {
108-
"none": "43.3 kB"
108+
"none": "45 kB"
109109
},
110110
"packages/react-router/dist/react-router.production.min.js": {
111-
"none": "13 kB"
111+
"none": "13.1 kB"
112112
},
113113
"packages/react-router/dist/umd/react-router.production.min.js": {
114-
"none": "15.1 kB"
114+
"none": "15.4 kB"
115115
},
116116
"packages/react-router-dom/dist/react-router-dom.production.min.js": {
117-
"none": "11.6 kB"
117+
"none": "11.8 kB"
118118
},
119119
"packages/react-router-dom/dist/umd/react-router-dom.production.min.js": {
120-
"none": "17.5 kB"
120+
"none": "17.7 kB"
121121
}
122122
}
123123
}

packages/react-router-dom-v5-compat/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# `react-router-dom-v5-compat`
22

3+
## 6.11.0
4+
5+
### Patch Changes
6+
7+
- Updated dependencies:
8+
9+
10+
311
## 6.10.0
412

513
### Patch Changes

packages/react-router-dom-v5-compat/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@ export {
177177
UNSAFE_DataRouterContext,
178178
UNSAFE_DataRouterStateContext,
179179
UNSAFE_useScrollRestoration,
180+
UNSAFE_useRouteId,
180181
} from "./react-router-dom";
181182

182183
export type { StaticRouterProps } from "./lib/components";

packages/react-router-dom-v5-compat/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-router-dom-v5-compat",
3-
"version": "6.10.0",
3+
"version": "6.11.0",
44
"description": "Migration path to React Router v6 from v4/5",
55
"keywords": [
66
"react",
@@ -24,7 +24,7 @@
2424
"types": "./dist/index.d.ts",
2525
"dependencies": {
2626
"history": "^5.3.0",
27-
"react-router": "6.10.0"
27+
"react-router": "6.11.0"
2828
},
2929
"peerDependencies": {
3030
"react": ">=16.8",

packages/react-router-dom/CHANGELOG.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,23 @@
11
# `react-router-dom`
22

3+
## 6.11.0
4+
5+
### Minor Changes
6+
7+
- Enable `basename` support in `useFetcher` ([#10336](https://github.com/remix-run/react-router/pull/10336))
8+
- If you were previously working around this issue by manually prepending the `basename` then you will need to remove the manually prepended `basename` from your `fetcher` calls (`fetcher.load('/basename/route') -> fetcher.load('/route')`)
9+
10+
### Patch Changes
11+
12+
- Fix inadvertent re-renders when using `Component` instead of `element` on a route definition ([#10287](https://github.com/remix-run/react-router/pull/10287))
13+
- Fail gracefully on `<Link to="//">` and other invalid URL values ([#10367](https://github.com/remix-run/react-router/pull/10367))
14+
- Switched from `useSyncExternalStore` to `useState` for internal `@remix-run/router` router state syncing in `<RouterProvider>`. We found some [subtle bugs](https://codesandbox.io/s/use-sync-external-store-loop-9g7b81) where router state updates got propagated _before_ other normal `useState` updates, which could lead to footguns in `useEffect` calls. ([#10377](https://github.com/remix-run/react-router/pull/10377), [#10409](https://github.com/remix-run/react-router/pull/10409))
15+
- Add static prop to `StaticRouterProvider`'s internal `Router` component ([#10401](https://github.com/remix-run/react-router/pull/10401))
16+
- When using a `RouterProvider`, `useNavigate`/`useSubmit`/`fetcher.submit` are now stable across location changes, since we can handle relative routing via the `@remix-run/router` instance and get rid of our dependence on `useLocation()`. When using `BrowserRouter`, these hooks remain unstable across location changes because they still rely on `useLocation()`. ([#10336](https://github.com/remix-run/react-router/pull/10336))
17+
- Updated dependencies:
18+
19+
- `@remix-run/[email protected]`
20+
321
## 6.10.0
422

523
### Minor Changes

0 commit comments

Comments
 (0)