Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate to Dart Sass #1108

Merged
merged 4 commits into from
Jan 23, 2024
Merged

Migrate to Dart Sass #1108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c859c9c
Replace sassc-rails with dartsass-rails
davidgisbey Jan 22, 2024
5a88139
Configure builds
davidgisbey Jan 22, 2024
1606e63
Remove Sass config
davidgisbey Jan 22, 2024
97432d4
Ensure Dart Sass is built on precompile
davidgisbey Jan 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@

# Ignore compiled assets
/public/assets
/app/assets/builds/*
!/app/assets/builds/.keep

.yarn/*
!.yarn/patches
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ gem "bootsnap", require: false
gem "cancancan"
gem "chosen-rails"
gem "dalli"
gem "dartsass-rails"
gem "gds-api-adapters"
gem "gds-sso"
gem "govspeak"
Expand All @@ -15,7 +16,6 @@ gem "govuk_publishing_components"
gem "kaminari"
gem "mongoid"
gem "plek"
gem "sassc-rails"
gem "uglifier"

group :test do
Expand Down
14 changes: 13 additions & 1 deletion Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,9 @@ GEM
rexml
crass (1.0.6)
dalli (3.2.6)
dartsass-rails (0.5.0)
railties (>= 6.0.0)
sass-embedded (~> 1.63)
database_cleaner-core (2.0.1)
database_cleaner-mongoid (2.0.1)
database_cleaner-core (~> 2.0.0)
Expand Down Expand Up @@ -622,6 +625,15 @@ GEM
sanitize (6.1.0)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
sass-embedded (1.70.0)
google-protobuf (~> 3.25)
rake (>= 13.0.0)
sass-embedded (1.70.0-aarch64-linux-gnu)
google-protobuf (~> 3.25)
sass-embedded (1.70.0-arm64-darwin)
google-protobuf (~> 3.25)
sass-embedded (1.70.0-x86_64-linux-gnu)
google-protobuf (~> 3.25)
sassc (2.4.0)
ffi (~> 1.9)
sassc-rails (2.1.2)
Expand Down Expand Up @@ -696,6 +708,7 @@ DEPENDENCIES
capybara
chosen-rails
dalli
dartsass-rails
database_cleaner-mongoid
factory_bot_rails
gds-api-adapters
Expand All @@ -713,7 +726,6 @@ DEPENDENCIES
rails (= 7.1.3)
rails-controller-testing
rubocop-govuk
sassc-rails
shoulda-context
simplecov
uglifier
Expand Down
Empty file added app/assets/builds/.keep
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion app/assets/config/manifest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
//= link_tree ../images
//= link_directory ../javascripts .js
//= link_directory ../stylesheets .css
//= link_tree ../builds
4 changes: 0 additions & 4 deletions config/environments/production.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,6 @@
# Do not fallback to assets pipeline if a precompiled asset is missed.
config.assets.compile = false

# Rather than use a CSS compressor, use the SASS style to perform compression.
config.sass.style = :compressed
config.sass.line_comments = false

# Enable serving of images, stylesheets, and JavaScripts from an asset server.
# config.asset_host = "http://assets.example.com"

Expand Down
1 change: 1 addition & 0 deletions config/initializers/dartsass.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Rails.application.config.dartsass.build_options << " --quiet-deps"
1 change: 1 addition & 0 deletions lib/tasks/assets.rake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Rake::Task["assets:precompile"].enhance(["dartsass:build"])
Loading