Skip to content

Commit 6c23794

Browse files
committed
Merge branch 'release-next' into dev
2 parents 843fe0e + 09b6cbe commit 6c23794

29 files changed

+209
-184
lines changed

.changeset/blocker-key-strict-mode.md

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

.changeset/formdata-submitter.md

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

.changeset/purple-islands-cough.md

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

.changeset/raw-payload-submission-router.md

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

.changeset/raw-payload-submission.md

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

.changeset/skip-fetcher-revalidate.md

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

.changeset/smart-pots-repair.md

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

.changeset/strip-basename-getkey.md

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

.changeset/strip-blocker-basename.md

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

.changeset/sync-window-location.md

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

.changeset/tsc-skiplibcheck-react17.md

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

DEVELOPMENT.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
New releases should be created from release branches originating from the `dev` branch. When you are ready to begin the release process:
66

7-
- Make sure you've pulled all of the changes from GitHub for both `dev` and `main` branches.
7+
- Make sure you've pulled all the changes from GitHub for both `dev` and `main` branches.
88
- Check out the `dev` branch.
99
- Create a new release branch with the `release-` prefix (eg, `git checkout -b release-next`).
1010
- **IMPORTANT:** The `release-` prefix is important, as this is what triggers our GitHub CI workflow that will ultimately publish the release.
@@ -17,7 +17,7 @@ Changesets will do most of the heavy lifting for our releases. When changes are
1717

1818
- Ensure you are on the new `release-*` branch.
1919
- Enter Changesets pre-release mode using the `pre` tag: `yarn changeset pre enter pre`.
20-
- Commit the change and push the the `release-*` branch to GitHub.
20+
- Commit the change and push the `release-*` branch to GitHub.
2121
- Wait for the release workflow to finish. The Changesets action in the workflow will open a PR that will increment all versions and generate the changelogs.
2222
- Review the updated `CHANGELOG` files and make any adjustments necessary, then merge the PR into the `release-*` branch.
2323
- `find packages -name 'CHANGELOG.md' -mindepth 2 -maxdepth 2 -exec code {} \;`
@@ -30,27 +30,27 @@ You may need to make changes to a pre-release prior to publishing a final stable
3030
- Make whatever changes you need.
3131
- Create a new changeset: `yarn changeset`.
3232
- **IMPORTANT:** This is required even if you ultimately don't want to include these changes in the logs. Remember, changelogs can be edited prior to publishing, but the Changeset version script needs to see new changesets in order to create a new version.
33-
- Commit the changesets and push the the `release-*` branch to GitHub.
33+
- Commit the changesets and push the `release-*` branch to GitHub.
3434
- Wait for the release workflow to finish and the Changesets action to open its PR that will increment all versions.
3535
- Review the PR, make any adjustments necessary, and merge it into the `release-*` branch.
3636
- Once the PR is merged, the release workflow will publish the updated packages to npm.
3737

3838
### Publishing the stable release
3939

4040
- Exit Changesets pre-release mode: `yarn changeset pre exit`.
41-
- Commit the edited pre-release file along with any unpublished changesets, and push the the `release-*` branch to GitHub.
41+
- Commit the edited pre-release file along with any unpublished changesets, and push the `release-*` branch to GitHub.
4242
- Wait for the release workflow to finish. The Changesets action in the workflow will open a PR that will increment all versions and generate the changelogs for the stable release.
4343
- Review the updated `CHANGELOG` files and make any adjustments necessary.
4444
- We should remove the changelogs for all pre-releases ahead of publishing the stable version.
4545
- [TODO: We should automate this]
46-
- Prepare the github release notes
46+
- Prepare the GitHub release notes
4747
- Copy the relevant changelog entries from all packages into the Release Notes and adjust accordingly, matching the format used by prior releases
4848
- Merge the PR into the `release-*` branch.
4949
- Once the PR is merged, the release workflow will publish the updated packages to npm.
5050
- Once the release is published:
5151
- merge the `release-*` branch into `main` and push it up to GitHub
5252
- merge the `release-*` branch into `dev` and push it up to GitHub
53-
- Convert the `[email protected]` tag to a Release on Github with the name `v6.x.y`
53+
- Convert the `[email protected]` tag to a Release on GitHub with the name `v6.x.y`
5454

5555
### Hotfix releases
5656

contributors.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
- 0xEddie
22
- abdallah-nour
3+
- abeadam
34
- abhi-kr-2100
45
- AchThomas
56
- adamdotjs
@@ -140,6 +141,7 @@
140141
- markivancho
141142
- maruffahmed
142143
- marvinruder
144+
- mathpaquette
143145
- matt-harro
144146
- maxpou
145147
- mcansh

docs/hooks/use-submit.md

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,28 +96,44 @@ submit([
9696
]);
9797
```
9898

99-
The default behavior if you submit a JSON object is to encode the data into `FormData`:
99+
The default behavior if you submit a JSON object for a POST submission is to encode the data into `FormData`:
100100

101101
```tsx
102-
submit({ key: "value", { encType: "application/x-www-form-urlencoded" });
102+
submit(
103+
{ key: "value" },
104+
{
105+
method: "post",
106+
encType: "application/x-www-form-urlencoded",
107+
}
108+
);
103109
// will serialize into request.formData() in your action
110+
// and will show up on useNavigation().formData during the navigation
104111
```
105112

106113
Or you can opt-into JSON encoding:
107114

108115
```tsx
109-
submit({ key: "value" }, { encType: "application/json" });
116+
submit(
117+
{ key: "value" },
118+
{ method: "post", encType: "application/json" }
119+
);
110120
// will serialize into request.json() in your action
121+
// and will show up on useNavigation().json during the navigation
111122

112-
submit('{"key":"value"}', { encType: "application/json" });
123+
submit('{"key":"value"}', {
124+
method: "post",
125+
encType: "application/json",
126+
});
113127
// will encode into request.json() in your action
128+
// and will show up on useNavigation().json during the navigation
114129
```
115130

116131
Or plain text:
117132

118133
```tsx
119-
submit("value", { encType: "text/plain" });
134+
submit("value", { method: "post", encType: "text/plain" });
120135
// will serialize into request.text() in your action
136+
// and will show up on useNavigation().text during the navigation
121137
```
122138

123139
## Submit options
@@ -126,8 +142,8 @@ The second argument is a set of options that map (mostly) directly to form submi
126142

127143
```tsx
128144
submit(null, {
129-
action: "/logout",
130145
method: "post",
146+
action: "/logout",
131147
});
132148

133149
// same as

docs/routers/picking-a-router.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ ReactDOM.createRoot(document.getElementById("root")).render(
5757

5858
We recommend all web projects use [`createBrowserRouter`][createbrowserrouter].
5959

60-
It uses the full URL instead of the hash urls (`#this/stuff`) common in web apps before `window.pushState` was standardized. Full URLs are better for SEO, better for server rendering, and are just more compatible with the rest of the web platform.
60+
It uses the full URL instead of the hash urls (`#this/stuff`) common in web apps before `history.pushState` was standardized. Full URLs are better for SEO, better for server rendering, and are just more compatible with the rest of the web platform.
6161

6262
If you're hosting your app on a static file server, you'll need to configure it to send all requests to your `index.html` to avoid getting 404s.
6363

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
"none": "16.2 kB"
119119
},
120120
"packages/react-router-dom/dist/react-router-dom.production.min.js": {
121-
"none": "12.5 kB"
121+
"none": "12.6 kB"
122122
},
123123
"packages/react-router-dom/dist/umd/react-router-dom.production.min.js": {
124124
"none": "18.6 kB"

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

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

3+
## 6.14.0
4+
5+
### Patch Changes
6+
7+
- Upgrade `typescript` to 5.1 ([#10581](https://github.com/remix-run/react-router/pull/10581))
8+
- Updated dependencies:
9+
10+
11+
312
## 6.13.0
413

514
### Patch 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.13.0",
3+
"version": "6.14.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.13.0"
27+
"react-router": "6.14.0"
2828
},
2929
"peerDependencies": {
3030
"react": ">=16.8",

0 commit comments

Comments
 (0)