From 95bb4c9e4f956d970e80d49aa73366a2e61790b4 Mon Sep 17 00:00:00 2001
From: Gildas <1122076+djhi@users.noreply.github.com>
Date: Mon, 13 Jan 2025 17:06:07 +0100
Subject: [PATCH 1/6] Supports react-router v7

---
 docs/FAQ.md                            |  5 +++++
 packages/ra-core/package.json          |  4 ++--
 packages/ra-ui-materialui/package.json |  4 ++--
 packages/react-admin/package.json      |  6 ++++--
 yarn.lock                              | 12 ++++++------
 5 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/docs/FAQ.md b/docs/FAQ.md
index 7a6fb4a8b30..7d85b7ca3ee 100644
--- a/docs/FAQ.md
+++ b/docs/FAQ.md
@@ -10,6 +10,7 @@ title: "FAQ"
 - [How can I customize forms depending on its inputs values?](#how-can-i-customize-forms-depending-on-its-inputs-values)
 - [UI in production build is empty or broken](#ui-in-production-build-is-empty-or-broken)
 - [My Resource is defined but not displayed on the Menu](#my-resource-is-defined-but-not-displayed-on-the-menu)
+- [Can I use react-router v7?](#can-i-use-react-router-v7)
 
 ## Can I have custom identifiers/primary keys for my resources?
 
@@ -167,3 +168,7 @@ export const MyMenu = () => (
     </Menu>
 );
 ```
+
+## Can I use react-router v7
+
+You can use react-router v7 with React-admin. Note that some package managers may require you to add [overrides (NPM)](https://docs.npmjs.com/cli/v9/configuring-npm/package-json#overrides) or [resolutions (Yarn)](https://classic.yarnpkg.com/lang/en/docs/selective-version-resolutions/) in order to avoid dependencies conflict with React-admin.
diff --git a/packages/ra-core/package.json b/packages/ra-core/package.json
index 09b82787f7a..d39884a88cd 100644
--- a/packages/ra-core/package.json
+++ b/packages/ra-core/package.json
@@ -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.22.0 || ^7.0.0",
+        "react-router-dom": "^6.22.0 || ^7.0.0"
     },
     "dependencies": {
         "@tanstack/react-query": "^5.21.7",
diff --git a/packages/ra-ui-materialui/package.json b/packages/ra-ui-materialui/package.json
index b0096951ec4..be5f2b4b738 100644
--- a/packages/ra-ui-materialui/package.json
+++ b/packages/ra-ui-materialui/package.json
@@ -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.22.0 || ^7.0.0",
+        "react-router-dom": "^6.22.0 || ^7.0.0"
     },
     "dependencies": {
         "@tanstack/react-query": "^5.21.7",
diff --git a/packages/react-admin/package.json b/packages/react-admin/package.json
index a34200bfff5..6cd2cf00b1f 100644
--- a/packages/react-admin/package.json
+++ b/packages/react-admin/package.json
@@ -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"
     },
@@ -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.22.0 || ^7.0.0",
+        "react-router-dom": "^6.22.0 || ^7.0.0"
     },
     "gitHead": "587df4c27bfcec4a756df4f95e5fc14728dfc0d7"
 }
diff --git a/yarn.lock b/yarn.lock
index de2b1f52605..34eb0a3475f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -16117,8 +16117,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.22.0 || ^7.0.0
+    react-router-dom: ^6.22.0 || ^7.0.0
   languageName: unknown
   linkType: soft
 
@@ -16396,8 +16396,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.22.0 || ^7.0.0
+    react-router-dom: ^6.22.0 || ^7.0.0
   languageName: unknown
   linkType: soft
 
@@ -16547,8 +16547,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:

From a6f7f24b0dfe5dca4c281b8a3a9ee50035bf0bed Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Kaiser <jb@marmelab.com>
Date: Mon, 13 Jan 2025 18:21:45 +0100
Subject: [PATCH 2/6] attempt 1 to fix multiple rr versions in monorepo

---
 examples/demo/package.json             |   4 +-
 examples/simple/package.json           |   4 +-
 packages/ra-core/package.json          |   4 +-
 packages/ra-ui-materialui/package.json |   4 +-
 packages/react-admin/package.json      |   6 +-
 yarn.lock                              | 106 +++++++++++++++++++------
 6 files changed, 92 insertions(+), 36 deletions(-)

diff --git a/examples/demo/package.json b/examples/demo/package.json
index e7c1f1823e9..1e075327fd7 100644
--- a/examples/demo/package.json
+++ b/examples/demo/package.json
@@ -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": {
diff --git a/examples/simple/package.json b/examples/simple/package.json
index 4c619b2a4d8..013362c611b 100644
--- a/examples/simple/package.json
+++ b/examples/simple/package.json
@@ -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",
diff --git a/packages/ra-core/package.json b/packages/ra-core/package.json
index d39884a88cd..1f9ab667448 100644
--- a/packages/ra-core/package.json
+++ b/packages/ra-core/package.json
@@ -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 || ^7.0.0",
-        "react-router-dom": "^6.22.0 || ^7.0.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",
diff --git a/packages/ra-ui-materialui/package.json b/packages/ra-ui-materialui/package.json
index be5f2b4b738..6df665a7972 100644
--- a/packages/ra-ui-materialui/package.json
+++ b/packages/ra-ui-materialui/package.json
@@ -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 || ^7.0.0",
-        "react-router-dom": "^6.22.0 || ^7.0.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",
diff --git a/packages/react-admin/package.json b/packages/react-admin/package.json
index 6cd2cf00b1f..4fa49be44a5 100644
--- a/packages/react-admin/package.json
+++ b/packages/react-admin/package.json
@@ -28,8 +28,6 @@
     "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"
     },
@@ -45,8 +43,8 @@
         "ra-language-english": "^5.4.3",
         "ra-ui-materialui": "^5.4.3",
         "react-hook-form": "^7.53.0",
-        "react-router": "^6.22.0 || ^7.0.0",
-        "react-router-dom": "^6.22.0 || ^7.0.0"
+        "react-router": "^6.25.1 || ^7.0.0",
+        "react-router-dom": "^6.25.1 || ^7.0.0"
     },
     "gitHead": "587df4c27bfcec4a756df4f95e5fc14728dfc0d7"
 }
diff --git a/yarn.lock b/yarn.lock
index 34eb0a3475f..3be5a6f6d10 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -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
 
@@ -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"
@@ -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"
@@ -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"
@@ -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 || ^7.0.0
-    react-router-dom: ^6.22.0 || ^7.0.0
+    react-router: ^6.25.1 || ^7.0.0
+    react-router-dom: ^6.25.1 || ^7.0.0
   languageName: unknown
   linkType: soft
 
@@ -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 || ^7.0.0
-    react-router-dom: ^6.22.0 || ^7.0.0
+    react-router: ^6.25.1 || ^7.0.0
+    react-router-dom: ^6.25.1 || ^7.0.0
   languageName: unknown
   linkType: soft
 
@@ -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.25.1"
-    react-router-dom: "npm:^6.25.1"
+    react-router: "npm:^6.25.1 || ^7.0.0"
+    react-router-dom: "npm:^6.25.1 || ^7.0.0"
     rimraf: "npm:^3.0.2"
     typescript: "npm:^5.1.3"
   peerDependencies:
@@ -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:^6.25.1 || ^7.0.0, 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:^6.25.1 || ^7.0.0, 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
 
@@ -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"
@@ -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"
@@ -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"

From 1d4d83fc8fddf143628a7f4fb2d823084a2f0aff Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Kaiser <jb@marmelab.com>
Date: Mon, 13 Jan 2025 18:58:29 +0100
Subject: [PATCH 3/6] update tutorial RR version and actually use it

---
 examples/demo/package.json     |  2 +-
 examples/simple/package.json   |  2 +-
 examples/tutorial/package.json |  6 ++++--
 examples/tutorial/src/App.tsx  | 14 +++++++++++++-
 yarn.lock                      |  2 ++
 5 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/examples/demo/package.json b/examples/demo/package.json
index 1e075327fd7..fbfde45b37e 100644
--- a/examples/demo/package.json
+++ b/examples/demo/package.json
@@ -34,7 +34,7 @@
         "recharts": "^2.15.0"
     },
     "scripts": {
-        "dev": "vite",
+        "dev": "vite --force",
         "build": "tsc && vite build",
         "type-check": "tsc",
         "preview": "vite preview"
diff --git a/examples/simple/package.json b/examples/simple/package.json
index 013362c611b..84b58ed8dd5 100644
--- a/examples/simple/package.json
+++ b/examples/simple/package.json
@@ -4,7 +4,7 @@
     "private": true,
     "type": "module",
     "scripts": {
-        "dev": "vite",
+        "dev": "vite --force",
         "build": "vite build",
         "serve": "vite preview",
         "type-check": "tsc --noEmit"
diff --git a/examples/tutorial/package.json b/examples/tutorial/package.json
index 1105a69d397..a2cffbabd3d 100644
--- a/examples/tutorial/package.json
+++ b/examples/tutorial/package.json
@@ -4,7 +4,7 @@
     "private": true,
     "type": "module",
     "scripts": {
-        "dev": "vite",
+        "dev": "vite --force",
         "build": "tsc && vite build",
         "preview": "vite preview"
     },
@@ -14,7 +14,9 @@
         "ra-data-json-server": "^5.0.0",
         "react": "^19.0.0",
         "react-admin": "^5.0.0",
-        "react-dom": "^19.0.0"
+        "react-dom": "^19.0.0",
+        "react-router": "^7.0.0",
+        "react-router-dom": "^7.0.0"
     },
     "devDependencies": {
         "@types/react": "^18.3.3",
diff --git a/examples/tutorial/src/App.tsx b/examples/tutorial/src/App.tsx
index 46d36ff573f..bd9deb3c5cf 100644
--- a/examples/tutorial/src/App.tsx
+++ b/examples/tutorial/src/App.tsx
@@ -1,7 +1,9 @@
-import { Admin, Resource, ShowGuesser } from 'react-admin';
+import { Admin, CustomRoutes, Resource, ShowGuesser } from 'react-admin';
 import jsonServerProvider from 'ra-data-json-server';
 import PostIcon from '@mui/icons-material/Book';
 import UserIcon from '@mui/icons-material/Group';
+import { Route } from 'react-router';
+import { Link } from 'react-router-dom';
 
 import { PostList, PostEdit, PostCreate } from './posts';
 import { UserList } from './users';
@@ -30,6 +32,16 @@ const App = () => (
             icon={UserIcon}
             recordRepresentation="name"
         />
+        <CustomRoutes>
+            <Route
+                path="/segments"
+                element={
+                    <>
+                        <Link to="path" />
+                    </>
+                }
+            />
+        </CustomRoutes>
     </Admin>
 );
 
diff --git a/yarn.lock b/yarn.lock
index 3be5a6f6d10..52cc27d43df 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -19054,6 +19054,8 @@ __metadata:
     react: "npm:^19.0.0"
     react-admin: "npm:^5.0.0"
     react-dom: "npm:^19.0.0"
+    react-router: "npm:^7.0.0"
+    react-router-dom: "npm:^7.0.0"
     typescript: "npm:^5.1.3"
     vite: "npm:^5.0.11"
   languageName: unknown

From 10eb54f696a650b597af22a014d08275015dcf76 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Kaiser <jb@marmelab.com>
Date: Tue, 14 Jan 2025 17:02:54 +0100
Subject: [PATCH 4/6] Revert "update tutorial RR version and actually use it"

This reverts commit 1d4d83fc8fddf143628a7f4fb2d823084a2f0aff.
---
 examples/demo/package.json     |  2 +-
 examples/simple/package.json   |  2 +-
 examples/tutorial/package.json |  6 ++----
 examples/tutorial/src/App.tsx  | 14 +-------------
 yarn.lock                      |  2 --
 5 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/examples/demo/package.json b/examples/demo/package.json
index fbfde45b37e..1e075327fd7 100644
--- a/examples/demo/package.json
+++ b/examples/demo/package.json
@@ -34,7 +34,7 @@
         "recharts": "^2.15.0"
     },
     "scripts": {
-        "dev": "vite --force",
+        "dev": "vite",
         "build": "tsc && vite build",
         "type-check": "tsc",
         "preview": "vite preview"
diff --git a/examples/simple/package.json b/examples/simple/package.json
index 84b58ed8dd5..013362c611b 100644
--- a/examples/simple/package.json
+++ b/examples/simple/package.json
@@ -4,7 +4,7 @@
     "private": true,
     "type": "module",
     "scripts": {
-        "dev": "vite --force",
+        "dev": "vite",
         "build": "vite build",
         "serve": "vite preview",
         "type-check": "tsc --noEmit"
diff --git a/examples/tutorial/package.json b/examples/tutorial/package.json
index a2cffbabd3d..1105a69d397 100644
--- a/examples/tutorial/package.json
+++ b/examples/tutorial/package.json
@@ -4,7 +4,7 @@
     "private": true,
     "type": "module",
     "scripts": {
-        "dev": "vite --force",
+        "dev": "vite",
         "build": "tsc && vite build",
         "preview": "vite preview"
     },
@@ -14,9 +14,7 @@
         "ra-data-json-server": "^5.0.0",
         "react": "^19.0.0",
         "react-admin": "^5.0.0",
-        "react-dom": "^19.0.0",
-        "react-router": "^7.0.0",
-        "react-router-dom": "^7.0.0"
+        "react-dom": "^19.0.0"
     },
     "devDependencies": {
         "@types/react": "^18.3.3",
diff --git a/examples/tutorial/src/App.tsx b/examples/tutorial/src/App.tsx
index bd9deb3c5cf..46d36ff573f 100644
--- a/examples/tutorial/src/App.tsx
+++ b/examples/tutorial/src/App.tsx
@@ -1,9 +1,7 @@
-import { Admin, CustomRoutes, Resource, ShowGuesser } from 'react-admin';
+import { Admin, Resource, ShowGuesser } from 'react-admin';
 import jsonServerProvider from 'ra-data-json-server';
 import PostIcon from '@mui/icons-material/Book';
 import UserIcon from '@mui/icons-material/Group';
-import { Route } from 'react-router';
-import { Link } from 'react-router-dom';
 
 import { PostList, PostEdit, PostCreate } from './posts';
 import { UserList } from './users';
@@ -32,16 +30,6 @@ const App = () => (
             icon={UserIcon}
             recordRepresentation="name"
         />
-        <CustomRoutes>
-            <Route
-                path="/segments"
-                element={
-                    <>
-                        <Link to="path" />
-                    </>
-                }
-            />
-        </CustomRoutes>
     </Admin>
 );
 
diff --git a/yarn.lock b/yarn.lock
index 52cc27d43df..3be5a6f6d10 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -19054,8 +19054,6 @@ __metadata:
     react: "npm:^19.0.0"
     react-admin: "npm:^5.0.0"
     react-dom: "npm:^19.0.0"
-    react-router: "npm:^7.0.0"
-    react-router-dom: "npm:^7.0.0"
     typescript: "npm:^5.1.3"
     vite: "npm:^5.0.11"
   languageName: unknown

From ef71b58360d3ec4d39796bd0651b86172101e6e9 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Kaiser <jb@marmelab.com>
Date: Tue, 14 Jan 2025 17:09:06 +0100
Subject: [PATCH 5/6] remove faq section

---
 docs/FAQ.md | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/docs/FAQ.md b/docs/FAQ.md
index 7d85b7ca3ee..7a6fb4a8b30 100644
--- a/docs/FAQ.md
+++ b/docs/FAQ.md
@@ -10,7 +10,6 @@ title: "FAQ"
 - [How can I customize forms depending on its inputs values?](#how-can-i-customize-forms-depending-on-its-inputs-values)
 - [UI in production build is empty or broken](#ui-in-production-build-is-empty-or-broken)
 - [My Resource is defined but not displayed on the Menu](#my-resource-is-defined-but-not-displayed-on-the-menu)
-- [Can I use react-router v7?](#can-i-use-react-router-v7)
 
 ## Can I have custom identifiers/primary keys for my resources?
 
@@ -168,7 +167,3 @@ export const MyMenu = () => (
     </Menu>
 );
 ```
-
-## Can I use react-router v7
-
-You can use react-router v7 with React-admin. Note that some package managers may require you to add [overrides (NPM)](https://docs.npmjs.com/cli/v9/configuring-npm/package-json#overrides) or [resolutions (Yarn)](https://classic.yarnpkg.com/lang/en/docs/selective-version-resolutions/) in order to avoid dependencies conflict with React-admin.

From 02b6ee77fd5ecd3c562bf57f16c95665ba960490 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Kaiser <jb@marmelab.com>
Date: Tue, 14 Jan 2025 17:43:59 +0100
Subject: [PATCH 6/6] fix unit test and stories

---
 packages/react-admin/package.json | 2 ++
 yarn.lock                         | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/react-admin/package.json b/packages/react-admin/package.json
index 4fa49be44a5..effc90be46c 100644
--- a/packages/react-admin/package.json
+++ b/packages/react-admin/package.json
@@ -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"
     },
diff --git a/yarn.lock b/yarn.lock
index 3be5a6f6d10..c6e180571bc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -16561,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.25.1 || ^7.0.0"
-    react-router-dom: "npm:^6.25.1 || ^7.0.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:
@@ -16801,7 +16801,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-router-dom@npm:^6.25.1 || ^7.0.0, react-router-dom@npm:^7.0.0":
+"react-router-dom@npm:^7.0.0":
   version: 7.1.1
   resolution: "react-router-dom@npm:7.1.1"
   dependencies:
@@ -16824,7 +16824,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-router@npm:7.1.1, react-router@npm:^6.25.1 || ^7.0.0, react-router@npm:^7.0.0":
+"react-router@npm:7.1.1, react-router@npm:^7.0.0":
   version: 7.1.1
   resolution: "react-router@npm:7.1.1"
   dependencies: