Skip to content

Commit ba4d010

Browse files
Upgrade to react-router v7 (#94)
1 parent 39972a6 commit ba4d010

File tree

7 files changed

+54
-44
lines changed

7 files changed

+54
-44
lines changed

package-lock.json

+47-37
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"dependencies": {
1717
"@emotion/react": "^11.14.0",
1818
"@emotion/styled": "^11.14.0",
19-
"@gridsuite/commons-ui": "0.89.2",
19+
"@gridsuite/commons-ui": "0.92.1",
2020
"@hookform/resolvers": "^4.0.0",
2121
"@mui/icons-material": "^5.16.14",
2222
"@mui/lab": "5.0.0-alpha.175",
@@ -33,7 +33,7 @@
3333
"react-hook-form": "^7.54.2",
3434
"react-intl": "^7.1.6",
3535
"react-redux": "^9.2.0",
36-
"react-router-dom": "^6.29.0",
36+
"react-router": "^7.4.1",
3737
"redux": "^5.0.1",
3838
"typeface-roboto": "^1.1.13",
3939
"yup": "^1.6.1"

src/components/App/app-top-bar.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import { Groups, ManageAccounts, PeopleAlt } from '@mui/icons-material';
1919
import { fetchAppsMetadata, logout, Metadata, TopBar } from '@gridsuite/commons-ui';
2020
import { useParameterState } from '../parameters';
2121
import { APP_NAME, PARAM_LANGUAGE, PARAM_THEME } from '../../utils/config-params';
22-
import { NavLink, type To, useMatches, useNavigate } from 'react-router-dom';
22+
import { NavLink, type To, useMatches, useNavigate } from 'react-router';
2323
import { useDispatch, useSelector } from 'react-redux';
2424
import { FormattedMessage } from 'react-intl';
2525
import { AppsMetadataSrv, StudySrv } from '../../services';

src/components/App/app.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { createRoot } from 'react-dom/client';
1111
import { act } from 'react-dom/test-utils';
1212
import { IntlProvider } from 'react-intl';
1313
import { Provider } from 'react-redux';
14-
import { createMemoryRouter, Outlet, RouterProvider } from 'react-router-dom';
14+
import { createMemoryRouter, Outlet, RouterProvider } from 'react-router';
1515
import App from './app';
1616
import { store } from '../../redux/store';
1717
import { createTheme, StyledEngineProvider, ThemeProvider } from '@mui/material/styles';

src/routes/ErrorPage.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
import { Grid, Typography } from '@mui/material';
9-
import { isRouteErrorResponse, useRouteError } from 'react-router-dom';
9+
import { isRouteErrorResponse, useRouteError } from 'react-router';
1010
import { ReactElement, useEffect } from 'react';
1111

1212
export default function ErrorPage(): ReactElement {

src/routes/router.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import {
1515
useLocation,
1616
useMatch,
1717
useNavigate,
18-
} from 'react-router-dom';
18+
} from 'react-router';
1919
import { useDispatch, useSelector } from 'react-redux';
2020
import { AppState } from '../redux/reducer';
2121
import { AppsMetadataSrv, UserAdminSrv } from '../services';

src/routes/utils.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
66
*/
77

8-
import { Navigate, RouteObject } from 'react-router-dom';
8+
import { Navigate, RouteObject } from 'react-router';
99
import { Profiles, Users, Groups } from '../pages';
1010
import ErrorPage from './ErrorPage';
1111
import HomePage from './HomePage';

0 commit comments

Comments
 (0)