Merge pull request #31 from CodingZeal/updating-react-router

Update to React Router beta

Author: bmatto

app/templates/client/index.js

@@ -2,7 +2,7 @@ import 'babel-polyfill'
 import React from 'react'
 import ReactDOM from 'react-dom'
 import { ApolloProvider } from 'react-apollo'
-import { BrowserRouter } from 'react-router'
+import { BrowserRouter } from 'react-router-dom'
 import { ThemeProvider } from 'react-css-themr'
 
 import './styles/commons.scss'

app/templates/client/modules/app/components/App/index.js

@@ -1,5 +1,5 @@
 import React from 'react'
-import { Match, Miss } from 'react-router'
+import { Switch, Route } from 'react-router-dom'
 import { themr } from 'react-css-themr'
 
 import appTheme from './theme.scss'
@@ -13,8 +13,10 @@ export function App({ theme }) {
         <h4>Welcome!</h4>
       </div>
 
-      <Match exactly pattern='/' component={Home} />
-      <Miss component={NotFound} />
+      <Switch>
+        <Route exact pattern='/' component={Home} />
+        <Route component={NotFound} />
+      </Switch>
     </div>
   )
 }

app/templates/package.json

@@ -26,7 +26,7 @@
     "react-css-themr": "^1.6.1",
     "react-dom": "^15.4.1",
     "react-redux": "^5.0.2",
-    "react-router": "^4.0.0-alpha.6",
+    "react-router-dom": "^4.0.0-beta.6",
     "react-toolbox": "^1.3.1",
     "redux": "^3.6.0",
     "redux-devtools-extension": "^1.0.0",