Skip to content

Commit

Permalink
Don't have solidus_admin as a solidus dependency
Browse files Browse the repository at this point in the history
For now it should stay opt-in.
  • Loading branch information
elia committed Sep 29, 2023
1 parent bce1ca2 commit 9fd6307
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 2 deletions.
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ group :backend do
end

group :admin do
gem 'solidus_admin', path: 'admin', require: false
gem 'axe-core-rspec', '~> 4.7', require: false
gem 'axe-core-capybara', '~> 4.7', require: false
end
Expand Down
5 changes: 5 additions & 0 deletions core/lib/generators/solidus/install/install_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ class InstallGenerator < Rails::Generators::AppBase
class_option :seed, type: :boolean, default: true, banner: 'Load seed data (migrations must be run)'
class_option :sample, type: :boolean, default: true, banner: 'Load sample data (migrations and seeds must be run)'
class_option :active_storage, type: :boolean, default: true, banner: 'Install ActiveStorage as image attachments handler for products and taxons'
class_option :admin_preview, type: :boolean, default: true, desc: 'Install the admin preview'
class_option :auto_accept, type: :boolean
class_option :user_class, type: :string
class_option :admin_email, type: :string
Expand Down Expand Up @@ -159,6 +160,10 @@ def run_migrations
end

def install_solidus_admin
return unless options[:admin_preview]

say_status :installing, "SolidusAdmin", :blue
bundle_command 'add solidus_admin'
generate 'solidus_admin:install'
end

Expand Down
1 change: 0 additions & 1 deletion lib/solidus.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,4 @@
require 'solidus_core'
require 'solidus_api'
require 'solidus_backend'
require 'solidus_admin'
require 'solidus_sample'
1 change: 0 additions & 1 deletion solidus.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ Gem::Specification.new do |s|
s.required_ruby_version = '>= 3.0.0'
s.required_rubygems_version = '>= 1.8.23'

s.add_dependency 'solidus_admin'
s.add_dependency 'solidus_api', s.version
s.add_dependency 'solidus_backend', s.version
s.add_dependency 'solidus_core', s.version
Expand Down

0 comments on commit 9fd6307

Please sign in to comment.