Merge pull request #260 from shakacode/update-ror-5

Update to 5.0.0.rc.1 of ReactOnRails

Author: justin808

Gemfile

@@ -40,7 +40,7 @@ gem "sdoc", group: :doc
 # Use Rails Html Sanitizer for HTML sanitization
 gem "rails-html-sanitizer"
 
-gem "react_on_rails", "~> 4.0.0"
+gem "react_on_rails", "~> 5.0.0.rc.1"
 
 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
 gem "therubyracer"

Gemfile.lock

@@ -203,7 +203,7 @@ GEM
     rake (10.5.0)
     rdoc (4.2.2)
       json (~> 1.4)
-    react_on_rails (4.0.0)
+    react_on_rails (5.0.0.rc.1)
       connection_pool
       execjs (~> 2.5)
       foreman
@@ -347,7 +347,7 @@ DEPENDENCIES
   rails-html-sanitizer
   rails_12factor
   rainbow
-  react_on_rails (~> 4.0.0)
+  react_on_rails (~> 5.0.0.rc.1)
   rspec-rails
   rspec-retry
   rubocop

client/app/bundles/comments/startup/ServerRouterApp.jsx

@@ -5,12 +5,13 @@ import { match, RouterContext } from 'react-router';
 import createStore from '../store/commentsStore';
 import routes from '../routes/routes';
 
-export default (props, location) => {
+export default (props, railsContext) => {
   const store = createStore(props);
 
   let error;
   let redirectLocation;
   let routeProps;
+  const location = { railsContext };
 
   // See https://github.com/reactjs/react-router/blob/master/docs/guides/ServerRendering.md
   match({ routes, location }, (_error, _redirectLocation, _routeProps) => {

client/npm-shrinkwrap.json

@@ -70,7 +70,7 @@
     "react-addons-pure-render-mixin": "^0.14.7",
     "react-bootstrap": "^0.28.3",
     "react-dom": "^0.14.7",
-    "react-on-rails": "^4.0.0",
+    "react-on-rails": "^5.0.0-rc.1",
     "react-redux": "^4.4.0",
     "react-router": "^2.0.0",
     "react-router-redux": "^4.0.0",
@@ -81,7 +81,7 @@
     "sass-loader": "^3.1.2",
     "sass-resources-loader": "1.0.2",
     "style-loader": "^0.13.0",
-    "turbolinks": "0.0.2",
+    "turbolinks": "^5.0.0-beta3",
     "url-loader": "^0.5.7",
     "webpack": "^1.12.14"
   },

client/package.json

@@ -39,8 +39,7 @@
   },
   "homepage": "https://github.com/shakacode/react-webpack-rails-tutorial",
   "dependencies": {
-    "babel-polyfill": "^6.6.1",
-    "estraverse": "^4.1.1",
-    "estraverse-fb": "^1.3.1"
+  },
+  "devDependencies": {
   }
 }