Skip to content

We need this as well for proper 0.14 server support. #118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 14, 2015
Merged

We need this as well for proper 0.14 server support. #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1dd2aa4
We need this as well for proper 0.14 server support.
Oct 10, 2015
b7bcdc9
Update README.md
justin808 Oct 11, 2015
fd785cd
Bump react_on_rails gem to 1.0.0.pre
dylangrafmyre Oct 13, 2015
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -353,7 +353,7 @@ DEPENDENCIES
rails-html-sanitizer
rails_12factor
rainbow
react_on_rails (~> 0.1.8)
react_on_rails (~> 1.0.0.pre)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's something wrong with this PR, as this is already on master:

https://github.com/shakacode/react-webpack-rails-tutorial/blob/master/Gemfile.lock#L356

@rstudner Any ideas?
rspec-rails
rubocop
ruby-lint
Expand Down
5 changes: 3 additions & 2 deletions client/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions client/webpack.server.rails.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'},
],
},
};