Skip to content

Commit

Permalink
Merge branch 'upgrade-rr' into release-next
Browse files Browse the repository at this point in the history
  • Loading branch information
mjackson committed Nov 8, 2024
2 parents 5019080 + 18e9d69 commit 0615a2b
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 16 deletions.
5 changes: 5 additions & 0 deletions .changeset/early-jobs-eat.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@remix-run/react": patch
---

[REMOVE] Bump router
4 changes: 2 additions & 2 deletions packages/remix-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
"dependencies": {
"@remix-run/router": "1.21.0-pre.0",
"@remix-run/server-runtime": "workspace:*",
"react-router": "6.28.0-pre.0",
"react-router-dom": "6.28.0-pre.0",
"react-router": "6.28.0",
"react-router-dom": "6.28.0",
"turbo-stream": "2.4.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/remix-testing/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"@remix-run/node": "workspace:*",
"@remix-run/react": "workspace:*",
"@remix-run/router": "1.21.0-pre.0",
"react-router-dom": "6.28.0-pre.0"
"react-router-dom": "6.28.0"
},
"devDependencies": {
"@remix-run/server-runtime": "workspace:*",
Expand Down
31 changes: 18 additions & 13 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 0615a2b

Please sign in to comment.