diff --git a/Gemfile b/Gemfile index e97a8da..0c5179c 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source "https://rubygems.org" ruby file: "./.ruby-version" gem "rails", "~> 7.1.3", ">= 7.1.3.2" -gem "sprockets-rails" +gem "propshaft" gem "pg" gem "puma", ">= 5.0" gem "importmap-rails" diff --git a/Gemfile.lock b/Gemfile.lock index f236150..5eb30d7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -161,6 +161,11 @@ GEM ast (~> 2.4.1) racc pg (1.5.6) + propshaft (0.9.0) + actionpack (>= 7.0.0) + activesupport (>= 7.0.0) + rack + railties (>= 7.0.0) psych (5.1.2) stringio public_suffix (5.0.5) @@ -249,13 +254,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.4.2) - actionpack (>= 5.2) - activesupport (>= 5.2) - sprockets (>= 3.0.0) stimulus-rails (1.3.3) railties (>= 6.0.0) stringio (3.1.0) @@ -299,11 +297,11 @@ DEPENDENCIES importmap-rails jbuilder pg + propshaft puma (>= 5.0) rails (~> 7.1.3, >= 7.1.3.2) rubocop-rails-omakase selenium-webdriver - sprockets-rails stimulus-rails turbo-rails tzinfo-data diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css deleted file mode 100644 index 288b9ab..0000000 --- a/app/assets/stylesheets/application.css +++ /dev/null @@ -1,15 +0,0 @@ -/* - * This is a manifest file that'll be compiled into application.css, which will include all the files - * listed below. - * - * Any CSS (and SCSS, if configured) file within this directory, lib/assets/stylesheets, or any plugin's - * vendor/assets/stylesheets directory can be referenced here using a relative path. - * - * You're free to add application-wide styles to this file and they'll appear at the bottom of the - * compiled file so the styles you add here take precedence over styles defined in any other CSS - * files in this directory. Styles in this file should be added after the last require_* statement. - * It is generally better to create a new file per style scope. - * - *= require_tree . - *= require_self - */ diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 4956375..29e9ad8 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -6,7 +6,7 @@ <%= csrf_meta_tags %> <%= csp_meta_tag %> - <%= stylesheet_link_tag "application", "data-turbo-track": "reload" %> + <%= stylesheet_link_tag :all, "data-turbo-track": "reload" %> <%= javascript_importmap_tags %>