diff --git a/Gemfile b/Gemfile index 03a6810f..cfee4618 100644 --- a/Gemfile +++ b/Gemfile @@ -6,14 +6,11 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" } # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '~> 7.1.3' -# The original asset pipeline for Rails [https://github.com/rails/sprockets-rails] -gem 'sprockets-rails' +gem 'propshaft' # Use Puma as the app server gem 'puma', '~> 6.0' -# Use Terser as compressor for JavaScript assets -gem 'terser', '~> 1.1' # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder gem 'jbuilder', '~> 2.7' # Use Redis adapter for caching in production diff --git a/Gemfile.lock b/Gemfile.lock index 7633cb03..2efe11d4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -95,7 +95,6 @@ GEM bcrypt (3.1.20) bcrypt_pbkdf (1.1.1) bcrypt_pbkdf (1.1.1-arm64-darwin) - bcrypt_pbkdf (1.1.1-x86_64-darwin) benchmark (0.4.0) bigdecimal (3.1.8) bindex (0.8.1) @@ -304,7 +303,6 @@ GEM faraday-retry (2.2.1) faraday (~> 2.0) ffi (1.17.0-arm64-darwin) - ffi (1.17.0-x86_64-darwin) ffi (1.17.0-x86_64-linux-gnu) ffi-compiler (1.3.2) ffi (>= 1.15.5) @@ -343,9 +341,6 @@ GEM google-protobuf (4.29.1-arm64-darwin) bigdecimal rake (>= 13) - google-protobuf (4.29.1-x86_64-darwin) - bigdecimal - rake (>= 13) google-protobuf (4.29.1-x86_64-linux) bigdecimal rake (>= 13) @@ -366,9 +361,6 @@ GEM grpc (1.68.1-arm64-darwin) google-protobuf (>= 3.25, < 5.0) googleapis-common-protos-types (~> 1.0) - grpc (1.68.1-x86_64-darwin) - google-protobuf (>= 3.25, < 5.0) - googleapis-common-protos-types (~> 1.0) grpc (1.68.1-x86_64-linux) google-protobuf (>= 3.25, < 5.0) googleapis-common-protos-types (~> 1.0) @@ -490,8 +482,6 @@ GEM nio4r (2.7.4) nokogiri (1.17.2-arm64-darwin) racc (~> 1.4) - nokogiri (1.17.2-x86_64-darwin) - racc (~> 1.4) nokogiri (1.17.2-x86_64-linux) racc (~> 1.4) oauth2 (2.0.9) @@ -513,9 +503,13 @@ GEM parallel (1.26.3) parser (3.3.6.0) ast (~> 2.4.1) - racc - pg (1.5.9) - psych (5.2.1) + pg (1.4.6) + propshaft (0.6.4) + actionpack (>= 7.0.0) + activesupport (>= 7.0.0) + rack + railties (>= 7.0.0) + psych (5.2.2) date stringio public_suffix (6.0.1) @@ -578,7 +572,7 @@ GEM zeitwerk (~> 2.6) rainbow (3.1.1) rake (13.2.1) - rdoc (6.9.0) + rdoc (6.10.0) psych (>= 4.0.0) recaptcha (5.18.0) redcarpet (3.6.0) @@ -715,15 +709,7 @@ GEM ostruct retriable ruby-progressbar - 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) sqlite3 (1.7.3-arm64-darwin) - sqlite3 (1.7.3-x86_64-darwin) sqlite3 (1.7.3-x86_64-linux) sshkit (1.23.2) base64 @@ -737,8 +723,6 @@ GEM stringio (3.1.2) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) - terser (1.2.4) - execjs (>= 0.3.0, < 3) test_xml (0.1.8) diffy (~> 3.0) nokogiri (>= 1.3.2) @@ -777,11 +761,7 @@ GEM zeitwerk (2.7.1) PLATFORMS - arm64-darwin-23 - x86_64-darwin-19 - x86_64-darwin-20 - x86_64-darwin-21 - x86_64-darwin-22 + arm64-darwin-24 x86_64-linux DEPENDENCIES @@ -817,6 +797,7 @@ DEPENDENCIES okcomputer openseadragon (= 0.9.0) pg + propshaft puma (~> 6.0) rack-attack rack-mini-profiler (~> 2.0) @@ -843,10 +824,8 @@ DEPENDENCIES sitemap_generator slowpoke (~> 0.4) solr_wrapper - sprockets-rails sqlite3 (~> 1.4) stimulus-rails (~> 1.2) - terser (~> 1.1) turbo-rails (~> 1.3) web-console (>= 4.1.0)