Skip to content

Commit

Permalink
Merge pull request #10440 from marmelab/react-router-v7
Browse files Browse the repository at this point in the history 
Add support for React router v7
  • Loading branch information
@djhi
djhi authored Jan 15, 2025
2 parents fd587d8 + 02b6ee7 commit e26362c
Show file tree
Hide file tree
Showing 6 changed files with 94 additions and 34 deletions.
4 changes: 2 additions & 2 deletions examples/demo/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
"react": "^19.0.0",
"react-admin": "^5.0.0",
"react-dom": "^19.0.0",
"react-router": "^6.22.0",
"react-router-dom": "^6.22.0",
"react-router": "^7.0.0",
"react-router-dom": "^7.0.0",
"recharts": "^2.15.0"
},
"scripts": {
Expand Down
4 changes: 2 additions & 2 deletions examples/simple/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
"react-admin": "^5.4.3",
"react-dom": "^18.3.1",
"react-hook-form": "^7.53.0",
"react-router": "^6.22.0",
"react-router-dom": "^6.22.0"
"react-router": "^6.25.1",
"react-router-dom": "^6.25.1"
},
"devDependencies": {
"@hookform/devtools": "^4.3.3",
Expand Down
4 changes: 2 additions & 2 deletions packages/ra-core/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@
"react": "^18.0.0 || ^19.0.0",
"react-dom": "^18.0.0 || ^19.0.0",
"react-hook-form": "^7.53.0",
"react-router": "^6.22.0",
"react-router-dom": "^6.22.0"
"react-router": "^6.25.1 || ^7.0.0",
"react-router-dom": "^6.25.1 || ^7.0.0"
},
"dependencies": {
"@tanstack/react-query": "^5.21.7",
Expand Down
4 changes: 2 additions & 2 deletions packages/ra-ui-materialui/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@
"react-dom": "^18.0.0 || ^19.0.0",
"react-hook-form": "*",
"react-is": "^18.0.0 || ^19.0.0",
"react-router": "^6.22.0",
"react-router-dom": "^6.22.0"
"react-router": "^6.25.1 || ^7.0.0",
"react-router-dom": "^6.25.1 || ^7.0.0"
},
"dependencies": {
"@tanstack/react-query": "^5.21.7",
Expand Down
6 changes: 4 additions & 2 deletions packages/react-admin/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
"devDependencies": {
"cross-env": "^5.2.0",
"expect": "^27.4.6",
"react-router": "^6.25.1",
"react-router-dom": "^6.25.1",
"rimraf": "^3.0.2",
"typescript": "^5.1.3"
},
Expand All @@ -43,8 +45,8 @@
"ra-language-english": "^5.4.3",
"ra-ui-materialui": "^5.4.3",
"react-hook-form": "^7.53.0",
"react-router": "^6.22.0",
"react-router-dom": "^6.22.0"
"react-router": "^6.25.1 || ^7.0.0",
"react-router-dom": "^6.25.1 || ^7.0.0"
},
"gitHead": "587df4c27bfcec4a756df4f95e5fc14728dfc0d7"
}
106 changes: 82 additions & 24 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3802,10 +3802,10 @@ __metadata:
languageName: node
linkType: hard

"@remix-run/router@npm:1.18.0":
version: 1.18.0
resolution: "@remix-run/router@npm:1.18.0"
checksum: 3ec7e441a0e54932a3d3bf932432094420f2c117715d80a5454bc7e55d13b91250749942aab032cd07aee191f1c1de33fede8682025bfd3a453dd207c016e140
"@remix-run/router@npm:1.21.0":
version: 1.21.0
resolution: "@remix-run/router@npm:1.21.0"
checksum: 570792211c083a1c7146613b79cbb8e0d1e14f34e974052e060e7f9dcad38c800d80fe0a18bf42811bc278ab12c0e8fd62cfce649e905046c4e55bd5a09eafdc
languageName: node
linkType: hard

Expand Down Expand Up @@ -4837,6 +4837,13 @@ __metadata:
languageName: node
linkType: hard

"@types/cookie@npm:^0.6.0":
version: 0.6.0
resolution: "@types/cookie@npm:0.6.0"
checksum: 5b326bd0188120fb32c0be086b141b1481fec9941b76ad537f9110e10d61ee2636beac145463319c71e4be67a17e85b81ca9e13ceb6e3bb63b93d16824d6c149
languageName: node
linkType: hard

"@types/d3-array@npm:^3.0.3":
version: 3.2.1
resolution: "@types/d3-array@npm:3.2.1"
Expand Down Expand Up @@ -7694,6 +7701,13 @@ __metadata:
languageName: node
linkType: hard

"cookie@npm:^1.0.1":
version: 1.0.2
resolution: "cookie@npm:1.0.2"
checksum: fd25fe79e8fbcfcaf6aa61cd081c55d144eeeba755206c058682257cb38c4bd6795c6620de3f064c740695bb65b7949ebb1db7a95e4636efb8357a335ad3f54b
languageName: node
linkType: hard

"core-js-compat@npm:^3.20.0, core-js-compat@npm:^3.31.0, core-js-compat@npm:^3.36.1":
version: 3.37.1
resolution: "core-js-compat@npm:3.37.1"
Expand Down Expand Up @@ -8514,8 +8528,8 @@ __metadata:
react: "npm:^19.0.0"
react-admin: "npm:^5.0.0"
react-dom: "npm:^19.0.0"
react-router: "npm:^6.22.0"
react-router-dom: "npm:^6.22.0"
react-router: "npm:^7.0.0"
react-router-dom: "npm:^7.0.0"
recharts: "npm:^2.15.0"
rewire: "npm:^5.0.0"
rollup-plugin-visualizer: "npm:^5.12.0"
Expand Down Expand Up @@ -16117,8 +16131,8 @@ __metadata:
react: ^18.0.0 || ^19.0.0
react-dom: ^18.0.0 || ^19.0.0
react-hook-form: ^7.53.0
react-router: ^6.22.0
react-router-dom: ^6.22.0
react-router: ^6.25.1 || ^7.0.0
react-router-dom: ^6.25.1 || ^7.0.0
languageName: unknown
linkType: soft

Expand Down Expand Up @@ -16396,8 +16410,8 @@ __metadata:
react-dom: ^18.0.0 || ^19.0.0
react-hook-form: "*"
react-is: ^18.0.0 || ^19.0.0
react-router: ^6.22.0
react-router-dom: ^6.22.0
react-router: ^6.25.1 || ^7.0.0
react-router-dom: ^6.25.1 || ^7.0.0
languageName: unknown
linkType: soft

Expand Down Expand Up @@ -16547,8 +16561,8 @@ __metadata:
ra-language-english: "npm:^5.4.3"
ra-ui-materialui: "npm:^5.4.3"
react-hook-form: "npm:^7.53.0"
react-router: "npm:^6.22.0"
react-router-dom: "npm:^6.22.0"
react-router: "npm:^6.25.1"
react-router-dom: "npm:^6.25.1"
rimraf: "npm:^3.0.2"
typescript: "npm:^5.1.3"
peerDependencies:
Expand Down Expand Up @@ -16775,26 +16789,56 @@ __metadata:
linkType: hard

"react-router-dom@npm:^6.22.0, react-router-dom@npm:^6.25.1":
version: 6.25.1
resolution: "react-router-dom@npm:6.25.1"
version: 6.28.1
resolution: "react-router-dom@npm:6.28.1"
dependencies:
"@remix-run/router": "npm:1.18.0"
react-router: "npm:6.25.1"
"@remix-run/router": "npm:1.21.0"
react-router: "npm:6.28.1"
peerDependencies:
react: ">=16.8"
react-dom: ">=16.8"
checksum: 15e2b5bf89a26db9a108d19a4e0e2054180bfb1f5f62662dd93ad697ee1bdc91a8041efd762d552c95e65fc06ca0cb0c1e88acdeeaf03aba37f7a29e470c7cc4
checksum: a32ec9c1a0da5f3e478e498a31ddc9f7ed15dbf1969802d94a4589e63f3f8e69c4b7defa0e24af3b7dd6cbe759eafe3eea31457cc8d409bd60240dee1eb46043
languageName: node
linkType: hard

"react-router-dom@npm:^7.0.0":
version: 7.1.1
resolution: "react-router-dom@npm:7.1.1"
dependencies:
react-router: "npm:7.1.1"
peerDependencies:
react: ">=18"
react-dom: ">=18"
checksum: 2dc5b231dd21aab21378c615b1e373149007d173e90db984e6f708b5ee4b28923b3cf88ce7d6f727be927829b37ba37c01436f9f7abeb84ba3d1bfc9ecd4bc72
languageName: node
linkType: hard

"react-router@npm:6.25.1, react-router@npm:^6.22.0, react-router@npm:^6.25.1":
version: 6.25.1
resolution: "react-router@npm:6.25.1"
"react-router@npm:6.28.1, react-router@npm:^6.22.0, react-router@npm:^6.25.1":
version: 6.28.1
resolution: "react-router@npm:6.28.1"
dependencies:
"@remix-run/router": "npm:1.18.0"
"@remix-run/router": "npm:1.21.0"
peerDependencies:
react: ">=16.8"
checksum: a7e824c1f6d9641beabc23111865ddd2525b3794403e07b297fc2bdd4cddec93e166aacdb9d2602768864d70f3bf490f59eeab8474a04ae1f13a832f305eeec3
checksum: 699da89e4629f227be803f5f06d3ace5522fca3035416b588380fea5f85ed7efb9155d041fb7b813305ca7fedebeb45f585696edb13cf4166fbb40fb18c77a93
languageName: node
linkType: hard

"react-router@npm:7.1.1, react-router@npm:^7.0.0":
version: 7.1.1
resolution: "react-router@npm:7.1.1"
dependencies:
"@types/cookie": "npm:^0.6.0"
cookie: "npm:^1.0.1"
set-cookie-parser: "npm:^2.6.0"
turbo-stream: "npm:2.4.0"
peerDependencies:
react: ">=18"
react-dom: ">=18"
peerDependenciesMeta:
react-dom:
optional: true
checksum: 39f4859670f286eb2eac29e5830c1f730405701fca0808e5db853ec05e54e55a848c764e10ffd14a7b9b3b2154a0d6449656d7f208b9b3e4b2af780e07bf57a8
languageName: node
linkType: hard

Expand Down Expand Up @@ -17760,6 +17804,13 @@ __metadata:
languageName: node
linkType: hard

"set-cookie-parser@npm:^2.6.0":
version: 2.7.1
resolution: "set-cookie-parser@npm:2.7.1"
checksum: 060c198c4c92547ac15988256f445eae523f57f2ceefeccf52d30d75dedf6bff22b9c26f756bd44e8e560d44ff4ab2130b178bd2e52ef5571bf7be3bd7632d9a
languageName: node
linkType: hard

"set-function-length@npm:^1.2.1":
version: 1.2.2
resolution: "set-function-length@npm:1.2.2"
Expand Down Expand Up @@ -17895,8 +17946,8 @@ __metadata:
react-admin: "npm:^5.4.3"
react-dom: "npm:^18.3.1"
react-hook-form: "npm:^7.53.0"
react-router: "npm:^6.22.0"
react-router-dom: "npm:^6.22.0"
react-router: "npm:^6.25.1"
react-router-dom: "npm:^6.25.1"
react-simple-animate: "npm:^3.5.3"
typescript: "npm:^5.1.3"
vite: "npm:^5.0.11"
Expand Down Expand Up @@ -18983,6 +19034,13 @@ __metadata:
languageName: node
linkType: hard

"turbo-stream@npm:2.4.0":
version: 2.4.0
resolution: "turbo-stream@npm:2.4.0"
checksum: e68b2569f1f16e6e9633d090c6024b2ae9f0e97bfeacb572451ca3732e120ebbb546f3bc4afc717c46cb57b5aea6104e04ef497f9912eef6a7641e809518e98a
languageName: node
linkType: hard

"tutorial@workspace:examples/tutorial":
version: 0.0.0-use.local
resolution: "tutorial@workspace:examples/tutorial"
Expand Down

0 comments on commit e26362c

Please sign in to comment.