Merge branch 'master' of https://github.com/ReactMaker/simple_react_start_kit_2017

Author: bbandydd

README.md

@@ -5,7 +5,7 @@
 ## 特色
 
 * [react](https://github.com/facebook/react)
-* [react-router 3](https://github.com/rackt/react-router)
+* [react-router 4](https://reacttraining.com/react-router/web/example/basic)
 * [webpack 2](https://github.com/webpack/webpack)
 * [babel stage-0 ](https://github.com/babel/babel)
 * [eslint](http://eslint.org)

package.json

@@ -30,13 +30,14 @@
     "less": "^2.7.1",
     "less-loader": "^2.2.3",
     "node-sass": "^4.5.3",
+    "normalize.css": "^7.0.0",
     "null-loader": "^0.1.1",
     "postcss": "^5.0.21",
     "postcss-loader": "^1.3.3",
     "react": "^15.0.1",
     "react-dom": "^15.0.1",
     "react-hot-loader": "^3.0.0-beta.6",
-    "react-router": "^3.0.2",
+    "react-router-dom": "4.1.2",
     "sass-loader": "^6.0.6",
     "style-loader": "^0.13.1",
     "url-loader": "^0.5.7",

src/containers/index.js

@@ -1,16 +1,18 @@
 import React from 'react';
 // import package
-import { Router, Route, hashHistory } from 'react-router';
+import { HashRouter as Router, Route, Switch } from 'react-router-dom';
+import 'normalize.css/normalize.css';
+
 // import relative path
 import Home from './Home';
 import NotFound from './NotFound';
 
-// add router key to fix this issue
-// https://github.com/reactjs/react-router-redux/issues/179#issuecomment-275576250
 const Main = () => (
-  <Router key={Math.random()} history={hashHistory}>
-    <Route path="/" component={Home} />
-    <Route path="*" component={NotFound} />
+  <Router>
+    <Switch>
+      <Route exact path="/" component={Home} />
+      <Route component={NotFound} />
+    </Switch>
   </Router>
 );