From 0b67516e100ce724a9b5b768e73db483deb788f3 Mon Sep 17 00:00:00 2001
From: David Crespo <david.crespo@oxidecomputer.com>
Date: Wed, 18 Dec 2024 16:51:10 -0600
Subject: [PATCH] use 7.1.1 stable

---
 package-lock.json | 70 ++++++++++++++++++++++++++++-------------------
 package.json      |  2 +-
 2 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3156734cbc..736b972f84 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -41,7 +41,7 @@
         "react-is": "^18.3.1",
         "react-merge-refs": "^2.1.1",
         "react-remove-scroll": "2.5.5",
-        "react-router": "^0.0.0-nightly-5115991bf-20241217",
+        "react-router": "^7.1.1",
         "react-stately": "^3.32.2",
         "recharts": "^2.12.7",
         "remeda": "^2.14.0",
@@ -4018,7 +4018,6 @@
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.6.0.tgz",
       "integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/d3-array": {
@@ -4985,15 +4984,6 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/backbone": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/backbone/-/backbone-1.1.2.tgz",
-      "integrity": "sha512-bdiYFVF+mXQ3712Urje2uvYClLPXOd2jsvp8AHlPyMKqpHRPCmCxZf099kCRadhA2sMxp761XB2aZ0/HYF4fDg==",
-      "license": "MIT",
-      "dependencies": {
-        "underscore": ">=1.5.0"
-      }
-    },
     "node_modules/balanced-match": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
@@ -7280,11 +7270,6 @@
         "node": ">=12.0.0"
       }
     },
-    "node_modules/expect.js": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/expect.js/-/expect.js-0.2.0.tgz",
-      "integrity": "sha512-Si9lyFUkFCY9nTSKocf/Im/knEJNHUgbEWCNpRqiM5J2w+0YPxalJo0aomfh4WxlQiZ6kG97cZlN2UhAVxPAsA=="
-    },
     "node_modules/express": {
       "version": "4.21.2",
       "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz",
@@ -11131,13 +11116,36 @@
       }
     },
     "node_modules/react-router": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/react-router/-/react-router-0.0.0.tgz",
-      "integrity": "sha512-8huR4s244BniVy18wd3lBvKayKBWyBFVp2p0CPtvdMLR2/GouCWLn2ExrSNXoHZ/oA45ktylbk65+oqEZdzkcA==",
-      "license": "Apache v2",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.1.1.tgz",
+      "integrity": "sha512-39sXJkftkKWRZ2oJtHhCxmoCrBCULr/HAH4IT5DHlgu/Q0FCPV0S4Lx+abjDTx/74xoZzNYDYbOZWlJjruyuDQ==",
+      "license": "MIT",
       "dependencies": {
-        "backbone": "~1.1.0",
-        "expect.js": "~0.2.0"
+        "@types/cookie": "^0.6.0",
+        "cookie": "^1.0.1",
+        "set-cookie-parser": "^2.6.0",
+        "turbo-stream": "2.4.0"
+      },
+      "engines": {
+        "node": ">=20.0.0"
+      },
+      "peerDependencies": {
+        "react": ">=18",
+        "react-dom": ">=18"
+      },
+      "peerDependenciesMeta": {
+        "react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/react-router/node_modules/cookie": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-1.0.2.tgz",
+      "integrity": "sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
       }
     },
     "node_modules/react-smooth": {
@@ -11773,6 +11781,12 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/set-cookie-parser": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.7.1.tgz",
+      "integrity": "sha512-IOc8uWeOZgnb3ptbCURJWNjWUPcO3ZnTTdzsurqERrP6nPyv+paC55vJM0LpOlT2ne+Ix+9+CRG1MNLlyZ4GjQ==",
+      "license": "MIT"
+    },
     "node_modules/set-function-length": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
@@ -12741,6 +12755,12 @@
         }
       }
     },
+    "node_modules/turbo-stream": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/turbo-stream/-/turbo-stream-2.4.0.tgz",
+      "integrity": "sha512-FHncC10WpBd2eOmGwpmQsWLDoK4cqsA/UT/GqNoaKOQnT8uzhtCbg3EoUDMvqpOSAI0S26mr0rkjzbOO6S3v1g==",
+      "license": "ISC"
+    },
     "node_modules/type-check": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
@@ -12887,12 +12907,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/underscore": {
-      "version": "1.13.7",
-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.7.tgz",
-      "integrity": "sha512-GMXzWtsc57XAtguZgaQViUOzs0KTkk8ojr3/xAxXLITqf/3EMwxC0inyETfDFjH/Krbhuep0HNbbjI9i/q3F3g==",
-      "license": "MIT"
-    },
     "node_modules/undici-types": {
       "version": "6.19.8",
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
diff --git a/package.json b/package.json
index 531a34b4fe..d17b5d5cf7 100644
--- a/package.json
+++ b/package.json
@@ -63,7 +63,7 @@
     "react-is": "^18.3.1",
     "react-merge-refs": "^2.1.1",
     "react-remove-scroll": "2.5.5",
-    "react-router": "^0.0.0-nightly-5115991bf-20241217",
+    "react-router": "^7.1.1",
     "react-stately": "^3.32.2",
     "recharts": "^2.12.7",
     "remeda": "^2.14.0",