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
Make spree_frontend gem optional
Damian Legawiecd177883df477
diff --git a/.circleci/config.yml b/.circleci/config.ymlindex effaae7e41..fd2b5b582f 100644--- a/.circleci/config.yml+++ b/.circleci/config.yml@@ -27,7 +27,7 @@ run_tests: &run_tests- spree-bundle-v8-ruby-2-7- run:name: Run rspec in parallel- command: BUNDLE_GEMFILE=../Gemfile ./bin/build-ci.rb test+ command: ./bin/build-ci.rb test- store_artifacts:path: /tmp/test-artifactsdestination: test-artifacts@@ -48,7 +48,7 @@ run_tests_3_0: &run_tests_3_0- spree-bundle-v8-ruby-3-0- run:name: Run rspec in parallel- command: BUNDLE_GEMFILE=../Gemfile ./bin/build-ci.rb test+ command: ./bin/build-ci.rb test- store_artifacts:path: /tmp/test-artifactsdestination: test-artifacts@@ -134,7 +134,7 @@ jobs:./bin/build-ci.rb install- run:name: Run rspec in parallel- command: BUNDLE_GEMFILE=../Gemfile ./bin/build-ci.rb test+ command: ./bin/build-ci.rb test- store_artifacts:path: /tmp/test-artifactsdestination: test-artifacts@@ -162,7 +162,7 @@ jobs:./bin/build-ci.rb install- run:name: Run rspec in parallel- command: BUNDLE_GEMFILE=../Gemfile ./bin/build-ci.rb test+ command: ./bin/build-ci.rb test- store_artifacts:path: /tmp/test-artifactsdestination: test-artifacts@@ -201,7 +201,7 @@ jobs:- spree-bundle-v8-ruby-3-0- run:name: Run rspec in parallel- command: BUNDLE_GEMFILE=../Gemfile ./bin/build-ci.rb test+ command: ./bin/build-ci.rb test- store_artifacts:path: /tmp/test-artifactsdestination: test-artifactsdiff --git a/Gemfile b/Gemfileindex 33371e00f3..2d5d377e6a 100644--- a/Gemfile+++ b/Gemfile@@ -1,3 +1,5 @@eval_gemfile('common_spree_dependencies.rb')+gem 'spree_frontend', path: 'frontend'+gemspecdiff --git a/api/spec/spec_helper.rb b/api/spec/spec_helper.rbindex e1615d0c0a..fff21b54ae 100644--- a/api/spec/spec_helper.rb+++ b/api/spec/spec_helper.rb@@ -21,7 +21,7 @@ ENV['RAILS_ENV'] ||= 'test'beginrequire File.expand_path('../dummy/config/environment', __FILE__)rescue LoadError- puts 'Could not load dummy application. Please ensure you have run `BUNDLE_GEMFILE=../Gemfile bundle exec rake test_app`'+ puts 'Could not load dummy application. Please ensure you have run `bundle exec rake test_app`'exitenddiff --git a/backend/app/assets/javascripts/spree/frontend/backend.js b/backend/app/assets/javascripts/spree/frontend/backend.jsdeleted file mode 100644index e44d478def..0000000000--- a/backend/app/assets/javascripts/spree/frontend/backend.js+++ /dev/null@@ -1 +0,0 @@-// Placeholder for backend dummy applicationdiff --git a/backend/app/assets/stylesheets/spree/frontend/backend.css b/backend/app/assets/stylesheets/spree/frontend/backend.cssdeleted file mode 100644index 63eac109f7..0000000000--- a/backend/app/assets/stylesheets/spree/frontend/backend.css+++ /dev/null@@ -1 +0,0 @@-/* Placeholder for backend dummy app */diff --git a/backend/spec/spec_helper.rb b/backend/spec/spec_helper.rbindex de05110597..b7dfc0f669 100644--- a/backend/spec/spec_helper.rb+++ b/backend/spec/spec_helper.rb@@ -21,7 +21,7 @@ ENV['RAILS_ENV'] ||= 'test'beginrequire File.expand_path('../dummy/config/environment', __FILE__)rescue LoadError- puts 'Could not load dummy application. Please ensure you have run `BUNDLE_GEMFILE=../Gemfile bundle exec rake test_app`'+ puts 'Could not load dummy application. Please ensure you have run `bundle exec rake test_app`'exitenddiff --git a/bin/build.sh b/bin/build.shindex d2e60164d5..45eedd59c5 100755--- a/bin/build.sh+++ b/bin/build.sh@@ -12,7 +12,7 @@ prepare_app(){set_gemfilebundle update --quietecho "Preparing test app..."- BUNDLE_GEMFILE=../Gemfile bundle exec rake test_app+ bundle exec rake test_app}# Target postgres. Override with: `DB=sqlite bash bin/build.sh`export DB=${DB:-postgres}diff --git a/bin/sandbox.sh b/bin/sandbox.shindex cd4d6081cc..5491411b36 100755--- a/bin/sandbox.sh+++ b/bin/sandbox.sh@@ -74,6 +74,7 @@ RUBYelsecat <<RUBY >> Gemfilegem 'spree', path: '..'+gem 'spree_frontend', path: '../frontend'$SPREE_AUTH_DEVISE_GEM$SPREE_GATEWAY_GEMgem 'spree_i18n', github: 'spree-contrib/spree_i18n', branch: 'master'@@ -106,6 +107,7 @@ bundle install --gemfile Gemfilebundle exec rails db:drop || truebundle exec rails db:createbundle exec rails g spree:install --auto-accept --user_class=Spree::User --enforce_available_locales=true --copy_storefront=false+bundle exec rails g spree:frontend:installbundle exec rails g spree:mailers_previewbundle exec rails g spree:auth:installbundle exec rails g spree_gateway:installdiff --git a/core/lib/generators/spree/install/install_generator.rb b/core/lib/generators/spree/install/install_generator.rbindex e2ed33e407..77f152d2ab 100644--- a/core/lib/generators/spree/install/install_generator.rb+++ b/core/lib/generators/spree/install/install_generator.rb@@ -65,19 +65,11 @@ module Spreedef setup_assets@lib_name = 'spree'%w{javascripts stylesheets images}.each do |path|- if Spree::Core::Engine.frontend_available? || Rails.env.test?- empty_directory "vendor/assets/#{path}/spree/frontend"- endif Spree::Core::Engine.backend_available? || Rails.env.test?empty_directory "vendor/assets/#{path}/spree/backend"endend- if Spree::Core::Engine.frontend_available? || Rails.env.test?- template 'vendor/assets/javascripts/spree/frontend/all.js'- template 'vendor/assets/stylesheets/spree/frontend/all.css'- end-if Spree::Core::Engine.backend_available? || Rails.env.test?template 'vendor/assets/javascripts/spree/backend/all.js'template 'vendor/assets/stylesheets/spree/backend/all.css'diff --git a/core/lib/generators/spree/install/templates/vendor/assets/javascripts/spree/backend/all.js b/core/lib/generators/spree/install/templates/vendor/assets/javascripts/spree/backend/all.jsindex 8cbee9a9b9..80edc71ae7 100644--- a/core/lib/generators/spree/install/templates/vendor/assets/javascripts/spree/backend/all.js+++ b/core/lib/generators/spree/install/templates/vendor/assets/javascripts/spree/backend/all.js@@ -5,11 +5,4 @@// the compiled file.////= require spree/backend-<% unless options[:lib_name] == 'spree' || options[:lib_name] == 'spree/backend' %>- <% filename = "spree/backend/#{ options[:lib_name].gsub("/", "_") }" %>- <% filepath = File.join(File.dirname(__FILE__), "../../app/assets/javascripts/#{filename}") %>- <% if javascript_exists?(filepath) %>- //= require <%= filename %>- <% end %>-<% end %>//= require_tree .diff --git a/core/lib/generators/spree/install/templates/vendor/assets/stylesheets/spree/backend/all.css b/core/lib/generators/spree/install/templates/vendor/assets/stylesheets/spree/backend/all.cssindex be13f93e67..20f0f987e1 100644--- a/core/lib/generators/spree/install/templates/vendor/assets/stylesheets/spree/backend/all.css+++ b/core/lib/generators/spree/install/templates/vendor/assets/stylesheets/spree/backend/all.css@@ -4,13 +4,6 @@* the top of the compiled file, but it's generally better to create a new file per style scope.**= require spree/backend-<% unless options[:lib_name] == 'spree' || options[:lib_name] == 'spree/backend' %>- <% filename = "spree/backend/#{ options[:lib_name].gsub("/", "_") }" %>- <% filepath = File.join(File.dirname(__FILE__), "../../app/assets/stylesheets/#{ filename }") %>- <% if stylesheet_exists?(filepath) %>- *= require <%= filename %>- <% end %>-<% end %>*= require_self*= require_tree .*/diff --git a/core/spec/spec_helper.rb b/core/spec/spec_helper.rbindex 250b7798b1..6e7c863c4f 100644--- a/core/spec/spec_helper.rb+++ b/core/spec/spec_helper.rb@@ -28,7 +28,7 @@ ENV['RAILS_ENV'] ||= 'test'beginrequire File.expand_path('../dummy/config/environment', __FILE__)rescue LoadError- puts 'Could not load dummy application. Please ensure you have run `BUNDLE_GEMFILE=../Gemfile bundle exec rake test_app`'+ puts 'Could not load dummy application. Please ensure you have run `bundle exec rake test_app`'endrequire 'rspec/rails'diff --git a/frontend/app/assets/javascripts/spree/frontend.js b/frontend/app/assets/javascripts/spree/frontend.jsindex 73a60d8a07..df4cb8d775 100644--- a/frontend/app/assets/javascripts/spree/frontend.js+++ b/frontend/app/assets/javascripts/spree/frontend.js@@ -10,6 +10,7 @@//= require spree/api/main//= require ./lazysizes.config//= require lazysizes.min+//= require accounting.min//= require turbolinks//= require spree/frontend/account//= require spree/frontend/api_tokensdiff --git a/frontend/lib/generators/spree/frontend/install/install_generator.rb b/frontend/lib/generators/spree/frontend/install/install_generator.rbindex e4cdbd83c2..c7fd023883 100644--- a/frontend/lib/generators/spree/frontend/install/install_generator.rb+++ b/frontend/lib/generators/spree/frontend/install/install_generator.rb@@ -16,13 +16,15 @@ module Spreeenddef install+ template 'vendor/assets/javascripts/spree/frontend/all.js'+ template 'vendor/assets/stylesheets/spree/frontend/all.css'# static imagesdirectory 'noimage', './app/assets/images/noimage'directory 'homepage', './app/assets/images/homepage'# SCSS themingtemplate 'variables.scss', './app/assets/stylesheets/spree/frontend/variables/variables.scss'# Sprockets 4 manifest- template 'app/assets/config/manifest.js', './app/assets/config/manifest.js'+ template 'app/assets/config/manifest.js'# home page templatedirectory 'home', './app/views/spree/home'enddiff --git a/core/lib/generators/spree/install/templates/vendor/assets/javascripts/spree/frontend/all.js b/frontend/lib/generators/spree/frontend/install/templates/vendor/assets/javascripts/spree/frontend/all.jssimilarity index 54%rename from core/lib/generators/spree/install/templates/vendor/assets/javascripts/spree/frontend/all.jsrename to frontend/lib/generators/spree/frontend/install/templates/vendor/assets/javascripts/spree/frontend/all.jsindex ffb23a1b6c..ce24237f31 100644--- a/core/lib/generators/spree/install/templates/vendor/assets/javascripts/spree/frontend/all.js+++ b/frontend/lib/generators/spree/frontend/install/templates/vendor/assets/javascripts/spree/frontend/all.js@@ -4,13 +4,5 @@// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the// the compiled file.//-//= require accounting.min//= require spree/frontend-<% unless options[:lib_name] == 'spree' || options[:lib_name] == 'spree/frontend' %>- <% filename = "spree/frontend/#{ options[:lib_name].gsub("/", "_") }" %>- <% filepath = File.join(File.dirname(__FILE__), "../../app/assets/javascripts/#{ filename }") %>- <% if javascript_exists?(filepath) %>- //= require <%= filename %>- <% end %>-<% end %>//= require_tree .diff --git a/core/lib/generators/spree/install/templates/vendor/assets/stylesheets/spree/frontend/all.css b/frontend/lib/generators/spree/frontend/install/templates/vendor/assets/stylesheets/spree/frontend/all.csssimilarity index 51%rename from core/lib/generators/spree/install/templates/vendor/assets/stylesheets/spree/frontend/all.cssrename to frontend/lib/generators/spree/frontend/install/templates/vendor/assets/stylesheets/spree/frontend/all.cssindex e227bd4dd0..ed0e9569af 100644--- a/core/lib/generators/spree/install/templates/vendor/assets/stylesheets/spree/frontend/all.css+++ b/frontend/lib/generators/spree/frontend/install/templates/vendor/assets/stylesheets/spree/frontend/all.css@@ -4,13 +4,6 @@* the top of the compiled file, but it's generally better to create a new file per style scope.**= require spree/frontend-<% unless options[:lib_name] == 'spree' || options[:lib_name] == 'spree/frontend' %>- <% filename = "spree/frontend/#{ options[:lib_name].gsub("/", "_") }" %>- <% filepath = File.join(File.dirname(__FILE__), "../../app/assets/stylesheets/#{ filename }") %>- <% if stylesheet_exists?(filepath) %>- *= require <%= filename %>- <% end %>-<% end %>*= require_self*= require_tree .*/diff --git a/frontend/spec/spec_helper.rb b/frontend/spec/spec_helper.rbindex 8e52f758b0..2a4223beb7 100644--- a/frontend/spec/spec_helper.rb+++ b/frontend/spec/spec_helper.rb@@ -20,7 +20,7 @@ ENV['RAILS_ENV'] ||= 'test'beginrequire File.expand_path('../dummy/config/environment', __FILE__)rescue LoadError- puts 'Could not load dummy application. Please ensure you have run `BUNDLE_GEMFILE=../Gemfile bundle exec rake test_app`'+ puts 'Could not load dummy application. Please ensure you have run `bundle exec rake test_app`'exitenddiff --git a/frontend/spree_frontend.gemspec b/frontend/spree_frontend.gemspecindex 79283db1d3..d122656637 100644--- a/frontend/spree_frontend.gemspec+++ b/frontend/spree_frontend.gemspec@@ -25,8 +25,8 @@ Gem::Specification.new do |s|s.require_path = 'lib's.requirements << 'none'- s.add_dependency 'spree_api', s.version- s.add_dependency 'spree_core', s.version+ s.add_dependency 'spree_api', ">= #{s.version}"+ s.add_dependency 'spree_core', ">= #{s.version}"s.add_dependency 'babel-transpiler', '~> 0.7's.add_dependency 'bootstrap', '~> 4.0'diff --git a/guides/src/content/developer/7_contributing/developing_spree.md b/guides/src/content/developer/7_contributing/developing_spree.mdindex 0b632d644f..aeaf6bdcf1 100644--- a/guides/src/content/developer/7_contributing/developing_spree.md+++ b/guides/src/content/developer/7_contributing/developing_spree.md@@ -115,7 +115,7 @@ the tests. For example, to run the tests for the core project.```shellcd core-BUNDLE_GEMFILE=../Gemfile bundle exec rake test_app+bundle exec rake test_appbundle exec rspec spec```@@ -123,7 +123,7 @@ If you would like to run specs against a particular database you may specify thedummy app's database, which defaults to sqlite3.```shell-DB=postgres BUNDLE_GEMFILE=../Gemfile bundle exec rake test_app+DB=postgres bundle exec rake test_app```If you want to run specs for only a single spec filediff --git a/lib/spree.rb b/lib/spree.rbindex 5d0834c48b..0ed6f7d785 100644--- a/lib/spree.rb+++ b/lib/spree.rb@@ -1,5 +1,4 @@require 'spree_core'require 'spree_api'require 'spree_backend'-require 'spree_frontend'require 'spree_sample'diff --git a/spree.gemspec b/spree.gemspecindex 3f76d6ccce..e2740debeb 100644--- a/spree.gemspec+++ b/spree.gemspec@@ -28,7 +28,6 @@ Gem::Specification.new do |s|s.add_dependency 'spree_core', s.versions.add_dependency 'spree_api', s.versions.add_dependency 'spree_backend', s.version- s.add_dependency 'spree_frontend', s.versions.add_dependency 'spree_sample', s.versions.add_dependency 'spree_cmd', s.versionend