Skip to content

Commit 6def427

Browse files
committed
Merge branch 'release-next' into dev
2 parents ff041d1 + 0a87644 commit 6def427

File tree

20 files changed

+125
-87
lines changed

20 files changed

+125
-87
lines changed

.changeset/flat-seals-hunt.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/lovely-apples-help.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/rich-bees-invent.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/six-pianos-serve.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/thirty-swans-fail.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 72 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -13,161 +13,163 @@ We manage release notes in this file instead of the paginated Github Releases Pa
1313
<summary>Table of Contents</summary>
1414

1515
- [React Router Releases](#react-router-releases)
16+
- [v6.24.1](#v6241)
17+
- [Patch Changes](#patch-changes)
1618
- [v6.24.0](#v6240)
1719
- [What's Changed](#whats-changed)
1820
- [Lazy Route Discovery (a.k.a. "Fog of War")](#lazy-route-discovery-aka-fog-of-war)
1921
- [Minor Changes](#minor-changes)
20-
- [Patch Changes](#patch-changes)
21-
- [v6.23.1](#v6231)
2222
- [Patch Changes](#patch-changes-1)
23+
- [v6.23.1](#v6231)
24+
- [Patch Changes](#patch-changes-2)
2325
- [v6.23.0](#v6230)
2426
- [What's Changed](#whats-changed-1)
2527
- [Data Strategy (unstable)](#data-strategy-unstable)
2628
- [Skip Action Error Revalidation (unstable)](#skip-action-error-revalidation-unstable)
2729
- [Minor Changes](#minor-changes-1)
2830
- [v6.22.3](#v6223)
29-
- [Patch Changes](#patch-changes-2)
30-
- [v6.22.2](#v6222)
3131
- [Patch Changes](#patch-changes-3)
32-
- [v6.22.1](#v6221)
32+
- [v6.22.2](#v6222)
3333
- [Patch Changes](#patch-changes-4)
34+
- [v6.22.1](#v6221)
35+
- [Patch Changes](#patch-changes-5)
3436
- [v6.22.0](#v6220)
3537
- [What's Changed](#whats-changed-2)
3638
- [Core Web Vitals Technology Report Flag](#core-web-vitals-technology-report-flag)
3739
- [Minor Changes](#minor-changes-2)
38-
- [Patch Changes](#patch-changes-5)
39-
- [v6.21.3](#v6213)
4040
- [Patch Changes](#patch-changes-6)
41-
- [v6.21.2](#v6212)
41+
- [v6.21.3](#v6213)
4242
- [Patch Changes](#patch-changes-7)
43-
- [v6.21.1](#v6211)
43+
- [v6.21.2](#v6212)
4444
- [Patch Changes](#patch-changes-8)
45+
- [v6.21.1](#v6211)
46+
- [Patch Changes](#patch-changes-9)
4547
- [v6.21.0](#v6210)
4648
- [What's Changed](#whats-changed-3)
4749
- [`future.v7_relativeSplatPath`](#futurev7_relativesplatpath)
4850
- [Partial Hydration](#partial-hydration)
4951
- [Minor Changes](#minor-changes-3)
50-
- [Patch Changes](#patch-changes-9)
51-
- [v6.20.1](#v6201)
5252
- [Patch Changes](#patch-changes-10)
53+
- [v6.20.1](#v6201)
54+
- [Patch Changes](#patch-changes-11)
5355
- [v6.20.0](#v6200)
5456
- [Minor Changes](#minor-changes-4)
55-
- [Patch Changes](#patch-changes-11)
57+
- [Patch Changes](#patch-changes-12)
5658
- [v6.19.0](#v6190)
5759
- [What's Changed](#whats-changed-4)
5860
- [`unstable_flushSync` API](#unstable_flushsync-api)
5961
- [Minor Changes](#minor-changes-5)
60-
- [Patch Changes](#patch-changes-12)
62+
- [Patch Changes](#patch-changes-13)
6163
- [v6.18.0](#v6180)
6264
- [What's Changed](#whats-changed-5)
6365
- [New Fetcher APIs](#new-fetcher-apis)
6466
- [Persistence Future Flag (`future.v7_fetcherPersist`)](#persistence-future-flag-futurev7_fetcherpersist)
6567
- [Minor Changes](#minor-changes-6)
66-
- [Patch Changes](#patch-changes-13)
68+
- [Patch Changes](#patch-changes-14)
6769
- [v6.17.0](#v6170)
6870
- [What's Changed](#whats-changed-6)
6971
- [View Transitions 🚀](#view-transitions-)
7072
- [Minor Changes](#minor-changes-7)
71-
- [Patch Changes](#patch-changes-14)
73+
- [Patch Changes](#patch-changes-15)
7274
- [v6.16.0](#v6160)
7375
- [Minor Changes](#minor-changes-8)
74-
- [Patch Changes](#patch-changes-15)
76+
- [Patch Changes](#patch-changes-16)
7577
- [v6.15.0](#v6150)
7678
- [Minor Changes](#minor-changes-9)
77-
- [Patch Changes](#patch-changes-16)
78-
- [v6.14.2](#v6142)
7979
- [Patch Changes](#patch-changes-17)
80-
- [v6.14.1](#v6141)
80+
- [v6.14.2](#v6142)
8181
- [Patch Changes](#patch-changes-18)
82+
- [v6.14.1](#v6141)
83+
- [Patch Changes](#patch-changes-19)
8284
- [v6.14.0](#v6140)
8385
- [What's Changed](#whats-changed-7)
8486
- [JSON/Text Submissions](#jsontext-submissions)
8587
- [Minor Changes](#minor-changes-10)
86-
- [Patch Changes](#patch-changes-19)
88+
- [Patch Changes](#patch-changes-20)
8789
- [v6.13.0](#v6130)
8890
- [What's Changed](#whats-changed-8)
89-
- [v7_startTransition](#v7_starttransition)
91+
- [`future.v7_startTransition`](#futurev7_starttransition)
9092
- [Minor Changes](#minor-changes-11)
91-
- [Patch Changes](#patch-changes-20)
92-
- [v6.12.1](#v6121)
9393
- [Patch Changes](#patch-changes-21)
94+
- [v6.12.1](#v6121)
95+
- [Patch Changes](#patch-changes-22)
9496
- [v6.12.0](#v6120)
9597
- [What's Changed](#whats-changed-9)
9698
- [`React.startTransition` support](#reactstarttransition-support)
9799
- [Minor Changes](#minor-changes-12)
98-
- [Patch Changes](#patch-changes-22)
99-
- [v6.11.2](#v6112)
100100
- [Patch Changes](#patch-changes-23)
101-
- [v6.11.1](#v6111)
101+
- [v6.11.2](#v6112)
102102
- [Patch Changes](#patch-changes-24)
103+
- [v6.11.1](#v6111)
104+
- [Patch Changes](#patch-changes-25)
103105
- [v6.11.0](#v6110)
104106
- [Minor Changes](#minor-changes-13)
105-
- [Patch Changes](#patch-changes-25)
107+
- [Patch Changes](#patch-changes-26)
106108
- [v6.10.0](#v6100)
107109
- [What's Changed](#whats-changed-10)
108110
- [Minor Changes](#minor-changes-14)
109-
- [future.v7_normalizeFormMethod](#futurev7_normalizeformmethod)
110-
- [Patch Changes](#patch-changes-26)
111+
- [`future.v7_normalizeFormMethod`](#futurev7_normalizeformmethod)
112+
- [Patch Changes](#patch-changes-27)
111113
- [v6.9.0](#v690)
112114
- [What's Changed](#whats-changed-11)
113115
- [`Component`/`ErrorBoundary` route properties](#componenterrorboundary-route-properties)
114116
- [Introducing Lazy Route Modules](#introducing-lazy-route-modules)
115117
- [Minor Changes](#minor-changes-15)
116-
- [Patch Changes](#patch-changes-27)
117-
- [v6.8.2](#v682)
118118
- [Patch Changes](#patch-changes-28)
119-
- [v6.8.1](#v681)
119+
- [v6.8.2](#v682)
120120
- [Patch Changes](#patch-changes-29)
121+
- [v6.8.1](#v681)
122+
- [Patch Changes](#patch-changes-30)
121123
- [v6.8.0](#v680)
122124
- [Minor Changes](#minor-changes-16)
123-
- [Patch Changes](#patch-changes-30)
125+
- [Patch Changes](#patch-changes-31)
124126
- [v6.7.0](#v670)
125127
- [Minor Changes](#minor-changes-17)
126-
- [Patch Changes](#patch-changes-31)
127-
- [v6.6.2](#v662)
128128
- [Patch Changes](#patch-changes-32)
129-
- [v6.6.1](#v661)
129+
- [v6.6.2](#v662)
130130
- [Patch Changes](#patch-changes-33)
131+
- [v6.6.1](#v661)
132+
- [Patch Changes](#patch-changes-34)
131133
- [v6.6.0](#v660)
132134
- [What's Changed](#whats-changed-12)
133135
- [Minor Changes](#minor-changes-18)
134-
- [Patch Changes](#patch-changes-34)
136+
- [Patch Changes](#patch-changes-35)
135137
- [v6.5.0](#v650)
136138
- [What's Changed](#whats-changed-13)
137139
- [Minor Changes](#minor-changes-19)
138-
- [Patch Changes](#patch-changes-35)
139-
- [v6.4.5](#v645)
140140
- [Patch Changes](#patch-changes-36)
141-
- [v6.4.4](#v644)
141+
- [v6.4.5](#v645)
142142
- [Patch Changes](#patch-changes-37)
143-
- [v6.4.3](#v643)
143+
- [v6.4.4](#v644)
144144
- [Patch Changes](#patch-changes-38)
145-
- [v6.4.2](#v642)
145+
- [v6.4.3](#v643)
146146
- [Patch Changes](#patch-changes-39)
147-
- [v6.4.1](#v641)
147+
- [v6.4.2](#v642)
148148
- [Patch Changes](#patch-changes-40)
149+
- [v6.4.1](#v641)
150+
- [Patch Changes](#patch-changes-41)
149151
- [v6.4.0](#v640)
150152
- [What's Changed](#whats-changed-14)
151153
- [Remix Data APIs](#remix-data-apis)
152-
- [Patch Changes](#patch-changes-41)
154+
- [Patch Changes](#patch-changes-42)
153155
- [v6.3.0](#v630)
154156
- [Minor Changes](#minor-changes-20)
155157
- [v6.2.2](#v622)
156-
- [Patch Changes](#patch-changes-42)
157-
- [v6.2.1](#v621)
158158
- [Patch Changes](#patch-changes-43)
159+
- [v6.2.1](#v621)
160+
- [Patch Changes](#patch-changes-44)
159161
- [v6.2.0](#v620)
160162
- [Minor Changes](#minor-changes-21)
161-
- [Patch Changes](#patch-changes-44)
162-
- [v6.1.1](#v611)
163163
- [Patch Changes](#patch-changes-45)
164+
- [v6.1.1](#v611)
165+
- [Patch Changes](#patch-changes-46)
164166
- [v6.1.0](#v610)
165167
- [Minor Changes](#minor-changes-22)
166-
- [Patch Changes](#patch-changes-46)
167-
- [v6.0.2](#v602)
168168
- [Patch Changes](#patch-changes-47)
169-
- [v6.0.1](#v601)
169+
- [v6.0.2](#v602)
170170
- [Patch Changes](#patch-changes-48)
171+
- [v6.0.1](#v601)
172+
- [Patch Changes](#patch-changes-49)
171173
- [v6.0.0](#v600)
172174

173175
</details>
@@ -191,6 +193,21 @@ Date: YYYY-MM-DD
191193
**Full Changelog**: [`v6.X.Y...v6.X.Y`](https://github.com/remix-run/react-router/compare/[email protected]@6.X.Y)
192194
-->
193195

196+
## v6.24.1
197+
198+
Date: 2024-07-03
199+
200+
### Patch Changes
201+
202+
- Remove `polyfill.io` reference from warning message because the domain was sold and has since been determined to serve malware ([#11741](https://github.com/remix-run/react-router/pull/11741))
203+
- See https://sansec.io/research/polyfill-supply-chain-attack
204+
- Export `NavLinkRenderProps` type for easier typing of custom `NavLink` callback ([#11553](https://github.com/remix-run/react-router/pull/11553))
205+
- When using `future.v7_relativeSplatPath`, properly resolve relative paths in splat routes that are children of pathless routes ([#11633](https://github.com/remix-run/react-router/pull/11633))
206+
- Fog of War (unstable): Trigger a new `router.routes` identity/reflow during route patching ([#11740](https://github.com/remix-run/react-router/pull/11740))
207+
- Fog of War (unstable): Fix initial matching when a splat route matches ([#11759](https://github.com/remix-run/react-router/pull/11759))
208+
209+
**Full Changelog**: [`v6.24.0...v6.24.1`](https://github.com/remix-run/react-router/compare/[email protected]@6.24.1)
210+
194211
## v6.24.0
195212

196213
Date: 2024-06-24
@@ -203,7 +220,7 @@ We're really excited to release our new API for "Lazy Route Discovery" in `v6.24
203220

204221
With "Fog of War", you can now load portions of the route tree lazily via the new `unstable_patchRoutesOnMiss` option passed to `createBrowserRouter` (and it's memory/hash counterparts). This gives you a way to hook into spots where React Router is unable to match a given path and patch new routes into the route tree during the navigation (or fetcher call).
205222

206-
Here's a very small example, but please refer to the [documentation](https://reactrouter.com/en/main/routers/create-browser-router#unstable_patchroutesonmiss) for more information and use cases:
223+
Here's a very small example, but please refer to the [documentation](https://reactrouter.com/en/main/routers/create-browser-router#optsunstable_patchroutesonmiss) for more information and use cases:
207224

208225
```js
209226
const router = createBrowserRouter(
@@ -506,7 +523,7 @@ Per this [RFC](https://github.com/remix-run/remix/discussions/7698), we've intro
506523

507524
- You may now specify your own fetcher identifier via `useFetcher({ key: string })`, which allows you to access the same fetcher instance from different components in your application without prop-drilling
508525
- Fetcher keys are now exposed on the fetchers returned from `useFetchers` so that they can be looked up by `key`
509-
- `Form` and `useSumbit` now support optional `navigate`/`fetcherKey` props/params to allow kicking off a fetcher submission under the hood with an optionally user-specified `key`
526+
- `Form` and `useSubmit` now support optional `navigate`/`fetcherKey` props/params to allow kicking off a fetcher submission under the hood with an optionally user-specified `key`
510527
- `<Form method="post" navigate={false} fetcherKey="my-key">`
511528
- `submit(data, { method: "post", navigate: false, fetcherKey: "my-key" })`
512529
- Invoking a fetcher in this way is ephemeral and stateless
@@ -765,7 +782,7 @@ Date: 2023-06-14
765782

766783
`6.13.0` is really a patch release in spirit but comes with a SemVer minor bump since we added a new future flag.
767784

768-
#### v7_startTransition
785+
#### `future.v7_startTransition`
769786

770787
The **tl;dr;** is that `6.13.0` is the same as [`6.12.0`](https://github.com/remix-run/react-router/releases/tag/react-router%406.12.0) bue we've moved the usage of `React.startTransition` behind an opt-in `future.v7_startTransition` [future flag](https://reactrouter.com/en/main/guides/api-development-strategy) because we found that there are applications in the wild that are currently using `Suspense` in ways that are incompatible with `React.startTransition`.
771788

@@ -918,7 +935,7 @@ You can also check out the docs [here](https://reactrouter.com/en/dev/guides/api
918935

919936
### Minor Changes
920937

921-
#### future.v7_normalizeFormMethod
938+
#### `future.v7_normalizeFormMethod`
922939

923940
The first future flag being introduced is `future.v7_normalizeFormMethod` which will normalize the exposed `useNavigation()/useFetcher()` `formMethod` fields as uppercase HTTP methods to align with the `fetch()` (and some Remix) behavior. ([#10207](https://github.com/remix-run/react-router/pull/10207))
924941

contributors.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
- adriananin
1010
- adrienharnay
1111
- afzalsayed96
12+
- AhmadMayo
1213
- Ajayff4
1314
- akamfoad
1415
- alany411
@@ -67,6 +68,7 @@
6768
- DigitalNaut
6869
- dmitrytarassov
6970
- dokeet
71+
- doytch
7072
- Drishtantr
7173
- edwin177
7274
- eiffelwong1
@@ -99,6 +101,7 @@
99101
- hongji00
100102
- hsbtr
101103
- hyesungoh
104+
- iamnishanth
102105
- ianflynnwork
103106
- IbraRouisDev
104107
- igniscyan

docs/route/route.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ Neither style is discouraged and behavior is identical. For the majority of this
7070
interface RouteObject {
7171
path?: string;
7272
index?: boolean;
73-
children?: React.ReactNode;
73+
children?: RouteObject[];
7474
caseSensitive?: boolean;
7575
id?: string;
7676
loader?: LoaderFunction;

docs/routers/create-browser-router.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ const router = createBrowserRouter(
439439
);
440440
```
441441

442-
In the above example, if the user clicks a clink to `/a`, React Router won't be able to match it initially and will call `patchRoutesOnMiss` with `/a` and a `matches` array containing the root route match. By calling `patch`, it the `a` route will be added to the route tree and React Router will perform matching again. This time it will successfully match the `/a` path and the navigation will complete successfully.
442+
In the above example, if the user clicks a link to `/a`, React Router won't be able to match it initially and will call `patchRoutesOnMiss` with `/a` and a `matches` array containing the root route match. By calling `patch`, the `a` route will be added to the route tree and React Router will perform matching again. This time it will successfully match the `/a` path and the navigation will complete successfully.
443443

444444
**Patching new root-level routes**
445445

docs/utils/create-routes-from-elements.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import {
1111
createBrowserRouter,
1212
createRoutesFromElements,
1313
RouterProvider,
14+
Route,
1415
} from "react-router-dom";
1516

1617
// You can do this:

0 commit comments

Comments
 (0)