Skip to content

Commit 7a5c0a7

Browse files
committed
Merge branch 'release-next' into dev
2 parents 9cfd99d + 8b1ee67 commit 7a5c0a7

File tree

15 files changed

+149
-59
lines changed

15 files changed

+149
-59
lines changed

.changeset/revert-resolve-to-fix.md

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

CHANGELOG.md

Lines changed: 57 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -13,120 +13,122 @@ 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.20.1](#v6201)
17+
- [Patch Changes](#patch-changes)
1618
- [v6.20.0](#v6200)
1719
- [Minor Changes](#minor-changes)
18-
- [Patch Changes](#patch-changes)
20+
- [Patch Changes](#patch-changes-1)
1921
- [v6.19.0](#v6190)
2022
- [What's Changed](#whats-changed)
2123
- [`unstable_flushSync` API](#unstable_flushsync-api)
2224
- [Minor Changes](#minor-changes-1)
23-
- [Patch Changes](#patch-changes-1)
25+
- [Patch Changes](#patch-changes-2)
2426
- [v6.18.0](#v6180)
2527
- [What's Changed](#whats-changed-1)
2628
- [New Fetcher APIs](#new-fetcher-apis)
2729
- [Persistence Future Flag (`future.v7_fetcherPersist`)](#persistence-future-flag-futurev7_fetcherpersist)
2830
- [Minor Changes](#minor-changes-2)
29-
- [Patch Changes](#patch-changes-2)
31+
- [Patch Changes](#patch-changes-3)
3032
- [v6.17.0](#v6170)
3133
- [What's Changed](#whats-changed-2)
3234
- [View Transitions 🚀](#view-transitions-)
3335
- [Minor Changes](#minor-changes-3)
34-
- [Patch Changes](#patch-changes-3)
36+
- [Patch Changes](#patch-changes-4)
3537
- [v6.16.0](#v6160)
3638
- [Minor Changes](#minor-changes-4)
37-
- [Patch Changes](#patch-changes-4)
39+
- [Patch Changes](#patch-changes-5)
3840
- [v6.15.0](#v6150)
3941
- [Minor Changes](#minor-changes-5)
40-
- [Patch Changes](#patch-changes-5)
41-
- [v6.14.2](#v6142)
4242
- [Patch Changes](#patch-changes-6)
43-
- [v6.14.1](#v6141)
43+
- [v6.14.2](#v6142)
4444
- [Patch Changes](#patch-changes-7)
45+
- [v6.14.1](#v6141)
46+
- [Patch Changes](#patch-changes-8)
4547
- [v6.14.0](#v6140)
4648
- [What's Changed](#whats-changed-3)
4749
- [JSON/Text Submissions](#jsontext-submissions)
4850
- [Minor Changes](#minor-changes-6)
49-
- [Patch Changes](#patch-changes-8)
51+
- [Patch Changes](#patch-changes-9)
5052
- [v6.13.0](#v6130)
5153
- [What's Changed](#whats-changed-4)
5254
- [Minor Changes](#minor-changes-7)
53-
- [Patch Changes](#patch-changes-9)
54-
- [v6.12.1](#v6121)
5555
- [Patch Changes](#patch-changes-10)
56+
- [v6.12.1](#v6121)
57+
- [Patch Changes](#patch-changes-11)
5658
- [v6.12.0](#v6120)
5759
- [What's Changed](#whats-changed-5)
5860
- [`React.startTransition` support](#reactstarttransition-support)
5961
- [Minor Changes](#minor-changes-8)
60-
- [Patch Changes](#patch-changes-11)
61-
- [v6.11.2](#v6112)
6262
- [Patch Changes](#patch-changes-12)
63-
- [v6.11.1](#v6111)
63+
- [v6.11.2](#v6112)
6464
- [Patch Changes](#patch-changes-13)
65+
- [v6.11.1](#v6111)
66+
- [Patch Changes](#patch-changes-14)
6567
- [v6.11.0](#v6110)
6668
- [Minor Changes](#minor-changes-9)
67-
- [Patch Changes](#patch-changes-14)
69+
- [Patch Changes](#patch-changes-15)
6870
- [v6.10.0](#v6100)
6971
- [What's Changed](#whats-changed-6)
7072
- [Minor Changes](#minor-changes-10)
71-
- [Patch Changes](#patch-changes-15)
73+
- [Patch Changes](#patch-changes-16)
7274
- [v6.9.0](#v690)
7375
- [What's Changed](#whats-changed-7)
7476
- [`Component`/`ErrorBoundary` route properties](#componenterrorboundary-route-properties)
7577
- [Introducing Lazy Route Modules](#introducing-lazy-route-modules)
7678
- [Minor Changes](#minor-changes-11)
77-
- [Patch Changes](#patch-changes-16)
78-
- [v6.8.2](#v682)
7979
- [Patch Changes](#patch-changes-17)
80-
- [v6.8.1](#v681)
80+
- [v6.8.2](#v682)
8181
- [Patch Changes](#patch-changes-18)
82+
- [v6.8.1](#v681)
83+
- [Patch Changes](#patch-changes-19)
8284
- [v6.8.0](#v680)
8385
- [Minor Changes](#minor-changes-12)
84-
- [Patch Changes](#patch-changes-19)
86+
- [Patch Changes](#patch-changes-20)
8587
- [v6.7.0](#v670)
8688
- [Minor Changes](#minor-changes-13)
87-
- [Patch Changes](#patch-changes-20)
88-
- [v6.6.2](#v662)
8989
- [Patch Changes](#patch-changes-21)
90-
- [v6.6.1](#v661)
90+
- [v6.6.2](#v662)
9191
- [Patch Changes](#patch-changes-22)
92+
- [v6.6.1](#v661)
93+
- [Patch Changes](#patch-changes-23)
9294
- [v6.6.0](#v660)
9395
- [What's Changed](#whats-changed-8)
9496
- [Minor Changes](#minor-changes-14)
95-
- [Patch Changes](#patch-changes-23)
97+
- [Patch Changes](#patch-changes-24)
9698
- [v6.5.0](#v650)
9799
- [What's Changed](#whats-changed-9)
98100
- [Minor Changes](#minor-changes-15)
99-
- [Patch Changes](#patch-changes-24)
100-
- [v6.4.5](#v645)
101101
- [Patch Changes](#patch-changes-25)
102-
- [v6.4.4](#v644)
102+
- [v6.4.5](#v645)
103103
- [Patch Changes](#patch-changes-26)
104-
- [v6.4.3](#v643)
104+
- [v6.4.4](#v644)
105105
- [Patch Changes](#patch-changes-27)
106-
- [v6.4.2](#v642)
106+
- [v6.4.3](#v643)
107107
- [Patch Changes](#patch-changes-28)
108-
- [v6.4.1](#v641)
108+
- [v6.4.2](#v642)
109109
- [Patch Changes](#patch-changes-29)
110+
- [v6.4.1](#v641)
111+
- [Patch Changes](#patch-changes-30)
110112
- [v6.4.0](#v640)
111113
- [What's Changed](#whats-changed-10)
112114
- [Remix Data APIs](#remix-data-apis)
113-
- [Patch Changes](#patch-changes-30)
115+
- [Patch Changes](#patch-changes-31)
114116
- [v6.3.0](#v630)
115117
- [Minor Changes](#minor-changes-16)
116118
- [v6.2.2](#v622)
117-
- [Patch Changes](#patch-changes-31)
118-
- [v6.2.1](#v621)
119119
- [Patch Changes](#patch-changes-32)
120+
- [v6.2.1](#v621)
121+
- [Patch Changes](#patch-changes-33)
120122
- [v6.2.0](#v620)
121123
- [Minor Changes](#minor-changes-17)
122-
- [Patch Changes](#patch-changes-33)
123-
- [v6.1.1](#v611)
124124
- [Patch Changes](#patch-changes-34)
125+
- [v6.1.1](#v611)
126+
- [Patch Changes](#patch-changes-35)
125127
- [v6.1.0](#v610)
126128
- [Minor Changes](#minor-changes-18)
127-
- [Patch Changes](#patch-changes-35)
128-
- [v6.0.1](#v601)
129129
- [Patch Changes](#patch-changes-36)
130+
- [v6.0.1](#v601)
131+
- [Patch Changes](#patch-changes-37)
130132
- [v6.0.0](#v600)
131133

132134
</details>
@@ -150,8 +152,21 @@ To add a new release, copy from this template:
150152
151153
-->
152154

155+
## v6.20.1
156+
157+
### Patch Changes
158+
159+
- Revert the `useResolvedPath` fix for splat routes due to a large number of applications that were relying on the buggy behavior (see [#11052](https://github.com/remix-run/react-router/issues/11052#issuecomment-1836589329)) ([#11078](https://github.com/remix-run/react-router/pull/11078))
160+
- We plan to re-introduce this fix behind a future flag in the next minor version (see [this comment](https://github.com/remix-run/react-router/issues/11052#issuecomment-1836589329))
161+
- This fix was included in versions `6.19.0` and `6.20.0`. If you are upgrading from `6.18.0` or earlier, you would not have been impacted by this fix.
162+
163+
**Full Changelog**: [`v6.20.0...v6.20.1`](https://github.com/remix-run/react-router/compare/[email protected]@6.20.1)
164+
153165
## v6.20.0
154166

167+
> [!WARNING]
168+
> Please use version `6.20.1` or later instead of `6.20.0`. We discovered that a large number of apps were relying on buggy behavior that was fixed in this release ([#11045](https://github.com/remix-run/react-router/pull/11045)). We reverted the fix in `6.20.1` and will be re-introducing it behind a future flag in a subsequent release. See [#11052](https://github.com/remix-run/react-router/issues/11052#issuecomment-1836589329) for more details.
169+
155170
### Minor Changes
156171

157172
- Export the `PathParam` type from the public API ([#10719](https://github.com/remix-run/react-router/pull/10719))
@@ -167,6 +182,9 @@ To add a new release, copy from this template:
167182

168183
## v6.19.0
169184

185+
> [!WARNING]
186+
> Please use version `6.20.1` or later instead of `6.19.0`. We discovered that a large number of apps were relying on buggy behavior that was fixed in this release ([#10983](https://github.com/remix-run/react-router/pull/10983)). We reverted the fix in `6.20.1` and will be re-introducing it behind a future flag in a subsequent release. See [#11052](https://github.com/remix-run/react-router/issues/11052#issuecomment-1836589329) for more details.
187+
170188
### What's Changed
171189

172190
#### `unstable_flushSync` API
@@ -509,7 +527,7 @@ We recommend folks adopt this flag sooner rather than later to be better compati
509527

510528
## v6.12.1
511529

512-
> **Warning**
530+
> [!WARNING]
513531
> Please use version `6.13.0` or later instead of `6.12.0`/`6.12.1`. These versions suffered from some Webpack build/minification issues resulting failed builds or invalid minified code in your production bundles. See [#10569](https://github.com/remix-run/react-router/pull/10569) and [#10579](https://github.com/remix-run/react-router/issues/10579) for more details.
514532
515533
### Patch Changes
@@ -520,7 +538,7 @@ We recommend folks adopt this flag sooner rather than later to be better compati
520538

521539
## v6.12.0
522540

523-
> **Warning**
541+
> [!WARNING]
524542
> Please use version `6.13.0` or later instead of `6.12.0`/`6.12.1`. These versions suffered from some Webpack build/minification issues resulting failed builds or invalid minified code in your production bundles. See [#10569](https://github.com/remix-run/react-router/pull/10569) and [#10579](https://github.com/remix-run/react-router/issues/10579) for more details.
525543
526544
### What's Changed

contributors.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,7 @@
213213
- stmtk1
214214
- swalker326
215215
- tanayv
216+
- thecode00
216217
- theostavrides
217218
- thisiskartik
218219
- thomasverleye

docs/hooks/use-navigation.md

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ function SomeComponent() {
2727
navigation.text;
2828
navigation.formAction;
2929
navigation.formMethod;
30+
navigation.formEncType;
3031
}
3132
```
3233

@@ -108,6 +109,45 @@ This tells you what the next [location][location] is going to be.
108109

109110
Note that this link will not appear "pending" if a form is being submitted to the URL the link points to, because we only do this for "loading" states. The form will contain the pending UI for when the state is "submitting", once the action is complete, then the link will go pending.
110111

112+
## `navigation.formAction`
113+
114+
Any POST, PUT, PATCH, or DELETE navigation that started from a `<Form>` or `useSubmit` will have form's submission action route's path value available in `navigation.formAction`.
115+
116+
In the case of a GET form submission, `navigation.formAction` will be empty
117+
118+
If you submitted the form at `example.com/id`, then `navigation.formAction` would be "/id"
119+
120+
## `navigation.formMethod`
121+
122+
Any POST, PUT, PATCH, or DELETE navigation that started from a `<Form>` or `useSubmit` will have form's submission method value available in `navigation.formMethod`.
123+
124+
In the case of a GET form submission, `navigation.formMethod` will be empty
125+
126+
Here is an example. Please note that `navigation.formMethod` is in lowercase
127+
128+
```tsx
129+
function SubmitButton() {
130+
const navigation = useNavigation();
131+
if (navigation.formMethod) {
132+
console.log(navigation.formMethod); // post
133+
}
134+
135+
return (
136+
<Form method="POST">
137+
<button>Submit</button>
138+
</Form>
139+
);
140+
}
141+
```
142+
143+
## `navigation.formEncType`
144+
145+
Any POST, PUT, PATCH, or DELETE navigation that started from a `<Form>` or `useSubmit` will have form's submission method value available in `navigation.formEncType`.
146+
147+
This property can be one of the four values: "text/plain," "application/json," "multipart/form-data," or "application/x-www-form-urlencoded."
148+
149+
In the case of a GET form submission, `navigation.formEncType` will be empty
150+
111151
[location]: ../utils/location
112152
[pickingarouter]: ../routers/picking-a-router
113153
[api-development-strategy]: ../guides/api-development-strategy

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.20.1
4+
5+
### Patch Changes
6+
7+
- Updated dependencies:
8+
9+
10+
311
## 6.20.0
412

513
### Minor Changes

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.20.0",
3+
"version": "6.20.1",
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.20.0"
27+
"react-router": "6.20.1"
2828
},
2929
"peerDependencies": {
3030
"react": ">=16.8",

packages/react-router-dom/CHANGELOG.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# `react-router-dom`
22

3+
## 6.20.1
4+
5+
### Patch Changes
6+
7+
- Revert the `useResolvedPath` fix for splat routes due to a large number of applications that were relying on the buggy behavior (see https://github.com/remix-run/react-router/issues/11052#issuecomment-1836589329). We plan to re-introduce this fix behind a future flag in the next minor version. ([#11078](https://github.com/remix-run/react-router/pull/11078))
8+
- Updated dependencies:
9+
10+
- `@remix-run/[email protected]`
11+
312
## 6.20.0
413

514
### Minor Changes
@@ -250,7 +259,7 @@
250259

251260
## 6.12.1
252261

253-
> **Warning**
262+
> [!WARNING]
254263
> Please use version `6.13.0` or later instead of `6.12.1`. This version suffers from a `webpack`/`terser` minification issue resulting in invalid minified code in your resulting production bundles which can cause issues in your application. See [#10579](https://github.com/remix-run/react-router/issues/10579) for more details.
255264
256265
### Patch Changes

packages/react-router-dom/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-router-dom",
3-
"version": "6.20.0",
3+
"version": "6.20.1",
44
"description": "Declarative routing for React web applications",
55
"keywords": [
66
"react",
@@ -23,8 +23,8 @@
2323
"module": "./dist/index.js",
2424
"types": "./dist/index.d.ts",
2525
"dependencies": {
26-
"@remix-run/router": "1.13.0",
27-
"react-router": "6.20.0"
26+
"@remix-run/router": "1.13.1",
27+
"react-router": "6.20.1"
2828
},
2929
"devDependencies": {
3030
"react": "^18.2.0",

packages/react-router-native/CHANGELOG.md

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

3+
## 6.20.1
4+
5+
### Patch Changes
6+
7+
- Updated dependencies:
8+
9+
310
## 6.20.0
411

512
### Minor Changes

packages/react-router-native/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-native",
3-
"version": "6.20.0",
3+
"version": "6.20.1",
44
"description": "Declarative routing for React Native applications",
55
"keywords": [
66
"react",
@@ -22,7 +22,7 @@
2222
"types": "./dist/index.d.ts",
2323
"dependencies": {
2424
"@ungap/url-search-params": "^0.2.2",
25-
"react-router": "6.20.0"
25+
"react-router": "6.20.1"
2626
},
2727
"devDependencies": {
2828
"react": "^18.2.0",

0 commit comments

Comments
 (0)