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
Move away from Node to Importmap (#12006)
Damian Legawiecaa0e12c732a9
diff --git a/bin/sandbox.sh b/bin/sandbox.shindex 9eb704fb47..400eb70431 100755--- a/bin/sandbox.sh+++ b/bin/sandbox.sh@@ -43,7 +43,6 @@ fiif [ "$SPREE_GATEWAY_PATH" != "" ]; thenSPREE_GATEWAY_GEM="gem 'spree_gateway', path: '$SPREE_GATEWAY_PATH'"else- # spree_gateway 'main' branch has latest needed changes - this tag needs to be replaced after release of 4.5-stableSPREE_GATEWAY_GEM="gem 'spree_gateway', github: 'spree/spree_gateway', branch: 'main'"fi@@ -53,10 +52,10 @@ elseSPREE_BACKEND_GEM="gem 'spree_backend', github: 'spree/spree_backend', branch: 'main'"fi-if [ "$SPREE_STOREFRINT_PATH" != "" ]; then- SPREE_STOREFRINT_PATH="gem 'spree_frontend', path: '$SPREE_DASHBOARD_PATH'"+if [ "$SPREE_STOREFRONT_PATH" != "" ]; then+ SPREE_STOREFRONT_PATH="gem 'spree_frontend', path: '$SPREE_STOREFRONT_PATH'"else- SPREE_STOREFRINT_PATH="gem 'spree_frontend', github: 'spree/spree_rails_frontend', branch: 'main'"+ SPREE_STOREFRONT_PATH="gem 'spree_frontend', github: 'spree/spree_rails_frontend', branch: 'main'"ficat <<RUBY >> Gemfile@@ -65,9 +64,9 @@ gem 'spree_emails', path: '../emails'gem 'spree_sample', path: '../sample'$SPREE_BACKEND_GEM$SPREE_GATEWAY_GEM-$SPREE_STOREFRINT_PATH+$SPREE_STOREFRONT_PATH$SPREE_AUTH_DEVISE_GEM-gem 'spree_i18n', github: 'spree-contrib/spree_i18n', ref: '3c3e5954888232153a78fa4168f40b3255586b3b'+gem 'spree_i18n', github: 'spree-contrib/spree_i18n', branch: 'main'group :test, :development dogem 'bullet'@@ -75,31 +74,16 @@ group :test, :development dogem 'awesome_print'end-# ExecJS runtime-gem 'mini_racer'-# temporary fix for sassc segfaults on ruby 3.0.0 on Mac OS Big Sur# this change fixes the issue:# https://github.com/sass/sassc-ruby/commit/04407faf6fbd400f1c9f72f752395e1dfa5865f7gem 'sassc', github: 'sass/sassc-ruby', branch: 'master'--gem 'oj'--gem 'jsbundling-rails'RUBYcat <<RUBY >> config/environments/development.rbRails.application.config.hosts.clearRUBY-touch config/initializers/oj.rb--cat <<RUBY >> config/initializers/oj.rb-require 'oj'--Oj.optimize_rails-RUBY-touch config/initializers/bullet.rbcat <<RUBY >> config/initializers/bullet.rb@@ -113,26 +97,9 @@ RUBYbundle updatebundle install --gemfile Gemfile-bin/rails javascript:install:esbuild+bin/rails importmap:installbin/rails turbo:install-yarn install--# for npm versions lower than 7.1 we need to add "build" script manually-# so below is added to ensure compatibility-cat <<RUBY > package.json-{- "name": "app",- "private": "true",- "dependencies": {- "@hotwired/turbo-rails": "^7.1.3",- "@spree/dashboard": "^0.2.0",- "esbuild": "^0.14.47"- },- "scripts": {- "build": "esbuild app/javascript/*.* --bundle --sourcemap --outdir=app/assets/builds --public-path=assets"- }-}-RUBY+bin/rails stimulus:installbin/rails db:drop || truebin/rails db:create@@ -142,4 +109,3 @@ bin/rails g spree:frontend:installbin/rails g spree:emails:installbin/rails g spree:auth:installbin/rails g spree_gateway:install-yarn builddiff --git a/core/lib/generators/spree/dummy/dummy_generator.rb b/core/lib/generators/spree/dummy/dummy_generator.rbindex c1aa59b24a..335b0b58bd 100644--- a/core/lib/generators/spree/dummy/dummy_generator.rb+++ b/core/lib/generators/spree/dummy/dummy_generator.rb@@ -32,7 +32,6 @@ module Spreeopts[:database] = 'sqlite3' if opts[:database].blank?opts[:force] = trueopts[:skip_bundle] = true- opts[:skip_gemfile] = trueopts[:skip_git] = trueopts[:skip_listen] = trueopts[:skip_rc] = true@@ -57,10 +56,6 @@ module Spreetemplate 'rails/test.rb', "#{dummy_path}/config/environments/test.rb", force: truetemplate 'rails/script/rails', "#{dummy_path}/spec/dummy/script/rails", force: truetemplate 'initializers/devise.rb', "#{dummy_path}/config/initializers/devise.rb", force: true-- if lib_name == 'spree/backend'- template 'package.json', "#{dummy_path}/package.json", force: true- endenddef test_dummy_inject_extension_requirementsdiff --git a/core/lib/spree/testing_support/common_rake.rb b/core/lib/spree/testing_support/common_rake.rbindex 66b402c702..5563c8a885 100644--- a/core/lib/spree/testing_support/common_rake.rb+++ b/core/lib/spree/testing_support/common_rake.rb@@ -14,21 +14,21 @@ namespace :common doENV['RAILS_ENV'] = 'test'Rails.env = 'test'- if ENV['LIB_NAME'] == 'spree/backend'- puts 'Preparing NPM package...'- system('yarn install')- system('yarn build')- system('yarn link')+ Spree::DummyGenerator.start ["--lib_name=#{ENV['LIB_NAME']}"]++ # install frontend libraries+ unless ['spree/api', 'spree/core', 'spree/sample'].include?(ENV['LIB_NAME'])+ system('bin/rails importmap:install')+ system('bin/rails turbo:install')+ system('bin/rails stimulus:install')end- Spree::DummyGenerator.start ["--lib_name=#{ENV['LIB_NAME']}", '--quiet']Spree::InstallGenerator.start ["--lib_name=#{ENV['LIB_NAME']}",'--auto-accept','--migrate=false','--seed=false','--sample=false',- '--quiet','--copy_storefront=false',"--install_storefront=#{args[:install_storefront]}","--install_admin=#{args[:install_admin]}",@@ -41,12 +41,6 @@ namespace :common doSpree::DummyModelGenerator.startsystem('bundle exec rake db:migrate')- unless ['spree/api', 'spree/core', 'spree/sample', 'spree/emails'].include?(ENV['LIB_NAME'])- puts 'Setting up node environment'- system('bin/rails javascript:install:esbuild')- system('bin/rails turbo:install')- end-beginrequire "generators/#{ENV['LIB_NAME']}/install/install_generator"puts 'Running extension installation generator...'@@ -56,11 +50,6 @@ namespace :common doendunless ['spree/api', 'spree/core', 'spree/sample'].include?(ENV['LIB_NAME'])- if ENV['LIB_NAME'] == 'spree/backend'- puts 'Installing node dependencies...'- system('yarn link @spree/dashboard')- system('yarn install')- endputs 'Precompiling assets...'system('bundle exec rake assets:precompile')end