BED-5489: Downgraded bh-shared-ui react-router-dom package to match B…

…HE/CE projects (#1168) * chore: downgraded react-router-dom package to match other projects * refactor: simplify type definition for SetURLSearchParams --------- Co-authored-by: Ben Waples <[email protected]>
SpecterOps · Feb 26, 2025 · c2ef034 · c2ef034
1 parent 4cee235
commit c2ef034
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 61 deletions.
diff --git a/.yarn/cache/@types-cookie-npm-0.6.0-1f4c3f48f0-5edce79957.zip b/.yarn/cache/@types-cookie-npm-0.6.0-1f4c3f48f0-5edce79957.zip
diff --git a/.yarn/cache/cookie-npm-1.0.2-7a4273d897-2c5a621414.zip b/.yarn/cache/cookie-npm-1.0.2-7a4273d897-2c5a621414.zip
diff --git a/.yarn/cache/react-router-dom-npm-7.1.3-4ea8242f95-c076e81315.zip b/.yarn/cache/react-router-dom-npm-7.1.3-4ea8242f95-c076e81315.zip
diff --git a/.yarn/cache/react-router-npm-7.1.3-690b1d22ca-4e0261232e.zip b/.yarn/cache/react-router-npm-7.1.3-690b1d22ca-4e0261232e.zip
diff --git a/.yarn/cache/set-cookie-parser-npm-2.7.1-0e92d9e679-2ef8b35109.zip b/.yarn/cache/set-cookie-parser-npm-2.7.1-0e92d9e679-2ef8b35109.zip
diff --git a/.yarn/cache/turbo-stream-npm-2.4.0-e0cec53097-e36f52ed40.zip b/.yarn/cache/turbo-stream-npm-2.4.0-e0cec53097-e36f52ed40.zip
diff --git a/packages/javascript/bh-shared-ui/package.json b/packages/javascript/bh-shared-ui/package.json
@@ -37,7 +37,7 @@
         "react-hook-form": "^7.45.1",
         "react-immutable-proptypes": "^2.2.0",
         "react-query": "^3.39.3",
-        "react-router-dom": "^7.1.3",
+        "react-router-dom": "6.4.1",
         "react-window": "^1.8.9",
         "react-window-infinite-loader": "^1.0.9",
         "swagger-ui-react": "^4.18.3",

diff --git a/packages/javascript/bh-shared-ui/src/utils/searchParams/searchParams.ts b/packages/javascript/bh-shared-ui/src/utils/searchParams/searchParams.ts
@@ -14,7 +14,11 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-import { SetURLSearchParams } from 'react-router-dom';
+import { useSearchParams } from 'react-router-dom';
+
+// FUTURE DEV: SetURLSearchParams is in both v6 and v7, but v6 uses this type internally and v7 exports it.
+// When we upgrade to v7, we can import SetURLSearchParams from react-router-dom
+type SetURLSearchParams = ReturnType<typeof useSearchParams>[1];
 
 type EmptyParam = undefined | null | '';
 

diff --git a/yarn.lock b/yarn.lock
@@ -3169,13 +3169,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/cookie@npm:^0.6.0":
-  version: 0.6.0
-  resolution: "@types/cookie@npm:0.6.0"
-  checksum: 5edce7995775b0b196b142883e4d4f71fd93c294eaec973670f1fa2540b70ea7390408ed513ddefef5fcb12a578100c76596e8f2a714b0c2ae9f70ee773f4510
-  languageName: node
-  linkType: hard
-
 "@types/debug@npm:^4.1.7":
   version: 4.1.12
   resolution: "@types/debug@npm:4.1.12"
@@ -4330,7 +4323,7 @@ __metadata:
     react-hook-form: ^7.45.1
     react-immutable-proptypes: ^2.2.0
     react-query: ^3.39.3
-    react-router-dom: ^7.1.3
+    react-router-dom: 6.4.1
     react-window: ^1.8.9
     react-window-infinite-loader: ^1.0.9
     rollup: ^4.13.2
@@ -5023,13 +5016,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cookie@npm:^1.0.1":
-  version: 1.0.2
-  resolution: "cookie@npm:1.0.2"
-  checksum: 2c5a6214147ffa7135ce41860c781de17e93128689b0d080d3116468274b3593b607bcd462ac210d3a61f081db3d3b09ae106e18d60b1f529580e95cf2db8a55
-  languageName: node
-  linkType: hard
-
 "cookie@npm:~0.6.0":
   version: 0.6.0
   resolution: "cookie@npm:0.6.0"
@@ -10034,18 +10020,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-router-dom@npm:^7.1.3":
-  version: 7.1.3
-  resolution: "react-router-dom@npm:7.1.3"
-  dependencies:
-    react-router: 7.1.3
-  peerDependencies:
-    react: ">=18"
-    react-dom: ">=18"
-  checksum: c076e813155cb7eeef00b556580bbe2df6cf5e8b4becbd8d46d26441af3cfee1750be7873a0a071b5eb9f2e3fb74e748ac61e12b68aef827e2f070466bec7d01
-  languageName: node
-  linkType: hard
-
 "react-router@npm:6.4.1":
   version: 6.4.1
   resolution: "react-router@npm:6.4.1"
@@ -10057,24 +10031,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-router@npm:7.1.3":
-  version: 7.1.3
-  resolution: "react-router@npm:7.1.3"
-  dependencies:
-    "@types/cookie": ^0.6.0
-    cookie: ^1.0.1
-    set-cookie-parser: ^2.6.0
-    turbo-stream: 2.4.0
-  peerDependencies:
-    react: ">=18"
-    react-dom: ">=18"
-  peerDependenciesMeta:
-    react-dom:
-      optional: true
-  checksum: 4e0261232eb4706bb7195821019504ba3f07319cb8808fd181853c83eea0b181d434b5f5296383ba8c30e6f1c5bff95827d529ac0e8d4a365130c711f3a6b828
-  languageName: node
-  linkType: hard
-
 "react-style-singleton@npm:^2.2.1":
   version: 2.2.1
   resolution: "react-style-singleton@npm:2.2.1"
@@ -10745,13 +10701,6 @@ __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: 2ef8b351094712f8f7df6d63ed4b10350b24a5b515772690e7dec227df85fcef5bc451c7765f484fd9f36694ece5438d1456407d017f237d0d3351d7dbbd3587
-  languageName: node
-  linkType: hard
-
 "set-function-length@npm:^1.2.1":
   version: 1.2.2
   resolution: "set-function-length@npm:1.2.2"
@@ -11678,13 +11627,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"turbo-stream@npm:2.4.0":
-  version: 2.4.0
-  resolution: "turbo-stream@npm:2.4.0"
-  checksum: e36f52ed40589f01bede79757a143bef484914d579927235be1fd0c205618994cb5779a39ff8c2a80a87a1464d05771cd75320a9412b15bca03c7ff432e3cdf7
-  languageName: node
-  linkType: hard
-
 "type-check@npm:^0.4.0, type-check@npm:~0.4.0":
   version: 0.4.0
   resolution: "type-check@npm:0.4.0"