Skip to content

armgit / spree

Public Imported from GitHub
0

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.

Move away from Node to Importmap (#12006)

Damian Legawiecaa0e12c732a9
diff --git a/bin/sandbox.sh b/bin/sandbox.sh
index 9eb704fb47..400eb70431 100755
--- a/bin/sandbox.sh
+++ b/bin/sandbox.sh
@@ -43,7 +43,6 @@ fi
if [ "$SPREE_GATEWAY_PATH" != "" ]; then
SPREE_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-stable
SPREE_GATEWAY_GEM="gem 'spree_gateway', github: 'spree/spree_gateway', branch: 'main'"
fi
@@ -53,10 +52,10 @@ else
SPREE_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'"
fi
cat <<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 do
gem 'bullet'
@@ -75,31 +74,16 @@ group :test, :development do
gem '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/04407faf6fbd400f1c9f72f752395e1dfa5865f7
gem 'sassc', github: 'sass/sassc-ruby', branch: 'master'
-
-gem 'oj'
-
-gem 'jsbundling-rails'
RUBY
cat <<RUBY >> config/environments/development.rb
Rails.application.config.hosts.clear
RUBY
-touch config/initializers/oj.rb
-
-cat <<RUBY >> config/initializers/oj.rb
-require 'oj'
-
-Oj.optimize_rails
-RUBY
-
touch config/initializers/bullet.rb
cat <<RUBY >> config/initializers/bullet.rb
@@ -113,26 +97,9 @@ RUBY
bundle update
bundle install --gemfile Gemfile
-bin/rails javascript:install:esbuild
+bin/rails importmap:install
bin/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:install
bin/rails db:drop || true
bin/rails db:create
@@ -142,4 +109,3 @@ bin/rails g spree:frontend:install
bin/rails g spree:emails:install
bin/rails g spree:auth:install
bin/rails g spree_gateway:install
-yarn build
diff --git a/core/lib/generators/spree/dummy/dummy_generator.rb b/core/lib/generators/spree/dummy/dummy_generator.rb
index 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 Spree
opts[:database] = 'sqlite3' if opts[:database].blank?
opts[:force] = true
opts[:skip_bundle] = true
- opts[:skip_gemfile] = true
opts[:skip_git] = true
opts[:skip_listen] = true
opts[:skip_rc] = true
@@ -57,10 +56,6 @@ module Spree
template 'rails/test.rb', "#{dummy_path}/config/environments/test.rb", force: true
template 'rails/script/rails', "#{dummy_path}/spec/dummy/script/rails", force: true
template '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
- end
end
def test_dummy_inject_extension_requirements
diff --git a/core/lib/spree/testing_support/common_rake.rb b/core/lib/spree/testing_support/common_rake.rb
index 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 do
ENV['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 do
Spree::DummyModelGenerator.start
system('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
-
begin
require "generators/#{ENV['LIB_NAME']}/install/install_generator"
puts 'Running extension installation generator...'
@@ -56,11 +50,6 @@ namespace :common do
end
unless ['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')
- end
puts 'Precompiling assets...'
system('bundle exec rake assets:precompile')
end