Skip to content
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

Upgrade ReactOnRails to 11.0.3 #438

Merged
merged 1 commit into from
Apr 25, 2018
Merged

Upgrade ReactOnRails to 11.0.3 #438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

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
@@ -1,7 +1,7 @@
source "https://rubygems.org"
ruby "2.4.1"

gem "react_on_rails", "10.0.2"
gem "react_on_rails", "11.0.3"
gem "webpacker"

# Bundle edge Rails instead: gem "rails", github: "rails/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 @@ -218,7 +218,7 @@ GEM
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
rdoc (4.3.0)
react_on_rails (10.0.2)
react_on_rails (11.0.3)
addressable
connection_pool
execjs (~> 2.5)
Expand Down Expand Up @@ -358,7 +358,7 @@ DEPENDENCIES
rails-html-sanitizer
rails_best_practices
rainbow
react_on_rails (= 10.0.2)
react_on_rails (= 11.0.3)
redis (= 3.3.3)
rspec-rails (= 3.6.1)
rspec-retry
Expand Down
4 changes: 2 additions & 2 deletions client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "Code from the React Webpack tutorial.",
"main": "server-express.js",
"engines": {
"node": "^7.8.0 || ^8.0.0 || ^9.2.0",
"node": "^7.8.0 || ^8.0.0 || ^9.2.0 || ^10.0.0",
"npm": "^4.4.4 || ^5.0.0",
"yarn": "^1.0.0"
},
Expand Down Expand Up @@ -82,7 +82,7 @@
"react-bootstrap": "^0.31.5",
"react-dom": "^16.1.1",
"react-intl": "^2.4.0",
"react-on-rails": "^10.0.2",
"react-on-rails": "11.0.3",
"react-redux": "^5.0.6",
"react-router": "^4.2.0",
"react-router-dom": "^4.2.2",
Expand Down
6 changes: 3 additions & 3 deletions client/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5294,9 +5294,9 @@ react-intl@^2.4.0:
intl-relativeformat "^2.0.0"
invariant "^2.1.1"

react-on-rails@^10.0.2:
version "10.0.2"
resolved "https://registry.yarnpkg.com/react-on-rails/-/react-on-rails-10.0.2.tgz#4d17b9e1df403ad3ff013f36654957051761c35a"
react-on-rails@11.0.3:
version "11.0.3"
resolved "https://registry.yarnpkg.com/react-on-rails/-/react-on-rails-11.0.3.tgz#0aa15eea0a3b4db1e85e75473afee06cb8a75981"

react-overlays@^0.7.4:
version "0.7.4"
Expand Down
3 changes: 0 additions & 3 deletions config/initializers/react_on_rails.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,6 @@
# called `custom_context(view_context)` and return a Hash.
config.rendering_extension = nil

# The server render method - either ExecJS or NodeJS
config.server_render_method = "ExecJS"

# Client js uses assets not digested by rails.
# For any asset matching this regex, non-digested symlink will be created
# To disable symlinks set this parameter to nil.
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "ShakaCode's example of React on Rails plus React Native",
"main": "server-express.js",
"engines": {
"node": "^7.8.0 || ^8.0.0 || ^9.2.0",
"node": "^7.8.0 || ^8.0.0 || ^9.2.0 || ^10.0.0",
"npm": "^4.4.4 || ^5.0.0",
"yarn": "^1.0.0"
},
Expand Down