lib/generators/blacklight/install_generator.rb in blacklight-7.0.0.rc1 vs lib/generators/blacklight/install_generator.rb in blacklight-7.0.0.rc2

@@ -9,11 +9,11 @@
     argument     :search_builder_name, type: :string, default: "search_builder"
     argument     :solr_version, type: :string, default: "latest"
 
     class_option :devise, type: :boolean, default: false, aliases: "-d", desc: "Use Devise as authentication logic."
     class_option :marc, type: :boolean, default: false, aliases: "-m", desc: "Generate MARC-based demo."
-    class_option :'skip-assets', type: :boolean, default: false, desc: "Skip generating javascript and css assets into the application"
+    class_option :'skip-assets', type: :boolean, default: !defined?(Sprockets), desc: "Skip generating javascript and css assets into the application"
     class_option :'skip-solr', type: :boolean, default: false, desc: "Skip generating solr configurations."
 
     desc <<-EOS
       This generator makes the following changes to your application:
        1. Generates blacklight:models
@@ -28,30 +28,23 @@
 
     def add_solr_wrapper
       generate 'blacklight:solr' unless options[:'skip-solr']
     end
 
-    # This could be skipped if you want to use webpacker
-    def add_javascript_dependencies
-      gem 'bootstrap', '~> 4.0'
-      gem 'popper_js'
-      gem 'twitter-typeahead-rails', '0.11.1.pre.corejavascript'
+    # Copy all files in templates/public/ directory to public/
+    # Call external generator in AssetsGenerator, so we can
+    # leave that callable seperately too.
+    def copy_public_assets
+      generate "blacklight:assets" unless options[:'skip-assets']
     end
 
     def bundle_install
       Bundler.with_clean_env do
         run "bundle install"
       end
     end
 
-    # Copy all files in templates/public/ directory to public/
-    # Call external generator in AssetsGenerator, so we can
-    # leave that callable seperately too.
-    def copy_public_assets
-      generate "blacklight:assets" unless options[:'skip-assets']
-    end
-
     def generate_blacklight_document
       generate 'blacklight:document', document_name
     end
 
     def generate_search_builder
@@ -93,10 +86,10 @@
 
     def generate_blacklight_marc_demo
       return unless options[:marc]
 
       blacklight_marc = String.new('blacklight-marc')
-      gem blacklight_marc, '~> 6.1'
+      gem blacklight_marc, '< 8'
 
       Bundler.with_clean_env do
         run "bundle install"
       end