Merge pull request #2011 from GSA/1987-update-router-v7

1987 update router v7

benefit-finder/package.json

@@ -37,8 +37,7 @@
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-modal": "^3.16.1",
-    "react-router": "^6.26.2",
-    "react-router-dom": "^6.26.2"
+    "react-router": "^7.0.2"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.25.3",

benefit-finder/src/App/index.jsx

@@ -1,5 +1,5 @@
 import { useState, createContext, useEffect, useMemo } from 'react'
-import { BrowserRouter, Routes, Route } from 'react-router-dom'
+import { BrowserRouter, Routes, Route } from 'react-router'
 import { version } from '../../package.json'
 import { useResetElement } from '@hooks'
 import * as apiCalls from '@api/apiCalls'

benefit-finder/src/Routes/Intro/__tests__/index.spec.jsx

@@ -1,5 +1,5 @@
 import { render } from '@testing-library/react'
-import { BrowserRouter } from 'react-router-dom'
+import { BrowserRouter } from 'react-router'
 import Intro from '../index.jsx'
 import * as en from '@locales/en/en.json'
 import content from '@api/mock-data/current.js'

benefit-finder/src/Routes/Intro/index.jsx

@@ -1,5 +1,5 @@
 import { useEffect, useContext } from 'react'
-import { useNavigate, useLocation } from 'react-router-dom'
+import { useNavigate, useLocation } from 'react-router'
 import { RouteContext } from '@/App'
 import { dataLayerUtils } from '@utils'
 import { useResetElement } from '@hooks'

benefit-finder/src/Routes/LifeEventSection/__tests__/index.spec.jsx

@@ -1,5 +1,5 @@
 import { render, screen } from '@testing-library/react'
-import { BrowserRouter } from 'react-router-dom'
+import { BrowserRouter } from 'react-router'
 import { RouteContext } from '@/App'
 import { cleanString } from '@utils'
 import LifeEventSection from '../index.jsx'

benefit-finder/src/Routes/LifeEventSection/index.jsx

@@ -1,6 +1,6 @@
 import { useState, useEffect, useRef, useContext, Fragment } from 'react'
 import { RouteContext } from '@/App'
-import { useNavigate, useLocation } from 'react-router-dom'
+import { useNavigate, useLocation } from 'react-router'
 import PropTypes from 'prop-types'
 import {
   dateInputValidation,

benefit-finder/src/Routes/ResultsView/__tests__/index.spec.jsx

@@ -1,5 +1,5 @@
 import { render, screen } from '@testing-library/react'
-import { BrowserRouter } from 'react-router-dom'
+import { BrowserRouter } from 'react-router'
 import ResultsView from '../index.jsx'
 import * as apiCalls from '@api/apiCalls.js'
 import * as en from '@locales/en/en.json'

benefit-finder/src/Routes/ResultsView/components/Results/__tests__/index.spec.jsx

@@ -1,5 +1,5 @@
 import { render } from '@testing-library/react'
-import { BrowserRouter } from 'react-router-dom'
+import { BrowserRouter } from 'react-router'
 import Results from '../index.jsx'
 import * as en from '@locales/en/en.json'
 

benefit-finder/src/Routes/ResultsView/components/Results/index.jsx

@@ -1,7 +1,7 @@
 import { useContext } from 'react'
 import PropTypes from 'prop-types'
 import { RouteContext } from '@/App'
-import { useNavigate } from 'react-router-dom'
+import { useNavigate } from 'react-router'
 import {
   BenefitAccordionGroup,
   Button,

benefit-finder/src/Routes/ResultsView/components/blocks/ZeroBenefitsHeading/__tests__/index.spec.jsx

@@ -1,5 +1,5 @@
 import { render } from '@testing-library/react'
-import { BrowserRouter } from 'react-router-dom'
+import { BrowserRouter } from 'react-router'
 import ZeroBenefitsHeading from '../index.jsx'
 import * as en from '@locales/en/en.json'
 const { resultsView } = en

benefit-finder/src/Routes/ResultsView/components/blocks/ZeroBenefitsHeading/index.jsx

@@ -1,7 +1,7 @@
 import PropTypes from 'prop-types'
 import { useContext } from 'react'
 import { RouteContext } from '@/App'
-import { useNavigate } from 'react-router-dom'
+import { useNavigate } from 'react-router'
 import { Button, Heading, StepBackButton } from '@components'
 import { createMarkup } from '@utils'
 

benefit-finder/src/Routes/VerifySelectionsView/__tests__/index.spec.jsx

@@ -1,5 +1,5 @@
 import { render } from '@testing-library/react'
-import { BrowserRouter } from 'react-router-dom'
+import { BrowserRouter } from 'react-router'
 import VerifySelectionsView from '../index.jsx'
 import * as en from '@locales/en/en.json'
 

benefit-finder/src/shared/components/RelativeBenefitList/__tests__/index.spec.jsx

@@ -32,7 +32,6 @@ describe('RelativeBenefitList', () => {
     expect(links[0].href).toContain(relativeBenefits[0].lifeEvent.lifeEventId)
     expect(links[1].href).toContain(relativeBenefits[1].lifeEvent.lifeEventId)
     // ensure the icons that contain values from the lifeEventId are in the dom
-    console.log(relativeBenefits[0].lifeEvent.lifeEventId)
     expect(
       screen.getByTestId(
         `benefit-finder-icon--${relativeBenefits[0].lifeEvent.lifeEventId}`

benefit-finder/src/shared/components/StepIndicator/__tests__/index.spec.jsx

@@ -1,5 +1,5 @@
 import { render } from '@testing-library/react'
-import { BrowserRouter } from 'react-router-dom'
+import { BrowserRouter } from 'react-router'
 import StepIndicator from '../index.jsx'
 import content from '@api/mock-data/current.js'
 // import * as en from '@locales/en/en.json'