Merge pull request #158 from remarkablemark/master

Update example app

example/Readme.md

@@ -5,7 +5,7 @@ This movie catalog app illustrates the usage of react-engine to build and run an
 * [express - 4.x](https://github.com/strongloop/express) on the server side
 * [react-engine - 3.x](https://github.com/paypal/react-engine) as the express view render engine
 * [react - 0.14.x](https://github.com/facebook/react) for building the UI
-* [react-router - 1.x](https://github.com/rackt/react-router) for UI routing
+* [react-router - 2.x](https://github.com/rackt/react-router) for UI routing
 * [webpack - 1.x](https://github.com/webpack/webpack) as the client side module loader
 * [babel - 6.x](https://github.com/babel/babel) for compiling the ES6/JSX code
 
@@ -26,8 +26,8 @@ $ open http://localhost:3000
   # (fill out the needed information like name, author, etc..)
   $ npm init
 
-  # install express, react, react-router (+ history, its dependency) & react-engine
-  $ npm install express react-engine react react-router history --save
+  # install express, react, react-router (optional) & react-engine
+  $ npm install express react-engine react@0.14 react-router --save
 
   # install the rest of the dependencies
   $ npm install babel-register babel-preset-react webpack --save

example/package.json

@@ -13,11 +13,10 @@
     "babel-preset-react": "^6.3.13",
     "babel-register": "^6.3.13",
     "express": "^4.13.3",
-    "history": "^1.17.0",
     "json-loader": "^0.5.4",
     "react": "^0.14.3",
     "react-engine": "^3.0.0",
-    "react-router": "^1.0.3",
+    "react-router": "^2.4.0",
     "serve-favicon": "^2.3.0",
     "webpack": "^1.12.9"
   }

example/public/routes.jsx

@@ -16,14 +16,15 @@
 'use strict';
 
 import React from 'react';
-import { Router, Route, IndexRoute, Redirect } from 'react-router';
+import { Router, Route, IndexRoute, Redirect, browserHistory } from 'react-router';
 
 import Layout from './views/layout.jsx';
 import ListPage from './views/list.jsx';
 import DetailPage from './views/detail.jsx';
+import Error404 from './views/404.jsx';
 
-var routes = module.exports = (
-  <Router>
+module.exports = (
+  <Router history={browserHistory}>
     <Route path='/' component={Layout}>
       <IndexRoute component={ListPage} />
       <Route path='/movie/:id' component={DetailPage} />