Merge pull request #50780 from zachasme/app-update-skip-sprockets

Preserve `--asset-pipeline propshaft` when running `app:update`

railties/lib/rails/app_updater.rb

@@ -31,10 +31,22 @@ def generator_options
           options[:skip_action_cable]   = !defined?(ActionCable::Engine)
           options[:skip_test]           = !defined?(Rails::TestUnitRailtie)
           options[:skip_system_test]    = Rails.application.config.generators.system_tests.nil?
-          options[:skip_asset_pipeline] = !defined?(Sprockets::Railtie) && !defined?(Propshaft::Railtie)
+          options[:asset_pipeline]      = asset_pipeline
+          options[:skip_asset_pipeline] = asset_pipeline.nil?
           options[:skip_bootsnap]       = !defined?(Bootsnap)
           options
         end
+
+        def asset_pipeline
+          case
+          when defined?(Sprockets::Railtie)
+            "sprockets"
+          when defined?(Propshaft::Railtie)
+            "propshaft"
+          else
+            nil
+          end
+        end
     end
   end
 end

railties/test/generators/app_generator_test.rb

@@ -295,6 +295,17 @@ def test_app_update_preserves_skip_system_test
     end
   end
 
+  def test_app_update_preserves_propshaft
+    run_generator [destination_root, "-a", "propshaft"]
+
+    FileUtils.cd(destination_root) do
+      config = "config/environments/production.rb"
+      assert_no_changes -> { File.readlines(config).grep(/config\.assets/) } do
+        run_app_update
+      end
+    end
+  end
+
   def test_gem_for_active_storage
     run_generator
     assert_file "Gemfile", /^# gem "image_processing"/