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.

Upgrade Sprockets to v4 :rocket:

Damian Legawiecd2a94cbbc810
diff --git a/backend/app/assets/config/spree_backend_manifest.js b/backend/app/assets/config/spree_backend_manifest.js
new file mode 100644
index 0000000000..1ae0d19263
--- /dev/null
+++ b/backend/app/assets/config/spree_backend_manifest.js
@@ -0,0 +1,129 @@
+//= link_tree ../images
+
+//= link spree/backend/all.js
+//= link spree/backend/all.css
+//= link jquery.jstree/themes/spree/style.css
+
+//= link select2_locale_af.js
+//= link select2_locale_ar.js
+//= link select2_locale_az.js
+//= link select2_locale_bg.js
+//= link select2_locale_bn.js
+//= link select2_locale_bs.js
+//= link select2_locale_ca.js
+//= link select2_locale_cs.js
+//= link select2_locale_da.js
+//= link select2_locale_de.js
+//= link select2_locale_dsb.js
+//= link select2_locale_el.js
+//= link select2_locale_en.js
+//= link select2_locale_es.js
+//= link select2_locale_et.js
+//= link select2_locale_eu.js
+//= link select2_locale_fa.js
+//= link select2_locale_fi.js
+//= link select2_locale_fr.js
+//= link select2_locale_gl.js
+//= link select2_locale_he.js
+//= link select2_locale_hi.js
+//= link select2_locale_hr.js
+//= link select2_locale_hsb.js
+//= link select2_locale_hu.js
+//= link select2_locale_hy.js
+//= link select2_locale_id.js
+//= link select2_locale_is.js
+//= link select2_locale_it.js
+//= link select2_locale_ja.js
+//= link select2_locale_ka.js
+//= link select2_locale_km.js
+//= link select2_locale_ko.js
+//= link select2_locale_lt.js
+//= link select2_locale_lv.js
+//= link select2_locale_mk.js
+//= link select2_locale_ms.js
+//= link select2_locale_nb.js
+//= link select2_locale_ne.js
+//= link select2_locale_nl.js
+//= link select2_locale_pl.js
+//= link select2_locale_ps.js
+//= link select2_locale_pt.js
+//= link select2_locale_pt-BR.js
+//= link select2_locale_ro.js
+//= link select2_locale_ru.js
+//= link select2_locale_sk.js
+//= link select2_locale_sl.js
+//= link select2_locale_sq.js
+//= link select2_locale_sr.js
+//= link select2_locale_sr-Cyrl.js
+//= link select2_locale_sv.js
+//= link select2_locale_th.js
+//= link select2_locale_tk.js
+//= link select2_locale_tr.js
+//= link select2_locale_uk.js
+//= link select2_locale_vi.js
+//= link select2_locale_zh-CN.js
+//= link select2_locale_zh-TW.js
+
+//= link flatpickr/l10n/ar.js
+//= link flatpickr/l10n/bs.js
+//= link flatpickr/l10n/default.js
+//= link flatpickr/l10n/fo.js
+//= link flatpickr/l10n/hr.js
+//= link flatpickr/l10n/ja.js
+//= link flatpickr/l10n/lv.js
+//= link flatpickr/l10n/no.js
+//= link flatpickr/l10n/si.js
+//= link flatpickr/l10n/sv.js
+//= link flatpickr/l10n/vn.js
+//= link flatpickr/l10n/at.js
+//= link flatpickr/l10n/cat.js
+//= link flatpickr/l10n/eo.js
+//= link flatpickr/l10n/fr.js
+//= link flatpickr/l10n/hu.js
+//= link flatpickr/l10n/ka.js
+//= link flatpickr/l10n/mk.js
+//= link flatpickr/l10n/pa.js
+//= link flatpickr/l10n/sk.js
+//= link flatpickr/l10n/th.js
+//= link flatpickr/l10n/zh-tw.js
+//= link flatpickr/l10n/az.js
+//= link flatpickr/l10n/cs.js
+//= link flatpickr/l10n/es.js
+//= link flatpickr/l10n/ga.js
+//= link flatpickr/l10n/id.js
+//= link flatpickr/l10n/km.js
+//= link flatpickr/l10n/mn.js
+//= link flatpickr/l10n/pl.js
+//= link flatpickr/l10n/sl.js
+//= link flatpickr/l10n/tr.js
+//= link flatpickr/l10n/zh.js
+//= link flatpickr/l10n/be.js
+//= link flatpickr/l10n/cy.js
+//= link flatpickr/l10n/et.js
+//= link flatpickr/l10n/gr.js
+//= link flatpickr/l10n/index.js
+//= link flatpickr/l10n/ko.js
+//= link flatpickr/l10n/ms.js
+//= link flatpickr/l10n/pt.js
+//= link flatpickr/l10n/sq.js
+//= link flatpickr/l10n/uk.js
+//= link flatpickr/l10n/bg.js
+//= link flatpickr/l10n/da.js
+//= link flatpickr/l10n/fa.js
+//= link flatpickr/l10n/he.js
+//= link flatpickr/l10n/is.js
+//= link flatpickr/l10n/kz.js
+//= link flatpickr/l10n/my.js
+//= link flatpickr/l10n/ro.js
+//= link flatpickr/l10n/sr-cyr.js
+//= link flatpickr/l10n/uz.js
+//= link flatpickr/l10n/bn.js
+//= link flatpickr/l10n/de.js
+//= link flatpickr/l10n/fi.js
+//= link flatpickr/l10n/hi.js
+//= link flatpickr/l10n/it.js
+//= link flatpickr/l10n/lt.js
+//= link flatpickr/l10n/nl.js
+//= link flatpickr/l10n/ru.js
+//= link flatpickr/l10n/sr.js
+//= link flatpickr/l10n/uz_latn.js
diff --git a/backend/config/initializers/assets.rb b/backend/config/initializers/assets.rb
index 855a2bbfbc..0a700043e1 100644
--- a/backend/config/initializers/assets.rb
+++ b/backend/config/initializers/assets.rb
@@ -1 +1 @@
-Rails.application.config.assets.precompile += %w(admin/* credit_cards/credit_card.gif flatpickr/l10n*)
+Rails.application.config.assets.precompile << 'spree_backend_manifest.js'
diff --git a/backend/lib/spree/backend/engine.rb b/backend/lib/spree/backend/engine.rb
index b4eb609068..b21e73cb98 100644
--- a/backend/lib/spree/backend/engine.rb
+++ b/backend/lib/spree/backend/engine.rb
@@ -11,19 +11,6 @@ module Spree
initializer 'spree.params.filter' do |app|
app.config.filter_parameters += [:password, :password_confirmation, :number]
end
-
- # sets the manifests / assets to be precompiled, even when initialize_on_precompile is false
- initializer 'spree.assets.precompile', group: :all do |app|
- app.config.assets.paths << "#{Rails.root}/app/assets/fonts"
- app.config.assets.precompile << /\.(?:svg|eot|woff|ttf)$/
-
- app.config.assets.precompile += %w[
- spree/backend/all*
- spree/backend/address_states.js
- jquery.jstree/themes/spree/*
- select2_locale*
- ]
- end
end
end
end
diff --git a/core/app/assets/config/spree_core_manifest.js b/core/app/assets/config/spree_core_manifest.js
new file mode 100644
index 0000000000..ac907b3677
--- /dev/null
+++ b/core/app/assets/config/spree_core_manifest.js
@@ -0,0 +1 @@
+//= link_tree ../images
diff --git a/core/config/initializers/assets.rb b/core/config/initializers/assets.rb
index 88cd14cd6b..de7a69919a 100644
--- a/core/config/initializers/assets.rb
+++ b/core/config/initializers/assets.rb
@@ -1,2 +1,2 @@
-Rails.application.config.assets.precompile += %w(logo/spree_50.png noimage/*.png)
+Rails.application.config.assets.precompile << 'spree_core_manifest.js'
Rails.application.config.active_storage.content_types_to_serve_as_binary.delete('image/svg+xml')
diff --git a/core/spree_core.gemspec b/core/spree_core.gemspec
index 38efa0183f..49f6804569 100644
--- a/core/spree_core.gemspec
+++ b/core/spree_core.gemspec
@@ -47,7 +47,7 @@ Gem::Specification.new do |s|
s.add_dependency 'state_machines-activemodel', '~> 0.7'
s.add_dependency 'stringex'
s.add_dependency 'twitter_cldr', '>= 4.3', '< 7.0'
- s.add_dependency 'sprockets', '~> 3.7'
+ s.add_dependency 'sprockets', '~> 4.0'
s.add_dependency 'sprockets-rails'
s.add_dependency 'mini_magick', '>= 4.9.4', '< 4.12.0'
s.add_dependency 'image_processing', '~> 1.2'
diff --git a/frontend/app/assets/config/spree_frontend_manifest.js b/frontend/app/assets/config/spree_frontend_manifest.js
new file mode 100644
index 0000000000..a77b013895
--- /dev/null
+++ b/frontend/app/assets/config/spree_frontend_manifest.js
@@ -0,0 +1,4 @@
+//= link_tree ../images
+//
+//= link spree/frontend/all.js
+//= link spree/frontend/all.css
diff --git a/frontend/config/initializers/assets.rb b/frontend/config/initializers/assets.rb
index d7bc5c28a5..eb74c76d9f 100644
--- a/frontend/config/initializers/assets.rb
+++ b/frontend/config/initializers/assets.rb
@@ -1,13 +1 @@
-Rails.application.config.assets.precompile += %w(
- favicon.ico
- credit_cards/*
- spree/frontend/checkout/shipment
- homepage/*
- meganav/*
- noimage/*
- arrow.svg
- check-mark-circle.svg
- error.svg
-)
+Rails.application.config.assets.precompile << 'spree_frontend_manifest.js'