From 5dddb8a2d885ffa26e28b9314b6a4d1af4bc08f9 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Sat, 9 Nov 2024 11:44:01 +0100 Subject: [PATCH] Switch to propshaft as assets pipeline --- Gemfile | 4 ++-- Gemfile.lock | 14 ++++++-------- app/assets/config/manifest.js | 3 --- 3 files changed, 8 insertions(+), 13 deletions(-) delete mode 100644 app/assets/config/manifest.js diff --git a/Gemfile b/Gemfile index 7757cf7..a438ea4 100644 --- a/Gemfile +++ b/Gemfile @@ -6,8 +6,8 @@ ruby '~> 3.3.0' # Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main" gem 'rails', '~> 8.0.0' -# The original asset pipeline for Rails [https://github.com/rails/sprockets-rails] -gem 'sprockets-rails' +# Use propshaft as asset pipeline +gem 'propshaft' # Use postgresql as the database for Active Record gem 'pg', '~> 1.5' diff --git a/Gemfile.lock b/Gemfile.lock index ee8a076..e2428cb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -197,6 +197,11 @@ GEM ast (~> 2.4.1) racc pg (1.5.9) + propshaft (1.1.0) + actionpack (>= 7.0.0) + activesupport (>= 7.0.0) + rack + railties (>= 7.0.0) psych (5.1.2) stringio public_suffix (5.0.4) @@ -293,13 +298,6 @@ GEM fugit (~> 1.11.0) railties (>= 7.1) thor (~> 1.3.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) thor (1.3.2) thread_safe (0.3.6) @@ -342,6 +340,7 @@ DEPENDENCIES github_api jbuilder pg (~> 1.5) + propshaft puma (~> 6.4) rack-cors rails (~> 8.0.0) @@ -352,7 +351,6 @@ DEPENDENCIES sentry-rails sentry-ruby solid_queue - sprockets-rails tzinfo-data unicorn (~> 6.1) web-console diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js deleted file mode 100644 index 5a7b73a..0000000 --- a/app/assets/config/manifest.js +++ /dev/null @@ -1,3 +0,0 @@ -//= link_tree ../images -//= link_tree ../builds -//= link_tree ../../../node_modules/@mdi/font