Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Bring back `payment_icons` as dependency (#12198)

Damian Legawiecf932f9d56140
diff --git a/admin/lib/spree/admin.rb b/admin/lib/spree/admin.rb
index e84dcddaef..fc094bde81 100644
--- a/admin/lib/spree/admin.rb
+++ b/admin/lib/spree/admin.rb
@@ -11,7 +11,7 @@ require 'bootstrap'
require 'turbo-rails'
require 'stimulus-rails'
require 'inline_svg'
-# require 'payment_icons'
+require 'payment_icons'
require 'dartsass-rails'
require 'responders'
require 'tinymce-rails'
diff --git a/admin/lib/spree/admin/engine.rb b/admin/lib/spree/admin/engine.rb
index 431692d188..08bfb94e03 100644
--- a/admin/lib/spree/admin/engine.rb
+++ b/admin/lib/spree/admin/engine.rb
@@ -3,12 +3,19 @@ require_relative 'runtime_configuration'
module Spree
module Admin
class Engine < ::Rails::Engine
- initializer 'spree.admin.configuration', before: :load_config_initializers do |app|
+ initializer 'spree.admin.configuration', before: :load_config_initializers do |_app|
Spree::Admin::RuntimeConfig = Spree::Admin::RuntimeConfiguration.new
end
- initializer "spree.admin.assets" do |app|
- app.config.assets.paths << root.join("app/javascript")
+ initializer 'spree.admin.dartsass_fix' do |app|
+ # we're not using any sass compressors, as we're using dartsass-rails
+ # some gems however like payment_icons still have sassc-rails as a dependency
+ # which sets the css_compressor to :sass and breaks the assets pipeline
+ app.config.assets.css_compressor = nil if app.config.assets.css_compressor == :sass
+ end
+
+ initializer 'spree.admin.assets' do |app|
+ app.config.assets.paths << root.join('app/javascript')
app.config.assets.precompile += %w[ spree_admin_manifest ]
end
diff --git a/admin/spree_admin.gemspec b/admin/spree_admin.gemspec
index a771bba92e..dc1fba606a 100644
--- a/admin/spree_admin.gemspec
+++ b/admin/spree_admin.gemspec
@@ -36,7 +36,7 @@ Gem::Specification.new do |s|
s.add_dependency 'dartsass-rails', '~> 0.5'
s.add_dependency 'importmap-rails'
s.add_dependency 'inline_svg', '~> 1.5'
- # s.add_dependency 'payment_icons'
+ s.add_dependency 'payment_icons'
s.add_dependency 'turbo-rails'
s.add_dependency 'stimulus-rails'
s.add_dependency 'responders'