Import from react-router-dom instead of react-router

server/index.js

@@ -25,7 +25,7 @@ const qs = require('qs');
 const url = require('url');
 const _ = require('lodash');
 const React = require('react');
-const { createServerRenderContext } = require('react-router');
+const { createServerRenderContext } = require('react-router-dom');
 const sagaEffects = require('redux-saga/effects');
 const auth = require('./auth');
 const sdk = require('./fakeSDK');

src/Routes.js

@@ -1,5 +1,5 @@
 import React, { PropTypes } from 'react';
-import { Miss } from 'react-router';
+import { Miss } from 'react-router-dom';
 import { RouterProvider, RoutesProvider } from './components';
 import { NotFoundPage, MatchWithSubRoutes } from './containers';
 import { flattenRoutes } from './routesConfiguration';

src/app.js

@@ -1,7 +1,7 @@
 import React, { PropTypes } from 'react';
 import ReactDOMServer from 'react-dom/server';
 import Helmet from 'react-helmet';
-import { BrowserRouter, ServerRouter } from 'react-router';
+import { BrowserRouter, ServerRouter } from 'react-router-dom';
 import { Provider } from 'react-redux';
 import { IntlProvider, addLocaleData } from 'react-intl';
 import en from 'react-intl/locale-data/en';

src/app.test.js

@@ -2,7 +2,7 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import ReactDOMServer from 'react-dom/server';
 import { forEach } from 'lodash';
-import { createServerRenderContext } from 'react-router';
+import { createServerRenderContext } from 'react-router-dom';
 import { ClientApp, ServerApp } from './app';
 import configureStore from './store';
 

src/components/NamedLink/NamedLink.js

@@ -4,7 +4,7 @@
  * (Helps to narrow down the scope of possible format changes to routes.)
  */
 import React, { PropTypes } from 'react';
-import { Link } from 'react-router';
+import { Link } from 'react-router-dom';
 import { pathByRouteName } from '../../routesConfiguration';
 
 const NamedLink = (props, context) => {

src/components/NamedRedirect/NamedRedirect.js

@@ -4,7 +4,7 @@
  * (Helps to narrow down the scope of possible format changes to routes.)
  */
 import React, { PropTypes } from 'react';
-import { Redirect } from 'react-router';
+import { Redirect } from 'react-router-dom';
 import { pathByRouteName } from '../../routesConfiguration';
 
 const NamedRedirect = (props, context) => {

src/containers/AuthenticationPage/AuthenticationPage.js

@@ -1,6 +1,6 @@
 import React, { PropTypes } from 'react';
 import { connect } from 'react-redux';
-import { Link, Redirect } from 'react-router';
+import { Link, Redirect } from 'react-router-dom';
 import { PageLayout } from '../../components';
 import { LoginForm, SignUpForm } from '../../containers';
 import { login } from '../../ducks/Auth.ducks';

src/containers/InboxPage/InboxPage.js

@@ -1,5 +1,5 @@
 import React, { PropTypes } from 'react';
-import { Link } from 'react-router';
+import { Link } from 'react-router-dom';
 import { PageLayout } from '../../components';
 
 const toPath = (filter, id) => {

src/containers/ListingPage/ListingPage.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Link } from 'react-router';
+import { Link } from 'react-router-dom';
 import { NamedLink, PageLayout } from '../../components';
 import css from './ListingPage.css';
 

src/containers/ManageListingsPage/ManageListingsPage.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Link } from 'react-router';
+import { Link } from 'react-router-dom';
 import { PageLayout } from '../../components';
 
 export default () => (

src/containers/MatchWithSubRoutes/MatchWithSubRoutes.js

@@ -1,6 +1,6 @@
 import React, { PropTypes } from 'react';
 import { connect } from 'react-redux';
-import { Match, Redirect } from 'react-router';
+import { Match, Redirect } from 'react-router-dom';
 import routesConfiguration, { pathByRouteName } from '../../routesConfiguration';
 
 // wrap `Match` and use this everywhere instead, then when

src/containers/NotFoundPage/NotFoundPage.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Link } from 'react-router';
+import { Link } from 'react-router-dom';
 import { PageLayout } from '../../components';
 
 export default () => (

src/containers/SalesConversationPage/SalesConversationPage.js

@@ -1,6 +1,6 @@
 /* eslint-disable react/no-unescaped-entities */
 import React, { PropTypes } from 'react';
-import { Link } from 'react-router';
+import { Link } from 'react-router-dom';
 import { PageLayout } from '../../components';
 
 const SalesConversationPage = props => {

src/containers/StyleguidePage/StyleguidePage.js

@@ -1,5 +1,5 @@
 import React, { PropTypes } from 'react';
-import { Link } from 'react-router';
+import { Link } from 'react-router-dom';
 import { map, size } from 'lodash';
 import * as allExamples from '../../examples';
 

src/containers/Topbar/Topbar.js

@@ -1,6 +1,6 @@
 import React, { PropTypes } from 'react';
 import { connect } from 'react-redux';
-import { Link } from 'react-router';
+import { Link } from 'react-router-dom';
 import { logout } from '../../ducks/Auth.ducks';
 
 import css from './Topbar.css';

src/routesConfiguration.js

@@ -1,9 +1,9 @@
 import React from 'react';
 import { find } from 'lodash';
-import { Redirect } from 'react-router';
+import { Redirect } from 'react-router-dom';
 
 // This will change to `matchPath` soonish
-import matchPattern from 'react-router/matchPattern';
+import matchPattern from 'react-router-dom/matchPattern';
 
 import pathToRegexp from 'path-to-regexp';
 import {

src/util/test-helpers.js

@@ -3,7 +3,7 @@ import renderer from 'react-test-renderer';
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
 import { IntlProvider } from 'react-intl';
-import { BrowserRouter } from 'react-router';
+import { BrowserRouter } from 'react-router-dom';
 import { Provider } from 'react-redux';
 import configureStore from '../store';