Frontend/update React Router to v7.18.3

frontend/package.json

@@ -60,7 +60,7 @@
     "react-error-boundary": "^3.1.4",
     "react-joyride": "^2.8.2",
     "react-phone-input-2": "^2.15.1",
-    "react-router-dom": "^6.30.6",
+    "react-router": "^7.18.3",
     "react-table": "^7.8.0",
     "yup": "^0.32.11"
   },

frontend/src/__tests__/LocaleSwitcher.test.js

@@ -5,7 +5,7 @@ import { I18nProvider } from '@lingui/react'
 import { i18n } from '@lingui/core'
 import { MockedProvider } from '@apollo/client/testing'
 import { waitFor, render } from '@testing-library/react'
-import { MemoryRouter } from 'react-router-dom'
+import { MemoryRouter } from 'react-router'
 import { makeVar } from '@apollo/client'
 import userEvent from '@testing-library/user-event'
 import { LocaleSwitcher } from '../app/LocaleSwitcher'

frontend/src/admin/AdminPage.js

@@ -3,7 +3,7 @@ import { Button, Flex, Stack, Text, useToast, Select } from '@chakra-ui/react'
 import { AddIcon } from '@chakra-ui/icons'
 import { Trans, useLingui } from '@lingui/react/macro'
 import { useQuery } from '@apollo/client'
-import { Link as RouteLink, useNavigate, useParams } from 'react-router-dom'
+import { Link as RouteLink, useNavigate, useParams } from 'react-router'
 
 import { AdminPanel } from './AdminPanel'
 import { OrganizationInformation } from './OrganizationInformation'

frontend/src/admin/__tests__/AdminDomainCard.test.js

@@ -1,6 +1,6 @@
 import React from 'react'
 import { render, waitFor } from '@testing-library/react'
-import { MemoryRouter } from 'react-router-dom'
+import { MemoryRouter } from 'react-router'
 import { List, theme, ChakraProvider } from '@chakra-ui/react'
 import { I18nProvider } from '@lingui/react'
 import { i18n } from '@lingui/core'

frontend/src/admin/__tests__/AdminDomains.test.js

@@ -1,7 +1,7 @@
 import React from 'react'
 import { fireEvent, render, waitFor } from '@testing-library/react'
 import { theme, ChakraProvider } from '@chakra-ui/react'
-import { MemoryRouter } from 'react-router-dom'
+import { MemoryRouter } from 'react-router'
 import { I18nProvider } from '@lingui/react'
 import { i18n } from '@lingui/core'
 import { MockedProvider } from '@apollo/client/testing'

frontend/src/admin/__tests__/AdminPage.test.js

@@ -5,7 +5,7 @@ import { i18n } from '@lingui/core'
 import { MockedProvider } from '@apollo/client/testing'
 import AdminPage from '../AdminPage'
 import { waitFor, render } from '@testing-library/react'
-import { MemoryRouter } from 'react-router-dom'
+import { MemoryRouter } from 'react-router'
 import { makeVar } from '@apollo/client'
 import userEvent from '@testing-library/user-event'
 import { UserVarProvider } from '../../utilities/userState'

frontend/src/admin/__tests__/AdminPanel.test.js

@@ -4,7 +4,7 @@ import { theme, ChakraProvider } from '@chakra-ui/react'
 import { I18nProvider } from '@lingui/react'
 import { i18n } from '@lingui/core'
 import { MockedProvider } from '@apollo/client/testing'
-import { createMemoryRouter, RouterProvider } from 'react-router-dom'
+import { createMemoryRouter, RouterProvider } from 'react-router'
 import { makeVar } from '@apollo/client'
 import { AdminPanel } from '../AdminPanel'
 import { createCache } from '../../client'

frontend/src/admin/__tests__/AuditLogTable.test.js

@@ -5,7 +5,7 @@ import { i18n } from '@lingui/core'
 import { MockedProvider } from '@apollo/client/testing'
 import { AuditLogTable } from '../AuditLogTable'
 import { waitFor, render } from '@testing-library/react'
-import { MemoryRouter } from 'react-router-dom'
+import { MemoryRouter } from 'react-router'
 import { makeVar } from '@apollo/client'
 import userEvent from '@testing-library/user-event'
 import { UserVarProvider } from '../../utilities/userState'

frontend/src/admin/__tests__/DomainTagsList.test.js

@@ -1,6 +1,6 @@
 import React from 'react'
 import { ChakraProvider, theme } from '@chakra-ui/react'
-import { MemoryRouter } from 'react-router-dom'
+import { MemoryRouter } from 'react-router'
 import { I18nProvider } from '@lingui/react'
 import { i18n } from '@lingui/core'
 import { makeVar } from '@apollo/client'

frontend/src/admin/__tests__/OrganizationInformation.test.js

@@ -1,6 +1,6 @@
 import React from 'react'
 import { ChakraProvider, theme } from '@chakra-ui/react'
-import { MemoryRouter } from 'react-router-dom'
+import { MemoryRouter } from 'react-router'
 import { act, render, waitFor } from '@testing-library/react'
 import { MockedProvider } from '@apollo/client/testing'
 import { I18nProvider } from '@lingui/react'

frontend/src/admin/__tests__/SuperAdminUserList.test.js

@@ -1,6 +1,6 @@
 import React from 'react'
 import { fireEvent, render, waitFor } from '@testing-library/react'
-import { MemoryRouter } from 'react-router-dom'
+import { MemoryRouter } from 'react-router'
 import { theme, ChakraProvider } from '@chakra-ui/react'
 import { I18nProvider } from '@lingui/react'
 import { MockedProvider } from '@apollo/client/testing'

frontend/src/admin/__tests__/UserList.test.js

@@ -1,6 +1,6 @@
 import React from 'react'
 import { fireEvent, render, waitFor } from '@testing-library/react'
-import { MemoryRouter } from 'react-router-dom'
+import { MemoryRouter } from 'react-router'
 import { theme, ChakraProvider } from '@chakra-ui/react'
 import { I18nProvider } from '@lingui/react'
 import { MockedProvider } from '@apollo/client/testing'

frontend/src/admin/__tests__/UserListModal.test.js

@@ -1,6 +1,6 @@
 import React from 'react'
 import { render, waitFor } from '@testing-library/react'
-import { MemoryRouter } from 'react-router-dom'
+import { MemoryRouter } from 'react-router'
 import { theme, ChakraProvider, useDisclosure } from '@chakra-ui/react'
 import { I18nProvider } from '@lingui/react'
 import { MockedProvider } from '@apollo/client/testing'

frontend/src/app/App.js

@@ -1,5 +1,5 @@
 import React, { Suspense } from 'react'
-import { Link as RouteLink, Routes, Route, Navigate } from 'react-router-dom'
+import { Link as RouteLink, Routes, Route, Navigate } from 'react-router'
 import { AlertDescription, AlertTitle, Box, Code, CSSReset, Flex, Link, Skeleton, Text } from '@chakra-ui/react'
 import { t } from "@lingui/core/macro"
 import { Trans } from "@lingui/react/macro"

frontend/src/app/ContactUsPage.js

@@ -1,7 +1,7 @@
 import React from 'react'
 import { Trans } from "@lingui/react/macro"
 import { Box, Divider, Heading, Button, Text, Link } from '@chakra-ui/react'
-import { Link as RouteLink } from 'react-router-dom'
+import { Link as RouteLink } from 'react-router'
 
 export default function ContactUsPage() {
   return (

frontend/src/app/FloatingMenu.js

@@ -1,6 +1,6 @@
 import { FloatingMenuLink } from './FloatingMenuLink'
 import React from 'react'
-import { Link as RouteLink } from 'react-router-dom'
+import { Link as RouteLink } from 'react-router'
 import {
   Box,
   Button,

frontend/src/app/FloatingMenuLink.js

@@ -1,6 +1,6 @@
 import React from 'react'
 import { Link, Text } from '@chakra-ui/react'
-import { Link as RouteLink } from 'react-router-dom'
+import { Link as RouteLink } from 'react-router'
 import { bool, string } from 'prop-types'
 
 export const FloatingMenuLink = ({ to, text, isExternal, ...props }) => {

frontend/src/app/Navigation.js

@@ -1,5 +1,5 @@
 import React from 'react'
-import { Link as ReactRouterLink } from 'react-router-dom'
+import { Link as ReactRouterLink } from 'react-router'
 import { Flex, Stack } from '@chakra-ui/react'
 import { node } from 'prop-types'
 

frontend/src/app/PrivatePage.js

@@ -1,6 +1,6 @@
 import React from 'react'
 import { bool, func } from 'prop-types'
-import { Navigate, useLocation } from 'react-router-dom'
+import { Navigate, useLocation } from 'react-router'
 import { Page } from './Page'
 
 // A wrapper for <Page> that redirects to the login

frontend/src/app/ScrollToAnchor.js

@@ -1,4 +1,4 @@
-import { useLocation } from 'react-router-dom'
+import { useLocation } from 'react-router'
 import { useEffect, useRef, useState } from 'react'
 
 function isInteractiveElement(element) {

frontend/src/app/SlideMessage.js

@@ -17,7 +17,7 @@ import {
   Slide,
 } from '@chakra-ui/react'
 
-import { Link as RouteLink } from 'react-router-dom'
+import { Link as RouteLink } from 'react-router'
 import { bool, func } from 'prop-types'
 
 const emailUrlEn = 'https://www.tbs-sct.gc.ca/pol/doc-eng.aspx?id=27600'

frontend/src/app/TopBanner.js

@@ -2,7 +2,7 @@ import React from 'react'
 import { t } from "@lingui/core/macro"
 import { Trans } from "@lingui/react/macro"
 import { Box, Button, Flex, useToast, Image, Link, Skeleton } from '@chakra-ui/react'
-import { Link as RouteLink } from 'react-router-dom'
+import { Link as RouteLink } from 'react-router'
 import { useMutation } from '@apollo/client'
 
 import sigEn from '../images/goc-header-logo-dark-en.svg'

frontend/src/app/__tests__/App.test.js

@@ -1,6 +1,6 @@
 import React from 'react'
 import { theme, ChakraProvider } from '@chakra-ui/react'
-import { MemoryRouter } from 'react-router-dom'
+import { MemoryRouter } from 'react-router'
 import { cleanup, render, waitFor } from '@testing-library/react'
 import { MockedProvider } from '@apollo/client/testing'
 import { I18nProvider } from '@lingui/react'

frontend/src/app/__tests__/ContactUsPage.test.js

@@ -1,6 +1,6 @@
 import React from 'react'
 import { theme, ChakraProvider } from '@chakra-ui/react'
-import { MemoryRouter } from 'react-router-dom'
+import { MemoryRouter } from 'react-router'
 import { cleanup, fireEvent, render, waitFor } from '@testing-library/react'
 import { MockedProvider } from '@apollo/client/testing'
 import { I18nProvider } from '@lingui/react'

frontend/src/app/__tests__/FloatingMenu.test.js

@@ -3,7 +3,7 @@ import { cleanup, render, waitFor } from '@testing-library/react'
 import { theme, ChakraProvider } from '@chakra-ui/react'
 import { I18nProvider } from '@lingui/react'
 import { i18n } from '@lingui/core'
-import { createMemoryRouter, MemoryRouter, RouterProvider } from 'react-router-dom'
+import { createMemoryRouter, MemoryRouter, RouterProvider } from 'react-router'
 import { fireEvent } from '@testing-library/dom'
 import { MockedProvider } from '@apollo/client/testing'
 import { makeVar } from '@apollo/client'

frontend/src/app/__tests__/FloatingMenuLink.test.js

@@ -3,7 +3,7 @@ import { render, waitFor, fireEvent } from '@testing-library/react'
 import { theme, ChakraProvider } from '@chakra-ui/react'
 import { I18nProvider } from '@lingui/react'
 import { i18n } from '@lingui/core'
-import { createMemoryRouter, MemoryRouter, RouterProvider } from 'react-router-dom'
+import { createMemoryRouter, MemoryRouter, RouterProvider } from 'react-router'
 import { MockedProvider } from '@apollo/client/testing'
 import { makeVar } from '@apollo/client'
 import { FloatingMenuLink } from '../FloatingMenuLink'

frontend/src/app/__tests__/NotificationBanner.test.js

@@ -4,7 +4,7 @@ import { render } from '@testing-library/react'
 import { I18nProvider } from '@lingui/react'
 import { i18n } from '@lingui/core'
 import { MockedProvider } from '@apollo/client/testing'
-import { MemoryRouter } from 'react-router-dom'
+import { MemoryRouter } from 'react-router'
 import { makeVar } from '@apollo/client'
 import { NotificationBanner } from '../NotificationBanner'
 import { UserVarProvider } from '../../utilities/userState'

frontend/src/app/__tests__/PrivatePage.test.js

@@ -1,6 +1,6 @@
 import React from 'react'
 import { render } from '@testing-library/react'
-import { createMemoryRouter, RouterProvider } from 'react-router-dom'
+import { createMemoryRouter, RouterProvider } from 'react-router'
 import { I18nProvider } from '@lingui/react'
 import { i18n } from '@lingui/core'
 import { makeVar } from '@apollo/client'

frontend/src/app/__tests__/ReadGuidancePage.test.js

@@ -1,6 +1,6 @@
 import React from 'react'
 import { theme, ChakraProvider } from '@chakra-ui/react'
-import { MemoryRouter } from 'react-router-dom'
+import { MemoryRouter } from 'react-router'
 import { cleanup, render, waitFor } from '@testing-library/react'
 import { MockedProvider } from '@apollo/client/testing'
 import { I18nProvider } from '@lingui/react'