1 files changed, 14 insertions, 24 deletions

diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index 07bd56c978..9b3698aa5e 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -469,13 +469,16 @@ module Rails
       self
     end
 
-    # Eager load the application by loading all ruby
-    # files inside eager_load paths.
     def eager_load!
-      if Rails.autoloaders.zeitwerk_enabled?
-        eager_load_with_zeitwerk!
-      else
-        eager_load_with_dependencies!
+      # Already done by Zeitwerk::Loader.eager_load_all in the finisher.
+      return if Rails.autoloaders.zeitwerk_enabled?
+
+      config.eager_load_paths.each do |load_path|
+        # Starts after load_path plus a slash, ends before ".rb".
+        relname_range = (load_path.to_s.length + 1)...-3
+        Dir.glob("#{load_path}/**/*.rb").sort.each do |file|
+          require_dependency file[relname_range]
+        end
       end
     end
 
@@ -567,12 +570,15 @@ module Rails
       ActiveSupport::Dependencies.autoload_paths.unshift(*_all_autoload_paths)
       ActiveSupport::Dependencies.autoload_once_paths.unshift(*_all_autoload_once_paths)
 
-      # Freeze so future modifications will fail rather than do nothing mysteriously
       config.autoload_paths.freeze
-      config.eager_load_paths.freeze
       config.autoload_once_paths.freeze
     end
 
+    initializer :set_eager_load_paths, before: :bootstrap_hook do
+      ActiveSupport::Dependencies._eager_load_paths.merge(config.eager_load_paths)
+      config.eager_load_paths.freeze
+    end
+
     initializer :add_routing_paths do |app|
       routing_paths = paths["config/routes.rb"].existent
 
@@ -651,22 +657,6 @@ module Rails
 
     private
 
-      def eager_load_with_zeitwerk!
-        (config.eager_load_paths - Zeitwerk::Loader.all_dirs).each do |path|
-          Dir.glob("#{path}/**/*.rb").sort.each { |file| require file }
-        end
-      end
-
-      def eager_load_with_dependencies!
-        config.eager_load_paths.each do |load_path|
-          # Starts after load_path plus a slash, ends before ".rb".
-          relname_range = (load_path.to_s.length + 1)...-3
-          Dir.glob("#{load_path}/**/*.rb").sort.each do |file|
-            require_dependency file[relname_range]
-          end
-        end
-      end
-
       def load_config_initializer(initializer) # :doc:
         ActiveSupport::Notifications.instrument("load_config_initializer.railties", initializer: initializer) do
           load(initializer)