Skip to content

Commit 9485c91

Browse files
authored
Merge pull request #485 from ncbo/chore/cssbundling-rails/483
Migrate to cssbundling-rails with Dart Sass
2 parents d62f92d + 8b0fa96 commit 9485c91

File tree

367 files changed

+7757
-5147
lines changed

Some content is hidden

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

367 files changed

+7757
-5147
lines changed

Gemfile

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,18 @@ gem 'rails', '8.0.3'
99
# JavaScript bundling for Rails
1010
gem 'jsbundling-rails'
1111

12+
# CSS bundling for Rails
13+
gem 'cssbundling-rails', '~> 1.4'
14+
1215
# Chart.js integration for Rails
1316
gem 'chart-js-rails'
1417

15-
gem 'select2-rails'
16-
17-
# SassC as a replacement for sass-rails
18-
gem 'sassc-rails' # sass-rails replacement
19-
2018
# Terser JavaScript minifier as a replacement for Uglifier
2119
gem 'terser' # uglifier replacement
2220

23-
# Bootstrap front-end framework
24-
gem 'bootstrap', '~> 5.2.3'
25-
2621
# jQuery integration for Rails
2722
gem 'jquery-rails'
2823

29-
# jQuery UI integration for Rails
30-
gem 'jquery-ui-rails'
31-
3224
# The original asset pipeline for Rails
3325
# [https://github.com/rails/sprockets-rails]
3426
gem 'sprockets-rails'

Gemfile.lock

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,6 @@ GEM
9393
airbrussh (1.5.3)
9494
sshkit (>= 1.6.1, != 1.7.0)
9595
ast (2.4.3)
96-
autoprefixer-rails (10.4.21.0)
97-
execjs (~> 2)
9896
base64 (0.3.0)
9997
bcrypt_pbkdf (1.1.1)
10098
bcrypt_pbkdf (1.1.1-arm64-darwin)
@@ -104,10 +102,6 @@ GEM
104102
bindex (0.8.1)
105103
bootsnap (1.19.0)
106104
msgpack (~> 1.2)
107-
bootstrap (5.2.3)
108-
autoprefixer-rails (>= 9.1.0)
109-
popper_js (>= 2.11.6, < 3)
110-
sassc-rails (>= 2.0.0)
111105
brakeman (7.1.1)
112106
racc
113107
bugsnag (6.28.0)
@@ -153,6 +147,8 @@ GEM
153147
crass (1.0.6)
154148
css_parser (1.21.1)
155149
addressable
150+
cssbundling-rails (1.4.3)
151+
railties (>= 6.0.0)
156152
csv (3.3.5)
157153
dalli (3.2.8)
158154
date (3.5.0)
@@ -258,8 +254,6 @@ GEM
258254
rails-dom-testing (>= 1, < 3)
259255
railties (>= 4.2.0)
260256
thor (>= 0.14, < 2.0)
261-
jquery-ui-rails (8.0.0)
262-
railties (>= 3.2.16)
263257
jsbundling-rails (1.3.1)
264258
railties (>= 6.0.0)
265259
json (2.16.0)
@@ -371,7 +365,6 @@ GEM
371365
parser (3.3.10.0)
372366
ast (~> 2.4.1)
373367
racc
374-
popper_js (2.11.8)
375368
pp (0.6.3)
376369
prettyprint
377370
prettyprint (0.2.0)
@@ -500,7 +493,6 @@ GEM
500493
sprockets-rails
501494
tilt
502495
securerandom (0.4.1)
503-
select2-rails (4.0.13)
504496
selenium-webdriver (4.38.0)
505497
base64 (~> 0.2)
506498
logger (~> 1.4)
@@ -593,7 +585,6 @@ PLATFORMS
593585
DEPENDENCIES
594586
bcrypt_pbkdf (>= 1.0, < 2.0)
595587
bootsnap
596-
bootstrap (~> 5.2.3)
597588
brakeman
598589
bugsnag (~> 6.26)
599590
capistrano (~> 3.17)
@@ -606,6 +597,7 @@ DEPENDENCIES
606597
chart-js-rails
607598
color (~> 1.8)
608599
concurrent-ruby (= 1.3.4)
600+
cssbundling-rails (~> 1.4)
609601
dalli
610602
debug
611603
deepl-rb
@@ -624,7 +616,6 @@ DEPENDENCIES
624616
inline_svg
625617
iso-639 (~> 0.3.6)
626618
jquery-rails
627-
jquery-ui-rails
628619
jsbundling-rails
629620
letter_opener_web (~> 2.0)
630621
lookbook (~> 1.5.5)
@@ -646,8 +637,6 @@ DEPENDENCIES
646637
rexml (~> 3)
647638
rspec-rails
648639
rubocop
649-
sassc-rails
650-
select2-rails
651640
selenium-webdriver
652641
simplecov
653642
simplecov-cobertura

Procfile.dev

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
web: bin/rails server -p 3000
22
js: yarn build --watch
3+
css: yarn build:css --watch

app/assets/config/manifest.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@
55
//= link bp_annotatorplus.js
66
//= link vendor.js
77
//= link_directory ../javascripts .js
8-
//= link_directory ../stylesheets .css
8+
9+
//= link flag-icon.css

app/assets/images/arrows.gif

-320 Bytes
Binary file not shown.

app/assets/images/bluebutton.png

-1.05 KB
Binary file not shown.
-60 Bytes
Binary file not shown.
-50 Bytes
Binary file not shown.
-61 Bytes
Binary file not shown.
-1.7 KB
Binary file not shown.

0 commit comments

Comments
 (0)