Merge branch 'master' into border-radius

Author: AaronMoat

.changeset/dirty-maps-battle.md

@@ -0,0 +1,5 @@
+---
+'scoobie': major
+---
+
+Update peer dependency from `react-router-dom` `>= 5.3.0` to `react-router` `>= 7.5.2 < 8`

.storybook/preview.tsx

@@ -6,7 +6,7 @@ import docs from 'braid-design-system/themes/docs';
 import seekJobs from 'braid-design-system/themes/seekJobs';
 import wireframe from 'braid-design-system/themes/wireframe';
 import { Helmet, HelmetProvider } from 'react-helmet-async';
-import { BrowserRouter } from 'react-router-dom';
+import { BrowserRouter } from 'react-router';
 
 import { CodeThemeProvider } from '../src/components/CodeThemeProvider';
 import { ScoobieLink } from '../src/components/ScoobieLink';

package.json

@@ -30,7 +30,7 @@
     "react": "18.3.1",
     "react-dom": "18.3.1",
     "react-helmet-async": "2.0.5",
-    "react-router-dom": "7.5.1",
+    "react-router": "7.5.2",
     "sku": "14.2.0",
     "storybook": "8.6.12",
     "webpack": "5.99.6"
@@ -44,7 +44,7 @@
   "peerDependencies": {
     "braid-design-system": ">= 31.21.0",
     "react": ">= 17 < 19",
-    "react-router-dom": ">= 5.3.0"
+    "react-router": ">= 7.5.2 < 8"
   },
   "repository": {
     "type": "git",

src/components/InternalLink.tsx

@@ -1,6 +1,6 @@
 import clsx, { type ClassValue } from 'clsx';
 import React, { type ComponentProps, forwardRef } from 'react';
-import { NavLink, useLocation } from 'react-router-dom';
+import { NavLink, useLocation } from 'react-router';
 
 import { parseInternalHref } from '../private/url';
 

yarn.lock

@@ -3400,7 +3400,6 @@
 
 "@zendesk/babel-plugin-react-displayname@https://codeload.github.com/zendesk/babel-plugin-react-displayname/tar.gz/7a837f2":
   version "1.0.0"
-  uid "8cdd54fa1526715c5fc1abdbc2811deac6485f3c"
   resolved "https://codeload.github.com/zendesk/babel-plugin-react-displayname/tar.gz/7a837f2#8cdd54fa1526715c5fc1abdbc2811deac6485f3c"
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -9323,17 +9322,10 @@ react-remove-scroll@^2.5.3:
     use-callback-ref "^1.3.3"
     use-sidecar "^1.1.3"
 
-[email protected]:
-  version "7.5.1"
-  resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-7.5.1.tgz#16ffa63006dfdbab53cf243be84c29535e7dc4e0"
-  integrity sha512-5DPSPc7ENrt2tlKPq0FtpG80ZbqA9aIKEyqX6hSNJDlol/tr6iqCK4crqdsusmOSSotq6zDsn0y3urX9TuTNmA==
-  dependencies:
-    react-router "7.5.1"
-
-[email protected]:
-  version "7.5.1"
-  resolved "https://registry.yarnpkg.com/react-router/-/react-router-7.5.1.tgz#e0bae54e913d139e727e7a88d165174a2cdbeb27"
-  integrity sha512-/jjU3fcYNd2bwz9Q0xt5TwyiyoO8XjSEFXJY4O/lMAlkGTHWuHRAbR9Etik+lSDqMC7A7mz3UlXzgYT6Vl58sA==
+[email protected]:
+  version "7.5.2"
+  resolved "https://registry.yarnpkg.com/react-router/-/react-router-7.5.2.tgz#889137b9ce91dadc06eb40997f57f08199845973"
+  integrity sha512-9Rw8r199klMnlGZ8VAsV/I8WrIF6IyJ90JQUdboupx1cdkgYqwnrYjH+I/nY/7cA1X5zia4mDJqH36npP7sxGQ==
   dependencies:
     cookie "^1.0.1"
     set-cookie-parser "^2.6.0"