Merge pull request openshift#16139 from vojtechszocs/react-router-cleanup

CONSOLE-5114: Clean up React Router imports and dependencies

Author: openshift-merge-bot[bot]

dynamic-demo-plugin/package.json

@@ -21,8 +21,6 @@
     "@patternfly/react-table": "^6.2.2",
     "@types/node": "^22.19.7",
     "@types/react": "^18.3.27",
-    "@types/react-router": "^5.1.20",
-    "@types/react-router-dom": "^5.3.3",
     "copy-webpack-plugin": "^13.0.1",
     "css-loader": "^5.2.7",
     "file-loader": "6.2.0",
@@ -34,8 +32,6 @@
     "react-dom": "18.3.1",
     "react-i18next": "~15.1.4",
     "react-router": "~7.13.1",
-    "react-router-dom": "~7.13.1",
-    "react-router-dom-v5-compat": "6.11.2",
     "style-loader": "^4.0.0",
     "ts-loader": "^9.5.4",
     "ts-node": "10.9.2",

dynamic-demo-plugin/src/components/ClusterOverview/Inventory.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { useTranslation } from 'react-i18next';
-import { Link } from 'react-router-dom';
+import { Link } from 'react-router';
 import { AddressBookIcon, MonitoringIcon } from '@patternfly/react-icons';
 import {
   InventoryItem,

dynamic-demo-plugin/src/components/ExampleNamespacedPage.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { useTranslation } from 'react-i18next';
-import { useParams } from 'react-router-dom-v5-compat';
+import { useParams } from 'react-router';
 import {
   Card,
   CardBody,

dynamic-demo-plugin/src/components/ProjectOverview/Inventory.tsx

@@ -5,7 +5,7 @@ import {
   InventoryItemTitle,
   InventoryItemLoading,
 } from '@openshift-console/dynamic-plugin-sdk';
-import { Link } from 'react-router-dom';
+import { Link } from 'react-router';
 import { useTranslation } from 'react-i18next';
 import type { FC } from 'react';
 

dynamic-demo-plugin/yarn.lock

@@ -23,7 +23,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/runtime@npm:^7.12.0, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.25.0, @babel/runtime@npm:^7.7.6":
+"@babel/runtime@npm:^7.12.0, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.25.0":
   version: 7.28.6
   resolution: "@babel/runtime@npm:7.28.6"
   checksum: 10c0/358cf2429992ac1c466df1a21c1601d595c46930a13c1d4662fde908d44ee78ec3c183aaff513ecb01ef8c55c3624afe0309eeeb34715672dbfadb7feedb2c0d
@@ -41,8 +41,6 @@ __metadata:
     "@patternfly/react-table": "npm:^6.2.2"
     "@types/node": "npm:^22.19.7"
     "@types/react": "npm:^18.3.27"
-    "@types/react-router": "npm:^5.1.20"
-    "@types/react-router-dom": "npm:^5.3.3"
     copy-webpack-plugin: "npm:^13.0.1"
     css-loader: "npm:^5.2.7"
     file-loader: "npm:6.2.0"
@@ -54,8 +52,6 @@ __metadata:
     react-dom: "npm:18.3.1"
     react-i18next: "npm:~15.1.4"
     react-router: "npm:~7.13.1"
-    react-router-dom: "npm:~7.13.1"
-    react-router-dom-v5-compat: "npm:6.11.2"
     style-loader: "npm:^4.0.0"
     ts-loader: "npm:^9.5.4"
     ts-node: "npm:10.9.2"
@@ -184,7 +180,6 @@ __metadata:
     react-i18next: ~15.1.4
     react-redux: 8.1.3
     react-router: ~7.13.1
-    react-router-dom: ~7.13.1
     redux: ^4.0.4
     redux-thunk: 2.4.0
   peerDependenciesMeta:
@@ -198,8 +193,6 @@ __metadata:
       optional: true
     react-router:
       optional: true
-    react-router-dom:
-      optional: true
     redux:
       optional: true
     redux-thunk:
@@ -299,13 +292,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
-
 "@tsconfig/node10@npm:^1.0.7":
   version: 1.0.12
   resolution: "@tsconfig/node10@npm:1.0.12"
@@ -361,13 +347,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/history@npm:^4.7.11":
-  version: 4.7.11
-  resolution: "@types/history@npm:4.7.11"
-  checksum: 10c0/3facf37c2493d1f92b2e93a22cac7ea70b06351c2ab9aaceaa3c56aa6099fb63516f6c4ec1616deb5c56b4093c026a043ea2d3373e6c0644d55710364d02c934
-  languageName: node
-  linkType: hard
-
 "@types/json-schema@npm:*, @types/json-schema@npm:^7.0.15, @types/json-schema@npm:^7.0.8, @types/json-schema@npm:^7.0.9":
   version: 7.0.15
   resolution: "@types/json-schema@npm:7.0.15"
@@ -414,28 +393,7 @@ __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:*, @types/react-router@npm:^5.1.20":
-  version: 5.1.20
-  resolution: "@types/react-router@npm:5.1.20"
-  dependencies:
-    "@types/history": "npm:^4.7.11"
-    "@types/react": "npm:*"
-  checksum: 10c0/1f7eee61981d2f807fa01a34a0ef98ebc0774023832b6611a69c7f28fdff01de5a38cabf399f32e376bf8099dcb7afaf724775bea9d38870224492bea4cb5737
-  languageName: node
-  linkType: hard
-
-"@types/react@npm:*, @types/react@npm:^18.3.27":
+"@types/react@npm:^18.3.27":
   version: 18.3.27
   resolution: "@types/react@npm:18.3.27"
   dependencies:
@@ -2047,15 +2005,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"history@npm:^5.3.0":
-  version: 5.3.0
-  resolution: "history@npm:5.3.0"
-  dependencies:
-    "@babel/runtime": "npm:^7.7.6"
-  checksum: 10c0/812ec839386222d6437bd78d9f05db32e47d105ada0ad8834b32626919dd2fee7a10001bc489510f93a8069d02f118214bd8d42a82f7cf9daf8e84fbcbbb2016
-  languageName: node
-  linkType: hard
-
 "hosted-git-info@npm:^2.1.4":
   version: 2.8.9
   resolution: "hosted-git-info@npm:2.8.9"
@@ -3204,44 +3153,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-router-dom-v5-compat@npm:6.11.2":
-  version: 6.11.2
-  resolution: "react-router-dom-v5-compat@npm:6.11.2"
-  dependencies:
-    history: "npm:^5.3.0"
-    react-router: "npm:6.11.2"
-  peerDependencies:
-    react: ">=16.8"
-    react-dom: ">=16.8"
-    react-router-dom: 4 || 5
-  checksum: 10c0/49cfec11d099e9a514558c4fd4b38d2850d2b570c25896c8f8eee92b4eac867ba871d8f02f22fbfc75ae9e8c3692c604c9ebb24f44cecbdc56cd88134597b6fc
-  languageName: node
-  linkType: hard
-
-"react-router-dom@npm:~7.13.1":
-  version: 7.13.1
-  resolution: "react-router-dom@npm:7.13.1"
-  dependencies:
-    react-router: "npm:7.13.1"
-  peerDependencies:
-    react: ">=18"
-    react-dom: ">=18"
-  checksum: 10c0/2b8ed9dc753f1f7be599a53a00900df04e2b4d1186b0a4d63004eebb2250cd78cd6837ff15fcada5f88d53ad127fff0d1de31468715dcd6dd79dad8cfa8414e9
-  languageName: node
-  linkType: hard
-
-"react-router@npm:6.11.2":
-  version: 6.11.2
-  resolution: "react-router@npm:6.11.2"
-  dependencies:
-    "@remix-run/router": "npm:1.6.2"
-  peerDependencies:
-    react: ">=16.8"
-  checksum: 10c0/a437606078d6096a6dfa322adf80d00ce153f20cd470ad888088c8da99f44477b963425c53f5461a540b909fc274154292ed80d636482dcdc58a423915ca1433
-  languageName: node
-  linkType: hard
-
-"react-router@npm:7.13.1, react-router@npm:~7.13.1":
+"react-router@npm:~7.13.1":
   version: 7.13.1
   resolution: "react-router@npm:7.13.1"
   dependencies:

frontend/.eslintrc.js

@@ -40,7 +40,6 @@ module.exports = {
     'no-multiple-empty-lines': [2, { max: 2, maxEOF: 0 }],
     eqeqeq: [2, 'allow-null'],
     'guard-for-in': 2,
-    'import/no-unresolved': ['error', { ignore: ['react-router-dom-v5-compat', 'react-router-dom'] }],
     'import/no-duplicates': ['error'],
     'max-nested-callbacks': [1, 4],
     'no-alert': 2,

frontend/package.json

@@ -84,8 +84,7 @@
       "\\.(css|less|scss)$": "<rootDir>/__mocks__/styleMock.js",
       "^dnd-core$": "dnd-core/dist/cjs",
       "^react-dnd$": "react-dnd/dist/cjs",
-      "^react-dnd-html5-backend$": "react-dnd-html5-backend/dist/cjs",
-      "^react-router-dom-v5-compat$": "react-router-dom"
+      "^react-dnd-html5-backend$": "react-dnd-html5-backend/dist/cjs"
     },
     "testEnvironment": "jsdom",
     "transform": {
@@ -217,7 +216,6 @@
     "react-modal": "^3.16.3",
     "react-redux": "8.1.3",
     "react-router": "~7.13.1",
-    "react-router-dom": "~7.13.1",
     "react-svg": "^16.2.0",
     "react-tagsinput": "3.20.x",
     "react-virtualized": "9.x",

frontend/packages/console-app/src/actions/hooks/useBindingActions.ts

@@ -1,7 +1,7 @@
 import { useCallback, useMemo } from 'react';
 import { ButtonVariant } from '@patternfly/react-core';
 import { useTranslation } from 'react-i18next';
-import { useNavigate } from 'react-router-dom-v5-compat';
+import { useNavigate } from 'react-router';
 import type { Action, K8sVerb } from '@console/dynamic-plugin-sdk';
 import { k8sPatchResource } from '@console/dynamic-plugin-sdk/src/utils/k8s';
 import { useDeepCompareMemoize } from '@console/dynamic-plugin-sdk/src/utils/k8s/hooks/useDeepCompareMemoize';

frontend/packages/console-app/src/actions/hooks/useBuildsActions.ts

@@ -1,7 +1,7 @@
 import { useMemo } from 'react';
 import { ButtonVariant } from '@patternfly/react-core';
 import { useTranslation } from 'react-i18next';
-import { redirect } from 'react-router-dom-v5-compat';
+import { redirect } from 'react-router';
 import type { Action } from '@console/dynamic-plugin-sdk';
 import { useOverlay } from '@console/dynamic-plugin-sdk/src/app/modal-support/useOverlay';
 import { k8sPatchResource } from '@console/dynamic-plugin-sdk/src/utils/k8s';

frontend/packages/console-app/src/actions/hooks/useCronJobActions.ts

@@ -1,7 +1,7 @@
 import { useMemo } from 'react';
 import { AlertVariant } from '@patternfly/react-core';
 import { useTranslation } from 'react-i18next';
-import { useNavigate } from 'react-router-dom-v5-compat';
+import { useNavigate } from 'react-router';
 import type { Action, AccessReviewResourceAttributes } from '@console/dynamic-plugin-sdk';
 import { useDeepCompareMemoize } from '@console/dynamic-plugin-sdk/src/utils/k8s/hooks/useDeepCompareMemoize';
 import { resourceObjPath } from '@console/internal/components/utils';