Update react-router

daniel-ac-martin · May 6, 2023 · 09ab9c9 · 09ab9c9
1 parent b7350b0
commit 09ab9c9
Show file tree

Hide file tree

Showing 9 changed files with 176 additions and 154 deletions.
diff --git a/apps/govuk-docs/package.json b/apps/govuk-docs/package.json
@@ -57,8 +57,8 @@
     "react": "16.14.0",
     "react-dom": "16.14.0",
     "react-helmet-async": "1.3.0",
-    "react-router": "5.3.4",
-    "react-router-dom": "5.3.4",
+    "react-router": "6.11.1",
+    "react-router-dom": "6.11.1",
     "serverless": "3.30.1",
     "start-server-and-test": "2.0.0",
     "ts-jest": "29.1.0",

diff --git a/apps/govuk-template/package.json b/apps/govuk-template/package.json
@@ -61,8 +61,8 @@
     "react": "16.14.0",
     "react-dom": "16.14.0",
     "react-helmet-async": "1.3.0",
-    "react-router": "5.3.4",
-    "react-router-dom": "5.3.4",
+    "react-router": "6.11.1",
+    "react-router-dom": "6.11.1",
     "serverless": "3.30.1",
     "start-server-and-test": "2.0.0",
     "ts-jest": "29.1.0",

diff --git a/lib/app-composer/package.json b/lib/app-composer/package.json
@@ -26,8 +26,8 @@
     "@not-govuk/user-info": "^0.7.2",
     "react": "^16.9.35",
     "react-helmet-async": "^1.0.7",
-    "react-router": "^5.1.7",
-    "react-router-dom": "^5.1.5"
+    "react-router": "^5.1.7 || ^6.0.0",
+    "react-router-dom": "^5.1.5 || ^6.0.0"
   },
   "devDependencies": {
     "@types/react": "16.14.38",

diff --git a/lib/component-test-helpers/package.json b/lib/component-test-helpers/package.json
@@ -20,7 +20,7 @@
   "license": "MIT",
   "peerDependencies": {
     "react": "^16.9.35",
-    "react-router": "^5.1.7"
+    "react-router": "^5.1.7 || ^6.0.0"
   },
   "devDependencies": {
     "@types/react": "16.14.38",

diff --git a/lib/forms/package.json b/lib/forms/package.json
@@ -31,7 +31,7 @@
   "peerDependencies": {
     "react": "^16.9.35",
     "react-dom": "^16.9.8",
-    "react-router-dom": "^5.1.5"
+    "react-router-dom": "^5.1.5 || ^6.0.0"
   },
   "devDependencies": {
     "@types/react": "16.14.38",

diff --git a/lib/route-utils/package.json b/lib/route-utils/package.json
@@ -22,12 +22,12 @@
     "node": ">=12.0.0"
   },
   "dependencies": {
-    "history": "4.10.1",
+    "history": "5.3.0",
     "qs": "^6.11.0",
     "url-parse": "^1.5.10"
   },
   "peerDependencies": {
-    "react-router-dom": "^5.1.5"
+    "react-router-dom": "^5.1.5 || ^6.0.0"
   },
   "devDependencies": {
     "@types/history": "4.7.11",

diff --git a/package.json b/package.json
@@ -81,8 +81,8 @@
     "react": "16.14.0",
     "react-dom": "16.14.0",
     "react-helmet-async": "1.3.0",
-    "react-router": "5.3.4",
-    "react-router-dom": "5.3.4",
+    "react-router": "6.11.1",
+    "react-router-dom": "6.11.1",
     "ts-jest": "29.1.0",
     "typescript": "4.9.5",
     "webpack": "5.80.0",

diff --git a/packages/components/package.json b/packages/components/package.json
@@ -78,8 +78,8 @@
   "peerDependencies": {
     "react": "^16.9.35",
     "react-dom": "^16.9.8",
-    "react-router": "^5.1.7",
-    "react-router-dom": "^5.1.5"
+    "react-router": "^5.1.7 || ^6.0.0",
+    "react-router-dom": "^5.1.5 || ^6.0.0"
   },
   "devDependencies": {
     "@not-govuk/component-test-helpers": "workspace:^0.7.2",