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
Merge branch '6-0-dev' into feature/v-3514
Damian Legawiecdd81f1c3c950
diff --cc spree/core/lib/spree/testing_support/common_rake.rbindex d6e37b1d95,353c881532..cb733e31c3--- a/spree/core/lib/spree/testing_support/common_rake.rb+++ b/spree/core/lib/spree/testing_support/common_rake.rb@@@ -8,12 -8,8 +8,8 @@@ namespace :common d# When using execute with a Hash, args IS the hash directlydefaults = {authentication: 'dummy',- user_class: 'Spree::LegacyUser',- admin_user_class: 'Spree::LegacyAdminUser'+ user_class: 'Spree::Customer',+ admin_user_class: 'Spree::AdminUser',- install_storefront: false,- install_admin: false,- javascript: false,- css: false}# Rake::TaskArguments#with_defaults modifies in-place# ActiveSupport adds Hash#with_defaults which returns a new hash, so check for Rake::TaskArguments specifically@@@ -49,13 -34,14 +34,6 @@@Spree::DummyGenerator.start dummy_app_args- # Install JavaScript dependencies (importmap, turbo, stimulus) if JavaScript is enabled- # Rails includes the gems but doesn't run the installers automatically- if javascript_enabled- puts 'Installing JavaScript dependencies...'- system('yes | bundle exec rails importmap:install turbo:install stimulus:install')- # install devise if it's not the legacy user- if args[:authentication] == 'devise' && args[:user_class] != 'Spree::LegacyUser'- system('bundle exec rails g devise:install --force --auto-accept')- system("bundle exec rails g devise #{args[:user_class]} --force --auto-accept")- system("bundle exec rails g devise #{args[:admin_user_class]} --force --auto-accept") if args[:admin_user_class].present? && args[:admin_user_class] != args[:user_class]- system('rm -rf spec') # we need to cleanup factories created by devise to avoid naming conflict-- end--# Run core Spree install generator# The spree:install generator lives in the root spree gem. Core gems (spree_core, spree_api)# don't have spree as a dependency, so we need to use the root Gemfile to access the generator.diff --cc spree/template.rbindex 971ce1cdbe,499594d0f6..b6fada5e17--- a/spree/template.rb+++ b/spree/template.rb@@@ -100,7 -113,9 +100,8 @@@ add_gemafter_bundle doconfigure_development_environment- setup_authinstall_spree+ setup_procfileseed_databaseload_sample_datashow_success_message