From be429a56bb4b643cf3032cb8cc605f187599af65 Mon Sep 17 00:00:00 2001 From: Trevor Vallender Date: Thu, 8 Aug 2024 09:12:01 +0100 Subject: [PATCH] Propshaft migration --- Gemfile | 2 +- Gemfile.lock | 14 ++++++-------- app/assets/config/manifest.js | 4 ---- app/views/layouts/application.html.erb | 2 +- 4 files changed, 8 insertions(+), 14 deletions(-) delete mode 100644 app/assets/config/manifest.js diff --git a/Gemfile b/Gemfile index a7fec95..50f757a 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" } ruby file: "./.ruby-version" gem "rails", "~> 7.1" -gem "sprockets-rails" +gem "propshaft" gem "pg" gem "puma" gem "image_processing" diff --git a/Gemfile.lock b/Gemfile.lock index 976e076..967a52b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -171,6 +171,11 @@ GEM nokogiri (1.16.7-x86_64-linux) racc (~> 1.4) pg (1.5.7) + propshaft (0.9.0) + actionpack (>= 7.0.0) + activesupport (>= 7.0.0) + rack + railties (>= 7.0.0) psych (5.1.2) stringio public_suffix (6.0.1) @@ -236,13 +241,6 @@ GEM activejob (>= 7) activerecord (>= 7) railties (>= 7) - 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) stimulus-rails (1.3.3) railties (>= 6.0.0) stringio (3.1.1) @@ -284,11 +282,11 @@ DEPENDENCIES jbuilder kaminari pg + propshaft puma rails (~> 7.1) selenium-webdriver solid_cache - sprockets-rails stimulus-rails turbo-rails web-console diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js deleted file mode 100644 index ddd546a..0000000 --- a/app/assets/config/manifest.js +++ /dev/null @@ -1,4 +0,0 @@ -//= link_tree ../images -//= link_directory ../stylesheets .css -//= link_tree ../../javascript .js -//= link_tree ../../../vendor/javascript .js diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 72a2f02..3d4eaa9 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -7,7 +7,7 @@ <%= csp_meta_tag %> <%= javascript_importmap_tags %> - <%= stylesheet_link_tag "application", "data-turbo-track": "reload" %> + <%= stylesheet_link_tag :all, "data-turbo-track": "reload" %>