Skip to content

Commit c6efa78

Browse files
committed
Merge branch 'dev' into markdalgleish/route-chunks
2 parents ee63047 + 44c4b66 commit c6efa78

File tree

83 files changed

+737
-804
lines changed

Some content is hidden

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

83 files changed

+737
-804
lines changed

.changeset/gold-suns-march.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Imports/Exports cleanup
1717
- `TrackedPromise`
1818
- `unstable_AgnosticPatchRoutesOnMissFunction`
1919
- `Action` -> exported as `NavigationType` via `react-router`
20-
- `Router` exported as `RemixRouter` to differentiate from RR's `<Router>`
20+
- `Router` exported as `DataRouter` to differentiate from RR's `<Router>`
2121
- API
2222
- `getToPathname` (`@private`)
2323
- `joinPaths` (`@private`)

.changeset/lemon-files-care.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@react-router/dev": patch
3+
---
4+
5+
include root "react-dom" module for optimization

.changeset/purple-poems-laugh.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"react-router": patch
3+
---
4+
5+
Fix redirects returned from loaders/actions using `data()`

.changeset/red-feet-shop.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
"react-router": minor
3+
---
4+
5+
[REMOVE] Allow returning undefined from loaders/actions part 2
6+
7+
- This is a follow up to #11680 which missed some of the Remix codepaths

.changeset/silly-papayas-trade.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"react-router": patch
3+
---
4+
5+
[REMOVE] Rename RemixRouter->DataRouter

docs/discussion/code-splitting.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
---
22
title: Automatic Code Splitting
3-
new: true
43
---
54

65
# Automatic Code Splitting
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
title: Picking a Router
3+
---
4+
5+
## TODO:

docs/discussion/race-conditions.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
---
22
title: Race Conditions
3-
new: true
43
---
54

65
# Race Conditions

docs/discussion/route-matching.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
---
22
title: Route Matching
3-
new: true
43
---
54

65
# Route Matching

docs/discussion/route-module-limitations.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
---
22
title: Route Module Limitations
3-
new: true
43
---
54

65
# Route Module Limitations

0 commit comments

Comments
 (0)