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
Rails 8 support
Damian Legawiec917749090d76
diff --git a/.circleci/config.yml b/.circleci/config.ymlindex aed79f195d..40adc085fa 100644--- a/.circleci/config.yml+++ b/.circleci/config.yml@@ -88,6 +88,7 @@ jobs:DB_USERNAME: rootDB_PASSWORD: passwordDB_HOST: 127.0.0.1+ RAILS_VERSION: 7.2.0# postgres teststest_core_postgres:diff --git a/admin/config/routes.rb b/admin/config/routes.rbindex d1ada58dbe..e8add2185e 100644--- a/admin/config/routes.rb+++ b/admin/config/routes.rb@@ -59,10 +59,10 @@ Spree::Core::Engine.add_routes dopost :resendput :cancelend- resource :shipping_address, except: [:index, :show], controller: 'orders/shipping_address'- resource :billing_address, except: [:index, :show], controller: 'orders/billing_address'+ resource :shipping_address, except: [:show], controller: 'orders/shipping_address'+ resource :billing_address, except: [:show], controller: 'orders/billing_address'resource :contact_information, only: [:edit, :update], controller: 'orders/contact_information'- resource :user, except: [:edit, :show, :index], controller: 'orders/user'+ resource :user, except: [:edit, :show], controller: 'orders/user'resources :shipments, only: [:edit, :update, :create], controller: 'shipments' domember dopost :shipdiff --git a/admin/lib/spree/admin.rb b/admin/lib/spree/admin.rbindex 2ee28b0fed..8514d35cd0 100644--- a/admin/lib/spree/admin.rb+++ b/admin/lib/spree/admin.rb@@ -17,8 +17,9 @@ require 'stimulus-rails'require 'local_time'require 'payment_icons'require 'dartsass-rails'-require 'tinymce-rails'require 'spree/admin/action_callbacks'require 'spree/admin/callbacks'require 'spree/admin/engine'++require 'tinymce-rails'diff --git a/admin/lib/spree/admin/engine.rb b/admin/lib/spree/admin/engine.rbindex a03ed790da..656951b550 100644--- a/admin/lib/spree/admin/engine.rb+++ b/admin/lib/spree/admin/engine.rb@@ -57,6 +57,8 @@ module Spreeapp.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 ||= []endinitializer 'spree.admin.importmap', after: 'importmap' do |app|diff --git a/admin/spec/controllers/spree/admin/products_controller_spec.rb b/admin/spec/controllers/spree/admin/products_controller_spec.rbindex c5a1967c34..3e70ec7021 100644--- a/admin/spec/controllers/spree/admin/products_controller_spec.rb+++ b/admin/spec/controllers/spree/admin/products_controller_spec.rb@@ -696,7 +696,7 @@ RSpec.describe Spree::Admin::ProductsController, type: :controller doit 'raises an error' doexpect {send_request- }.to raise_error(ActionController::ParameterMissing, 'param is missing or the value is empty: id')+ }.to raise_error(ActionController::ParameterMissing)endendenddiff --git a/bin/sandbox.sh b/bin/sandbox.shindex 95e3123773..d067b2ffa3 100755--- a/bin/sandbox.sh+++ b/bin/sandbox.sh@@ -20,6 +20,13 @@ sqlite|'')esacrm -rf ./sandbox++mkdir -p sandbox/app/assets/config+cat <<MANIFEST > sandbox/app/assets/config/manifest.js+//= link_tree ../images+//= link_directory ../stylesheets .css+MANIFEST+bundle exec rails new sandbox --database="$RAILSDB" \--skip-bundle \--skip-git \diff --git a/common_spree_dependencies.rb b/common_spree_dependencies.rbindex fb463b8648..521bd2d1c7 100644--- a/common_spree_dependencies.rb+++ b/common_spree_dependencies.rb@@ -4,7 +4,7 @@source 'https://rubygems.org'gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw]-gem 'rails', ENV.fetch('RAILS_VERSION', '~> 7.2.0'), require: false+gem 'rails', ENV.fetch('RAILS_VERSION', '~> 8.0.0'), require: falseplatforms :jruby dogem 'jruby-openssl'@@ -17,7 +17,7 @@ platforms :ruby dogem 'sqlite3', '>= 2.0'end-gem 'sprockets-rails', '>= 2.0.0'+gem 'sprockets-rails', '>= 3.5.2'group :test dogem 'capybara'diff --git a/core/lib/generators/spree/dummy/dummy_generator.rb b/core/lib/generators/spree/dummy/dummy_generator.rbindex b31529c3fb..f791e8a376 100644--- a/core/lib/generators/spree/dummy/dummy_generator.rb+++ b/core/lib/generators/spree/dummy/dummy_generator.rb@@ -54,8 +54,8 @@ module Spreetemplate 'rails/application.rb', "#{dummy_path}/config/application.rb", force: truetemplate 'rails/routes.rb', "#{dummy_path}/config/routes.rb", force: truetemplate 'rails/test.rb', "#{dummy_path}/config/environments/test.rb", force: true- template 'rails/script/rails', "#{dummy_path}/spec/dummy/script/rails", force: truetemplate 'initializers/devise.rb', "#{dummy_path}/config/initializers/devise.rb", force: true+ template "app/assets/config/manifest.js", "#{dummy_path}/app/assets/config/manifest.js", force: trueenddef test_dummy_inject_extension_requirementsdiff --git a/core/lib/generators/spree/dummy/templates/app/assets/config/manifest.js b/core/lib/generators/spree/dummy/templates/app/assets/config/manifest.jsnew file mode 100644index 0000000000..e69de29bb2diff --git a/core/lib/generators/spree/dummy/templates/rails/application.rb b/core/lib/generators/spree/dummy/templates/rails/application.rbindex e387ded83b..c9456ff7d1 100644--- a/core/lib/generators/spree/dummy/templates/rails/application.rb+++ b/core/lib/generators/spree/dummy/templates/rails/application.rb@@ -2,9 +2,8 @@ require File.expand_path('../boot', __FILE__)require 'rails/all'-Bundler.require(*Rails.groups(assets: %w(development test)))+Bundler.require(*Rails.groups)require '<%= lib_name %>'<%= application_definition %>-diff --git a/core/lib/generators/spree/dummy/templates/rails/script/rails b/core/lib/generators/spree/dummy/templates/rails/script/railsdeleted file mode 100644index f8da2cffd4..0000000000--- a/core/lib/generators/spree/dummy/templates/rails/script/rails+++ /dev/null@@ -1,6 +0,0 @@-#!/usr/bin/env ruby-# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.--APP_PATH = File.expand_path('../../config/application', __FILE__)-require File.expand_path('../../config/boot', __FILE__)-require 'rails/commands'diff --git a/core/spree_core.gemspec b/core/spree_core.gemspecindex 66a7b9a58f..e6cb7f4c77 100644--- a/core/spree_core.gemspec+++ b/core/spree_core.gemspec@@ -28,7 +28,7 @@ Gem::Specification.new do |s|s.add_development_dependency 'i18n-tasks'- s.add_dependency 'rails', '>= 7.2', '< 8.0'+ s.add_dependency 'rails', '>= 7.2', '< 8.1's.add_dependency 'activemerchant', '~> 1.67's.add_dependency 'acts_as_list', '>= 0.8'