blacklight 8.13.0 → 9.0.0.beta1

data/lib/generators/blacklight/assets/importmap_generator.rb

@@ -5,39 +5,16 @@ module Blacklight
     class ImportmapGenerator < Rails::Generators::Base
       class_option :'bootstrap-version', type: :string, default: ENV.fetch('BOOTSTRAP_VERSION', '~> 5.3'), desc: "Set the generated app's bootstrap version"
 
-      def add_javascript_dependencies
-        gem 'bootstrap', options[:'bootstrap-version'].presence # in rails 7, only for stylesheets
-        gem 'jquery-rails' if bootstrap_4? # Bootstrap 4 has a dependency on jquery
-      end
-
-      def create_sprockets_manifest_if_needed
-        # BL8 still optionally supports Sprockets for CSS, but Rails 8+
-        # no longer creates the manifest.js file that Sprockets requires.
-        # We don't need to if we already have one, or if we're using
-        # cssbundling (which would create an application.bootstrap.scss file)
-        # via a `rails new` invocation with `--css bootstrap`.
-        return if File.exist?('app/assets/config/manifest.js')
-        return if File.exist?('app/assets/stylesheets/application.bootstrap.scss')
-
-        create_file 'app/assets/config/manifest.js' do
-          <<~CONTENT
-            //= link_tree ../images
-            //= link_directory ../stylesheets .css
-            //= link_tree ../../javascript .js
-          CONTENT
-        end
-      end
-
       def import_javascript_assets
         append_to_file 'config/importmap.rb' do
           <<~CONTENT
-            pin "@github/auto-complete-element", to: "https://cdn.jsdelivr.net/npm/@github/auto-complete-element@3.8.0/+esm"
+            pin "@github/auto-complete-element", to: "https://cdn.skypack.dev/@github/auto-complete-element"
             pin "@popperjs/core", to: "https://ga.jspm.io/npm:@popperjs/core@2.11.6/dist/umd/popper.min.js"
-            pin "bootstrap", to: "https://ga.jspm.io/npm:bootstrap@#{(defined?(Bootstrap) && Bootstrap::VERSION) || '5.3.2'}/dist/js/bootstrap.js"
+            pin "bootstrap", to: "https://ga.jspm.io/npm:bootstrap@#{(defined?(Bootstrap) && Bootstrap::VERSION) || '5.3.3'}/dist/js/bootstrap.js"
           CONTENT
         end
 
-        return unless File.exist?('app/assets/config/manifest.js')
+        return unless defined?(Sprockets)
 
         append_to_file 'app/assets/config/manifest.js' do
           <<~CONTENT
@@ -57,47 +34,29 @@ module Blacklight
         append_to_file 'app/javascript/application.js' do
           <<~CONTENT
             import githubAutoCompleteElement from "@github/auto-complete-element"
-            import Blacklight from "blacklight"
+            import Blacklight from "blacklight-frontend"
           CONTENT
         end
       end
 
       def add_stylesheet
         if File.exist? 'app/assets/stylesheets/application.bootstrap.scss'
-          if ENV['CI']
-            run "yarn add file:#{Blacklight::Engine.root}"
-          else
-            run "yarn add blacklight-frontend@#{Blacklight::VERSION}"
-          end
-
           append_to_file 'app/assets/stylesheets/application.bootstrap.scss' do
             <<~CONTENT
-              @import "blacklight-frontend/app/assets/stylesheets/blacklight/blacklight";
+              @import url("blacklight.css");
             CONTENT
           end
         else
-          # NOTE: sassc-rails pulls in sprockets-rails, which requires that a
-          # manifest.js file exists.
-          gem "sassc-rails", "~> 2.1"
-
-          create_file 'app/assets/stylesheets/blacklight.scss' do
+          append_to_file 'app/assets/stylesheets/application.css' do
             <<~CONTENT
-              @import 'bootstrap';
-              @import 'blacklight/blacklight';
+              /*
+               *= require blacklight
+               */
+              @import url(https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css);
             CONTENT
           end
-
-          # application.css in a Rails 8 app has no Sprockets require
-          # directives, so blacklight.scss won't be included unless we add one.
-          inject_into_file 'app/assets/stylesheets/application.css',
-                           "\n *= require blacklight",
-                           before: "\n */"
         end
       end
-
-      def bootstrap_4?
-        options[:'bootstrap-version'].match?(/\A[^0-9]*4\./)
-      end
     end
   end
 end

data/lib/generators/blacklight/assets/propshaft_generator.rb

@@ -18,7 +18,7 @@ module Blacklight
       def add_package_assets
         append_to_file 'app/assets/stylesheets/application.bootstrap.scss' do
           <<~CONTENT
-            @import "blacklight-frontend/app/assets/stylesheets/blacklight/blacklight";
+            @import url("blacklight.css");
           CONTENT
         end
 

data/lib/generators/blacklight/assets_generator.rb

@@ -2,7 +2,7 @@
 
 module Blacklight
   class AssetsGenerator < Rails::Generators::Base
-    class_option :'bootstrap-version', type: :string, default: ENV.fetch('BOOTSTRAP_VERSION', '~> 5.3'), desc: "Set the generated app's bootstrap version"
+    class_option :'bootstrap-version', type: :string, default: ENV.fetch('BOOTSTRAP_VERSION', '5.3.3'), desc: "Set the generated app's bootstrap version"
 
     def run_asset_pipeline_specific_generator
       generated_options = "--bootstrap-version='#{options[:'bootstrap-version']}'" if options[:'bootstrap-version']
@@ -11,8 +11,8 @@ module Blacklight
                     'blacklight:assets:importmap'
                   elsif defined?(Propshaft)
                     'blacklight:assets:propshaft'
-                  elsif defined?(Sprockets)
-                    'blacklight:assets:sprockets'
+                  else
+                    raise "Unsupported path"
                   end
 
       generate generator, generated_options if generator

data/lib/generators/blacklight/controller_generator.rb

@@ -16,9 +16,9 @@ module Blacklight
     # Add Blacklight to the application controller
     def inject_blacklight_controller_behavior
       inject_into_class "app/controllers/application_controller.rb", "ApplicationController" do
-        "  # Adds a few additional behaviors into the application controller\n" \
-          "  include Blacklight::Controller\n" \
-          "  layout :determine_layout if respond_to? :layout\n\n"
+        "  # Adds a few additional behaviors into the application controller\n  " \
+          "include Blacklight::Controller\n  " \
+          "layout :determine_layout if respond_to? :layout\n\n"
       end
     end
 

data/lib/generators/blacklight/search_builder_generator.rb

@@ -27,7 +27,7 @@ module Blacklight
     private
 
     def rspec_installed?
-      defined?(RSpec::Rails)
+      defined?(RSpec) && defined?(RSpec::Rails)
     end
   end
 end

data/lib/generators/blacklight/templates/.solr_wrapper.yml

@@ -1,7 +1,5 @@
 # Place any default configuration for solr_wrapper here
 # port: 8983
-env:
-  SOLR_MODULES: analysis-extras
 collection:
   dir: solr/conf/
   name: blacklight-core