Merge pull request rails#54810 from brunoprietog/read-generator-options-properly

Read generator options properly

Author: eileencodes

railties/lib/rails/generators/app_base.rb

@@ -494,7 +494,7 @@ def jbuilder_gemfile_entry
       def javascript_gemfile_entry
         return if options[:skip_javascript]
 
-        if options[:javascript] == "importmap"
+        if using_importmap?
           GemfileEntry.floats "importmap-rails", "Use JavaScript with ESM import maps [https://github.com/rails/importmap-rails]"
         else
           GemfileEntry.floats "jsbundling-rails", "Bundle and transpile JavaScript [https://github.com/rails/jsbundling-rails]"
@@ -514,11 +514,11 @@ def hotwire_gemfile_entry
       end
 
       def using_importmap?
-        options[:javascript] == "importmap"
+        !options.skip_javascript? && options[:javascript] == "importmap"
       end
 
       def using_js_runtime?
-        (options[:javascript] && !using_importmap?) || (options[:css] && !%w[tailwind sass].include?(options[:css]))
+        !options.skip_javascript? && (!using_importmap? || (options[:css] && !%w[tailwind sass].include?(options[:css])))
       end
 
       def using_node?

railties/lib/rails/generators/rails/app/templates/app/controllers/application_controller.rb.tt

@@ -2,7 +2,7 @@ class ApplicationController < ActionController::<%= options.api? ? "API" : "Base
 <%- unless options.api? -%>
   # Only allow modern browsers supporting webp images, web push, badges, import maps, CSS nesting, and CSS :has.
   allow_browser versions: :modern
-<%- if options.using_importmap? -%>
+<%- if using_importmap? -%>
 
   # Changes to the importmap will invalidate the etag for HTML responses
   stale_when_importmap_changes

railties/lib/rails/generators/rails/app/templates/config/ci.rb.tt

@@ -10,7 +10,7 @@ CI.run do
 <% if using_node? -%>
   step "Security: Yarn vulnerability audit", "yarn audit"
 <% end -%>
-<% if options[:javascript] == "importmap" && !options[:api] && !options[:skip_javascript] -%>
+<% if using_importmap? -%>
   step "Security: Importmap vulnerability audit", "bin/importmap audit"
 <% end -%>
 <% unless options.skip_brakeman? -%>

railties/lib/rails/generators/rails/app/templates/github/ci.yml.tt

@@ -27,7 +27,7 @@ jobs:
         run: bin/bundler-audit
 
 <% end -%>
-<%- if options[:javascript] == "importmap" && !options[:api] && !options[:skip_javascript] -%>
+<%- if using_importmap? -%>
   scan_js:
     runs-on: ubuntu-latest
 

railties/test/generators/app_generator_test.rb

@@ -873,10 +873,18 @@ def test_skip_javascript_option
     assert_no_gem "jsbundling-rails"
     assert_no_node_files
 
+    assert_file "app/controllers/application_controller.rb" do |content|
+      assert_no_match(/importmap/, content)
+    end
+
     assert_file "config/initializers/content_security_policy.rb" do |content|
       assert_no_match(/policy\.connect_src/, content)
     end
 
+    assert_file "config/ci.rb" do |content|
+      assert_no_match(/importmap|yarn/, content)
+    end
+
     assert_file ".gitattributes" do |content|
       assert_no_match(/yarn\.lock/, content)
     end