Skip to content

Commit 40701e5

Browse files
committed
Merge branch 'release-next' into dev
2 parents 19af0cf + 667f936 commit 40701e5

29 files changed

+548
-170
lines changed

.changeset/fetcher-cleanup.md

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

.changeset/fetcher-data.md

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

.changeset/fetcher-key.md

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

.changeset/fix-get-delete-fetcher-types.md

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

.changeset/fix-router-future-prop.md

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

.changeset/form-navigate-false.md

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

.changeset/support-optional-path-segments-in-match-path.md

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

contributors.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@
197197
- senseibarni
198198
- sergiodxa
199199
- sgalhs
200+
- sgrishchenko
200201
- shamsup
201202
- shihanng
202203
- shivamsinghchahar
@@ -238,7 +239,6 @@
238239
- xavier-lc
239240
- xcsnowcity
240241
- yionr
241-
- yuleicul
242242
- yracnet
243+
- yuleicul
243244
- zheng-chuang
244-
- sgrishchenko

docs/components/form.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ interface FormProps
2020
| "text/plain";
2121
action?: string;
2222
onSubmit?: React.FormEventHandler<HTMLFormElement>;
23+
fetcherKey?: string;
24+
navigate?: boolean;
2325
preventScrollReset?: boolean;
2426
relative?: "route" | "path";
2527
reloadDocument?: boolean;

docs/guides/api-development-strategy.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,9 @@ const router = createBrowserRouter(routes, {
6565

6666
| Flag | Description |
6767
| ------------------------ | --------------------------------------------------------------------- |
68-
| `v7_normalizeFormMethod` | Normalize `useNavigation().formMethod` to be an uppercase HTTP Method |
6968
| `v7_fetcherPersist` | Delay active fetcher cleanup until they return to an `idle` state |
69+
| `v7_normalizeFormMethod` | Normalize `useNavigation().formMethod` to be an uppercase HTTP Method |
70+
| `v7_prependBasename` | Prepend the router basename to navigate/fetch paths |
7071

7172
### React Router Future Flags
7273

0 commit comments

Comments
 (0)