Skip to content

Commit 8cc0e7c

Browse files
committed
- 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
1 parent 4dffbf9 commit 8cc0e7c

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

lib/react/rails/engine.rb

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@ module React
22
module Rails
33
class Engine < ::Rails::Engine
44
initializer "react_rails.setup_engine", :group => :all do |app|
5-
app.assets.register_engine '.jsx', React::JSX::Template
5+
if app.assets.nil?
6+
app.config.assets.register_engine '.jsx', React::JSX::Template
7+
else
8+
app.assets.register_engine '.jsx', React::JSX::Template
9+
end
610
end
711
end
812
end

lib/react/rails/railtie.rb

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,12 @@ class Railtie < ::Rails::Railtie
3838
addons: app.config.react.addons,
3939
})
4040

41-
app.assets.version = [
42-
app.assets.version,
43-
"react-#{asset_variant.react_build}",
44-
].compact.join('-')
41+
if app.assets.nil?
42+
app.config.assets.version = [app.config.assets.version, "react-#{asset_variant.react_build}",].compact.join('-')
43+
else
44+
app.assets.version = [app.assets.version, "react-#{asset_variant.react_build}",].compact.join('-')
45+
end
46+
4547
end
4648

4749
config.before_initialize do |app|

0 commit comments

Comments
 (0)