diff options
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/activesupport.gemspec | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/dependencies/zeitwerk_integration.rb | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/activesupport/activesupport.gemspec b/activesupport/activesupport.gemspec index 92cdfd89fe..0879660f9e 100644 --- a/activesupport/activesupport.gemspec +++ b/activesupport/activesupport.gemspec @@ -34,5 +34,5 @@ Gem::Specification.new do |s| s.add_dependency "tzinfo", "~> 1.1" s.add_dependency "minitest", "~> 5.1" s.add_dependency "concurrent-ruby", "~> 1.0", ">= 1.0.2" - s.add_dependency "zeitwerk", "~> 1.0" + s.add_dependency "zeitwerk", "~> 1.1" end diff --git a/activesupport/lib/active_support/dependencies/zeitwerk_integration.rb b/activesupport/lib/active_support/dependencies/zeitwerk_integration.rb index 75624bae09..55fc92ee8b 100644 --- a/activesupport/lib/active_support/dependencies/zeitwerk_integration.rb +++ b/activesupport/lib/active_support/dependencies/zeitwerk_integration.rb @@ -6,7 +6,7 @@ module ActiveSupport module Decorations def clear Dependencies.unload_interlock do - Rails.autoloader.reload + Rails.autoloaders.main.reload end end @@ -19,9 +19,7 @@ module ActiveSupport end def autoloaded_constants - Rails.autoloaders.flat_map do |autoloader| - autoloader.loaded.to_a - end + (Rails.autoloaders.main.loaded + Rails.autoloaders.once.loaded).to_a end def autoloaded?(object) @@ -46,9 +44,9 @@ module ActiveSupport next unless File.directory?(autoload_path) if autoload_once?(autoload_path) - Rails.once_autoloader.push_dir(autoload_path) + Rails.autoloaders.once.push_dir(autoload_path) else - Rails.autoloader.push_dir(autoload_path) + Rails.autoloaders.main.push_dir(autoload_path) end end |