Replace Sprockets with Propshaft (#28239)
This commit is contained in:
		
							
								
								
									
										1
									
								
								.github/renovate.json5
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.github/renovate.json5
									
									
									
									
										vendored
									
									
								
							@@ -50,7 +50,6 @@
 | 
				
			|||||||
      matchManagers: ['bundler'],
 | 
					      matchManagers: ['bundler'],
 | 
				
			||||||
      matchPackageNames: [
 | 
					      matchPackageNames: [
 | 
				
			||||||
        'rack', // Needs to be synced with Rails version
 | 
					        'rack', // Needs to be synced with Rails version
 | 
				
			||||||
        'sprockets', // Requires manual upgrade https://github.com/rails/sprockets/blob/master/UPGRADING.md#guide-to-upgrading-from-sprockets-3x-to-4x
 | 
					 | 
				
			||||||
        'strong_migrations', // Requires manual upgrade
 | 
					        'strong_migrations', // Requires manual upgrade
 | 
				
			||||||
        'sidekiq', // Requires manual upgrade
 | 
					        'sidekiq', // Requires manual upgrade
 | 
				
			||||||
        'sidekiq-unique-jobs', // Requires manual upgrades and sync with Sidekiq version
 | 
					        'sidekiq-unique-jobs', // Requires manual upgrades and sync with Sidekiq version
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										3
									
								
								Gemfile
									
									
									
									
									
								
							
							
						
						
									
										3
									
								
								Gemfile
									
									
									
									
									
								
							@@ -5,7 +5,7 @@ ruby '>= 3.0.0'
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
gem 'puma', '~> 6.3'
 | 
					gem 'puma', '~> 6.3'
 | 
				
			||||||
gem 'rails', '~> 7.1.1'
 | 
					gem 'rails', '~> 7.1.1'
 | 
				
			||||||
gem 'sprockets', '~> 3.7.2'
 | 
					gem 'propshaft'
 | 
				
			||||||
gem 'thor', '~> 1.2'
 | 
					gem 'thor', '~> 1.2'
 | 
				
			||||||
gem 'rack', '~> 2.2.7'
 | 
					gem 'rack', '~> 2.2.7'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -89,7 +89,6 @@ gem 'sidekiq-unique-jobs', '~> 7.1'
 | 
				
			|||||||
gem 'sidekiq-bulk', '~> 0.2.0'
 | 
					gem 'sidekiq-bulk', '~> 0.2.0'
 | 
				
			||||||
gem 'simple-navigation', '~> 4.4'
 | 
					gem 'simple-navigation', '~> 4.4'
 | 
				
			||||||
gem 'simple_form', '~> 5.2'
 | 
					gem 'simple_form', '~> 5.2'
 | 
				
			||||||
gem 'sprockets-rails', '~> 3.4', require: 'sprockets/railtie'
 | 
					 | 
				
			||||||
gem 'stoplight', '~> 3.0.1'
 | 
					gem 'stoplight', '~> 3.0.1'
 | 
				
			||||||
gem 'strong_migrations', '1.6.4'
 | 
					gem 'strong_migrations', '1.6.4'
 | 
				
			||||||
gem 'tty-prompt', '~> 0.23', require: false
 | 
					gem 'tty-prompt', '~> 0.23', require: false
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										15
									
								
								Gemfile.lock
									
									
									
									
									
								
							
							
						
						
									
										15
									
								
								Gemfile.lock
									
									
									
									
									
								
							@@ -534,6 +534,11 @@ GEM
 | 
				
			|||||||
      net-smtp
 | 
					      net-smtp
 | 
				
			||||||
      premailer (~> 1.7, >= 1.7.9)
 | 
					      premailer (~> 1.7, >= 1.7.9)
 | 
				
			||||||
    private_address_check (0.5.0)
 | 
					    private_address_check (0.5.0)
 | 
				
			||||||
 | 
					    propshaft (0.8.0)
 | 
				
			||||||
 | 
					      actionpack (>= 7.0.0)
 | 
				
			||||||
 | 
					      activesupport (>= 7.0.0)
 | 
				
			||||||
 | 
					      rack
 | 
				
			||||||
 | 
					      railties (>= 7.0.0)
 | 
				
			||||||
    psych (5.1.1.1)
 | 
					    psych (5.1.1.1)
 | 
				
			||||||
      stringio
 | 
					      stringio
 | 
				
			||||||
    public_suffix (5.0.4)
 | 
					    public_suffix (5.0.4)
 | 
				
			||||||
@@ -736,13 +741,6 @@ GEM
 | 
				
			|||||||
    simplecov-lcov (0.8.0)
 | 
					    simplecov-lcov (0.8.0)
 | 
				
			||||||
    simplecov_json_formatter (0.1.4)
 | 
					    simplecov_json_formatter (0.1.4)
 | 
				
			||||||
    smart_properties (1.17.0)
 | 
					    smart_properties (1.17.0)
 | 
				
			||||||
    sprockets (3.7.2)
 | 
					 | 
				
			||||||
      concurrent-ruby (~> 1.0)
 | 
					 | 
				
			||||||
      rack (> 1, < 3)
 | 
					 | 
				
			||||||
    sprockets-rails (3.4.2)
 | 
					 | 
				
			||||||
      actionpack (>= 5.2)
 | 
					 | 
				
			||||||
      activesupport (>= 5.2)
 | 
					 | 
				
			||||||
      sprockets (>= 3.0.0)
 | 
					 | 
				
			||||||
    stackprof (0.2.25)
 | 
					    stackprof (0.2.25)
 | 
				
			||||||
    statsd-ruby (1.5.0)
 | 
					    statsd-ruby (1.5.0)
 | 
				
			||||||
    stoplight (3.0.2)
 | 
					    stoplight (3.0.2)
 | 
				
			||||||
@@ -911,6 +909,7 @@ DEPENDENCIES
 | 
				
			|||||||
  posix-spawn
 | 
					  posix-spawn
 | 
				
			||||||
  premailer-rails
 | 
					  premailer-rails
 | 
				
			||||||
  private_address_check (~> 0.5)
 | 
					  private_address_check (~> 0.5)
 | 
				
			||||||
 | 
					  propshaft
 | 
				
			||||||
  public_suffix (~> 5.0)
 | 
					  public_suffix (~> 5.0)
 | 
				
			||||||
  puma (~> 6.3)
 | 
					  puma (~> 6.3)
 | 
				
			||||||
  pundit (~> 2.3)
 | 
					  pundit (~> 2.3)
 | 
				
			||||||
@@ -949,8 +948,6 @@ DEPENDENCIES
 | 
				
			|||||||
  simple_form (~> 5.2)
 | 
					  simple_form (~> 5.2)
 | 
				
			||||||
  simplecov (~> 0.22)
 | 
					  simplecov (~> 0.22)
 | 
				
			||||||
  simplecov-lcov (~> 0.8)
 | 
					  simplecov-lcov (~> 0.8)
 | 
				
			||||||
  sprockets (~> 3.7.2)
 | 
					 | 
				
			||||||
  sprockets-rails (~> 3.4)
 | 
					 | 
				
			||||||
  stackprof
 | 
					  stackprof
 | 
				
			||||||
  stoplight (~> 3.0.1)
 | 
					  stoplight (~> 3.0.1)
 | 
				
			||||||
  strong_migrations (= 1.6.4)
 | 
					  strong_migrations (= 1.6.4)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -14,7 +14,6 @@ require 'active_job/railtie'
 | 
				
			|||||||
# require 'action_mailbox/engine'
 | 
					# require 'action_mailbox/engine'
 | 
				
			||||||
# require 'action_text/engine'
 | 
					# require 'action_text/engine'
 | 
				
			||||||
# require 'rails/test_unit/railtie'
 | 
					# require 'rails/test_unit/railtie'
 | 
				
			||||||
require 'sprockets/railtie'
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Used to be implicitly required in action_mailbox/engine
 | 
					# Used to be implicitly required in action_mailbox/engine
 | 
				
			||||||
require 'mail'
 | 
					require 'mail'
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -71,17 +71,6 @@ Rails.application.configure do
 | 
				
			|||||||
  # Highlight code that enqueued background job in logs.
 | 
					  # Highlight code that enqueued background job in logs.
 | 
				
			||||||
  config.active_job.verbose_enqueue_logs = true
 | 
					  config.active_job.verbose_enqueue_logs = true
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  # Debug mode disables concatenation and preprocessing of assets.
 | 
					 | 
				
			||||||
  config.assets.debug = true
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  # Suppress logger output for asset requests.
 | 
					 | 
				
			||||||
  config.assets.quiet = true
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  # Adds additional error checking when serving assets at runtime.
 | 
					 | 
				
			||||||
  # Checks for improperly declared sprockets dependencies.
 | 
					 | 
				
			||||||
  # Raises helpful error messages.
 | 
					 | 
				
			||||||
  config.assets.raise_runtime_errors = true
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  # Raises error for missing translations.
 | 
					  # Raises error for missing translations.
 | 
				
			||||||
  # config.i18n.raise_on_missing_translations = true
 | 
					  # config.i18n.raise_on_missing_translations = true
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,16 +0,0 @@
 | 
				
			|||||||
# frozen_string_literal: true
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
# Be sure to restart your server when you modify this file.
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
# Version of your assets, change this if you want to expire all your assets.
 | 
					 | 
				
			||||||
Rails.application.config.assets.version = '1.0'
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
# Add additional assets to the asset load path.
 | 
					 | 
				
			||||||
# Rails.application.config.assets.paths << Emoji.images_path
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
# 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 )
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
Rails.application.config.assets.initialize_on_precompile = true
 | 
					 | 
				
			||||||
		Reference in New Issue
	
	Block a user