Merge pull request rails#50708 from aeroastro/feature/watch-directories-instead-of-file

Prevent unnecessary application reloads in development

Author: rafaelfranca

railties/CHANGELOG.md

@@ -1,3 +1,11 @@
+*   Prevent unnecessary application reloads in development.
+
+    Previously, some files outside autoload paths triggered unnecessary reloads.
+    With this fix, application reloads according to `Rails.autoloaders.main.dirs`,
+    thereby preventing unnecessary reloads.
+
+    *Takumasa Ochi*
+
 *   Use `oven-sh/setup-bun` in GitHub CI when generating an app with bun
 
     *TangRufus*

railties/lib/rails/application.rb

@@ -412,8 +412,8 @@ def routes_reloader # :nodoc:
     def watchable_args # :nodoc:
       files, dirs = config.watchable_files.dup, config.watchable_dirs.dup
 
-      ActiveSupport::Dependencies.autoload_paths.each do |path|
-        File.file?(path) ? files << path.to_s : dirs[path.to_s] = [:rb]
+      Rails.autoloaders.main.dirs.each do |path|
+        dirs[path.to_s] = [:rb]
       end
 
       [files, dirs]

railties/test/application/watcher_test.rb

@@ -13,7 +13,7 @@ def app
       @app ||= Rails.application
     end
 
-    test "watchable_args classifies files included in autoload path" do
+    test "watchable_args does NOT include files in autoload path" do
       add_to_config <<-RUBY
         config.file_watcher = ActiveSupport::EventedFileUpdateChecker
       RUBY
@@ -22,7 +22,23 @@ def app
       require "#{rails_root}/config/environment"
 
       files, _ = Rails.application.watchable_args
-      assert_includes files, "#{rails_root}/app/README.md"
+      assert_not_includes files, "#{rails_root}/app/README.md"
+    end
+
+    test "watchable_args does include dirs in autoload path" do
+      add_to_config <<-RUBY
+        config.file_watcher = ActiveSupport::EventedFileUpdateChecker
+        config.autoload_paths += %W(#{rails_root}/manually-specified-path)
+      RUBY
+      app_dir "app/automatically-specified-path"
+      app_dir "manually-specified-path"
+
+      require "#{rails_root}/config/environment"
+
+      _, dirs = Rails.application.watchable_args
+
+      assert_includes dirs, "#{rails_root}/app/automatically-specified-path"
+      assert_includes dirs, "#{rails_root}/manually-specified-path"
     end
   end
 end