diff --git a/Gemfile b/Gemfile index c0f2a20c9..4b699cd3c 100644 --- a/Gemfile +++ b/Gemfile @@ -49,7 +49,7 @@ gem "redcarpet", "~> 3.6.0" gem "responders", "~> 3.1.1" gem "rinku", "~> 2.0.6", require: "rails_rinku" gem "ros-apartment", "~> 2.11.0", require: "apartment" # Remove ConnectionHandling monkey patch when upgrading -gem "sassc-embedded", "~> 1.80.1" +gem "sassc-embedded", "~> 1.77.5" gem "sassc-rails", "~> 2.1.2" gem "savon", "~> 2.15.1" gem "sitemap_generator", "~> 6.3.0" diff --git a/Gemfile.lock b/Gemfile.lock index 9446eeef4..355a66885 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -593,13 +593,13 @@ GEM capistrano (~> 3.0) sshkit (>= 1.2) safely_block (0.4.1) - sass-embedded (1.80.4) - google-protobuf (~> 4.28) + sass-embedded (1.77.5) + google-protobuf (>= 3.25, < 5.0) rake (>= 13) sassc (2.4.0) ffi (~> 1.9) - sassc-embedded (1.80.1) - sass-embedded (~> 1.80) + sassc-embedded (1.77.5) + sass-embedded (~> 1.77) sassc-rails (2.1.2) railties (>= 4.0.0) sassc (>= 2.0) @@ -794,7 +794,7 @@ DEPENDENCIES rubocop-rspec (~> 3.4.0) rubocop-rspec_rails (~> 2.30.0) rvm1-capistrano3 (~> 1.4.0) - sassc-embedded (~> 1.80.1) + sassc-embedded (~> 1.77.5) sassc-rails (~> 2.1.2) savon (~> 2.15.1) selenium-webdriver (~> 4.25.0) diff --git a/config/initializers/sass.rb b/config/initializers/sass.rb index ff9946cdc..3760b32e5 100644 --- a/config/initializers/sass.rb +++ b/config/initializers/sass.rb @@ -1,10 +1,9 @@ -# TODO: Remove quiet_deps once we upgrade Foundation and Font Awesome, -# and remove silence_deprecations once we migrate away from Sass @import rules, -# which will be removed in Dart Sass 3.0.0. +# TODO: we could remove it once we upgrade Font Awesome, although +# we might need to add it again if we upgrade Sass SassC::Engine.class_eval do alias_method :original_initialize, :initialize def initialize(template, options = {}) - original_initialize(template, options.merge(quiet_deps: true, silence_deprecations: [:import])) + original_initialize(template, options.merge(quiet_deps: true)) end end