From e8ae27ffa8fdddcafc50cac62f713716dac1d2ae Mon Sep 17 00:00:00 2001 From: Alf Eaton <eaton.alf@gmail.com> Date: Thu, 19 Oct 2017 10:14:30 +0100 Subject: [PATCH] Upgrade to react-router v4 * Import from react-router-dom * Use withRouter * Remove react-router-redux * Replace AuthenticatedPage with PrivateRoute --- package.json | 2 +- src/molecules/AppBar.js | 2 +- test/AppBar.test.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 6d247574f..6528d9157 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "react-dom": "^15.6.1", "react-feather": "^1.0.7", "react-redux": "^5.0.2", - "react-router": "^3.0.5", + "react-router-dom": "^4.2.2", "react-tag-autocomplete": "^5.4.1", "recompose": "^0.25.0", "redux": "^3.6.0", diff --git a/src/molecules/AppBar.js b/src/molecules/AppBar.js index 5373dcbe4..4af63917e 100644 --- a/src/molecules/AppBar.js +++ b/src/molecules/AppBar.js @@ -1,5 +1,5 @@ import React from 'react' -import { Link } from 'react-router' +import { Link } from 'react-router-dom' import classnames from 'classnames' import classes from './AppBar.local.scss' import Icon from '../atoms/Icon' diff --git a/test/AppBar.test.js b/test/AppBar.test.js index cefb04773..ce92d01be 100644 --- a/test/AppBar.test.js +++ b/test/AppBar.test.js @@ -1,7 +1,7 @@ import React from 'react' import { clone } from 'lodash' import { shallow } from 'enzyme' -import { Link } from 'react-router' +import { Link } from 'react-router-dom' import renderer from 'react-test-renderer' import AppBar from '../src/molecules/AppBar' -- GitLab