diff --git a/Gemfile b/Gemfile index 905d67b..ef1c2ba 100644 --- a/Gemfile +++ b/Gemfile @@ -1,9 +1,8 @@ source "https://rubygems.org" gem "rails", github: "rails/rails", branch: "main" -gem "sprockets-rails" # The modern asset pipeline for Rails [https://github.com/rails/propshaft] -# gem "propshaft" +gem "propshaft" # Use sqlite3 as the database for Active Record gem "sqlite3", ">= 1.4" # Use the Puma web server [https://github.com/puma/puma] diff --git a/Gemfile.lock b/Gemfile.lock index 8641096..5b0b297 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -178,6 +178,11 @@ GEM parser (3.3.3.0) ast (~> 2.4.1) racc + 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.0) @@ -245,13 +250,6 @@ GEM rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) - sprockets (4.2.1) - concurrent-ruby (~> 1.0) - rack (>= 2.2.4, < 4) - sprockets-rails (3.5.1) - actionpack (>= 6.1) - activesupport (>= 6.1) - sprockets (>= 3.0.0) sqlite3 (2.0.2-aarch64-linux-gnu) sqlite3 (2.0.2-arm64-darwin) sqlite3 (2.0.2-x86_64-linux-gnu) @@ -301,11 +299,11 @@ DEPENDENCIES debug importmap-rails jbuilder + propshaft puma (>= 5.0) rails! rubocop-rails-omakase selenium-webdriver - sprockets-rails sqlite3 (>= 1.4) stimulus-rails tailwindcss-rails (~> 2.0) diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js deleted file mode 100644 index b06fc42..0000000 --- a/app/assets/config/manifest.js +++ /dev/null @@ -1,5 +0,0 @@ -//= link_tree ../images -//= link_directory ../stylesheets .css -//= link_tree ../../javascript .js -//= link_tree ../../../vendor/javascript .js -//= link_tree ../builds