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.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Add propshaft support and use propshaft as default for Rails 8 instal… (#13237)
Damian Legawiec5e007628cf51
diff --git a/admin/config/initializers/assets.rb b/admin/config/initializers/assets.rbindex 6f0894dd1a..3fcd2f854d 100644--- a/admin/config/initializers/assets.rb+++ b/admin/config/initializers/assets.rb@@ -1 +1,3 @@-Rails.application.config.assets.precompile << 'spree_admin_manifest.js'+if Rails.application.config.respond_to?(:assets)+ Rails.application.config.assets.precompile << 'spree_admin_manifest.js'+enddiff --git a/admin/lib/spree/admin.rb b/admin/lib/spree/admin.rbindex 483d9ad7f1..d3f345e815 100644--- a/admin/lib/spree/admin.rb+++ b/admin/lib/spree/admin.rb@@ -1,8 +1,6 @@require 'spree_core'require 'spree_api'-require 'sprockets/railtie'-require 'active_link_to'require 'breadcrumbs_on_rails'require 'chartkick'diff --git a/admin/lib/spree/admin/engine.rb b/admin/lib/spree/admin/engine.rbindex 27374107ae..870e929e41 100644--- a/admin/lib/spree/admin/engine.rb+++ b/admin/lib/spree/admin/engine.rb@@ -138,10 +138,12 @@ module Spreeendinitializer '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+ if app.config.respond_to?(:assets)+ # 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+ endend# Rails 7.1 introduced a new feature that raises an error if a callback action is missing.@@ -151,11 +153,13 @@ module Spreeendinitializer 'spree.admin.assets' do |app|- app.config.assets.paths << root.join('app/javascript')- app.config.assets.paths << root.join('vendor/javascript')- app.config.assets.precompile += %w[ spree_admin_manifest bootstrap.bundle.min.js jquery3.min.js ]- # fix for TinyMCE-rails gem to work with both propshaft and sprockets- app.config.assets.excluded_paths ||= []+ if app.config.respond_to?(:assets)+ app.config.assets.paths << root.join('app/javascript')+ app.config.assets.paths << root.join('vendor/javascript')+ app.config.assets.precompile += %w[ spree_admin_manifest bootstrap.bundle.min.js jquery3.min.js ]+ # fix for TinyMCE-rails gem to work with both propshaft and sprockets+ app.config.assets.excluded_paths ||= []+ endendinitializer 'spree.admin.importmap', after: 'importmap' do |app|diff --git a/admin/spree_admin.gemspec b/admin/spree_admin.gemspecindex 6e28518129..f0a5102748 100644--- a/admin/spree_admin.gemspec+++ b/admin/spree_admin.gemspec@@ -42,6 +42,5 @@ Gem::Specification.new do |s|s.add_dependency 'payment_icons's.add_dependency 'turbo-rails's.add_dependency 'stimulus-rails'- s.add_dependency 'sprockets', '>= 4.0's.add_dependency 'tinymce-rails', '~> 6.8.5'enddiff --git a/bin/sandbox.sh b/bin/sandbox.shindex 9ea451f59e..292ff9f0f8 100755--- a/bin/sandbox.sh+++ b/bin/sandbox.sh@@ -33,7 +33,6 @@ bundle exec rails new sandbox --database="$RAILSDB" \--skip-keeps \--skip-rc \--skip-test \- --skip-asset-pipeline \--skip-docker \--skip-rubocop \--skip-brakeman \diff --git a/core/lib/generators/spree/dummy/dummy_generator.rb b/core/lib/generators/spree/dummy/dummy_generator.rbindex f853fc7723..7e41d50c24 100644--- a/core/lib/generators/spree/dummy/dummy_generator.rb+++ b/core/lib/generators/spree/dummy/dummy_generator.rb@@ -38,7 +38,6 @@ module Spreeopts[:skip_spring] = trueopts[:skip_test] = trueopts[:skip_bootsnap] = true- opts[:skip_asset_pipeline] = true # skip installing propshaft, we're still using sprockets as a dependencyopts[:skip_docker] = trueopts[:skip_rubocop] = trueopts[:skip_brakeman] = truediff --git a/core/lib/spree/core.rb b/core/lib/spree/core.rbindex 5d8d30b4b0..0c7d4b5d71 100644--- a/core/lib/spree/core.rb+++ b/core/lib/spree/core.rb@@ -10,7 +10,6 @@ require 'action_cable/engine'require 'mail'require 'action_mailer/railtie'-require 'sprockets/railtie'require 'active_merchant'require 'acts_as_list'diff --git a/emails/config/initializers/assets.rb b/emails/config/initializers/assets.rbindex 8c63432363..475b396339 100644--- a/emails/config/initializers/assets.rb+++ b/emails/config/initializers/assets.rb@@ -1 +1,3 @@-Rails.application.config.assets.precompile << 'spree_emails_manifest.js'+if Rails.application.config.respond_to?(:assets)+ Rails.application.config.assets.precompile << 'spree_emails_manifest.js'+enddiff --git a/emails/spree_emails.gemspec b/emails/spree_emails.gemspecindex e3c5c53e0c..007c4b261b 100644--- a/emails/spree_emails.gemspec+++ b/emails/spree_emails.gemspec@@ -27,7 +27,6 @@ Gem::Specification.new do |s|s.require_path = 'lib's.add_dependency 'spree_core', ">= #{s.version}"- s.add_dependency 'sprockets', '>= 4.0's.add_development_dependency 'email_spec', '~> 2.2'enddiff --git a/storefront/config/initializers/assets.rb b/storefront/config/initializers/assets.rbindex 4eaeb7cb20..dc261ade01 100644--- a/storefront/config/initializers/assets.rb+++ b/storefront/config/initializers/assets.rb@@ -1 +1,3 @@-Rails.application.config.assets.precompile << 'spree_storefront_manifest.js'+if Rails.application.config.respond_to?(:assets)+ Rails.application.config.assets.precompile << 'spree_storefront_manifest.js'+enddiff --git a/storefront/lib/spree/storefront.rb b/storefront/lib/spree/storefront.rbindex 18ca6a60e5..acaa21af35 100644--- a/storefront/lib/spree/storefront.rb+++ b/storefront/lib/spree/storefront.rb@@ -1,7 +1,5 @@require 'spree_core'-require 'sprockets/railtie'-require 'active_link_to'require 'canonical-rails'require 'heroicon'diff --git a/storefront/lib/spree/storefront/engine.rb b/storefront/lib/spree/storefront/engine.rbindex 0699f7bcb1..dbde6f1964 100644--- a/storefront/lib/spree/storefront/engine.rb+++ b/storefront/lib/spree/storefront/engine.rb@@ -27,9 +27,11 @@ module Spreeendinitializer 'spree.storefront.assets' do |app|- app.config.assets.paths << root.join('app/javascript')- app.config.assets.paths << root.join('vendor/javascript')- app.config.assets.precompile += %w[spree_storefront_manifest]+ if app.config.respond_to?(:assets)+ app.config.assets.paths << root.join('app/javascript')+ app.config.assets.paths << root.join('vendor/javascript')+ app.config.assets.precompile += %w[spree_storefront_manifest]+ endendinitializer 'spree.storefront.importmap', before: 'importmap' do |app|diff --git a/storefront/spree_storefront.gemspec b/storefront/spree_storefront.gemspecindex 37b69a353b..422ba4de8c 100644--- a/storefront/spree_storefront.gemspec+++ b/storefront/spree_storefront.gemspec@@ -33,7 +33,6 @@ Gem::Specification.new do |s|s.add_dependency 'local_time', '~> 3.0's.add_dependency 'mail_form's.add_dependency 'payment_icons'- s.add_dependency 'sprockets', '>= 4.0's.add_dependency 'stimulus-rails's.add_dependency 'tailwindcss-rails's.add_dependency 'tailwindcss-ruby', '~> 3.4.17' # lock at Tailwind v3 for now, https://github.com/rails/tailwindcss-rails?tab=readme-ov-file#choosing-a-specific-version-of-tailwindcss