From 8cc0e7cf9669169e3edc4154a04d6318c0acc5b9 Mon Sep 17 00:00:00 2001
From: Vipul A M <vipulnsward@gmail.com>
Date: Sat, 18 Jul 2015 12:36:54 +0530
Subject: [PATCH 1/3] - Assets version and register_engine have been moved from
 app.assets to app.config.assets on sprockets - Added a check to make sure to
 use proper asset object when calling version, register_engine, etc

---
 lib/react/rails/engine.rb  |  6 +++++-
 lib/react/rails/railtie.rb | 10 ++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/lib/react/rails/engine.rb b/lib/react/rails/engine.rb
index 7af1f8c54..edfbd7a57 100644
--- a/lib/react/rails/engine.rb
+++ b/lib/react/rails/engine.rb
@@ -2,7 +2,11 @@ module React
   module Rails
     class Engine < ::Rails::Engine
       initializer "react_rails.setup_engine", :group => :all do |app|
-        app.assets.register_engine '.jsx', React::JSX::Template
+        if app.assets.nil?
+         app.config.assets.register_engine '.jsx', React::JSX::Template
+        else
+          app.assets.register_engine '.jsx', React::JSX::Template
+        end
       end
     end
   end
diff --git a/lib/react/rails/railtie.rb b/lib/react/rails/railtie.rb
index a5283c22a..ad3dd55f3 100644
--- a/lib/react/rails/railtie.rb
+++ b/lib/react/rails/railtie.rb
@@ -38,10 +38,12 @@ class Railtie < ::Rails::Railtie
           addons: app.config.react.addons,
         })
 
-        app.assets.version = [
-          app.assets.version,
-          "react-#{asset_variant.react_build}",
-        ].compact.join('-')
+        if app.assets.nil?
+          app.config.assets.version = [app.config.assets.version, "react-#{asset_variant.react_build}",].compact.join('-')
+        else
+          app.assets.version = [app.assets.version, "react-#{asset_variant.react_build}",].compact.join('-')
+        end
+
       end
 
       config.before_initialize do |app|

From f88c3e9598ef5f44bb91f33fcc67096ef8c1a5d9 Mon Sep 17 00:00:00 2001
From: Vipul A M <vipulnsward@gmail.com>
Date: Sat, 18 Jul 2015 15:01:47 +0530
Subject: [PATCH 2/3] - Use Sprockets.register_engine if we are on latest
 master

---
 lib/react/rails/engine.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/react/rails/engine.rb b/lib/react/rails/engine.rb
index edfbd7a57..7a62f5d2a 100644
--- a/lib/react/rails/engine.rb
+++ b/lib/react/rails/engine.rb
@@ -3,7 +3,7 @@ module Rails
     class Engine < ::Rails::Engine
       initializer "react_rails.setup_engine", :group => :all do |app|
         if app.assets.nil?
-         app.config.assets.register_engine '.jsx', React::JSX::Template
+          Sprockets.register_engine  '.jsx', React::JSX::Template
         else
           app.assets.register_engine '.jsx', React::JSX::Template
         end

From 9133f8053360b87692a14183d921815e62fcdf83 Mon Sep 17 00:00:00 2001
From: Vipul A M <vipulnsward@gmail.com>
Date: Thu, 23 Jul 2015 18:47:04 +0530
Subject: [PATCH 3/3] - DRY up setting of Sprockets config

---
 lib/react/rails/engine.rb  | 7 ++-----
 lib/react/rails/railtie.rb | 7 ++-----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/lib/react/rails/engine.rb b/lib/react/rails/engine.rb
index 7a62f5d2a..aef68a40c 100644
--- a/lib/react/rails/engine.rb
+++ b/lib/react/rails/engine.rb
@@ -2,11 +2,8 @@ module React
   module Rails
     class Engine < ::Rails::Engine
       initializer "react_rails.setup_engine", :group => :all do |app|
-        if app.assets.nil?
-          Sprockets.register_engine  '.jsx', React::JSX::Template
-        else
-          app.assets.register_engine '.jsx', React::JSX::Template
-        end
+        sprockets_env = app.assets || Sprockets # Sprockets 3.x expects this in a different place
+        sprockets_env.register_engine(".jsx", React::JSX::Template)
       end
     end
   end
diff --git a/lib/react/rails/railtie.rb b/lib/react/rails/railtie.rb
index ad3dd55f3..e372f4af3 100644
--- a/lib/react/rails/railtie.rb
+++ b/lib/react/rails/railtie.rb
@@ -38,11 +38,8 @@ class Railtie < ::Rails::Railtie
           addons: app.config.react.addons,
         })
 
-        if app.assets.nil?
-          app.config.assets.version = [app.config.assets.version, "react-#{asset_variant.react_build}",].compact.join('-')
-        else
-          app.assets.version = [app.assets.version, "react-#{asset_variant.react_build}",].compact.join('-')
-        end
+        sprockets_env = app.assets || app.config.assets # sprockets-rails 3.x attaches this at a different config
+        sprockets_env.version = [sprockets_env.version, "react-#{asset_variant.react_build}",].compact.join('-')
 
       end