From 9025f3e9fd821ee0862b30105967b1ead7dccf5c Mon Sep 17 00:00:00 2001 From: Austin Sullivan Date: Mon, 2 Nov 2026 17:01:43 -0500 Subject: [PATCH] chore(deps): upgrade react-router to v7.18.0 --- packages/dev/package.json | 3 +- packages/dev/src/common/Page.tsx | 2 +- packages/dev/src/index.tsx | 2 +- yarn.lock | 77 +++++++++++--------------------- 4 files changed, 30 insertions(+), 54 deletions(-) diff --git a/packages/dev/package.json b/packages/dev/package.json index dcade729..a57ce132 100644 --- a/packages/dev/package.json +++ b/packages/dev/package.json @@ -21,11 +21,10 @@ "react": "^18.2.0", "react-dom": "^18.2.0", "react-i18next": "^15.5.3", - "react-router-dom": "^6.11.2" + "react-router": "^7.18.0" }, "devDependencies": { "@types/react": "^18.2.79", - "@types/react-router-dom": "^5.3.3", "ajv": "^8.18.0", "assets-webpack-plugin": "^7.1.1", "clean-css-loader": "^4.2.1", diff --git a/packages/dev/src/common/Page.tsx b/packages/dev/src/common/Page.tsx index 079959d8..52d0d02f 100644 --- a/packages/dev/src/common/Page.tsx +++ b/packages/dev/src/common/Page.tsx @@ -24,7 +24,7 @@ import { import RhUiMenuBarsIcon from '@patternfly/react-icons/dist/js/icons/rh-ui-menu-bars-icon'; import LightbulbIcon from '@patternfly/react-icons/dist/js/icons/lightbulb-icon'; import { QuickStartContext } from '@patternfly/quickstarts'; -import { Link } from 'react-router-dom'; +import { Link } from 'react-router'; import Nav from '../Nav'; import { SettingsModal } from '../SettingsModal'; diff --git a/packages/dev/src/index.tsx b/packages/dev/src/index.tsx index 19869ff5..329c4f10 100755 --- a/packages/dev/src/index.tsx +++ b/packages/dev/src/index.tsx @@ -1,5 +1,5 @@ import { createRoot } from 'react-dom/client'; -import { Route, BrowserRouter, Routes } from 'react-router-dom'; +import { Route, BrowserRouter, Routes } from 'react-router'; // fonts, variables import '@patternfly/patternfly/patternfly.css'; diff --git a/yarn.lock b/yarn.lock index 04320f50..7cd3de49 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2825,7 +2825,6 @@ __metadata: "@patternfly/quickstarts": "workspace:*" "@patternfly/react-core": "npm:^6.5.1" "@types/react": "npm:^18.2.79" - "@types/react-router-dom": "npm:^5.3.3" ajv: "npm:^8.18.0" assets-webpack-plugin: "npm:^7.1.1" clean-css-loader: "npm:^4.2.1" @@ -2846,7 +2845,7 @@ __metadata: react: "npm:^18.2.0" react-dom: "npm:^18.2.0" react-i18next: "npm:^15.5.3" - react-router-dom: "npm:^6.11.2" + react-router: "npm:^7.18.0" serve: "npm:^11.3.2" style-loader: "npm:^3.3.2" sync-fetch: "npm:^0.3.0" @@ -3244,13 +3243,6 @@ __metadata: languageName: node linkType: hard -"@remix-run/router@npm:1.6.2": - version: 1.6.2 - resolution: "@remix-run/router@npm:1.6.2" - checksum: 10c0/73da6884e53873e4290abb3978373cafc3f351994273b0663eda5e12c81cb427fc6fe4df1924569d9a214f701d0106cf37122455951e0239d7e6fa35071df558 - languageName: node - linkType: hard - "@rollup/plugin-commonjs@npm:^17.0.0": version: 17.1.0 resolution: "@rollup/plugin-commonjs@npm:17.1.0" @@ -3844,7 +3836,7 @@ __metadata: languageName: node linkType: hard -"@types/history@npm:*, @types/history@npm:^4.7.11, @types/history@npm:^4.7.8": +"@types/history@npm:^4.7.8": version: 4.7.11 resolution: "@types/history@npm:4.7.11" checksum: 10c0/3facf37c2493d1f92b2e93a22cac7ea70b06351c2ab9aaceaa3c56aa6099fb63516f6c4ec1616deb5c56b4093c026a043ea2d3373e6c0644d55710364d02c934 @@ -4059,27 +4051,6 @@ __metadata: languageName: node linkType: hard -"@types/react-router-dom@npm:^5.3.3": - version: 5.3.3 - resolution: "@types/react-router-dom@npm:5.3.3" - dependencies: - "@types/history": "npm:^4.7.11" - "@types/react": "npm:*" - "@types/react-router": "npm:*" - checksum: 10c0/a9231a16afb9ed5142678147eafec9d48582809295754fb60946e29fcd3757a4c7a3180fa94b45763e4c7f6e3f02379e2fcb8dd986db479dcab40eff5fc62a91 - languageName: node - linkType: hard - -"@types/react-router@npm:*": - version: 5.1.16 - resolution: "@types/react-router@npm:5.1.16" - dependencies: - "@types/history": "npm:*" - "@types/react": "npm:*" - checksum: 10c0/235f8c35fd6d082ff2639289e5a21b7e74fb4abb7ab44a0fc59346ff97c0a115dc83ffe2ab2dcde4a8114e8fdb80eb31ffaa3a9006378915fe53cb834dbf283a - languageName: node - linkType: hard - "@types/react@npm:*, @types/react@npm:^18.2.79": version: 18.2.79 resolution: "@types/react@npm:18.2.79" @@ -7714,6 +7685,13 @@ __metadata: languageName: node linkType: hard +"cookie@npm:^1.0.1": + version: 1.1.1 + resolution: "cookie@npm:1.1.1" + checksum: 10c0/79c4ddc0fcad9c4f045f826f42edf54bcc921a29586a4558b0898277fa89fb47be95bc384c2253f493af7b29500c830da28341274527328f18eba9f58afa112c + languageName: node + linkType: hard + "cookie@npm:~0.7.1": version: 0.7.2 resolution: "cookie@npm:0.7.2" @@ -19113,27 +19091,19 @@ __metadata: languageName: node linkType: hard -"react-router-dom@npm:^6.11.2": - version: 6.11.2 - resolution: "react-router-dom@npm:6.11.2" - dependencies: - "@remix-run/router": "npm:1.6.2" - react-router: "npm:6.11.2" - peerDependencies: - react: ">=16.8" - react-dom: ">=16.8" - checksum: 10c0/be7433bc290e56c0dd3e1008d53a76cc9866bf460980658501880876420086f11810ec3355a3abcd79ac537d6a1351eda009fade841c266456d0e8df60967b76 - languageName: node - linkType: hard - -"react-router@npm:6.11.2": - version: 6.11.2 - resolution: "react-router@npm:6.11.2" +"react-router@npm:^7.18.0": + version: 7.18.5 + resolution: "react-router@npm:7.18.5" dependencies: - "@remix-run/router": "npm:1.6.2" + cookie: "npm:^1.0.1" + set-cookie-parser: "npm:^2.6.0" peerDependencies: - react: ">=16.8" - checksum: 10c0/a437606078d6096a6dfa322adf80d00ce153f20cd470ad888088c8da99f44477b963425c53f5461a540b909fc274154292ed80d636482dcdc58a423915ca1433 + react: ">=18" + react-dom: ">=18" + peerDependenciesMeta: + react-dom: + optional: true + checksum: 10c0/dbed9b4d0019873615028e2fe7bf7782ab4f41d9f287595b9a82f4a6d619dc5d3b88449fb3e717282f9f558312f29f88325372a7bb67355472703291607f9280 languageName: node linkType: hard @@ -20676,6 +20646,13 @@ __metadata: languageName: node linkType: hard +"set-cookie-parser@npm:^2.6.0": + version: 2.7.3 + resolution: "set-cookie-parser@npm:2.7.3" + checksum: 10c0/cf15a6124afd833b09d0d7b60148ba8b2a09cb8e7a4c4d5826a1fcbcd6c11bda338f6d728511ceb79fa977aca7b8025e1f6bec5d27faab4875aa5a707e5735b8 + languageName: node + linkType: hard + "set-function-length@npm:^1.2.2": version: 1.2.2 resolution: "set-function-length@npm:1.2.2"