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.

Fixed extension generator to not include storefront dependency by default

Damian Legawiec9436630761fb
diff --git a/cli/lib/spree_cli/templates/extension/Gemfile b/cli/lib/spree_cli/templates/extension/Gemfile
index 3d84dc2202..3f94c21340 100644
--- a/cli/lib/spree_cli/templates/extension/Gemfile
+++ b/cli/lib/spree_cli/templates/extension/Gemfile
@@ -11,11 +11,12 @@ spree_opts = { github: 'spree/spree', branch: 'main' }
gem 'spree', spree_opts
gem 'spree_emails', spree_opts
gem 'spree_admin', spree_opts
-gem 'spree_storefront', spree_opts
gem 'mysql2' if ENV['DB'] == 'mysql' || ENV['CI']
gem 'pg' if ENV['DB'] == 'postgres' || ENV['CI']
gem 'sqlite3', '>= 2.0'
+gem 'sprockets-rails', '>= 3.5.2'
+
gemspec
diff --git a/cli/lib/spree_cli/templates/extension/config/initializers/spree.rb.tt b/cli/lib/spree_cli/templates/extension/config/initializers/spree.rb.tt
index c7c242fce9..c4239b80a9 100644
--- a/cli/lib/spree_cli/templates/extension/config/initializers/spree.rb.tt
+++ b/cli/lib/spree_cli/templates/extension/config/initializers/spree.rb.tt
@@ -28,5 +28,5 @@ Rails.application.config.after_initialize do
# Spree.page_builder.page_blocks << Spree::PageBlocks::BigRedButtonToCallSales
# Storefront partials
- Spree.storefront.partials.head << '<%= file_name %>/head'
+ # Spree.storefront.partials.head << '<%= file_name %>/head'
end
diff --git a/cli/lib/spree_cli/templates/extension/extension.gemspec b/cli/lib/spree_cli/templates/extension/extension.gemspec
index 3bc232c079..7d38e1fa38 100644
--- a/cli/lib/spree_cli/templates/extension/extension.gemspec
+++ b/cli/lib/spree_cli/templates/extension/extension.gemspec
@@ -21,7 +21,6 @@ Gem::Specification.new do |s|
s.requirements << 'none'
s.add_dependency 'spree', '>= <%= Gem.loaded_specs['spree_cli'].version %>'
- s.add_dependency 'spree_storefront', '>= <%= Gem.loaded_specs['spree_cli'].version %>'
s.add_dependency 'spree_admin', '>= <%= Gem.loaded_specs['spree_cli'].version %>'
s.add_dependency 'spree_extension'
diff --git a/cli/lib/spree_cli/templates/extension/lib/%file_name%/engine.rb.tt b/cli/lib/spree_cli/templates/extension/lib/%file_name%/engine.rb.tt
index ccad946863..4464bd965e 100644
--- a/cli/lib/spree_cli/templates/extension/lib/%file_name%/engine.rb.tt
+++ b/cli/lib/spree_cli/templates/extension/lib/%file_name%/engine.rb.tt
@@ -14,16 +14,18 @@ module <%= class_name %>
end
initializer '<%= file_name %>.assets' do |app|
- app.config.assets.paths << root.join('app/javascript')
- app.config.assets.paths << root.join('vendor/javascript')
- app.config.assets.paths << root.join('vendor/stylesheets')
- app.config.assets.precompile += %w[<%= file_name %>_manifest]
+ if app.config.respond_to?(:assets)
+ app.config.assets.paths << root.join('app/javascript')
+ app.config.assets.precompile += %w[<%= file_name %>_manifest]
+ end
end
initializer '<%= file_name %>.importmap', before: 'importmap' do |app|
- app.config.importmap.paths << root.join('config/importmap.rb')
- # https://github.com/rails/importmap-rails?tab=readme-ov-file#sweeping-the-cache-in-development-and-test
- app.config.importmap.cache_sweepers << root.join('app/javascript')
+ if app.config.respond_to?(:importmap)
+ app.config.importmap.paths << root.join('config/importmap.rb')
+ # https://github.com/rails/importmap-rails?tab=readme-ov-file#sweeping-the-cache-in-development-and-test
+ app.config.importmap.cache_sweepers << root.join('app/javascript')
+ end
end
def self.activate
diff --git a/cli/lib/spree_cli/templates/extension/spec/feature/home_page_spec.rb b/cli/lib/spree_cli/templates/extension/spec/feature/home_page_spec.rb
deleted file mode 100644
index be107cc8b5..0000000000
--- a/cli/lib/spree_cli/templates/extension/spec/feature/home_page_spec.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-require 'spec_helper'
-
-RSpec.describe 'Home Page', type: :feature, js: true do
- let(:store) { Spree::Store.default }
-
- describe 'visiting the home page' do
- before do
- visit '/'
- end
-
- it 'loads successfully' do
- expect(page).to have_content(store.name)
- end
- end
-end
diff --git a/core/lib/generators/spree/install/install_generator.rb b/core/lib/generators/spree/install/install_generator.rb
index da2d67871c..249365f958 100644
--- a/core/lib/generators/spree/install/install_generator.rb
+++ b/core/lib/generators/spree/install/install_generator.rb
@@ -111,7 +111,7 @@ module Spree
silence_warnings { rake 'action_text:install:migrations' }
silence_warnings { rake 'spree:install:migrations' }
silence_warnings { rake 'spree_api:install:migrations' }
- silence_warnings { rake 'spree_page_builder:install:migrations' } if @install_storefront
+ silence_warnings { rake 'spree_page_builder:install:migrations' } if @install_storefront && Spree::Core::Engine.frontend_available?
end
end