Skip to content

Commit f7f5519

Browse files
brophdawg11brophdawg11
committed
Merge branch 'release-next' into dev
2 parents ab71f62 + a3927fe commit f7f5519

File tree

25 files changed

+127
-76
lines changed

25 files changed

+127
-76
lines changed

‎.changeset/fetcher-submission-revalidation.md

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

‎.changeset/fix-fragments-ids.md

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

‎.changeset/initialize-lazy-errors.md

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

‎.changeset/normalize-form-method.md

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

‎.changeset/ssr-error-boundary.md

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

‎.changeset/update-web-fetch.md

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

‎.github/workflows/test.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ jobs:
4040
- name: 🏗 Build
4141
run: yarn build
4242

43+
- name: 🔬 Lint
44+
run: yarn lint
45+
4346
- name: 🧪 Run tests
4447
run: yarn test
4548

‎contributors.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@
104104
- kentcdodds
105105
- kiliman
106106
- kkirsche
107+
- kno-raziel
107108
- koojaa
108109
- KostiantynPopovych
109110
- KutnerUri
@@ -142,6 +143,7 @@
142143
- ms10596
143144
- ned-park
144145
- nilubisan
146+
- nnhjs
145147
- noisypigeon
146148
- Obi-Dann
147149
- omar-moquete
@@ -195,9 +197,9 @@
195197
- WalkAlone0325
196198
- willemarcel
197199
- williamsdyyz
200+
- willsawyerrrr
198201
- xavier-lc
199202
- xcsnowcity
200203
- yionr
201204
- yuleicul
202205
- zheng-chuang
203-
- nnhjs

‎docs/hooks/use-fetchers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ For example, imagine a UI where the sidebar lists projects, and the main view di
3838
+-----------------+----------------------------┘
3939
```
4040

41-
When the user clicks a checkbox, the submission goes to the action to change the state of the task. Instead of creating a "loading state" we want to create an "optimistic UI" that will **immediately** update the checkbox to appear checked even though the server hasn't processed it yet. In the checkbox component, we can use `fetcher.submission`:
41+
When the user clicks a checkbox, the submission goes to the action to change the state of the task. Instead of creating a "loading state" we want to create an "optimistic UI" that will **immediately** update the checkbox to appear checked even though the server hasn't processed it yet. In the checkbox component, we can use `fetcher.formData`:
4242

4343
```tsx
4444
function Task({ task }) {

‎docs/start/concepts.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -664,9 +664,7 @@ And the resulting element tree rendered will be:
664664
</PageLayout>
665665
```
666666

667-
<docs-warning>
668-
Don't forget to add an `<Outlet>` to your layout where you would like child route elements to be rendered. Using `children` will not work as expected.
669-
</docs-warning>
667+
<docs-warning>Don't forget to add an `<Outlet>` to your layout where you would like child route elements to be rendered. Using `{children}` will not work as expected.</docs-warning>
670668

671669
The `PageLayout` route is admittedly weird. We call it a [layout route](#layout-route) because it doesn't participate in the matching at all (though its children do). It only exists to make wrapping multiple child routes in the same layout simpler. If we didn't allow this then you'd have to handle layouts in two different ways: sometimes your routes do it for you, sometimes you do it manually with lots of layout component repetition throughout your app:
672670

‎docs/start/faq.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ Another important reason for using the `element` prop in v6 is that `<Route chil
118118

119119
## How do I add a No Match (404) Route in react-router v6?
120120

121-
In v4 we would have just left the path prop off a route. In v5 we would have wrapped our 404 element in a Route and used `path="*"`. In v6 use the new element prop, pass `path="*"` instead:
121+
In v4 we would have just left the path prop off a route. In v5 we would have wrapped our 404 element in a Route and used `path="*"`. In v6 use `path="*"` and pass the 404 element into the new `element` prop instead of wrapping it:
122122

123123
```js
124124
<Route path="*" element={<NoMatch />} />

‎examples/lazy-loading-router-provider/package-lock.json

Lines changed: 15 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/lazy-loading-router-provider/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"dependencies": {
1010
"react": "^18.2.0",
1111
"react-dom": "^18.2.0",
12-
"react-router-dom": "^6.8.0"
12+
"react-router-dom": "^6.9.0"
1313
},
1414
"devDependencies": {
1515
"@rollup/plugin-replace": "^5.0.2",

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
},
106106
"filesize": {
107107
"packages/router/dist/router.umd.min.js": {
108-
"none": "43.1 kB"
108+
"none": "43.3 kB"
109109
},
110110
"packages/react-router/dist/react-router.production.min.js": {
111111
"none": "13 kB"

‎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.10.0
4+
5+
### Patch Changes
6+
7+
- Updated dependencies:
8+
- `[email protected]`
9+
- `[email protected]`
10+
311
## 6.9.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.9.0",
3+
"version": "6.10.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.9.0"
27+
"react-router": "6.10.0"
2828
},
2929
"peerDependencies": {
3030
"react": ">=16.8",

‎packages/react-router-dom/CHANGELOG.md

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

3+
## 6.10.0
4+
5+
### Minor Changes
6+
7+
- Added support for [**Future Flags**](https://reactrouter.com/en/main/guides/api-development-strategy) in React Router. The first 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()` behavior. ([#10207](https://github.com/remix-run/react-router/pull/10207))
8+
9+
- When `future.v7_normalizeFormMethod === false` (default v6 behavior),
10+
- `useNavigation().formMethod` is lowercase
11+
- `useFetcher().formMethod` is lowercase
12+
- When `future.v7_normalizeFormMethod === true`:
13+
- `useNavigation().formMethod` is uppercase
14+
- `useFetcher().formMethod` is uppercase
15+
16+
### Patch Changes
17+
18+
- Fix `createStaticHandler` to also check for `ErrorBoundary` on routes in addition to `errorElement` ([#10190](https://github.com/remix-run/react-router/pull/10190))
19+
- Updated dependencies:
20+
- `@remix-run/[email protected]`
21+
- `[email protected]`
22+
323
## 6.9.0
424

525
### Minor 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.9.0",
3+
"version": "6.10.0",
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.4.0",
27-
"react-router": "6.9.0"
26+
"@remix-run/router": "1.5.0",
27+
"react-router": "6.10.0"
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.10.0
4+
5+
### Patch Changes
6+
7+
- Updated dependencies:
8+
- `[email protected]`
9+
310
## 6.9.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.9.0",
3+
"version": "6.10.0",
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.1.4",
25-
"react-router": "6.9.0"
25+
"react-router": "6.10.0"
2626
},
2727
"devDependencies": {
2828
"react": "^18.2.0",

‎packages/react-router/CHANGELOG.md

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,24 @@
11
# `react-router`
22

3+
## 6.10.0
4+
5+
### Minor Changes
6+
7+
- Added support for [**Future Flags**](https://reactrouter.com/en/main/guides/api-development-strategy) in React Router. The first 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()` behavior. ([#10207](https://github.com/remix-run/react-router/pull/10207))
8+
9+
- When `future.v7_normalizeFormMethod === false` (default v6 behavior),
10+
- `useNavigation().formMethod` is lowercase
11+
- `useFetcher().formMethod` is lowercase
12+
- When `future.v7_normalizeFormMethod === true`:
13+
- `useNavigation().formMethod` is uppercase
14+
- `useFetcher().formMethod` is uppercase
15+
16+
### Patch Changes
17+
18+
- Fix route ID generation when using Fragments in `createRoutesFromElements` ([#10193](https://github.com/remix-run/react-router/pull/10193))
19+
- Updated dependencies:
20+
- `@remix-run/[email protected]`
21+
322
## 6.9.0
423

524
### Minor Changes
@@ -105,8 +124,8 @@
105124

106125
### Patch Changes
107126

108-
- Fix `generatePath` incorrectly applying parameters in some cases ([`bc6fefa1`](https://github.com/remix-run/react-router/commit/bc6fefa19019ce9f5250c8b5af9b8c5d3390e9d1))
109-
- Improve memoization for context providers to avoid unnecessary re-renders ([`bc6fefa1`](https://github.com/remix-run/react-router/commit/bc6fefa19019ce9f5250c8b5af9b8c5d3390e9d1))
127+
- Fix `generatePath` incorrectly applying parameters in some cases ([#10078](https://github.com/remix-run/react-router/pull/10078))
128+
- Improve memoization for context providers to avoid unnecessary re-renders ([#9983](https://github.com/remix-run/react-router/pull/9983))
110129

111130
## 6.8.2
112131

‎packages/react-router/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",
3-
"version": "6.9.0",
3+
"version": "6.10.0",
44
"description": "Declarative routing for React",
55
"keywords": [
66
"react",
@@ -23,7 +23,7 @@
2323
"module": "./dist/index.js",
2424
"types": "./dist/index.d.ts",
2525
"dependencies": {
26-
"@remix-run/router": "1.4.0"
26+
"@remix-run/router": "1.5.0"
2727
},
2828
"devDependencies": {
2929
"react": "^18.2.0"

‎packages/router/CHANGELOG.md

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,25 @@
11
# `@remix-run/router`
22

3+
## 1.5.0
4+
5+
### Minor Changes
6+
7+
- Added support for [**Future Flags**](https://reactrouter.com/en/main/guides/api-development-strategy) in React Router. The first 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()` behavior. ([#10207](https://github.com/remix-run/react-router/pull/10207))
8+
9+
- When `future.v7_normalizeFormMethod === false` (default v6 behavior),
10+
- `useNavigation().formMethod` is lowercase
11+
- `useFetcher().formMethod` is lowercase
12+
- When `future.v7_normalizeFormMethod === true`:
13+
- `useNavigation().formMethod` is uppercase
14+
- `useFetcher().formMethod` is uppercase
15+
16+
### Patch Changes
17+
18+
- Provide fetcher submission to `shouldRevalidate` if the fetcher action redirects ([#10208](https://github.com/remix-run/react-router/pull/10208))
19+
- Properly handle `lazy()` errors during router initialization ([#10201](https://github.com/remix-run/react-router/pull/10201))
20+
- Remove `instanceof` check for `DeferredData` to be resilient to ESM/CJS boundaries in SSR bundling scenarios ([#10247](https://github.com/remix-run/react-router/pull/10247))
21+
- Update to latest `@remix-run/[email protected]` ([#10216](https://github.com/remix-run/react-router/pull/10216))
22+
323
## 1.4.0
424

525
### Minor Changes
@@ -64,7 +84,7 @@
6484

6585
### Patch Changes
6686

67-
- Fix `generatePath` incorrectly applying parameters in some cases ([`bc6fefa1`](https://github.com/remix-run/react-router/commit/bc6fefa19019ce9f5250c8b5af9b8c5d3390e9d1))
87+
- Fix `generatePath` incorrectly applying parameters in some cases ([#10078](https://github.com/remix-run/react-router/pull/10078))
6888

6989
## 1.3.3
7090

‎packages/router/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@remix-run/router",
3-
"version": "1.4.0",
3+
"version": "1.5.0",
44
"description": "Nested/Data-driven/Framework-agnostic Routing",
55
"keywords": [
66
"remix",

0 commit comments

Comments
 (0)