feat(demo16): update react-router of demo16 to v2.x

feibenren · May 17, 2016 · bbfeb2d · bbfeb2d
1 parent da87bd6
commit bbfeb2d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/demo16/index.html b/demo16/index.html
@@ -1,5 +1,6 @@
 <html>
   <body>
+    <div id="app"></div>
     <script src="/bundle.js"></script>
   </body>
 </htmL>
diff --git a/demo16/index.js b/demo16/index.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import { render } from 'react-dom';
-import { Router, Route, Link, IndexRoute } from 'react-router';
-import createBrowserHistory from 'history/lib/createBrowserHistory';
+import { Router, Route, Link, IndexRoute, browserHistory } from 'react-router';
 
 require('./app.css');
 
@@ -53,10 +52,8 @@ var Calendar = React.createClass({
   }
 });
 
-let history = createBrowserHistory();
-
 render((
-  <Router history={history}>
+  <Router history={browserHistory}>
     <Route path="/" component={App}>
       <IndexRoute component={Dashboard}/>
       <Route path="app" component={Dashboard}/>
@@ -65,4 +62,4 @@ render((
       <Route path="*" component={Dashboard}/>
     </Route>
   </Router>
-), document.body);
+), document.querySelector('#app'));
diff --git a/package.json b/package.json
@@ -25,7 +25,7 @@
     "open-browser-webpack-plugin": "0.0.1",
     "react": "~0.14.2",
     "react-dom": "~0.14.2",
-    "react-router": "^1.0.3",
+    "react-router": "2.x",
     "style-loader": "~0.12.3",
     "url-loader": "~0.5.6",
     "webpack": "~1.11.0",