diff --git a/Gemfile b/Gemfile index 767645be0..95c2f8cb9 100644 --- a/Gemfile +++ b/Gemfile @@ -39,7 +39,7 @@ gem "rails-html-sanitizer" # Use Unicorn as the app server gem "unicorn" -gem "react_on_rails", "~> 0.1.8" +gem "react_on_rails", "~> 1.0.0.pre" gem "therubyracer" gem "autoprefixer-rails" diff --git a/Gemfile.lock b/Gemfile.lock index acaf810ff..1f790b1c2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -207,7 +207,7 @@ GEM raindrops (0.15.0) rake (10.4.2) rdoc (4.2.0) - react_on_rails (0.1.8) + react_on_rails (1.0.0.pre) connection_pool execjs (~> 2.5) rails (>= 4.0) @@ -353,7 +353,7 @@ DEPENDENCIES rails-html-sanitizer rails_12factor rainbow - react_on_rails (~> 0.1.8) + react_on_rails (~> 1.0.0.pre) rspec-rails rubocop ruby-lint diff --git a/client/README.md b/client/README.md index 64dabdac6..10b5460fa 100644 --- a/client/README.md +++ b/client/README.md @@ -39,9 +39,10 @@ Updating Node Dependencies npm install -g npm-check-updates ``` - +Then run this to update the dependencies (starting at the top level). + ``` -# Make sure you are in the `client` directory, then run: +# Make sure you are in the top directory, then run: cd client rm npm-shrinkwrap.json npm-check-updates -u diff --git a/client/webpack.server.rails.config.js b/client/webpack.server.rails.config.js index 5d23c808a..d78856b8f 100644 --- a/client/webpack.server.rails.config.js +++ b/client/webpack.server.rails.config.js @@ -27,6 +27,7 @@ module.exports = { // React is necessary for the client rendering: {test: require.resolve('react'), loader: 'expose?React'}, + {test: require.resolve('react-dom/server'), loader: 'expose?ReactDOMServer'}, ], }, };