From 1191071d84a8ab9a49f962b38409e86c8a0936af Mon Sep 17 00:00:00 2001
From: Flora Thiebaut <flora.thiebaut@sdsc.ethz.ch>
Date: Wed, 31 Jan 2024 10:19:12 +0100
Subject: [PATCH] chore(client): upgrade react-router

---
 client/package-lock.json | 83 ++++++++++++++--------------------------
 client/package.json      |  4 +-
 2 files changed, 30 insertions(+), 57 deletions(-)

diff --git a/client/package-lock.json b/client/package-lock.json
index 3587af03cf..92c88f655e 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -56,8 +56,8 @@
         "react-media": "^1.10.0",
         "react-pdf": "^5.5.0",
         "react-redux": "^8.1.3",
-        "react-router": "^5.1.2",
-        "react-router-dom": "^5.1.2",
+        "react-router": "^6.21.3",
+        "react-router-dom": "^6.21.3",
         "react-router-hash-link": "^2.4.3",
         "react-select": "^5.8.0",
         "react-toastify": "^6.2.0",
@@ -6432,6 +6432,14 @@
         }
       }
     },
+    "node_modules/@remix-run/router": {
+      "version": "1.14.2",
+      "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.14.2.tgz",
+      "integrity": "sha512-ACXpdMM9hmKZww21yEqWwiLws/UPLhNKvimN8RrYSqPSvB3ov7sLvAcfvaxePeLvccTQKGdkDIhLYApZVDFuKg==",
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
     "node_modules/@renku/ckeditor5-build-renku": {
       "version": "0.0.6",
       "license": "GPL-2.0-or-later, Apache-2.0",
@@ -26787,18 +26795,6 @@
         "node": ">=12.0.0"
       }
     },
-    "node_modules/history": {
-      "version": "4.10.1",
-      "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.1.2",
-        "loose-envify": "^1.2.0",
-        "resolve-pathname": "^3.0.0",
-        "tiny-invariant": "^1.0.2",
-        "tiny-warning": "^1.0.0",
-        "value-equal": "^1.0.1"
-      }
-    },
     "node_modules/hoist-non-react-statics": {
       "version": "3.3.2",
       "license": "BSD-3-Clause",
@@ -37203,37 +37199,33 @@
       }
     },
     "node_modules/react-router": {
-      "version": "5.3.4",
-      "license": "MIT",
+      "version": "6.21.3",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.21.3.tgz",
+      "integrity": "sha512-a0H638ZXULv1OdkmiK6s6itNhoy33ywxmUFT/xtSoVyf9VnC7n7+VT4LjVzdIHSaF5TIh9ylUgxMXksHTgGrKg==",
       "dependencies": {
-        "@babel/runtime": "^7.12.13",
-        "history": "^4.9.0",
-        "hoist-non-react-statics": "^3.1.0",
-        "loose-envify": "^1.3.1",
-        "path-to-regexp": "^1.7.0",
-        "prop-types": "^15.6.2",
-        "react-is": "^16.6.0",
-        "tiny-invariant": "^1.0.2",
-        "tiny-warning": "^1.0.0"
+        "@remix-run/router": "1.14.2"
+      },
+      "engines": {
+        "node": ">=14.0.0"
       },
       "peerDependencies": {
-        "react": ">=15"
+        "react": ">=16.8"
       }
     },
     "node_modules/react-router-dom": {
-      "version": "5.3.4",
-      "license": "MIT",
+      "version": "6.21.3",
+      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.21.3.tgz",
+      "integrity": "sha512-kNzubk7n4YHSrErzjLK72j0B5i969GsuCGazRl3G6j1zqZBLjuSlYBdVdkDOgzGdPIffUOc9nmgiadTEVoq91g==",
       "dependencies": {
-        "@babel/runtime": "^7.12.13",
-        "history": "^4.9.0",
-        "loose-envify": "^1.3.1",
-        "prop-types": "^15.6.2",
-        "react-router": "5.3.4",
-        "tiny-invariant": "^1.0.2",
-        "tiny-warning": "^1.0.0"
+        "@remix-run/router": "1.14.2",
+        "react-router": "6.21.3"
+      },
+      "engines": {
+        "node": ">=14.0.0"
       },
       "peerDependencies": {
-        "react": ">=15"
+        "react": ">=16.8",
+        "react-dom": ">=16.8"
       }
     },
     "node_modules/react-router-hash-link": {
@@ -37247,17 +37239,6 @@
         "react-router-dom": ">=4"
       }
     },
-    "node_modules/react-router/node_modules/isarray": {
-      "version": "0.0.1",
-      "license": "MIT"
-    },
-    "node_modules/react-router/node_modules/path-to-regexp": {
-      "version": "1.8.0",
-      "license": "MIT",
-      "dependencies": {
-        "isarray": "0.0.1"
-      }
-    },
     "node_modules/react-select": {
       "version": "5.8.0",
       "resolved": "https://registry.npmjs.org/react-select/-/react-select-5.8.0.tgz",
@@ -38314,10 +38295,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/resolve-pathname": {
-      "version": "3.0.0",
-      "license": "MIT"
-    },
     "node_modules/resolve.exports": {
       "version": "1.1.0",
       "dev": true,
@@ -41012,10 +40989,6 @@
         "spdx-expression-parse": "^3.0.0"
       }
     },
-    "node_modules/value-equal": {
-      "version": "1.0.1",
-      "license": "MIT"
-    },
     "node_modules/vary": {
       "version": "1.1.2",
       "dev": true,
diff --git a/client/package.json b/client/package.json
index 139ee411b0..7a6a27e18e 100644
--- a/client/package.json
+++ b/client/package.json
@@ -73,8 +73,8 @@
     "react-media": "^1.10.0",
     "react-pdf": "^5.5.0",
     "react-redux": "^8.1.3",
-    "react-router": "^5.1.2",
-    "react-router-dom": "^5.1.2",
+    "react-router": "^6.21.3",
+    "react-router-dom": "^6.21.3",
     "react-router-hash-link": "^2.4.3",
     "react-select": "^5.8.0",
     "react-toastify": "^6.2.0",