From 8ae203b3a50e0d14ef4c3849014440dab464c6b3 Mon Sep 17 00:00:00 2001
From: Judah Meek <judah.meek@gmail.com>
Date: Tue, 24 Apr 2018 21:52:37 -0500
Subject: [PATCH] upgrade ReactOnRails to 11.0.3

---
 Gemfile                               | 2 +-
 Gemfile.lock                          | 4 ++--
 client/package.json                   | 4 ++--
 client/yarn.lock                      | 6 +++---
 config/initializers/react_on_rails.rb | 3 ---
 package.json                          | 2 +-
 6 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/Gemfile b/Gemfile
index 96e197b82..0ad0c8691 100644
--- a/Gemfile
+++ b/Gemfile
@@ -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"
diff --git a/Gemfile.lock b/Gemfile.lock
index 2e4b5dead..7353fbcc8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -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)
@@ -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
diff --git a/client/package.json b/client/package.json
index b53ed402d..bbb42a610 100644
--- a/client/package.json
+++ b/client/package.json
@@ -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"
   },
@@ -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",
diff --git a/client/yarn.lock b/client/yarn.lock
index 55e732f2f..52807de73 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -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"
diff --git a/config/initializers/react_on_rails.rb b/config/initializers/react_on_rails.rb
index 8e986ca8d..5609d2a98 100644
--- a/config/initializers/react_on_rails.rb
+++ b/config/initializers/react_on_rails.rb
@@ -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.
diff --git a/package.json b/package.json
index c2fc86986..2806db30c 100644
--- a/package.json
+++ b/package.json
@@ -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"
   },