Skip to content

Commit 81be2c2

Browse files
committed
Merge branch 'v7' into brophdawg11/expose-promises
2 parents fbbd4fd + aab4ea0 commit 81be2c2

File tree

191 files changed

+4094
-26451
lines changed

Some content is hidden

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

191 files changed

+4094
-26451
lines changed

.changeset/config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"baseBranch": "dev",
2222
"updateInternalDependencies": "patch",
2323
"bumpVersionsWithWorkspaceProtocolOnly": true,
24-
"ignore": ["integration", "integration-*"],
24+
"ignore": ["integration", "integration-*", "@playground/*"],
2525
"___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": {
2626
"onlyUpdatePeerDependentsWhenOutOfRange": true
2727
}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
"@react-router/server-runtime": major
3+
"react-router-dom": major
4+
"@react-router/express": major
5+
"react-router": major
6+
"@react-router/serve": major
7+
"@react-router/node": major
8+
"@react-router/dev": major
9+
---
10+
11+
Remove single_fetch future flag.

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,6 @@ node_modules/
2626
.tmp
2727
/.env
2828
/NOTES.md
29+
30+
# v7 reference docs
31+
/public

docs/guides/api-development-strategy.md renamed to docs/community/api-development-strategy.md

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

65
# API Development Strategy
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
---
22
title: Contributing
3-
order: 8
43
---
54

65
# Contributing to React Router
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
---
2-
title: Route
2+
title: Community
33
order: 5
44
---

docs/components/await.md

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

0 commit comments

Comments
 (0)