Switch from sassc-rails to dartsass-sprockets
sassc-rails, and its underlying libsass, is deprecated. dartsass-sprockets allows us to use the currently maintained dartsass implementation, without having to change any of our toolchain. The version of sass-embedded is pinned to avoid warnings in bootstrap. When we upgrade bootstrap versions, we can upgrade sass-embedded to match.
This commit is contained in:
parent
6b6c468915
commit
41f13ac73a
2 changed files with 29 additions and 17 deletions
6
Gemfile
6
Gemfile
|
@ -10,7 +10,9 @@ gem "json"
|
||||||
gem "pg"
|
gem "pg"
|
||||||
|
|
||||||
# Use SCSS for stylesheets
|
# Use SCSS for stylesheets
|
||||||
gem "sassc-rails"
|
gem "dartsass-sprockets"
|
||||||
|
# Pin the dependentent sass-embedded to avoid deprecation warnings in bootstrap
|
||||||
|
gem "sass-embedded", "~> 1.55.0"
|
||||||
|
|
||||||
# Use Terser as compressor for JavaScript assets
|
# Use Terser as compressor for JavaScript assets
|
||||||
gem "terser"
|
gem "terser"
|
||||||
|
@ -43,7 +45,7 @@ gem "sprockets-exporters_pack"
|
||||||
gem "actionpack-page_caching", ">= 1.2.0"
|
gem "actionpack-page_caching", ">= 1.2.0"
|
||||||
gem "activerecord-import"
|
gem "activerecord-import"
|
||||||
gem "active_record_union"
|
gem "active_record_union"
|
||||||
gem "bootstrap", "~> 5.1.0"
|
gem "bootstrap", :github => "gravitystorm/bootstrap-rubygem", :branch => "dartsass_5_1_3"
|
||||||
gem "bootstrap_form", "~> 5.0"
|
gem "bootstrap_form", "~> 5.0"
|
||||||
gem "cancancan"
|
gem "cancancan"
|
||||||
gem "composite_primary_keys", "~> 14.0.0"
|
gem "composite_primary_keys", "~> 14.0.0"
|
||||||
|
|
40
Gemfile.lock
40
Gemfile.lock
|
@ -1,3 +1,12 @@
|
||||||
|
GIT
|
||||||
|
remote: https://github.com/gravitystorm/bootstrap-rubygem.git
|
||||||
|
revision: 8c48a63412e0ef1a280b95ef5344667be92d374a
|
||||||
|
branch: dartsass_5_1_3
|
||||||
|
specs:
|
||||||
|
bootstrap (5.1.3)
|
||||||
|
autoprefixer-rails (>= 9.1.0)
|
||||||
|
popper_js (>= 2.9.3, < 3)
|
||||||
|
|
||||||
GEM
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
|
@ -117,10 +126,6 @@ GEM
|
||||||
debug_inspector (>= 0.0.1)
|
debug_inspector (>= 0.0.1)
|
||||||
bootsnap (1.16.0)
|
bootsnap (1.16.0)
|
||||||
msgpack (~> 1.2)
|
msgpack (~> 1.2)
|
||||||
bootstrap (5.1.3)
|
|
||||||
autoprefixer-rails (>= 9.1.0)
|
|
||||||
popper_js (>= 2.9.3, < 3)
|
|
||||||
sassc-rails (>= 2.0.0)
|
|
||||||
bootstrap_form (5.3.2)
|
bootstrap_form (5.3.2)
|
||||||
actionpack (>= 6.1)
|
actionpack (>= 6.1)
|
||||||
activemodel (>= 6.1)
|
activemodel (>= 6.1)
|
||||||
|
@ -153,6 +158,14 @@ GEM
|
||||||
rexml
|
rexml
|
||||||
crass (1.0.6)
|
crass (1.0.6)
|
||||||
dalli (3.2.6)
|
dalli (3.2.6)
|
||||||
|
dartsass-ruby (3.0.1)
|
||||||
|
sass-embedded (~> 1.54)
|
||||||
|
dartsass-sprockets (3.0.0)
|
||||||
|
dartsass-ruby (~> 3.0)
|
||||||
|
railties (>= 4.0.0)
|
||||||
|
sprockets (> 3.0)
|
||||||
|
sprockets-rails
|
||||||
|
tilt
|
||||||
date (3.3.3)
|
date (3.3.3)
|
||||||
debug_inspector (1.1.0)
|
debug_inspector (1.1.0)
|
||||||
deep_merge (1.2.2)
|
deep_merge (1.2.2)
|
||||||
|
@ -231,6 +244,7 @@ GEM
|
||||||
ffi (>= 1.0.0)
|
ffi (>= 1.0.0)
|
||||||
globalid (1.2.1)
|
globalid (1.2.1)
|
||||||
activesupport (>= 6.1)
|
activesupport (>= 6.1)
|
||||||
|
google-protobuf (3.24.3)
|
||||||
hashdiff (1.0.1)
|
hashdiff (1.0.1)
|
||||||
hashie (5.0.0)
|
hashie (5.0.0)
|
||||||
highline (2.1.0)
|
highline (2.1.0)
|
||||||
|
@ -474,14 +488,9 @@ GEM
|
||||||
sanitize (6.1.0)
|
sanitize (6.1.0)
|
||||||
crass (~> 1.0.2)
|
crass (~> 1.0.2)
|
||||||
nokogiri (>= 1.12.0)
|
nokogiri (>= 1.12.0)
|
||||||
sassc (2.4.0)
|
sass-embedded (1.55.0)
|
||||||
ffi (~> 1.9)
|
google-protobuf (~> 3.19)
|
||||||
sassc-rails (2.1.2)
|
rake (>= 10.0.0)
|
||||||
railties (>= 4.0.0)
|
|
||||||
sassc (>= 2.0)
|
|
||||||
sprockets (> 3.0)
|
|
||||||
sprockets-rails
|
|
||||||
tilt
|
|
||||||
secure_headers (6.5.0)
|
secure_headers (6.5.0)
|
||||||
selenium-webdriver (4.13.1)
|
selenium-webdriver (4.13.1)
|
||||||
rexml (~> 3.2, >= 3.2.5)
|
rexml (~> 3.2, >= 3.2.5)
|
||||||
|
@ -551,7 +560,7 @@ DEPENDENCIES
|
||||||
better_errors
|
better_errors
|
||||||
binding_of_caller
|
binding_of_caller
|
||||||
bootsnap (>= 1.4.2)
|
bootsnap (>= 1.4.2)
|
||||||
bootstrap (~> 5.1.0)
|
bootstrap!
|
||||||
bootstrap_form (~> 5.0)
|
bootstrap_form (~> 5.0)
|
||||||
brakeman
|
brakeman
|
||||||
browser
|
browser
|
||||||
|
@ -563,6 +572,7 @@ DEPENDENCIES
|
||||||
config
|
config
|
||||||
connection_pool
|
connection_pool
|
||||||
dalli
|
dalli
|
||||||
|
dartsass-sprockets
|
||||||
debug_inspector
|
debug_inspector
|
||||||
delayed_job_active_record
|
delayed_job_active_record
|
||||||
doorkeeper
|
doorkeeper
|
||||||
|
@ -619,7 +629,7 @@ DEPENDENCIES
|
||||||
rubocop-rails
|
rubocop-rails
|
||||||
rubocop-rake
|
rubocop-rake
|
||||||
sanitize
|
sanitize
|
||||||
sassc-rails
|
sass-embedded (~> 1.55.0)
|
||||||
secure_headers
|
secure_headers
|
||||||
selenium-webdriver
|
selenium-webdriver
|
||||||
simplecov
|
simplecov
|
||||||
|
@ -632,4 +642,4 @@ DEPENDENCIES
|
||||||
webmock
|
webmock
|
||||||
|
|
||||||
BUNDLED WITH
|
BUNDLED WITH
|
||||||
2.3.26
|
2.4.19
|
||||||
|
|
Loading…
Add table
Reference in a new issue