No new apps should be started with sprockets (rails#52887)

* No new apps should be started with sprockets

Co-authored-by: Andrew Novoselac <[email protected]>
Co-authored-by: Tute Costa <[email protected]>
Co-authored-by: Federico Sapuppo <[email protected]>
Co-authored-by: zzak <[email protected]>
Co-authored-by: Federico Sapuppo <[email protected]>

Author: 5 people

railties/lib/rails/commands/app/update_command.rb

@@ -73,21 +73,13 @@ def generator_options
               skip_rubocop:        skip_gem?("rubocop"),
               skip_test:           !defined?(Rails::TestUnitRailtie),
               skip_system_test:    Rails.application.config.generators.system_tests.nil?,
-              asset_pipeline:      asset_pipeline,
               skip_asset_pipeline: asset_pipeline.nil?,
               skip_bootsnap:       !defined?(Bootsnap),
             }.merge(options)
           end
 
           def asset_pipeline
-            case
-            when defined?(Sprockets::Railtie)
-              "sprockets"
-            when defined?(Propshaft::Railtie)
-              "propshaft"
-            else
-              nil
-            end
+            "propshaft" if defined?(Propshaft::Railtie)
           end
 
           def skip_gem?(gem_name)

railties/lib/rails/generators/app_base.rb

@@ -19,7 +19,6 @@ class AppBase < Base # :nodoc:
 
       JAVASCRIPT_OPTIONS = %w( importmap bun webpack esbuild rollup )
       CSS_OPTIONS = %w( tailwind bootstrap bulma postcss sass )
-      ASSET_PIPELINE_OPTIONS = %w( none sprockets propshaft )
 
       attr_accessor :rails_template
       add_shebang_option!
@@ -74,10 +73,6 @@ def self.add_shared_options_for(name)
 
         class_option :skip_asset_pipeline, type: :boolean, aliases: "-A", default: nil
 
-        class_option :asset_pipeline,      type: :string, aliases: "-a", default: "propshaft",
-                                           enum: ASSET_PIPELINE_OPTIONS,
-                                           desc: "Choose your asset pipeline"
-
         class_option :skip_javascript,     type: :boolean, aliases: ["-J", "--skip-js"], default: (true if name == "plugin"),
                                            desc: "Skip JavaScript files"
 
@@ -296,12 +291,7 @@ def web_server_gemfile_entry # :doc:
       end
 
       def asset_pipeline_gemfile_entry
-        return if skip_asset_pipeline?
-
-        if options[:asset_pipeline] == "sprockets"
-          GemfileEntry.floats "sprockets-rails",
-            "The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]"
-        elsif options[:asset_pipeline] == "propshaft"
+        unless skip_asset_pipeline?
           GemfileEntry.floats "propshaft", "The modern asset pipeline for Rails [https://github.com/rails/propshaft]"
         end
       end
@@ -395,14 +385,6 @@ def skip_asset_pipeline? # :doc:
         options[:skip_asset_pipeline]
       end
 
-      def skip_sprockets?
-        skip_asset_pipeline? || options[:asset_pipeline] != "sprockets"
-      end
-
-      def skip_propshaft?
-        skip_asset_pipeline? || options[:asset_pipeline] != "propshaft"
-      end
-
       def skip_thruster?
         options[:skip_thruster]
       end

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

@@ -142,7 +142,6 @@ def config_when_updating
       active_storage_config_exist     = File.exist?("config/storage.yml")
       rack_cors_config_exist          = File.exist?("config/initializers/cors.rb")
       assets_config_exist             = File.exist?("config/initializers/assets.rb")
-      asset_manifest_exist            = File.exist?("app/assets/config/manifest.js")
       asset_app_stylesheet_exist      = File.exist?("app/assets/stylesheets/application.css")
       csp_config_exist                = File.exist?("config/initializers/content_security_policy.rb")
 
@@ -158,15 +157,11 @@ def config_when_updating
         template "config/storage.yml"
       end
 
-      if skip_sprockets? && skip_propshaft? && !assets_config_exist
+      if skip_asset_pipeline? && !assets_config_exist
         remove_file "config/initializers/assets.rb"
       end
 
-      if skip_sprockets? && !asset_manifest_exist
-        remove_file "app/assets/config/manifest.js"
-      end
-
-      if skip_sprockets? && !asset_app_stylesheet_exist
+      if skip_asset_pipeline? && !asset_app_stylesheet_exist
         remove_file "app/assets/stylesheets/application.css"
       end
 
@@ -506,14 +501,9 @@ def delete_public_files_if_api_option
         end
       end
 
-      def delete_assets_initializer_skipping_sprockets_and_propshaft
-        if skip_sprockets? && skip_propshaft?
+      def delete_assets_initializer_skipping_asset_pipeline
+        if skip_asset_pipeline?
           remove_file "config/initializers/assets.rb"
-        end
-
-        if skip_sprockets?
-          remove_file "app/assets/config/manifest.js"
-          remove_dir  "app/assets/config"
           remove_file "app/assets/stylesheets/application.css"
           create_file "app/assets/stylesheets/application.css", "/* Application styles */\n" unless options[:api]
         end

railties/lib/rails/generators/rails/app/templates/app/assets/config/manifest.js.tt

@@ -14,7 +14,7 @@
     <link rel="icon" href="/icon.png" type="image/png">
     <link rel="icon" href="/icon.svg" type="image/svg+xml">
     <link rel="apple-touch-icon" href="/icon.png">
-    <% style_link_target = options[:asset_pipeline] == "propshaft" ? ":all" : "\"application\"" %>
+    <% style_link_target = options[:skip_asset_pipeline] ? "\"application\"" : ":all" %>
     <%- if options[:skip_hotwire] || options[:skip_javascript] -%>
     <%%= stylesheet_link_tag <%= style_link_target %> %>
     <%- else -%>

railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt

@@ -67,11 +67,6 @@ Rails.application.configure do
   # Highlight code that enqueued background job in logs.
   config.active_job.verbose_enqueue_logs = true
 
-  <%- end -%>
-  <%- unless skip_sprockets? -%>
-  # Suppress logger output for asset requests.
-  config.assets.quiet = true
-
   <%- end -%>
   # Raises error for missing translations.
   # config.i18n.raise_on_missing_translations = true

railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt

@@ -23,14 +23,6 @@ Rails.application.configure do
   # Disable serving static files from `public/`, relying on NGINX/Apache to do so instead.
   # config.public_file_server.enabled = false
 
-  <%- unless skip_sprockets? -%>
-  # Compress CSS using a preprocessor.
-  # config.assets.css_compressor = :sass
-
-  # Do not fall back to assets pipeline if a precompiled asset is missed.
-  config.assets.compile = false
-
-  <%- end -%>
   # Enable serving of images, stylesheets, and JavaScripts from an asset server.
   # config.asset_host = "http://assets.example.com"
 

railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt

@@ -5,10 +5,3 @@ Rails.application.config.assets.version = "1.0"
 
 # Add additional assets to the asset load path.
 # Rails.application.config.assets.paths << Emoji.images_path
-<% if options[:asset_pipeline] == "sprockets" -%>
-
-# Precompile additional assets.
-# application.js, application.css, and all non-JS/CSS in the app/assets
-# folder are already added.
-# Rails.application.config.assets.precompile += %w[ admin.js admin.css ]
-<% end -%>

railties/lib/rails/generators/rails/app/templates/config/initializers/assets.rb.tt

@@ -152,9 +152,8 @@ def test_dummy_config
       end
     end
 
-    def test_dummy_sprocket_assets
-      template "rails/stylesheets.css",   "#{dummy_path}/app/assets/stylesheets/application.css", force: true
-      template "rails/dummy_manifest.js", "#{dummy_path}/app/assets/config/manifest.js", force: true
+    def test_dummy_assets
+      template "rails/stylesheets.css", "#{dummy_path}/app/assets/stylesheets/application.css", force: true
     end
 
     def test_dummy_clean
@@ -170,10 +169,6 @@ def test_dummy_clean
       end
     end
 
-    def assets_manifest
-      template "rails/engine_manifest.js", "app/assets/config/#{underscored_name}_manifest.js"
-    end
-
     def stylesheets
       if mountable?
         copy_file "rails/stylesheets.css",
@@ -364,7 +359,7 @@ def create_dummy_app(path = nil)
         mute do
           build(:generate_test_dummy)
           build(:test_dummy_config)
-          build(:test_dummy_sprocket_assets) unless skip_sprockets?
+          build(:test_dummy_assets) unless skip_asset_pipeline?
           build(:test_dummy_clean)
           # ensure that bin/rails has proper dummy_path
           build(:bin)