Skip to content

Commit e7a8f10

Browse files
committed
Merge branch 'release-next' into dev
2 parents c265a42 + 13fb25a commit e7a8f10

File tree

74 files changed

+489
-439
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+489
-439
lines changed

.changeset/aborted-query-error-message.md

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

.changeset/encode-uri-ssr.md

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

.changeset/error-response-type.md

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

.changeset/export-should-revalidate-args.md

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

.changeset/remix-v2-prep.md

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

.changeset/route-lazy-race.md

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

.changeset/should-revalidate-action-result-type.md

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

contributors.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
- AchThomas
66
- adamdotjs
77
- adil62
8+
- adrienharnay
89
- afzalsayed96
910
- Ajayff4
1011
- akamfoad
@@ -132,6 +133,7 @@
132133
- lopezac
133134
- lordofthecactus
134135
- LordThi
136+
- louis-young
135137
- loun4
136138
- lounsbrough
137139
- lpaube
@@ -178,7 +180,9 @@
178180
- petersendidit
179181
- promet99
180182
- pyitphyoaung
183+
- refusado
181184
- rimian
185+
- robbtraister
182186
- RobHannay
183187
- rtmann
184188
- rubeonline
@@ -195,10 +199,12 @@
195199
- shivamsinghchahar
196200
- SimenB
197201
- SkayuX
202+
- smithki
198203
- souzasmatheus
199204
- srmagura
200205
- stasundr
201206
- stmtk1
207+
- swalker326
202208
- tanayv
203209
- theostavrides
204210
- thisiskartik
@@ -230,7 +236,3 @@
230236
- yionr
231237
- yuleicul
232238
- zheng-chuang
233-
- swalker326
234-
- smithki
235-
- louis-young
236-
- robbtraister

docs/hooks/use-navigate.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ The `navigate` function has two signatures:
5454

5555
## `options.replace`
5656

57-
Specifying `replace: true` will cause the navigation will replace the current entry in the history stack instead of adding a new one.
57+
Specifying `replace: true` will cause the navigation to replace the current entry in the history stack instead of adding a new one.
5858

5959
## `options.state`
6060

docs/route/lazy.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ let routes = createRoutesFromElements(
2222
);
2323
```
2424

25-
Then in your lazy route modules, export the properties you want defined for the route:
25+
Then in your lazy route modules, export the properties you want defined for the route (`loader`, `Component`, `ErrorBoundary`):
2626

2727
```jsx
2828
export async function loader({ request }) {
@@ -59,6 +59,10 @@ export function ErrorBoundary() {
5959
ErrorBoundary.displayName = "SampleErrorBoundary";
6060
```
6161

62+
<docs-info>
63+
Note that there's no `default` export in this lazy-loaded file. That's because `default` is not a valid key on a route object. These files generally should only export keys you would define on a route object, such as `loader`, `action`, `Component`, `ErrorBoundary`, etc. All exports will be spread directly on the route object unless you manually return an object from `lazy`.
64+
</docs-info>
65+
6266
## Statically Defined Properties
6367

6468
Any properties defined statically on the route cannot be overwritten by the `lazy` function, and you'll receive a console warning if you attempt to overwrite them.

0 commit comments

Comments
 (0)