Skip to content

Commit 6a9dde6

Browse files
authored
Merge pull request #2649 from spamguy/sass
Replace sprockets-sass with dartsass-sprockets
2 parents be50790 + 81dfb8b commit 6a9dde6

File tree

127 files changed

+518
-169
lines changed

Some content is hidden

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

127 files changed

+518
-169
lines changed

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.18.0)
3363
ffi (>= 1.15.0)
@@ -37,6 +67,9 @@ GEM
3767
exifr (1.4.0)
3868
ffi (1.17.3)
3969
fspath (3.1.2)
70+
google-protobuf (4.33.4)
71+
bigdecimal
72+
rake (>= 13)
4073
highline (3.1.2)
4174
reline
4275
html-pipeline (2.14.3)
@@ -56,7 +89,14 @@ GEM
5689
image_size (3.3.0)
5790
in_threads (1.6.0)
5891
io-console (0.8.0)
92+
irb (1.16.0)
93+
pp (>= 0.6.0)
94+
rdoc (>= 4.0.0)
95+
reline (>= 0.4.2)
5996
logger (1.6.6)
97+
loofah (2.25.0)
98+
crass (~> 1.0.2)
99+
nokogiri (>= 1.12.0)
60100
method_source (1.1.0)
61101
mini_portile2 (2.8.9)
62102
minitest (5.27.0)
@@ -68,6 +108,9 @@ GEM
68108
mini_portile2 (~> 2.8.2)
69109
racc (~> 1.4)
70110
options (2.3.2)
111+
pp (0.6.3)
112+
prettyprint
113+
prettyprint (0.2.0)
71114
progress (3.6.0)
72115
progress_bar (1.3.4)
73116
highline (>= 1.6)
@@ -78,18 +121,44 @@ GEM
78121
pry-byebug (3.11.0)
79122
byebug (~> 12.0)
80123
pry (>= 0.13, < 0.16)
124+
psych (5.3.1)
125+
date
126+
stringio
81127
racc (1.8.1)
82128
rack (2.2.22)
83129
rack-protection (3.2.0)
84130
base64 (>= 0.1.0)
85131
rack (~> 2.2, >= 2.2.4)
132+
rack-session (1.0.2)
133+
rack (< 3)
86134
rack-ssl-enforcer (0.2.9)
87135
rack-test (2.2.0)
88136
rack (>= 1.3)
137+
rackup (1.0.1)
138+
rack (< 3)
139+
webrick
140+
rails-dom-testing (2.3.0)
141+
activesupport (>= 5.0.0)
142+
minitest
143+
nokogiri (>= 1.6)
144+
rails-html-sanitizer (1.6.2)
145+
loofah (~> 2.21)
146+
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)
147+
railties (7.2.3)
148+
actionpack (= 7.2.3)
149+
activesupport (= 7.2.3)
150+
cgi
151+
irb (~> 1.13)
152+
rackup (>= 1.0.0)
153+
rake (>= 12.2)
154+
thor (~> 1.0, >= 1.2.2)
155+
tsort (>= 0.2)
156+
zeitwerk (~> 2.6)
89157
rake (13.3.1)
90-
rb-fsevent (0.11.2)
91-
rb-inotify (0.10.1)
92-
ffi (~> 1.0)
158+
rdoc (7.1.0)
159+
erb
160+
psych (>= 4.0.0)
161+
tsort
93162
redcarpet (3.6.1)
94163
reline (0.6.0)
95164
io-console (~> 0.5)
@@ -99,11 +168,11 @@ GEM
99168
rss (0.3.1)
100169
rexml
101170
ruby2_keywords (0.0.5)
102-
sass (3.7.4)
103-
sass-listen (~> 4.0.0)
104-
sass-listen (4.0.0)
105-
rb-fsevent (~> 0.9, >= 0.9.4)
106-
rb-inotify (~> 0.9, >= 0.9.7)
171+
sass-embedded (1.97.3)
172+
google-protobuf (~> 4.31)
173+
rake (>= 13)
174+
sassc-embedded (1.80.8)
175+
sass-embedded (~> 1.80)
107176
securerandom (0.3.2)
108177
sinatra (3.2.0)
109178
mustermann (~> 3.0)
@@ -116,14 +185,17 @@ GEM
116185
rack-protection (= 3.2.0)
117186
sinatra (= 3.2.0)
118187
tilt (~> 2.0)
119-
sprockets (3.7.5)
120-
base64
188+
sprockets (4.2.2)
121189
concurrent-ruby (~> 1.0)
122-
rack (> 1, < 3)
190+
logger
191+
rack (>= 2.2.4, < 4)
123192
sprockets-helpers (1.4.0)
124193
sprockets (>= 2.2)
125-
sprockets-sass (2.0.0.beta2)
126-
sprockets (>= 2.0, < 4.0)
194+
sprockets-rails (3.5.2)
195+
actionpack (>= 6.1)
196+
activesupport (>= 6.1)
197+
sprockets (>= 3.0.0)
198+
stringio (3.2.0)
127199
strings (0.2.1)
128200
strings-ansi (~> 0.2)
129201
unicode-display_width (>= 1.5, < 3.0)
@@ -139,6 +211,7 @@ GEM
139211
rack (>= 1, < 3)
140212
thor (1.4.0)
141213
tilt (2.6.0)
214+
tsort (0.2.0)
142215
tty-pager (0.14.0)
143216
strings (~> 0.2.0)
144217
tty-screen (~> 0.8)
@@ -150,7 +223,10 @@ GEM
150223
unicode-display_width (2.3.0)
151224
unicode_utils (1.4.0)
152225
unix_utils (0.0.15)
226+
useragent (0.16.11)
227+
webrick (1.9.2)
153228
yajl-ruby (1.4.3)
229+
zeitwerk (2.7.4)
154230

155231
PLATFORMS
156232
ruby
@@ -160,6 +236,7 @@ DEPENDENCIES
160236
better_errors
161237
browser
162238
chunky_png
239+
dartsass-sprockets
163240
erubi
164241
html-pipeline
165242
image_optim
@@ -176,12 +253,10 @@ DEPENDENCIES
176253
redcarpet
177254
rr
178255
rss
179-
sass
180256
sinatra
181257
sinatra-contrib
182258
sprockets
183259
sprockets-helpers
184-
sprockets-sass
185260
terminal-table
186261
terser
187262
thin

assets/javascripts/application.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818

1919
//= require_tree ./templates
2020

21+
//= link_tree ../images/sprites
22+
2123
//= require tracking
2224

2325
var init = function () {

0 commit comments

Comments
 (0)