From 68f38a75389ee72cc00229cdf221551ceee5c6c2 Mon Sep 17 00:00:00 2001 From: Ryunosuke Sato Date: Thu, 22 Aug 2024 01:01:06 +0900 Subject: [PATCH] Replace sprockets with propshaft --- Gemfile | 3 +-- Gemfile.lock | 26 ++++++-------------------- config/application.rb | 2 +- config/initializers/assets.rb | 5 +---- 4 files changed, 9 insertions(+), 27 deletions(-) diff --git a/Gemfile b/Gemfile index 7610e24..4e65e77 100644 --- a/Gemfile +++ b/Gemfile @@ -11,11 +11,10 @@ gem 'omniauth' gem 'omniauth-github' gem 'omniauth-rails_csrf_protection' gem 'pg' +gem 'propshaft' gem 'puma', require: false gem 'redis' gem 'roadie-rails' -gem 'sassc-rails' -gem 'sprockets-rails' gem 'uglifier' group :development do diff --git a/Gemfile.lock b/Gemfile.lock index 8d6319d..69bf57e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -124,9 +124,6 @@ GEM logger faraday-net_http (3.1.1) net-http - ffi (1.17.0-aarch64-linux-gnu) - ffi (1.17.0-arm64-darwin) - ffi (1.17.0-x86_64-linux-gnu) globalid (1.2.1) activesupport (>= 6.1) haml (6.3.0) @@ -211,6 +208,11 @@ GEM actionpack (>= 4.2) omniauth (~> 2.0) pg (1.5.7) + propshaft (0.9.1) + actionpack (>= 7.0.0) + activesupport (>= 7.0.0) + rack + railties (>= 7.0.0) psych (5.1.2) stringio public_suffix (6.0.1) @@ -295,14 +297,6 @@ GEM rspec-mocks (~> 3.13) rspec-support (~> 3.13) rspec-support (3.13.1) - sassc (2.4.0) - ffi (~> 1.9) - sassc-rails (2.1.2) - railties (>= 4.0.0) - sassc (>= 2.0) - sprockets (> 3.0) - sprockets-rails - tilt sawyer (0.9.2) addressable (>= 2.3.5) faraday (>= 0.17.3, < 3) @@ -310,13 +304,6 @@ GEM snaky_hash (2.0.1) hashie version_gem (~> 1.1, >= 1.1.1) - sprockets (4.2.1) - concurrent-ruby (~> 1.0) - rack (>= 2.2.4, < 4) - sprockets-rails (3.5.2) - actionpack (>= 6.1) - activesupport (>= 6.1) - sprockets (>= 3.0.0) stringio (3.1.1) strscan (3.1.0) temple (0.10.3) @@ -362,14 +349,13 @@ DEPENDENCIES omniauth-github omniauth-rails_csrf_protection pg + propshaft puma rails (~> 7.2.0) redis roadie-rails rspec-its rspec-rails - sassc-rails - sprockets-rails uglifier web-console diff --git a/config/application.rb b/config/application.rb index 5b30fe8..dcb2f22 100644 --- a/config/application.rb +++ b/config/application.rb @@ -12,7 +12,7 @@ # require "action_text/engine" require "action_view/railtie" # require "action_cable/engine" -require "sprockets/railtie" +# require "sprockets/railtie" # require "rails/test_unit/railtie" # Require the gems listed in Gemfile, including any gems diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index c770c07..2eeef96 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -9,7 +9,4 @@ # 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( - normalize.css - rails-ujs.js -) +# Rails.application.config.assets.precompile += %w( admin.js admin.css )