diff --git a/lib/chanko/loader.rb b/lib/chanko/loader.rb index ccb6446..3edc550 100644 --- a/lib/chanko/loader.rb +++ b/lib/chanko/loader.rb @@ -43,20 +43,18 @@ def self.eager_load_units! def self.prepare_eager_load add_unit_directory_to_eager_load_paths + Rails.autoloaders.main.collapse(Chanko::Config.units_directory_path + '/*') + Rails.autoloaders.main.ignore(Chanko::Config.units_directory_path + '/*/spec*') end def self.add_unit_directory_to_eager_load_paths path = Chanko::Config.units_directory_path + unless Rails.configuration.eager_load_paths.include?(path) Rails.configuration.eager_load_paths << path end end - def self.initialize_zeitwerk_settings - Rails.autoloaders.main.collapse(Chanko::Config.units_directory_path + '/*') - Rails.autoloaders.main.ignore(Chanko::Config.units_directory_path + '/*/spec*') - end - def initialize(name) @name = name end diff --git a/lib/chanko/railtie.rb b/lib/chanko/railtie.rb index da10407..2ce3965 100644 --- a/lib/chanko/railtie.rb +++ b/lib/chanko/railtie.rb @@ -14,11 +14,6 @@ class Railtie < Rails::Railtie end end - initializer("chanko.support_zeitwerk", before: "chanko.include") do |app| - if Rails.respond_to?(:autoloaders) && Rails.autoloaders.zeitwerk_enabled? - Chanko::Loader::ZeitwerkLoader.initialize_zeitwerk_settings - end - end initializer("chanko.zeitwerk.prepare_eager_load", before: :set_autoload_paths) do |app| # zeitwerk freezes autoload_paths after :set_autoload_paths.