Skip to content

Commit 371e293

Browse files
committed
Reposition asset path build
The standard config/initializers are only run after `railtie#before_initialize`, but we have to build the asset paths before `railtie#after_initialize` since at that point Sprockets has already frozen the asset paths. This PR moves the asset path build to a point in between `before_initialize` and `after_initialize`, after the standard initializers are run but before Sprockets freezes the environment.
1 parent 4aba49a commit 371e293

File tree

4 files changed

+6
-3
lines changed

4 files changed

+6
-3
lines changed

lib/react/rails/railtie.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class Railtie < ::Rails::Railtie
5151

5252
end
5353

54-
config.before_initialize do |app|
54+
initializer "react_rails.set_variant", after: :engines_blank_point, group: :all do |app|
5555
asset_variant = React::Rails::AssetVariant.new({
5656
variant: app.config.react.variant,
5757
addons: app.config.react.addons,

test/dummy/config/application.rb

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ class Application < Rails::Application
2626
# config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
2727
# config.i18n.default_locale = :de
2828
config.react.variant = :production
29+
config.react.addons = false
2930

3031
config.assets.enabled = true
3132
end
+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Override setting set in application.rb
2+
Rails.application.config.react.addons = true

test/react_test.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ class ReactTest < ActionDispatch::IntegrationTest
3535
end
3636
end
3737

38-
test "the development version is loaded" do
38+
test "the development version with addons is loaded" do
3939
asset = Rails.application.assets.find_asset('react')
40-
assert asset.pathname.to_s.end_with?('development/react.js')
40+
assert asset.pathname.to_s.end_with?('development-with-addons/react.js')
4141
end
4242
end

0 commit comments

Comments
 (0)