File tree Expand file tree Collapse file tree 3 files changed +2
-14
lines changed Expand file tree Collapse file tree 3 files changed +2
-14
lines changed Original file line number Diff line number Diff line change 11Rails . application . config . assets . paths << ManageIQ ::UI ::Classic ::Engine . root . join ( 'node_modules' )
22
33Rails . application . config . assets . precompile << proc do |filename , path |
4- path =~ %r{app/assets} && !%w( .js .css ) . include? ( File . extname ( filename ) )
4+ path =~ %r{app/assets} && !%w( .js .css .sass ) . include? ( File . extname ( filename ) )
55end
Original file line number Diff line number Diff line change 11require 'rails/engine'
22require 'sprockets/railtie'
33
4- # Since we serve our assets directly through apache on an appliance after they
5- # are pre-compiled, there is no need to have sass/coffeescript loaded in the
6- # application, so we can save a bit of resources by not loading these two.
7- #
8- # That said, we still need to load both of these when pre-compiling the assets
9- # in production mode, so if Rake is defined, load things like we used to.
10- #
11- # For this to work properly, it is dependent on patternfly/patternfly-sass#150
12- if ENV [ "RAILS_ENV" ] != "production" || defined? ( Rake )
13- require 'sass-rails'
14- end
15-
164require 'high_voltage'
175require 'webpacker'
186
Original file line number Diff line number Diff line change @@ -27,7 +27,7 @@ Gem::Specification.new do |s|
2727 # TODO: fix manageiq-decorators so we can eager load after manageiq-ui-classic
2828 # s.add_dependency "manageiq-decorators"
2929 s . add_dependency "more_core_extensions" , ">= 3.2" , "< 5"
30- s . add_dependency "sass -rails"
30+ s . add_dependency "sprockets -rails"
3131 s . add_dependency "uglifier" , "~>4.2.0"
3232 s . add_dependency "webpacker" , "~>2.0.0"
3333
You can’t perform that action at this time.
0 commit comments