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

Jump to bottom

Drop sass rails #9286

Merged
merged 1 commit into from
Oct 22, 2024
Merged

Drop sass rails #9286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 1 deletion config/initializers/assets.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Rails.application.config.assets.paths << ManageIQ::UI::Classic::Engine.root.join('node_modules')

Rails.application.config.assets.precompile << proc do |filename, path|
path =~ %r{app/assets} && !%w(.js .css).include?(File.extname(filename))
path =~ %r{app/assets} && !%w(.js .css .sass).include?(File.extname(filename))
end
12 changes: 0 additions & 12 deletions lib/manageiq/ui/classic/engine.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,6 @@
require 'rails/engine'
require 'sprockets/railtie'

# Since we serve our assets directly through apache on an appliance after they
# are pre-compiled, there is no need to have sass/coffeescript loaded in the
# application, so we can save a bit of resources by not loading these two.
#
# That said, we still need to load both of these when pre-compiling the assets
# in production mode, so if Rake is defined, load things like we used to.
#
# For this to work properly, it is dependent on patternfly/patternfly-sass#150
if ENV["RAILS_ENV"] != "production" || defined?(Rake)
require 'sass-rails'
end

require 'high_voltage'
require 'webpacker'

Expand Down
2 changes: 1 addition & 1 deletion manageiq-ui-classic.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Gem::Specification.new do |s|
# TODO: fix manageiq-decorators so we can eager load after manageiq-ui-classic
# s.add_dependency "manageiq-decorators"
s.add_dependency "more_core_extensions", ">= 3.2", "< 5"
s.add_dependency "sass-rails"
s.add_dependency "sprockets-rails"
s.add_dependency "uglifier", "~>4.2.0"
s.add_dependency "webpacker", "~>2.0.0"

Expand Down