diff --git a/lib/react/rails/engine.rb b/lib/react/rails/engine.rb index 7af1f8c5..aef68a40 100644 --- a/lib/react/rails/engine.rb +++ b/lib/react/rails/engine.rb @@ -2,7 +2,8 @@ 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 + 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 a5283c22..e372f4af 100644 --- a/lib/react/rails/railtie.rb +++ b/lib/react/rails/railtie.rb @@ -38,10 +38,9 @@ class Railtie < ::Rails::Railtie addons: app.config.react.addons, }) - app.assets.version = [ - app.assets.version, - "react-#{asset_variant.react_build}", - ].compact.join('-') + 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 config.before_initialize do |app|