Merge pull request rails#50183 from jonathanhefner/app_generator-separate-lock-from-install

Separate `bundle lock` from `bundle install`

Author: jonathanhefner

railties/lib/rails/generators/app_base.rb

@@ -680,19 +680,7 @@ def target_rails_prerelease(self_command = "new")
       end
 
       def run_bundle
-        if bundle_install?
-          bundle_command("install", "BUNDLE_IGNORE_MESSAGES" => "1")
-
-          # The vast majority of Rails apps will be deployed on `x86_64-linux`.
-          platforms = ["--add-platform=x86_64-linux"]
-
-          # Users that develop on M1 mac may use docker and would need `aarch64-linux` as well.
-          platforms << "--add-platform=aarch64-linux" if RUBY_PLATFORM.start_with?("arm64")
-
-          platforms.each do |platform|
-            bundle_command("lock #{platform}", "BUNDLE_IGNORE_MESSAGES" => "1")
-          end
-        end
+        bundle_command("install", "BUNDLE_IGNORE_MESSAGES" => "1") if bundle_install?
       end
 
       def run_javascript
@@ -722,6 +710,16 @@ def run_css
         end
       end
 
+      def add_bundler_platforms
+        if bundle_install?
+          # The vast majority of Rails apps will be deployed on `x86_64-linux`.
+          bundle_command("lock --add-platform=x86_64-linux")
+
+          # Users that develop on M1 mac may use docker and would need `aarch64-linux` as well.
+          bundle_command("lock --add-platform=aarch64-linux") if RUBY_PLATFORM.start_with?("arm64")
+        end
+      end
+
       def generate_bundler_binstub
         if bundle_install?
           bundle_command("binstubs bundler")

railties/lib/rails/generators/rails/app/app_generator.rb

@@ -539,6 +539,7 @@ def finish_template
 
       public_task :apply_rails_template
       public_task :run_bundle
+      public_task :add_bundler_platforms
       public_task :generate_bundler_binstub
       public_task :run_javascript
       public_task :run_hotwire

railties/test/generators/app_generator_test.rb

@@ -1085,6 +1085,24 @@ def test_apply_rails_template_class_method_runs_bundle_and_after_bundle_callback
     end
   end
 
+  def test_apply_rails_template_class_method_does_not_add_bundler_platforms
+    run_generator
+
+    FileUtils.cd(destination_root) do
+      FileUtils.touch("lib/template.rb")
+
+      generator_class.no_commands do
+        # There isn't an easy way to access the generator instance in order to
+        # assert that we don't run `bundle lock --add-platform`, so the
+        # following assertion assumes that the sole call to `bundle_command` is
+        # for `bundle install`.
+        assert_called_on_instance_of(generator_class, :bundle_command, times: 1) do
+          quietly { generator_class.apply_rails_template("lib/template.rb", destination_root) }
+        end
+      end
+    end
+  end
+
   def test_gitignore
     run_generator