Move asset generating to the assets generator

lib/generators/blacklight/assets_generator.rb

@@ -3,6 +3,13 @@ module Blacklight
   class Assets < Rails::Generators::Base
     source_root File.expand_path('../templates', __FILE__)
 
+    # 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'
+    end
+
     def assets
       copy_file "blacklight.scss", "app/assets/stylesheets/blacklight.scss"
 

lib/generators/blacklight/install_generator.rb

@@ -30,11 +30,11 @@ 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
@@ -43,13 +43,6 @@ def 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