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.

Ensure we always setup tailwind environment during installation

Damian Legawiec2e0725173d05
diff --git a/admin/lib/generators/spree/admin/install/install_generator.rb b/admin/lib/generators/spree/admin/install/install_generator.rb
index 09b5d8d5f0..c6319a1910 100644
--- a/admin/lib/generators/spree/admin/install/install_generator.rb
+++ b/admin/lib/generators/spree/admin/install/install_generator.rb
@@ -57,7 +57,8 @@ module Spree
def install_tailwind_css
template(
'app/assets/tailwind/spree_admin.css',
- 'app/assets/tailwind/spree_admin.css'
+ 'app/assets/tailwind/spree_admin.css',
+ force: options[:force]
)
say "Created app/assets/tailwind/spree_admin.css for Tailwind CSS customization"
end
diff --git a/core/lib/generators/spree/install/install_generator.rb b/core/lib/generators/spree/install/install_generator.rb
index 495bf7fc1f..70334504e7 100644
--- a/core/lib/generators/spree/install/install_generator.rb
+++ b/core/lib/generators/spree/install/install_generator.rb
@@ -58,22 +58,22 @@ module Spree
def install_storefront
if @install_storefront && Spree::Core::Engine.frontend_available?
- generate 'spree:storefront:install'
+ generate "spree:storefront:install#{' --force' if options[:force]}"
# generate devise controllers if authentication is devise
if @authentication == 'devise'
- generate 'spree:storefront:devise'
+ generate "spree:storefront:devise#{' --force' if options[:force]}"
end
end
end
def install_admin
if @install_admin && Spree::Core::Engine.admin_available?
- generate 'spree:admin:install'
+ generate "spree:admin:install#{' --force' if options[:force]}"
# generate devise controllers if authentication is devise
if @authentication == 'devise'
- generate 'spree:admin:devise'
+ generate "spree:admin:devise#{' --force' if options[:force]}"
end
end
end
diff --git a/core/lib/spree/testing_support/common_rake.rb b/core/lib/spree/testing_support/common_rake.rb
index b0c3bd099f..7f63c8030b 100644
--- a/core/lib/spree/testing_support/common_rake.rb
+++ b/core/lib/spree/testing_support/common_rake.rb
@@ -30,7 +30,8 @@ namespace :common do
Spree::DummyGenerator.start dummy_app_args
unless skip_javascript
- system('bundle exec rails importmap:install turbo:install stimulus:install')
+ system('yes | bundle exec rails importmap:install turbo:install stimulus:install')
+ system('yes | bundle exec rails tailwindcss:install')
end
# install devise if it's not the legacy user, useful for testing storefront
@@ -43,6 +44,7 @@ namespace :common do
Spree::InstallGenerator.start [
"--lib_name=#{ENV['LIB_NAME']}",
'--auto-accept',
+ '--force',
'--migrate=false',
'--seed=false',
'--sample=false',
@@ -65,9 +67,9 @@ namespace :common do
puts 'Running extension installation generator...'
if ENV['NO_MIGRATE']
- "#{ENV['LIB_NAME'].camelize}::Generators::InstallGenerator".constantize.start([])
+ "#{ENV['LIB_NAME'].camelize}::Generators::InstallGenerator".constantize.start(['--force'])
else
- "#{ENV['LIB_NAME'].camelize}::Generators::InstallGenerator".constantize.start(['--auto-run-migrations'])
+ "#{ENV['LIB_NAME'].camelize}::Generators::InstallGenerator".constantize.start(['--force', '--auto-run-migrations'])
end
rescue LoadError
puts 'Skipping installation no generator to run...'
diff --git a/storefront/lib/generators/spree/storefront/install/install_generator.rb b/storefront/lib/generators/spree/storefront/install/install_generator.rb
index 88257282e9..923c82d085 100644
--- a/storefront/lib/generators/spree/storefront/install/install_generator.rb
+++ b/storefront/lib/generators/spree/storefront/install/install_generator.rb
@@ -16,8 +16,8 @@ module Spree
def install
empty_directory Rails.root.join('app/assets/tailwind') if Rails.root && !Rails.root.join('app/assets/tailwind').exist?
- template 'application.css', 'app/assets/tailwind/application.css'
- template 'tailwind.config.js', 'config/tailwind.config.js'
+ template 'application.css', 'app/assets/tailwind/application.css', force: options[:force]
+ template 'tailwind.config.js', 'config/tailwind.config.js', force: options[:force]
if Rails.root && Rails.root.join("Procfile.dev").exist?
append_to_file 'Procfile.dev', "\nstorefront_css: bin/rails tailwindcss:watch" unless File.read('Procfile.dev').include?('storefront_css:')