Skip to content

Commit ebd756d

Browse files
committed
Replace sprockets-sass with dartsass-sprockets.
Add manual precompile of .scss.erb files to thor task, since dart-sass is no longer responsible for it. Remove @import statements deprecated by dart-sass, and add them as @use clauses in individual modules. Replace deprecated darken() functions with color.adjust(). Update copyright year in README.
1 parent ec7198e commit ebd756d

128 files changed

Lines changed: 569 additions & 218 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,7 @@ docs/**/*
1212
*.tar.bz2
1313
*.tar.gz
1414
*.zip
15+
16+
# SCSS manually compiled from ERB.
17+
assets/stylesheets/global/_icons.scss
18+
assets/stylesheets/components/_environment.scss

Gemfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,15 @@ group :app do
1515
gem 'browser'
1616
gem 'chunky_png'
1717
gem 'erubi'
18+
gem 'dartsass-sprockets'
1819
gem 'image_optim_pack', platforms: :ruby
1920
gem 'image_optim'
2021
gem 'rack-ssl-enforcer'
2122
gem 'rack'
2223
gem 'rss'
23-
gem 'sass'
2424
gem 'sinatra-contrib'
2525
gem 'sinatra'
2626
gem 'sprockets-helpers'
27-
gem 'sprockets-sass'
2827
gem 'sprockets'
2928
gem 'thin'
3029
end

Gemfile.lock

Lines changed: 90 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,25 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4+
actionpack (7.2.3)
5+
actionview (= 7.2.3)
6+
activesupport (= 7.2.3)
7+
cgi
8+
nokogiri (>= 1.8.5)
9+
racc
10+
rack (>= 2.2.4, < 3.3)
11+
rack-session (>= 1.0.1)
12+
rack-test (>= 0.6.3)
13+
rails-dom-testing (~> 2.2)
14+
rails-html-sanitizer (~> 1.6)
15+
useragent (~> 0.16)
16+
actionview (7.2.3)
17+
activesupport (= 7.2.3)
18+
builder (~> 3.1)
19+
cgi
20+
erubi (~> 1.11)
21+
rails-dom-testing (~> 2.2)
22+
rails-html-sanitizer (~> 1.6)
423
activesupport (7.2.3)
524
base64
625
benchmark (>= 0.3)
@@ -21,13 +40,24 @@ GEM
2140
rouge (>= 1.0.0)
2241
bigdecimal (3.1.9)
2342
browser (5.3.1)
43+
builder (3.3.0)
2444
byebug (12.0.0)
45+
cgi (0.5.1)
2546
chunky_png (1.4.0)
2647
coderay (1.1.3)
2748
concurrent-ruby (1.3.5)
2849
connection_pool (2.4.1)
50+
crass (1.0.6)
2951
daemons (1.4.1)
52+
dartsass-sprockets (3.2.1)
53+
railties (>= 4.0.0)
54+
sassc-embedded (~> 1.80.1)
55+
sprockets (> 3.0)
56+
sprockets-rails
57+
tilt
58+
date (3.5.1)
3059
drb (2.2.3)
60+
erb (6.0.1)
3161
erubi (1.13.1)
3262
ethon (0.17.0)
3363
ffi (>= 1.15.0)
@@ -36,6 +66,9 @@ GEM
3666
exifr (1.4.0)
3767
ffi (1.17.2)
3868
fspath (3.1.2)
69+
google-protobuf (4.33.4)
70+
bigdecimal
71+
rake (>= 13)
3972
highline (3.1.2)
4073
reline
4174
html-pipeline (2.14.3)
@@ -55,7 +88,14 @@ GEM
5588
image_size (3.3.0)
5689
in_threads (1.6.0)
5790
io-console (0.8.0)
91+
irb (1.16.0)
92+
pp (>= 0.6.0)
93+
rdoc (>= 4.0.0)
94+
reline (>= 0.4.2)
5895
logger (1.6.6)
96+
loofah (2.25.0)
97+
crass (~> 1.0.2)
98+
nokogiri (>= 1.12.0)
5999
method_source (1.1.0)
60100
mini_portile2 (2.8.9)
61101
minitest (5.27.0)
@@ -67,6 +107,9 @@ GEM
67107
mini_portile2 (~> 2.8.2)
68108
racc (~> 1.4)
69109
options (2.3.2)
110+
pp (0.6.3)
111+
prettyprint
112+
prettyprint (0.2.0)
70113
progress (3.6.0)
71114
progress_bar (1.3.4)
72115
highline (>= 1.6)
@@ -77,18 +120,44 @@ GEM
77120
pry-byebug (3.11.0)
78121
byebug (~> 12.0)
79122
pry (>= 0.13, < 0.16)
123+
psych (5.3.1)
124+
date
125+
stringio
80126
racc (1.8.1)
81127
rack (2.2.21)
82128
rack-protection (3.2.0)
83129
base64 (>= 0.1.0)
84130
rack (~> 2.2, >= 2.2.4)
131+
rack-session (1.0.2)
132+
rack (< 3)
85133
rack-ssl-enforcer (0.2.9)
86134
rack-test (2.2.0)
87135
rack (>= 1.3)
136+
rackup (1.0.1)
137+
rack (< 3)
138+
webrick
139+
rails-dom-testing (2.3.0)
140+
activesupport (>= 5.0.0)
141+
minitest
142+
nokogiri (>= 1.6)
143+
rails-html-sanitizer (1.6.2)
144+
loofah (~> 2.21)
145+
nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
146+
railties (7.2.3)
147+
actionpack (= 7.2.3)
148+
activesupport (= 7.2.3)
149+
cgi
150+
irb (~> 1.13)
151+
rackup (>= 1.0.0)
152+
rake (>= 12.2)
153+
thor (~> 1.0, >= 1.2.2)
154+
tsort (>= 0.2)
155+
zeitwerk (~> 2.6)
88156
rake (13.3.1)
89-
rb-fsevent (0.11.2)
90-
rb-inotify (0.10.1)
91-
ffi (~> 1.0)
157+
rdoc (7.1.0)
158+
erb
159+
psych (>= 4.0.0)
160+
tsort
92161
redcarpet (3.6.1)
93162
reline (0.6.0)
94163
io-console (~> 0.5)
@@ -98,11 +167,11 @@ GEM
98167
rss (0.3.1)
99168
rexml
100169
ruby2_keywords (0.0.5)
101-
sass (3.7.4)
102-
sass-listen (~> 4.0.0)
103-
sass-listen (4.0.0)
104-
rb-fsevent (~> 0.9, >= 0.9.4)
105-
rb-inotify (~> 0.9, >= 0.9.7)
170+
sass-embedded (1.97.3)
171+
google-protobuf (~> 4.31)
172+
rake (>= 13)
173+
sassc-embedded (1.80.8)
174+
sass-embedded (~> 1.80)
106175
securerandom (0.3.2)
107176
sinatra (3.2.0)
108177
mustermann (~> 3.0)
@@ -115,14 +184,17 @@ GEM
115184
rack-protection (= 3.2.0)
116185
sinatra (= 3.2.0)
117186
tilt (~> 2.0)
118-
sprockets (3.7.5)
119-
base64
187+
sprockets (4.2.2)
120188
concurrent-ruby (~> 1.0)
121-
rack (> 1, < 3)
189+
logger
190+
rack (>= 2.2.4, < 4)
122191
sprockets-helpers (1.4.0)
123192
sprockets (>= 2.2)
124-
sprockets-sass (2.0.0.beta2)
125-
sprockets (>= 2.0, < 4.0)
193+
sprockets-rails (3.5.2)
194+
actionpack (>= 6.1)
195+
activesupport (>= 6.1)
196+
sprockets (>= 3.0.0)
197+
stringio (3.2.0)
126198
strings (0.2.1)
127199
strings-ansi (~> 0.2)
128200
unicode-display_width (>= 1.5, < 3.0)
@@ -138,6 +210,7 @@ GEM
138210
rack (>= 1, < 3)
139211
thor (1.4.0)
140212
tilt (2.6.0)
213+
tsort (0.2.0)
141214
tty-pager (0.14.0)
142215
strings (~> 0.2.0)
143216
tty-screen (~> 0.8)
@@ -149,7 +222,10 @@ GEM
149222
unicode-display_width (2.3.0)
150223
unicode_utils (1.4.0)
151224
unix_utils (0.0.15)
225+
useragent (0.16.11)
226+
webrick (1.9.2)
152227
yajl-ruby (1.4.3)
228+
zeitwerk (2.7.4)
153229

154230
PLATFORMS
155231
ruby
@@ -159,6 +235,7 @@ DEPENDENCIES
159235
better_errors
160236
browser
161237
chunky_png
238+
dartsass-sprockets
162239
erubi
163240
html-pipeline
164241
image_optim
@@ -175,12 +252,10 @@ DEPENDENCIES
175252
redcarpet
176253
rr
177254
rss
178-
sass
179255
sinatra
180256
sinatra-contrib
181257
sprockets
182258
sprockets-helpers
183-
sprockets-sass
184259
terminal-table
185260
terser
186261
thin

0 commit comments

Comments
 (0)