fix: react-router 7.5.2 fix imports

mikkojamG · mikkojamG · commit 27733cd32337 · 2025-09-12T08:10:03.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -403,53 +403,47 @@ See https://github.com/City-of-Helsinki/kukkuu-ui/milestone/6?closed=1
 
 ## [3.12.0](https://github.com/City-of-Helsinki/kukkuu-ui/compare/kukkuu-ui-v3.11.2...kukkuu-ui-v3.12.0) (2025-06-05)
 
-
 ### Features
 
-* Unenrolment should be available only over 48h before occurrence ([d1f836c](https://github.com/City-of-Helsinki/kukkuu-ui/commit/d1f836c2535f94c8e661a69aa42503e5c6c6b05a))
-
+- Unenrolment should be available only over 48h before occurrence ([d1f836c](https://github.com/City-of-Helsinki/kukkuu-ui/commit/d1f836c2535f94c8e661a69aa42503e5c6c6b05a))
 
 ### Bug Fixes
 
-* Define default locale for external authentication process ([b9d0804](https://github.com/City-of-Helsinki/kukkuu-ui/commit/b9d080448f321139b4afe8459966d0fa03f5aac2))
-* **docker:** Add VITE_ENROLMENT_CANCELLATION_TIME_LIMIT_HOURS buildarg ([b2a24b1](https://github.com/City-of-Helsinki/kukkuu-ui/commit/b2a24b1471062c7d4ef5c091f6d2dcb0825d183f))
-* **error:** Add missing error element to router ([074e8f8](https://github.com/City-of-Helsinki/kukkuu-ui/commit/074e8f8c53d975c6daefda79017f259351a4303c))
-* **error:** Add missing HTTP50X page for Nginx ([79d7d84](https://github.com/City-of-Helsinki/kukkuu-ui/commit/79d7d84de78c30491ad1f6a6f0193a39d6f44cca))
-* Improve child notes explanation text in means of privacy policy ([31b61bf](https://github.com/City-of-Helsinki/kukkuu-ui/commit/31b61bf438f090a035e26fcb9692356f8f604f08))
+- Define default locale for external authentication process ([b9d0804](https://github.com/City-of-Helsinki/kukkuu-ui/commit/b9d080448f321139b4afe8459966d0fa03f5aac2))
+- **docker:** Add VITE_ENROLMENT_CANCELLATION_TIME_LIMIT_HOURS buildarg ([b2a24b1](https://github.com/City-of-Helsinki/kukkuu-ui/commit/b2a24b1471062c7d4ef5c091f6d2dcb0825d183f))
+- **error:** Add missing error element to router ([074e8f8](https://github.com/City-of-Helsinki/kukkuu-ui/commit/074e8f8c53d975c6daefda79017f259351a4303c))
+- **error:** Add missing HTTP50X page for Nginx ([79d7d84](https://github.com/City-of-Helsinki/kukkuu-ui/commit/79d7d84de78c30491ad1f6a6f0193a39d6f44cca))
+- Improve child notes explanation text in means of privacy policy ([31b61bf](https://github.com/City-of-Helsinki/kukkuu-ui/commit/31b61bf438f090a035e26fcb9692356f8f604f08))
 
 ## [3.11.2](https://github.com/City-of-Helsinki/kukkuu-ui/compare/kukkuu-ui-v3.11.1...kukkuu-ui-v3.11.2) (2025-05-28)
 
-
 ### Bug Fixes
 
-* Configure commitlint to ignore dependabot commits & set more rules ([ed32114](https://github.com/City-of-Helsinki/kukkuu-ui/commit/ed32114e10b2e5cfdbb707ee679717a1c94c5332))
-* Layout test by using useLocation consistently from react-router-dom ([d3f2379](https://github.com/City-of-Helsinki/kukkuu-ui/commit/d3f2379aad09d40d5be3e7686d038ba6b7b2d7e7))
-* Set dependabot reviewers for ratkaisutoimisto ([1767f44](https://github.com/City-of-Helsinki/kukkuu-ui/commit/1767f44906afbc2acf22bb6dd28b440c8459b881))
+- Configure commitlint to ignore dependabot commits & set more rules ([ed32114](https://github.com/City-of-Helsinki/kukkuu-ui/commit/ed32114e10b2e5cfdbb707ee679717a1c94c5332))
+- Layout test by using useLocation consistently from react-router-dom ([d3f2379](https://github.com/City-of-Helsinki/kukkuu-ui/commit/d3f2379aad09d40d5be3e7686d038ba6b7b2d7e7))
+- Set dependabot reviewers for ratkaisutoimisto ([1767f44](https://github.com/City-of-Helsinki/kukkuu-ui/commit/1767f44906afbc2acf22bb6dd28b440c8459b881))
 
 ## [3.11.1](https://github.com/City-of-Helsinki/kukkuu-ui/compare/kukkuu-ui-v3.11.0...kukkuu-ui-v3.11.1) (2025-03-11)
 
-
 ### Bug Fixes
 
-* **notification:** Fix routing of internal hrefs in Notification ([#669](https://github.com/City-of-Helsinki/kukkuu-ui/issues/669)) ([5b33e4e](https://github.com/City-of-Helsinki/kukkuu-ui/commit/5b33e4e399d53de4ea2b984e16d46d1b45ac8b17))
+- **notification:** Fix routing of internal hrefs in Notification ([#669](https://github.com/City-of-Helsinki/kukkuu-ui/issues/669)) ([5b33e4e](https://github.com/City-of-Helsinki/kukkuu-ui/commit/5b33e4e399d53de4ea2b984e16d46d1b45ac8b17))
 
 ## [3.11.0](https://github.com/City-of-Helsinki/kukkuu-ui/compare/kukkuu-ui-v3.10.0...kukkuu-ui-v3.11.0) (2025-02-25)
 
-
 ### Features
 
-* Hardcode CMS languages for faster language rendering in header ([1fc343d](https://github.com/City-of-Helsinki/kukkuu-ui/commit/1fc343df1fb06ac1c03a3083548973430cc09c3f))
-* Use apollo client local storage cache persister ([c1569f5](https://github.com/City-of-Helsinki/kukkuu-ui/commit/c1569f5e1749a0a29e0849e44785966cc01db6cb))
-* Use react-router Link in scope of RHHC ([4635583](https://github.com/City-of-Helsinki/kukkuu-ui/commit/4635583038b38dcd80faac90b09e2559c2556ab0))
-
+- Hardcode CMS languages for faster language rendering in header ([1fc343d](https://github.com/City-of-Helsinki/kukkuu-ui/commit/1fc343df1fb06ac1c03a3083548973430cc09c3f))
+- Use apollo client local storage cache persister ([c1569f5](https://github.com/City-of-Helsinki/kukkuu-ui/commit/c1569f5e1749a0a29e0849e44785966cc01db6cb))
+- Use react-router Link in scope of RHHC ([4635583](https://github.com/City-of-Helsinki/kukkuu-ui/commit/4635583038b38dcd80faac90b09e2559c2556ab0))
 
 ### Bug Fixes
 
-* **csp:** Allow cms images ([2806516](https://github.com/City-of-Helsinki/kukkuu-ui/commit/2806516d1e4278a51d8a92ef385a8d29b1565cec))
-* **hotreload:** Use eslint-plugin-react-refresh, refactor code to comply ([8cd5d25](https://github.com/City-of-Helsinki/kukkuu-ui/commit/8cd5d25b014b23b0d535bd4fb46b349dc61b6514))
-* **sonarcloud:** Conditional render in JSX with {!!x && x}, not {x && x} ([36ce44f](https://github.com/City-of-Helsinki/kukkuu-ui/commit/36ce44f77d68558ee42321bb19aaa44978115e26))
-* **sonarcloud:** Fix removeSurroundingSlashes regex & test it works ([143851c](https://github.com/City-of-Helsinki/kukkuu-ui/commit/143851c7daff51ba7916d5e0c097590fdcb167f3))
-* **sonarcloud:** Show toast error when onClick navigation promise fails ([4a2ff2f](https://github.com/City-of-Helsinki/kukkuu-ui/commit/4a2ff2f533dc2caa719163b5114115a16e017586))
+- **csp:** Allow cms images ([2806516](https://github.com/City-of-Helsinki/kukkuu-ui/commit/2806516d1e4278a51d8a92ef385a8d29b1565cec))
+- **hotreload:** Use eslint-plugin-react-refresh, refactor code to comply ([8cd5d25](https://github.com/City-of-Helsinki/kukkuu-ui/commit/8cd5d25b014b23b0d535bd4fb46b349dc61b6514))
+- **sonarcloud:** Conditional render in JSX with {!!x && x}, not {x && x} ([36ce44f](https://github.com/City-of-Helsinki/kukkuu-ui/commit/36ce44f77d68558ee42321bb19aaa44978115e26))
+- **sonarcloud:** Fix removeSurroundingSlashes regex & test it works ([143851c](https://github.com/City-of-Helsinki/kukkuu-ui/commit/143851c7daff51ba7916d5e0c097590fdcb167f3))
+- **sonarcloud:** Show toast error when onClick navigation promise fails ([4a2ff2f](https://github.com/City-of-Helsinki/kukkuu-ui/commit/4a2ff2f533dc2caa719163b5114115a16e017586))
 
 ## [3.10.0](https://github.com/City-of-Helsinki/kukkuu-ui/compare/kukkuu-ui-v3.9.0...kukkuu-ui-v3.10.0) (2025-02-06)
 
diff --git a/package.json b/package.json
@@ -81,7 +81,6 @@
     "@types/react-dom": "^18.3.5",
     "@types/react-modal": "^3.16.3",
     "@types/react-redux": "^7.1.34",
-    "@types/react-router-dom": "^5.3.3",
     "@types/validator": "^13.12.2",
     "@typescript-eslint/eslint-plugin": "^8.21.0",
     "@typescript-eslint/parser": "^8.21.0",
@@ -134,7 +133,6 @@
     "react-qrcode-logo": "^3.0.0",
     "react-redux": "^9.2.0",
     "react-router": "^7.5.2",
-    "react-router-dom": "^7.1.3",
     "react-toastify": "^11.0.3",
     "redux": "^5.0.1",
     "redux-persist": "^6.0.0",
diff --git a/src/common/components/button/LinkButton.tsx b/src/common/components/button/LinkButton.tsx
@@ -1,4 +1,4 @@
-import { Link, LinkProps } from 'react-router-dom';
+import { Link, LinkProps } from 'react-router';
 
 import LinkButtonBase, { LinkButtonBaseProps } from './LinkButtonBase';
 
diff --git a/src/common/components/resetFocus/ResetFocus.tsx b/src/common/components/resetFocus/ResetFocus.tsx
@@ -4,7 +4,7 @@ import { RESET_FOCUS_ID } from './constants';
 
 /**
  * Ensure that browser focus is set to body when navigating using
- * <Link> from react-router-dom.
+ * <Link> from react-router.
  */
 const ResetFocus = (): React.ReactElement => {
   const pathname = window?.location?.pathname;
diff --git a/src/common/route/RouteUtils.ts b/src/common/route/RouteUtils.ts
@@ -1,5 +1,5 @@
 import { useEffect } from 'react';
-import { useLocation } from 'react-router-dom';
+import { useLocation } from 'react-router';
 
 export const updateLocaleParam = (
   url: string,
@@ -11,7 +11,7 @@ export const updateLocaleParam = (
 
 /**
  * Ensure that browser scrolls to top when navigating using
- * <Link> from react-router-dom.
+ * <Link> from react-router.
  *
  * Implementation fetched from
  * https://reacttraining.com/react-router/web/guides/scroll-restoration
diff --git a/src/common/test/TestProviders.tsx b/src/common/test/TestProviders.tsx
@@ -2,7 +2,7 @@ import { ReactElement, ReactNode } from 'react';
 import { Provider } from 'react-redux';
 import { MockedProvider, MockedResponse } from '@apollo/client/testing';
 import { HelmetProvider } from 'react-helmet-async';
-import { BrowserRouter } from 'react-router-dom';
+import { BrowserRouter } from 'react-router';
 import {
   ConfigProvider as RHHCConfigProvider,
   defaultConfig as rhhcDefaultConfig,
diff --git a/src/domain/app/AppRoute.tsx b/src/domain/app/AppRoute.tsx
@@ -1,6 +1,6 @@
 import { Helmet } from 'react-helmet-async';
 import { useTranslation } from 'react-i18next';
-import { RouteProps, useNavigate } from 'react-router-dom';
+import { RouteProps, useNavigate } from 'react-router';
 import { useOidcClient } from 'hds-react';
 import React from 'react';
 
diff --git a/src/domain/app/BrowserApp.tsx b/src/domain/app/BrowserApp.tsx
@@ -1,5 +1,5 @@
 import { ApolloProvider } from '@apollo/client';
-import { RouterProvider } from 'react-router-dom';
+import { RouterProvider } from 'react-router';
 import { PersistGate } from 'redux-persist/integration/react';
 import { Provider } from 'react-redux';
 import { ToastContainer } from 'react-toastify';
diff --git a/src/domain/app/errorElement/ApplicationError.tsx b/src/domain/app/errorElement/ApplicationError.tsx
@@ -1,6 +1,6 @@
 import { FunctionComponent } from 'react';
 import { useTranslation } from 'react-i18next';
-import { Link } from 'react-router-dom';
+import { Link } from 'react-router';
 
 import styles from './ApplicationError.module.scss';
 import Container from '../layout/Container';
diff --git a/src/domain/app/layout/ListPageLayout.tsx b/src/domain/app/layout/ListPageLayout.tsx
@@ -1,6 +1,6 @@
 import { ReactNode } from 'react';
 import { Container, IconArrowLeft } from 'hds-react';
-import { Link, LinkProps } from 'react-router-dom';
+import { Link, LinkProps } from 'react-router';
 import { useTranslation } from 'react-i18next';
 
 import Text from '../../../common/components/text/Text';
diff --git a/src/domain/app/layout/utilityComponents/HeroLayout.tsx b/src/domain/app/layout/utilityComponents/HeroLayout.tsx
@@ -1,6 +1,6 @@
 import { ReactElement } from 'react';
 import { useTranslation } from 'react-i18next';
-import { Link } from 'react-router-dom';
+import { Link } from 'react-router';
 import { IconArrowLeft } from 'hds-react';
 
 import styles from './heroLayout.module.scss';
diff --git a/src/domain/app/navigation/Navigation.tsx b/src/domain/app/navigation/Navigation.tsx
@@ -1,7 +1,7 @@
 import { useCallback } from 'react';
 import { Navigation as RHHCNavigation } from 'react-helsinki-headless-cms/apollo';
 import { useTranslation } from 'react-i18next';
-import { useLocation, useNavigate } from 'react-router-dom';
+import { useLocation, useNavigate } from 'react-router';
 import {
   Language,
   LanguageCodeEnum,
diff --git a/src/domain/app/navigation/UserNavigation.tsx b/src/domain/app/navigation/UserNavigation.tsx
@@ -8,7 +8,7 @@ import {
   IconLinkExternal,
 } from 'hds-react';
 import { useTranslation } from 'react-i18next';
-import { useNavigate } from 'react-router-dom';
+import { useNavigate } from 'react-router';
 import { useMatomo } from '@jonkoops/matomo-tracker-react';
 import { toast } from 'react-toastify';
 
diff --git a/src/domain/app/notFound/NotFound.tsx b/src/domain/app/notFound/NotFound.tsx
@@ -1,6 +1,6 @@
 import { FunctionComponent } from 'react';
 import { useTranslation } from 'react-i18next';
-import { Link } from 'react-router-dom';
+import { Link } from 'react-router';
 
 import styles from './notFound.module.scss';
 import Container from '../layout/Container';
diff --git a/src/domain/app/routes/NavigateToLocalePath.tsx b/src/domain/app/routes/NavigateToLocalePath.tsx
@@ -1,5 +1,5 @@
 import { useTranslation } from 'react-i18next';
-import { Navigate, useLocation } from 'react-router-dom';
+import { Navigate, useLocation } from 'react-router';
 
 export const NavigateToLocalePath = () => {
   const {
diff --git a/src/domain/app/routes/SilentRenewRedirect.tsx b/src/domain/app/routes/SilentRenewRedirect.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { useNavigate } from 'react-router-dom';
+import { useNavigate } from 'react-router';
 
 const SilentRenewRedirect = () => {
   const navigate = useNavigate();
diff --git a/src/domain/app/routes/browserRouter.tsx b/src/domain/app/routes/browserRouter.tsx
@@ -1,4 +1,4 @@
-import { createBrowserRouter } from 'react-router-dom';
+import { createBrowserRouter } from 'react-router';
 
 import { NavigateToLocalePath } from './NavigateToLocalePath';
 import AppRoute from '../AppRoute';
diff --git a/src/domain/app/routes/useLocaleRouteNavigate.tsx b/src/domain/app/routes/useLocaleRouteNavigate.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-import { useLocation, useMatch, useNavigate } from 'react-router-dom';
+import { useLocation, useMatch, useNavigate } from 'react-router';
 
 import { SUPPORT_LANGUAGES } from '../../../common/translation/TranslationConstants';
 
diff --git a/src/domain/app/routes/useProfileChildRouteAuthorization.tsx b/src/domain/app/routes/useProfileChildRouteAuthorization.tsx
@@ -1,4 +1,4 @@
-import { useLocation, useNavigate, useParams } from 'react-router-dom';
+import { useLocation, useNavigate, useParams } from 'react-router';
 import { useEffect } from 'react';
 
 import useGetPathname from '../../../common/route/utils/useGetPathname';
diff --git a/src/domain/app/useAppRouteHref.tsx b/src/domain/app/useAppRouteHref.tsx
@@ -1,4 +1,4 @@
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 
 import { AppRouteProps } from './AppRoute';
 
diff --git a/src/domain/app/useHashAnchorLinks.ts b/src/domain/app/useHashAnchorLinks.ts
@@ -1,5 +1,5 @@
 import { useEffect } from 'react';
-import { useLocation } from 'react-router-dom';
+import { useLocation } from 'react-router';
 
 // I couldn't find any non-intrusive "default" way to support this
 // behavior.
diff --git a/src/domain/auth/KukkuuHDSLoginCallbackHandler.tsx b/src/domain/auth/KukkuuHDSLoginCallbackHandler.tsx
@@ -2,7 +2,7 @@ import { OidcClientError, User, LoginCallbackHandler } from 'hds-react';
 import * as Sentry from '@sentry/browser';
 import { useTranslation } from 'react-i18next';
 import { toast } from 'react-toastify';
-import { useNavigate } from 'react-router-dom';
+import { useNavigate } from 'react-router';
 
 import useGetPathname from '../../common/route/utils/useGetPathname';
 
diff --git a/src/domain/auth/Unauthorized.tsx b/src/domain/auth/Unauthorized.tsx
@@ -1,5 +1,5 @@
 import { useTranslation } from 'react-i18next';
-import { useNavigate, useSearchParams } from 'react-router-dom';
+import { useNavigate, useSearchParams } from 'react-router';
 import { IconSignin, useOidcClient } from 'hds-react';
 import React from 'react';
 
diff --git a/src/domain/auth/__tests__/Unauthorized.test.tsx b/src/domain/auth/__tests__/Unauthorized.test.tsx
@@ -1,5 +1,5 @@
 import * as HdsReact from 'hds-react';
-import * as ReactRouterDom from 'react-router-dom';
+import * as ReactRouterDom from 'react-router';
 import { waitFor } from '@testing-library/react';
 
 import * as ProfileChildRouteAuthorization from '../../app/routes/useProfileChildRouteAuthorization';
@@ -13,7 +13,7 @@ vi.mock('hds-react', async (importOriginal: any) => {
   };
 });
 const navigateMock = vi.fn();
-vi.mock('react-router-dom', async (importOriginal: any) => {
+vi.mock('react-router', async (importOriginal: any) => {
   const mod = await importOriginal();
   return {
     ...mod,
diff --git a/src/domain/event/Event.tsx b/src/domain/event/Event.tsx
@@ -1,6 +1,6 @@
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { useParams, useLocation } from 'react-router-dom';
+import { useParams, useLocation } from 'react-router';
 import { useQuery } from '@apollo/client';
 import * as Sentry from '@sentry/browser';
 import { Notification } from 'hds-react';
diff --git a/src/domain/event/EventIsEnrolled.tsx b/src/domain/event/EventIsEnrolled.tsx
@@ -1,6 +1,6 @@
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 import * as Sentry from '@sentry/browser';
 import { useQuery } from '@apollo/client';
 
diff --git a/src/domain/event/EventOccurrence.tsx b/src/domain/event/EventOccurrence.tsx
@@ -1,5 +1,5 @@
 import { useTranslation } from 'react-i18next';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 
 import { TicketSystem } from '../api/generatedTypes/graphql';
 import { formatTime, newDate } from '../../common/time/utils';
diff --git a/src/domain/event/EventPage.tsx b/src/domain/event/EventPage.tsx
@@ -1,5 +1,5 @@
 import { ReactElement } from 'react';
-import { Link } from 'react-router-dom';
+import { Link } from 'react-router';
 import { useTranslation } from 'react-i18next';
 import { IconArrowLeft } from 'hds-react';
 
diff --git a/src/domain/event/EventRedirect.tsx b/src/domain/event/EventRedirect.tsx
@@ -1,7 +1,7 @@
 import { Trans, useTranslation } from 'react-i18next';
 import { ApolloError, useMutation, useQuery } from '@apollo/client';
 import * as Sentry from '@sentry/browser';
-import { useParams, useNavigate } from 'react-router-dom';
+import { useParams, useNavigate } from 'react-router';
 import React from 'react';
 import { Notification } from 'hds-react';
 import { toast } from 'react-toastify';
diff --git a/src/domain/event/ExternalTicketSystemEventIsEnrolled.tsx b/src/domain/event/ExternalTicketSystemEventIsEnrolled.tsx
@@ -1,5 +1,5 @@
 import { useTranslation } from 'react-i18next';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 import { useQuery } from '@apollo/client';
 
 import styles from './externalTicketSystemEventIsEnrolled.module.scss';
diff --git a/src/domain/event/enrol/EnrolPage.tsx b/src/domain/event/enrol/EnrolPage.tsx
@@ -1,5 +1,5 @@
 import { useTranslation } from 'react-i18next';
-import { useNavigate, useParams } from 'react-router-dom';
+import { useNavigate, useParams } from 'react-router';
 import { useMutation, useQuery } from '@apollo/client';
 import * as Sentry from '@sentry/browser';
 import { toast } from 'react-toastify';
diff --git a/src/domain/event/modal/UnenrolModal.tsx b/src/domain/event/modal/UnenrolModal.tsx
@@ -1,6 +1,6 @@
 import { useTranslation } from 'react-i18next';
 import { useMutation } from '@apollo/client';
-import { useNavigate } from 'react-router-dom';
+import { useNavigate } from 'react-router';
 // TODO: KK-300 Check how the cancel button should look
 // TODO: KK-300 If the same, find a better/reusable location for this css module
 import { toast } from 'react-toastify';
diff --git a/src/domain/event/route/EventRoute.tsx b/src/domain/event/route/EventRoute.tsx
@@ -1,4 +1,4 @@
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 import { useTranslation } from 'react-i18next';
 import { useQuery } from '@apollo/client';
 
diff --git a/src/domain/eventGroup/EventGroup.tsx b/src/domain/eventGroup/EventGroup.tsx
@@ -1,6 +1,6 @@
 import { QueryResult } from '@apollo/client';
 import { useTranslation } from 'react-i18next';
-import { useNavigate } from 'react-router-dom';
+import { useNavigate } from 'react-router';
 
 import useGetPathname from '../../common/route/utils/useGetPathname';
 import List from '../../common/components/list/List';
diff --git a/src/domain/eventGroup/EventGroupPage.tsx b/src/domain/eventGroup/EventGroupPage.tsx
@@ -1,5 +1,5 @@
 import { useQuery } from '@apollo/client';
-import { useParams } from 'react-router-dom';
+import { useParams } from 'react-router';
 
 import eventGroupQuery from './queries/eventGroupQuery';
 import EventGroup from './EventGroup';
diff --git a/src/domain/headlessCms/HeadlessCmsPage.tsx b/src/domain/headlessCms/HeadlessCmsPage.tsx
@@ -1,5 +1,5 @@
 import { Page, PageContent } from 'react-helsinki-headless-cms/apollo';
-import { useLocation } from 'react-router-dom';
+import { useLocation } from 'react-router';
 
 import styles from './headlessCmsPage.module.scss';
 import NotFound from '../app/notFound/NotFound';
diff --git a/src/domain/home/form/HomePreliminaryForm.tsx b/src/domain/home/form/HomePreliminaryForm.tsx
@@ -2,7 +2,7 @@ import React, { FunctionComponent, Ref } from 'react';
 import { Formik, Form } from 'formik';
 import { connect } from 'react-redux';
 import { useTranslation, Trans } from 'react-i18next';
-import { useNavigate } from 'react-router-dom';
+import { useNavigate } from 'react-router';
 import * as yup from 'yup';
 import { CheckboxProps, useOidcClient } from 'hds-react';
 
diff --git a/src/domain/home/hero/HomeHero.tsx b/src/domain/home/hero/HomeHero.tsx
@@ -1,5 +1,5 @@
 import { useTranslation } from 'react-i18next';
-import { useNavigate } from 'react-router-dom';
+import { useNavigate } from 'react-router';
 import { IconAlertCircle, useOidcClient } from 'hds-react';
 
 import Button from '../../../common/components/button/Button';
diff --git a/src/domain/profile/Profile.tsx b/src/domain/profile/Profile.tsx
@@ -1,7 +1,7 @@
 import React, { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { IconPen, useOidcClient } from 'hds-react';
-import { useNavigate } from 'react-router-dom';
+import { useNavigate } from 'react-router';
 
 import LoadingSpinner from '../../common/components/spinner/LoadingSpinner';
 import Button from '../../common/components/button/Button';
diff --git a/src/domain/profile/__tests__/Profile.test.tsx b/src/domain/profile/__tests__/Profile.test.tsx
diff --git a/src/domain/profile/children/child/ProfileChild.tsx b/src/domain/profile/children/child/ProfileChild.tsx
diff --git a/src/domain/profile/children/child/ProfileChildDetail.tsx b/src/domain/profile/children/child/ProfileChildDetail.tsx
diff --git a/src/domain/profile/children/child/ProfileChildEnrolment.tsx b/src/domain/profile/children/child/ProfileChildEnrolment.tsx
diff --git a/src/domain/profile/children/child/useChildRouteGoBackTo.ts b/src/domain/profile/children/child/useChildRouteGoBackTo.ts
diff --git a/src/domain/profile/events/ProfileEventsList.tsx b/src/domain/profile/events/ProfileEventsList.tsx
diff --git a/src/domain/profile/subscriptions/ManageSubscriptions.tsx b/src/domain/profile/subscriptions/ManageSubscriptions.tsx
diff --git a/src/domain/profile/subscriptions/__tests__/ManageSubscriptions.test.tsx b/src/domain/profile/subscriptions/__tests__/ManageSubscriptions.test.tsx
diff --git a/src/domain/registration/form/RegistrationForm.tsx b/src/domain/registration/form/RegistrationForm.tsx
diff --git a/src/domain/registration/notEligible/NotEligible.tsx b/src/domain/registration/notEligible/NotEligible.tsx
diff --git a/src/domain/registration/welcome/Welcome.tsx b/src/domain/registration/welcome/Welcome.tsx
diff --git a/src/hooks/useCmsLanguageOptions.ts b/src/hooks/useCmsLanguageOptions.ts
diff --git a/vite.config.ts b/vite.config.ts
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { Link, LinkProps } from 'react-router-dom';`
	`1`	`+import { Link, LinkProps } from 'react-router';`
`2`	`2`
`3`	`3`	`import LinkButtonBase, { LinkButtonBaseProps } from './LinkButtonBase';`
`4`	`4`