Skip to content

Commit

Permalink
Merge pull request #9480 from marmelab/force-react-router-version
Browse files Browse the repository at this point in the history 
Fix TabbedForm and TabbedShowLayout tab navigation: limit react-router version to 6.18.0 as a workaround
  • Loading branch information
@fzaninotto
fzaninotto authored Nov 29, 2023
2 parents 01ed72a + 529dcb4 commit 2bed8b2
Show file tree
Hide file tree
Showing 8 changed files with 38 additions and 38 deletions.
4 changes: 2 additions & 2 deletions examples/crm/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
"react-admin": "^4.12.0",
"react-dom": "^17.0.0",
"react-error-boundary": "^3.1.4",
"react-router": "^6.1.0",
"react-router-dom": "^6.1.0"
"react-router": "6.1.0 - 6.18.0",
"react-router-dom": "6.1.0 - 6.18.0"
},
"devDependencies": {
"@testing-library/jest-dom": "^5.11.4",
Expand Down
4 changes: 2 additions & 2 deletions examples/demo/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
"react-admin": "^4.12.0",
"react-app-polyfill": "^2.0.0",
"react-dom": "^17.0.0",
"react-router": "^6.1.0",
"react-router-dom": "^6.1.0",
"react-router": "6.1.0 - 6.18.0",
"react-router-dom": "6.1.0 - 6.18.0",
"recharts": "^2.1.15"
},
"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 @@ -27,8 +27,8 @@
"react-dom": "^17.0.0",
"react-hook-form": "^7.43.9",
"react-query": "^3.32.1",
"react-router": "^6.1.0",
"react-router-dom": "^6.1.0"
"react-router": "6.1.0 - 6.18.0",
"react-router-dom": "6.1.0 - 6.18.0"
},
"devDependencies": {
"@babel/preset-react": "^7.12.10",
Expand Down
8 changes: 4 additions & 4 deletions packages/ra-core/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
"react": "^17.0.0",
"react-dom": "^17.0.0",
"react-hook-form": "^7.43.9",
"react-router": "^6.1.0",
"react-router-dom": "^6.1.0",
"react-router": "6.1.0 - 6.18.0",
"react-router-dom": "6.1.0 - 6.18.0",
"react-test-renderer": "^16.9.0 || ^17.0.0",
"recharts": "^2.1.15",
"rimraf": "^3.0.2",
Expand All @@ -54,8 +54,8 @@
"react": "^16.9.0 || ^17.0.0 || ^18.0.0",
"react-dom": "^16.9.0 || ^17.0.0 || ^18.0.0",
"react-hook-form": "^7.43.9",
"react-router": "^6.1.0",
"react-router-dom": "^6.1.0"
"react-router": "6.1.0 - 6.18.0",
"react-router-dom": "6.1.0 - 6.18.0"
},
"dependencies": {
"clsx": "^1.1.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/ra-no-code/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
"cross-env": "^5.2.0",
"react": "^17.0.0",
"react-dom": "^17.0.0",
"react-router": "^6.1.0",
"react-router-dom": "^6.1.0",
"react-router": "6.1.0 - 6.18.0",
"react-router-dom": "6.1.0 - 6.18.0",
"rimraf": "^3.0.2",
"typescript": "^5.1.3"
},
Expand Down
8 changes: 4 additions & 4 deletions packages/ra-ui-materialui/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
"react-dom": "^17.0.0",
"react-hook-form": "^7.43.9",
"react-is": "^17.0.0",
"react-router": "^6.1.0",
"react-router-dom": "^6.1.0",
"react-router": "6.1.0 - 6.18.0",
"react-router-dom": "6.1.0 - 6.18.0",
"react-test-renderer": "~16.8.6",
"rimraf": "^3.0.2",
"typescript": "^5.1.3"
Expand All @@ -56,8 +56,8 @@
"react-dom": "^16.9.0 || ^17.0.0 || ^18.0.0",
"react-hook-form": "*",
"react-is": "^16.9.0 || ^17.0.0 || ^18.0.0",
"react-router": "^6.1.0",
"react-router-dom": "^6.1.0"
"react-router": "6.1.0 - 6.18.0",
"react-router-dom": "6.1.0 - 6.18.0"
},
"dependencies": {
"autosuggest-highlight": "^3.1.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/react-admin/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
"ra-language-english": "^4.16.1",
"ra-ui-materialui": "^4.16.1",
"react-hook-form": "^7.43.9",
"react-router": "^6.1.0",
"react-router-dom": "^6.1.0"
"react-router": "6.1.0 - 6.18.0",
"react-router-dom": "6.1.0 - 6.18.0"
},
"gitHead": "b227592132da6ae5f01438fa8269e04596cdfdd8"
}
40 changes: 20 additions & 20 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9968,8 +9968,8 @@ __metadata:
react-admin: ^4.12.0
react-app-polyfill: ^2.0.0
react-dom: ^17.0.0
react-router: ^6.1.0
react-router-dom: ^6.1.0
react-router: 6.1.0 - 6.18.0
react-router-dom: 6.1.0 - 6.18.0
recharts: ^2.1.15
rewire: ^5.0.0
rollup-plugin-visualizer: ^5.9.2
Expand Down Expand Up @@ -18114,8 +18114,8 @@ __metadata:
react-hook-form: ^7.43.9
react-is: ^17.0.2
react-query: ^3.32.1
react-router: ^6.1.0
react-router-dom: ^6.1.0
react-router: 6.1.0 - 6.18.0
react-router-dom: 6.1.0 - 6.18.0
react-test-renderer: ^16.9.0 || ^17.0.0
recharts: ^2.1.15
rimraf: ^3.0.2
Expand All @@ -18127,8 +18127,8 @@ __metadata:
react: ^16.9.0 || ^17.0.0 || ^18.0.0
react-dom: ^16.9.0 || ^17.0.0 || ^18.0.0
react-hook-form: ^7.43.9
react-router: ^6.1.0
react-router-dom: ^6.1.0
react-router: 6.1.0 - 6.18.0
react-router-dom: 6.1.0 - 6.18.0
languageName: unknown
linkType: soft

Expand Down Expand Up @@ -18348,8 +18348,8 @@ __metadata:
react-dom: ^17.0.0
react-dropzone: ^12.0.4
react-query: ^3.32.1
react-router: ^6.1.0
react-router-dom: ^6.1.0
react-router: 6.1.0 - 6.18.0
react-router-dom: 6.1.0 - 6.18.0
rimraf: ^3.0.2
typescript: ^5.1.3
peerDependencies:
Expand Down Expand Up @@ -18391,8 +18391,8 @@ __metadata:
react-hook-form: ^7.43.9
react-is: ^17.0.0
react-query: ^3.32.1
react-router: ^6.1.0
react-router-dom: ^6.1.0
react-router: 6.1.0 - 6.18.0
react-router-dom: 6.1.0 - 6.18.0
react-test-renderer: ~16.8.6
react-transition-group: ^4.4.1
rimraf: ^3.0.2
Expand All @@ -18405,8 +18405,8 @@ __metadata:
react-dom: ^16.9.0 || ^17.0.0 || ^18.0.0
react-hook-form: "*"
react-is: ^16.9.0 || ^17.0.0 || ^18.0.0
react-router: ^6.1.0
react-router-dom: ^6.1.0
react-router: 6.1.0 - 6.18.0
react-router-dom: 6.1.0 - 6.18.0
languageName: unknown
linkType: soft

Expand Down Expand Up @@ -18501,8 +18501,8 @@ __metadata:
react-admin: ^4.12.0
react-dom: ^17.0.0
react-error-boundary: ^3.1.4
react-router: ^6.1.0
react-router-dom: ^6.1.0
react-router: 6.1.0 - 6.18.0
react-router-dom: 6.1.0 - 6.18.0
rollup-plugin-visualizer: ^5.9.2
typescript: ^5.1.3
vite: ^3.2.0
Expand Down Expand Up @@ -18577,8 +18577,8 @@ __metadata:
ra-language-english: ^4.16.1
ra-ui-materialui: ^4.16.1
react-hook-form: ^7.43.9
react-router: ^6.1.0
react-router-dom: ^6.1.0
react-router: 6.1.0 - 6.18.0
react-router-dom: 6.1.0 - 6.18.0
rimraf: ^3.0.2
typescript: ^5.1.3
peerDependencies:
Expand Down Expand Up @@ -18922,7 +18922,7 @@ __metadata:
languageName: node
linkType: hard

"react-router-dom@npm:^6.1.0":
"react-router-dom@npm:6.1.0 - 6.18.0":
version: 6.2.1
resolution: "react-router-dom@npm:6.2.1"
dependencies:
Expand All @@ -18935,7 +18935,7 @@ __metadata:
languageName: node
linkType: hard

"react-router@npm:6.2.1, react-router@npm:^6.1.0":
"react-router@npm:6.1.0 - 6.18.0, react-router@npm:6.2.1":
version: 6.2.1
resolution: "react-router@npm:6.2.1"
dependencies:
Expand Down Expand Up @@ -20146,8 +20146,8 @@ __metadata:
react-dom: ^17.0.0
react-hook-form: ^7.43.9
react-query: ^3.32.1
react-router: ^6.1.0
react-router-dom: ^6.1.0
react-router: 6.1.0 - 6.18.0
react-router-dom: 6.1.0 - 6.18.0
typescript: ^5.1.3
vite: ^3.2.0
languageName: unknown
Expand Down

0 comments on commit 2bed8b2

Please sign in to comment.