Skip to content

Commit

Permalink
Remove Rails::Engine override to support Rails 4.2
Browse files Browse the repository at this point in the history
We can just define the initializer inside Propshaft::Railtie.
  • Loading branch information
rafaelfranca committed Dec 3, 2021
1 parent 8ebe7a5 commit 66ce0f8
Showing 1 changed file with 6 additions and 9 deletions.
15 changes: 6 additions & 9 deletions lib/propshaft/railtie.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,6 @@
require "rails/railtie"
require "active_support/ordered_options"

# FIXME: There's gotta be a better way than this hack?
class Rails::Engine < Rails::Railtie
initializer "propshaft.append_assets_path", group: :all do |app|
app.config.assets.paths.unshift(*paths["vendor/assets"].existent_directories)
app.config.assets.paths.unshift(*paths["lib/assets"].existent_directories)
app.config.assets.paths.unshift(*paths["app/assets"].existent_directories)
end
end

module Propshaft
class Railtie < ::Rails::Railtie
config.assets = ActiveSupport::OrderedOptions.new
Expand Down Expand Up @@ -44,6 +35,12 @@ class Railtie < ::Rails::Railtie
end
end

initializer "propshaft.append_assets_path" do |app|
app.config.assets.paths.unshift(*paths["vendor/assets"].existent_directories)
app.config.assets.paths.unshift(*paths["lib/assets"].existent_directories)
app.config.assets.paths.unshift(*paths["app/assets"].existent_directories)
end

initializer "propshaft.logger" do
Propshaft.logger = config.assets.logger || Rails.logger
end
Expand Down

0 comments on commit 66ce0f8

Please sign in to comment.