Skip to content

Commit cc44024

Browse files
author
Sascha Pfeiffer
committed
upgraded react router
Signed-off-by: Sascha Pfeiffer <sascha.pfeiffer@psono.com>
1 parent e72cf18 commit cc44024

File tree

5 files changed

+60
-37
lines changed

5 files changed

+60
-37
lines changed

package-lock.json

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

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"react-moment": "^0.9.2",
4444
"react-popper": "^0.10.4",
4545
"react-redux": "^7.1.3",
46-
"react-router-dom": "^4.3.1",
46+
"react-router-dom": "^5.1.2",
4747
"react-scripts": "^3.4.1",
4848
"react-spinners": "^0.8.0",
4949
"react-swipeable-views": "^0.12.13",

src/components/Header/Header.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react';
2-
import matchPath from 'react-router/matchPath';
2+
import { matchPath } from 'react-router-dom';
33
import PropTypes from 'prop-types';
44
import { Menu } from '@material-ui/icons';
55
import {

src/containers/App.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { HashLoader } from 'react-spinners';
55
import { createBrowserHistory } from 'history';
66
import { withStyles } from '@material-ui/core';
77
import { Router, Route, Switch } from 'react-router-dom';
8-
import matchPath from 'react-router/matchPath';
8+
import { matchPath } from 'react-router-dom';
99
import { compose } from 'redux';
1010

1111
import store from '../services/store';

src/containers/Index/SwitchRoutes.jsx

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import React from 'react';
22
import PropTypes from 'prop-types';
33
import { withStyles } from '@material-ui/core';
4-
import { Switch, Route, Redirect } from 'react-router-dom';
5-
import matchPath from 'react-router/matchPath';
4+
import { Switch, Route, Redirect, matchPath } from 'react-router-dom';
65
import sidebarRoutes from '../../routes/sidebar';
76
import ldapRoutes from '../../routes/ldap';
87
import samlRoutes from '../../routes/saml';

0 commit comments

Comments
 (0)