blacklight 8.1.0 → 8.2.0

data/app/components/blacklight/advanced_search_form_component.html.erb

@@ -40,8 +40,8 @@
 
   <% if sort_fields_select %>
     <div class="form-group row mb-4">
-      <%= content_tag :h2, t('blacklight.advanced_search.form.sort_label'), id: 'advanced-search-sort-label', class: 'col-md-3 col-form-label text-md-right' %>
-      <div class="col">
+      <%= content_tag :h2, t('blacklight.advanced_search.form.sort_label'), id: 'advanced-search-sort-label', class: 'col-md-3 text-md-right' %>
+      <div class="col-md-9">
         <%= sort_fields_select %>
       </div>
     </div>
@@ -50,7 +50,7 @@
   <div class="form-group row">
     <div class="submit-buttons col-md-9 offset-md-3">
       <%= submit_tag t('blacklight.advanced_search.form.search_btn_html'), class: 'btn btn-primary advanced-search-submit', id: "advanced-search-submit" %>
-      <%= button_tag t('blacklight.advanced_search.form.start_over_html'), type: 'reset', class: 'btn btn-link advanced-search-start-over' %>
+      <%= link_to t('blacklight.advanced_search.form.start_over_html'), request.path, :class =>"btn btn-link advanced-search-start-over" %>
     </div>
   </div>
 <% end %>

data/app/components/blacklight/advanced_search_form_component.rb

@@ -55,7 +55,7 @@ module Blacklight
     def initialize_search_filter_controls
       fields = blacklight_config.facet_fields.select { |_k, v| v.include_in_advanced_search || v.include_in_advanced_search.nil? }
 
-      fields.each do |_k, config|
+      fields.each_value do |config|
         display_facet = @response.aggregations[config.field]
         with_search_filter_control(config: config, display_facet: display_facet)
       end

data/app/components/blacklight/document/bookmark_component.html.erb

@@ -1,13 +1,9 @@
-<%-
-# the data-doc-id attribute is used by our JS that converts to a checkbox/label.
-# we don't use the per-form csrf token
--%>
+<%- # we don't use the per-form csrf token -%>
 <%= form_tag(bookmark_path,
              authenticity_token: false,
              method:  bookmarked? ? :delete : :put,
              class: "bookmark-toggle",
              data: {
-               'doc-id' => @document.id,
                present: t('blacklight.search.bookmarks.present'),
                absent: t('blacklight.search.bookmarks.absent'),
                inprogress: t('blacklight.search.bookmarks.inprogress')
@@ -20,6 +16,5 @@
   </div>
 
   <%= submit_tag(t(bookmarked? ? 'remove.button' : 'add.button', scope: 'blacklight.bookmarks'),
-                 id: "bookmark_toggle_#{@document.id.to_s.parameterize}",
                  class: "bookmark-#{bookmarked? ? 'remove' : 'add'} btn btn-outline-secondary") %>
 <% end %>

data/app/components/blacklight/facet_field_component.html.erb

@@ -8,11 +8,12 @@
       data-target="#<%= html_id %>"
       data-bs-target="#<%= html_id %>"
       aria-expanded="<%= @facet_field.collapsed? ? 'false' : 'true' %>"
+      arial-controls="<%= html_id %>"
     >
       <%= label %>
     </button>
   </h3>
-  <div id="<%= html_id %>" aria-labelledby="<%= header_html_id %>" class="panel-collapse facet-content collapse <%= "show" unless @facet_field.collapsed? %>">
+  <div id="<%= html_id %>" role="region" aria-labelledby="<%= header_html_id %>" class="panel-collapse facet-content collapse <%= "show" unless @facet_field.collapsed? %>">
     <div class="card-body">
       <%= body %>
 

data/app/components/blacklight/icons/legacy_icon_component.rb

@@ -11,7 +11,7 @@ module Blacklight
       end
 
       def call
-        tag.span(svg&.html_safe || default_icon,  # rubocop:disable Rails/OutputSafety
+        tag.span(svg&.html_safe || default_icon, # rubocop:disable Rails/OutputSafety
                  class: "blacklight-icons blacklight-icon-#{@name} #{@classes}".strip,
                  'aria-hidden': (true if @aria_hidden))
       end

data/app/components/blacklight/response/facet_group_component.html.erb

@@ -15,7 +15,6 @@
       aria: {
         controls: @panel_id,
         expanded: 'false',
-        label: t('blacklight.search.facets.group.toggle'),
       } do %>
       <span data-show-label><%= t('blacklight.search.facets.group.open') %></span>
       <span data-hide-label><%= t('blacklight.search.facets.group.close') %></span>

data/app/components/blacklight/search_bar_component.html.erb

@@ -23,7 +23,7 @@
     <% if autocomplete_path.present? %>
       <auto-complete src="<%= autocomplete_path %>" for="autocomplete-popup" class="search-autocomplete-wrapper">
         <%= f.search_field @query_param, value: @q, placeholder: scoped_t('search.placeholder'), class: "search-q q form-control rounded-#{search_fields.length > 1 ? '0' : 'left'}", autofocus: @autofocus, aria: { label: scoped_t('search.label'), autocomplete: 'list', controls: 'autocomplete-popup' }  %>
-        <ul id="autocomplete-popup" role="listbox" aria-label="<%= scoped_t('search.label') %>"></ul>
+        <ul id="autocomplete-popup" role="listbox" aria-label="<%= scoped_t('search.label') %>" hidden></ul>
       </auto-complete>
     <% else %>
       <%= f.search_field @query_param, value: @q, placeholder: scoped_t('search.placeholder'), class: "search-q q form-control rounded-#{search_fields.length > 1 ? '0' : 'left'}", autofocus: @autofocus, aria: { label: scoped_t('search.label') }  %>

data/app/components/blacklight/system/flash_message_component.html.erb

@@ -1,6 +1,6 @@
 <div class="alert <%= @classes %>">
   <%= message %>
-  <%= tag.button_tag button_contents, type: "button", class: "btn-close",
+  <%= tag.button button_contents, type: "button", class: "btn-close",
                      data: { dismiss: "alert", bs_dismiss: "alert" },
                      aria: { label: "Close" } %>
 </div>

data/app/controllers/concerns/blacklight/token_based_user.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+# A controller mixin that allows users to share their bookmarks.
+# This is used to create a callback from refworks in the bookmarks_export_url helper in blacklight-marc
 module Blacklight::TokenBasedUser
   extend ActiveSupport::Concern
 
@@ -45,34 +47,18 @@ module Blacklight::TokenBasedUser
   end
 
   def export_secret_token
-    secret_key_generator.generate_key('encrypted user session key')[0..(key_len - 1)]
+    secret_key_generator.generate_key('encrypted user session key', key_len)
   end
 
   def secret_key_generator
-    @secret_key_generator ||= begin
-      app = Rails.application
-
-      secret_key_base = if app.respond_to?(:credentials)
-                          # Rails 5.2+
-                          app.credentials.secret_key_base
-                        else
-                          # Rails <= 5.1
-                          app.secrets.secret_key_base
-                        end
-      ActiveSupport::KeyGenerator.new(secret_key_base)
-    end
+    @secret_key_generator ||= ActiveSupport::KeyGenerator.new(Rails.application.secret_key_base)
   end
 
   def message_encryptor
     ActiveSupport::MessageEncryptor.new(export_secret_token)
   end
 
-  # Ruby 2.4 requires keys of very particular lengths
   def key_len
-    if ActiveSupport::MessageEncryptor.respond_to? :key_len
-      ActiveSupport::MessageEncryptor.key_len
-    else
-      0
-    end
+    ActiveSupport::MessageEncryptor.key_len
   end
 end

data/app/helpers/blacklight/url_helper_behavior.rb

@@ -36,7 +36,8 @@ module Blacklight::UrlHelperBehavior
   private :document_link_params
 
   ##
-  # Attributes for a link that gives a URL we can use to track clicks for the current search session
+  # Attributes for a link that gives a URL we can use to track clicks for the current search session.
+  # We disable turbo prefetch (InstantClick), because since we replace the link with a form, it's just wasted.
   # @param [SolrDocument] document
   # @param [Integer] counter
   # @example
@@ -52,7 +53,7 @@ module Blacklight::UrlHelperBehavior
     return {} if path.nil?
 
     context_method = blacklight_config.track_search_session.storage == 'client' ? 'get' : 'post'
-    { data: { context_href: path, context_method: context_method } }
+    { data: { context_href: path, context_method: context_method, turbo_prefetch: false } }
   end
 
   ##

data/app/javascript/blacklight/bookmark_toggle.js

@@ -1,4 +1,4 @@
-import CheckboxSubmit from 'blacklight/checkbox_submit'
+import CheckboxSubmit from './checkbox_submit.js'
 
 const BookmarkToggle = (e) => {
   if (e.target.matches('[data-checkboxsubmit-target="checkbox"]')) {

data/app/javascript/blacklight/checkbox_submit.js

@@ -18,11 +18,11 @@ export default class CheckboxSubmit {
     this.form = form
   }
 
-  async clicked(evt) {
+  clicked(evt) {
     this.spanTarget.innerHTML = this.form.getAttribute('data-inprogress')
     this.labelTarget.setAttribute('disabled', 'disabled');
     this.checkboxTarget.setAttribute('disabled', 'disabled');
-    const response = await fetch(this.formTarget.getAttribute('action'), {
+    fetch(this.formTarget.getAttribute('action'), {
       body: new FormData(this.formTarget),
       method: this.formTarget.getAttribute('method').toUpperCase(),
       headers: {
@@ -30,16 +30,17 @@ export default class CheckboxSubmit {
         'X-Requested-With': 'XMLHttpRequest',
         'X-CSRF-Token': document.querySelector('meta[name=csrf-token]')?.content
       }
-    })
-    this.labelTarget.removeAttribute('disabled')
-    this.checkboxTarget.removeAttribute('disabled')
-    if (response.ok) {
-      const json = await response.json()
+    }).then((response) => {
+      if (response.ok) return response.json();
+      return Promise.reject('response was not ok')
+    }).then((json) => {
+      this.labelTarget.removeAttribute('disabled')
+      this.checkboxTarget.removeAttribute('disabled')
       this.updateStateFor(!this.checked)
       document.querySelector('[data-role=bookmark-counter]').innerHTML = json.bookmarks.count
-    } else {
-      alert('Error')
-    }
+    }).catch((error) => {
+      this.handleError(error)
+    })
   }
 
   get checked() {
@@ -62,6 +63,10 @@ export default class CheckboxSubmit {
     return this.form.querySelector('[data-checkboxsubmit-target="span"]')
   }
 
+  handleError() {
+    alert("Unable to save the bookmark at this time.")
+  }
+
   updateStateFor(state) {
     this.checkboxTarget.checked = state
 

data/app/javascript/blacklight/index.js

@@ -1,8 +1,13 @@
-import BookmarkToggle from 'blacklight/bookmark_toggle'
-import ButtonFocus from 'blacklight/button_focus'
-import Modal from 'blacklight/modal'
-import SearchContext from 'blacklight/search_context'
-import Core from 'blacklight/core'
+// ALL imports in this dir, including in files imported, should be RELATIVE
+// paths to keep things working in the various ways these files get used, at
+// both compile time and npm package run time.
+
+import BookmarkToggle from './bookmark_toggle.js'
+import ButtonFocus from './button_focus.js'
+import Modal from './modal.js'
+import SearchContext from './search_context.js'
+import Core from './core.js'
+
 
 export default {
   BookmarkToggle,

data/app/javascript/blacklight/modal.js

@@ -52,7 +52,7 @@
   can be a turbo-stream that defines some HTML fragementsand where on the page to put them:
   https://turbo.hotwired.dev/handbook/streams
 */
-import ModalForm from 'blacklight/modalForm'
+import ModalForm from './modalForm.js'
 
 const Modal = (() => {
   const modal = {}
@@ -97,21 +97,35 @@ const Modal = (() => {
   }
 
   // Add the passed in contents to the modal and display it.
+  // We have specific handling so that scripts returned from the ajax call are executed.
+  // This enables adding a script like recaptcha to prevent bots from sending emails.
   modal.receiveAjax = function (contents) {
-      const domparser = new DOMParser();
-      const dom = domparser.parseFromString(contents, "text/html")
-      // If there is a containerSelector on the document, use its children.
-      let elements = dom.querySelectorAll(`${modal.containerSelector} > *`)
-      if (elements.length == 0) {
-        // If the containerSelector wasn't found, use the whole document
-        elements = dom.body.childNodes
-      }
-
-      document.querySelector(`${modal.modalSelector} .modal-content`).replaceChildren(...elements)
-
-      modal.show();
+    const domparser = new DOMParser();
+    const dom = domparser.parseFromString(contents, "text/html")
+    // If there is a containerSelector on the document, use its children.
+    let elements = dom.querySelectorAll(`${modal.containerSelector} > *`)
+    const frag = document.createDocumentFragment()
+    if (elements.length == 0) {
+      // If the containerSelector wasn't found, use the whole document
+      elements = dom.body.childNodes
+    }
+    elements.forEach((el) => frag.appendChild(el))
+    modal.activateScripts(frag)
+    
+    document.querySelector(`${modal.modalSelector} .modal-content`).replaceChildren(frag)
+
+    modal.show();
   };
 
+  // DOMParser doesn't allow scripts to be executed.  This fixes that.
+  modal.activateScripts = function (frag) {
+    frag.querySelectorAll('script').forEach((script) => {
+      const fixedScript = document.createElement('script')
+      fixedScript.src = script.src
+      fixedScript.async = false
+      script.parentNode.replaceChild(fixedScript, script)
+    })
+  }
 
   modal.modalAjaxLinkClick = function(e) {
     e.preventDefault();

data/app/javascript/blacklight/search_context.js

@@ -27,6 +27,7 @@ SearchContext.handleSearchContextMethod = function(event) {
 
   // check for meta keys.. if set, we should open in a new tab
   if(event.metaKey || event.ctrlKey) {
+    form.dataset.turbo = "false";
     target = '_blank';
   }
 

data/app/values/blacklight/types.rb

@@ -65,6 +65,19 @@ module Blacklight
       end
     end
 
+    class Time < Value
+      def cast(input)
+        value = super
+        return if value.blank?
+
+        begin
+          ::Time.parse(value.to_s) # rubocop:disable Rails/TimeZone
+        rescue ArgumentError
+          Rails.logger&.info "Unable to parse time: #{value.inspect}"
+        end
+      end
+    end
+
     class Boolean < Value
       def cast(input)
         ActiveModel::Type::Boolean.new.cast(super)
@@ -106,6 +119,7 @@ module Blacklight
     register :boolean, Boolean
     register :string, String
     register :date, Date
+    register :time, Time
     register :array, Array
     register :json, JsonValue
     register :html, Html

data/app/views/catalog/_advanced_search_form.html.erb

@@ -1,6 +1,6 @@
 <%= render(Blacklight::AdvancedSearchFormComponent.new(
       url: search_action_url,
-      classes: ['advanced', 'form-horizontal'],
+      classes: ['advanced'],
       params: search_state.params_for_search.except(:qt),
       response: @response
     )) %>

data/app/views/catalog/_citation.html.erb

@@ -1,5 +1,5 @@
 <%= render Blacklight::System::ModalComponent.new do |component| %>
-  <% component.title { t('blacklight.tools.citation') } %>
+  <% component.with_title { t('blacklight.tools.citation') } %>
 
   <%= render Blacklight::Document::CitationComponent.with_collection(@documents) if @documents.present? %>
 <% end %>

data/app/views/catalog/email.html.erb

@@ -1,7 +1,7 @@
 <%= render Blacklight::System::ModalComponent.new do |component| %>
-  <% component.title { t('blacklight.email.form.title') } %>
+  <% component.with_title { t('blacklight.email.form.title') } %>
 
-  <% component.body do %>
+  <% component.with_body do %>
     <%= render 'email_form' %>
   <% end %>
 <% end %>

data/app/views/catalog/sms.html.erb

@@ -1,7 +1,7 @@
 <%= render Blacklight::System::ModalComponent.new do |component| %>
-  <% component.title { t('blacklight.sms.form.title') } %>
+  <% component.with_title { t('blacklight.sms.form.title') } %>
 
-  <% component.body do %>
+  <% component.with_body do %>
     <%= render 'sms_form' %>
   <% end %>
 <% end %>

data/app/views/kaminari/blacklight/_page.html.erb

@@ -11,7 +11,7 @@
 
 <li class="page-item <%= 'active' if page.current? %>">
   <% if page.current? %>
-    <span class="page-link" aria-label="<%= t('views.pagination.aria.current_page', page: page_display) %>" aria-current="true"><%= page_display %></span>
+    <span class="page-link" aria-current="true"><%= page_display %><span class="sr-only visually-hidden"> <%= t('views.pagination.aria.current_page', page: page_display) %></span></span>
   <% else %>
     <%= link_to page_display, url, :remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil, class: 'page-link', aria: { label: t('views.pagination.aria.go_to_page', page: page_display) } %>
   <% end %>

data/blacklight.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
   s.add_dependency "view_component", '>= 2.66', '< 4'
 
   s.add_development_dependency "rsolr", ">= 1.0.6", "< 3"  # Library for interacting with rSolr.
-  s.add_development_dependency "rspec-rails", "~> 6.0"
+  s.add_development_dependency "rspec-rails", "~> 6.1"
   s.add_development_dependency "rspec-collection_matchers", ">= 1.0"
   s.add_development_dependency 'axe-core-rspec'
   s.add_development_dependency "capybara", '~> 3'

data/config/locales/blacklight.ar.yml

@@ -101,7 +101,6 @@ ar:
         group:
           close: إخفاء الأوجه
           open: عرض الأوجه
-          toggle: المزيد »
         missing: "[غير موجود]"
         more_html: المزيد <span class="sr-only visually-hidden">%{field_name}</span> »
         pivot:

data/config/locales/blacklight.ca.yml

@@ -190,8 +190,6 @@ ca:
         pivot:
           show: Mostrar
           hide: Amagar
-        group:
-          toggle: 'altres »'
       group:
         more: 'més »'
       filters:

data/config/locales/blacklight.de.yml

@@ -91,7 +91,6 @@ de:
         group:
           close: Facetten ausblenden
           open: Facetten zeigen
-          toggle: mehr »
         missing:
         - fehlt
         more_html: mehr <span class="sr-only visually-hidden">%{field_name}</span> »

data/config/locales/blacklight.en.yml

@@ -191,7 +191,6 @@ en:
           show: Show
           hide: Hide
         group:
-          toggle: Toggle facets
           open: Show facets
           close: Hide facets
       group:

data/config/locales/blacklight.es.yml

@@ -91,7 +91,6 @@ es:
         group:
           close: Ocultar facetas
           open: Mostrar facetas
-          toggle: más »
         missing: "[Falta]"
         more_html: más <span class="sr-only visually-hidden">%{field_name}</span> »
         pivot:

data/config/locales/blacklight.fr.yml

@@ -91,7 +91,6 @@ fr:
         group:
           close: Masquer les facettes
           open: Afficher les facettes
-          toggle: plus »
         missing: "[manquante]"
         more_html: plus <span class="sr-only visually-hidden">%{field_name}</span> »
         pivot:

data/config/locales/blacklight.hu.yml

@@ -89,7 +89,6 @@ hu:
         group:
           close: Fazetek elrejtése
           open: Szempontok megjelenítése
-          toggle: több »
         missing: "[Hiányzó]"
         more_html: több <span class="sr-only visually-hidden">%{field_name}</span> »
         pivot:

data/config/locales/blacklight.it.yml

@@ -91,7 +91,6 @@ it:
         group:
           close: Nascondi sfaccettature
           open: Mostra sfaccettature
-          toggle: altri »
         missing:
         - Mancante
         more_html: altri <span class="sr-only visually-hidden">%{field_name}</span> »

data/config/locales/blacklight.nl.yml

@@ -89,7 +89,6 @@ nl:
         group:
           close: Verberg facetten
           open: Toon facetten
-          toggle: meer »
         missing: "[Ontbrekend]"
         more_html: Meer <span class="sr-only visually-hidden">%{field_name}</span> »
         pivot:

data/config/locales/blacklight.pt-BR.yml

@@ -89,7 +89,6 @@ pt-BR:
         group:
           close: Ocultar facetas
           open: Mostrar facetas
-          toggle: mais »
         missing:
         - Ausência
         more_html: mais <span class="sr-only visually-hidden">%{field_name}</span> »

data/config/locales/blacklight.sq.yml

@@ -89,7 +89,6 @@ sq:
         group:
           close: Fshih aspektet
           open: Trego aspektet
-          toggle: më shumë »
         missing: "[Mungon]"
         more_html: Më shumë <span class="sr-only visually-hidden">%{field_name}</span> »
         pivot:

data/config/locales/blacklight.zh.yml

@@ -89,7 +89,6 @@ zh:
         group:
           close: 隐藏方面
           open: 显示方面
-          toggle: 更多 »
         missing: "[未找到]"
         more_html: 更多 <span class="sr-only visually-hidden">%{field_name}</span> »
         pivot:

data/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3.7"
-
 services:
   app:
     build:

data/lib/blacklight/solr/repository.rb

@@ -21,7 +21,9 @@ module Blacklight::Solr
     # Execute a search query against solr
     # @param [Hash] params solr query parameters
     def search params = {}
-      send_and_receive search_path(params), params.reverse_merge(qt: blacklight_config.qt)
+      request_params = params.reverse_merge({ qt: blacklight_config.qt })
+
+      send_and_receive search_path(request_params), request_params
     end
 
     # @param [Hash] request_params

data/lib/blacklight/solr/response/params.rb

@@ -31,7 +31,7 @@ module Blacklight::Solr::Response::Params
     defaults = {
       sort: single_valued_param(:'facet.sort'),
       limit: single_valued_param(:'facet.limit')&.to_i || 100,
-      offset: single_valued_param(:'facet.offset')&.to_i || 0,
+      offset: single_valued_param(:'facet.offset').to_i,
       prefix: single_valued_param(:'facet.prefix')
     }
 

data/lib/blacklight/solr/search_builder_behavior.rb

@@ -86,6 +86,8 @@ module Blacklight::Solr
       return unless search_state.query_param
 
       bool_query = search_field.clause_params.transform_values { |v| v.merge(query: search_state.query_param) }
+      solr_parameters["spellcheck.q"] ||= search_state.query_param
+
       solr_parameters.append_boolean_query(:must, bool_query)
     end
 

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

@@ -3,7 +3,7 @@
 module Blacklight
   module Assets
     class ImportmapGenerator < Rails::Generators::Base
-      class_option :'bootstrap-version', type: :string, default: ENV.fetch('BOOTSTRAP_VERSION', '~> 5.1'), desc: "Set the generated app's bootstrap version"
+      class_option :'bootstrap-version', type: :string, default: ENV.fetch('BOOTSTRAP_VERSION', '~> 5.3'), desc: "Set the generated app's bootstrap version"
 
       # This could be skipped if you want to use webpacker
       def add_javascript_dependencies
@@ -16,7 +16,7 @@ module Blacklight
           <<~CONTENT
             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.2.2'}/dist/js/bootstrap.js"
+            pin "bootstrap", to: "https://ga.jspm.io/npm:bootstrap@#{(defined?(Bootstrap) && Bootstrap::VERSION) || '5.3.2'}/dist/js/bootstrap.js"
           CONTENT
         end
 

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

@@ -3,7 +3,7 @@
 module Blacklight
   module Assets
     class SprocketsGenerator < Rails::Generators::Base
-      class_option :'bootstrap-version', type: :string, default: ENV.fetch('BOOTSTRAP_VERSION', '~> 5.1'), desc: "Set the generated app's bootstrap version"
+      class_option :'bootstrap-version', type: :string, default: ENV.fetch('BOOTSTRAP_VERSION', '~> 5.3'), desc: "Set the generated app's bootstrap version"
 
       # This could be skipped if you want to use webpacker
       def add_javascript_dependencies

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.1'), desc: "Set the generated app's bootstrap version"
+    class_option :'bootstrap-version', type: :string, default: ENV.fetch('BOOTSTRAP_VERSION', '~> 5.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']

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blacklight-frontend",
-  "version": "8.0.1",
+  "version": "8.2.0",
   "description": "The frontend code and styles for Blacklight",
   "main": "app/assets/javascripts/blacklight",
   "module": "app/assets/javascripts/blacklight/blacklight.esm.js",

data/spec/controllers/catalog_controller_spec.rb

@@ -54,7 +54,7 @@ RSpec.describe CatalogController, api: true do
       it "has no docs or facet values for query without results", integration: true do
         get :index, params: { q: 'sadfdsafasdfsadfsadfsadf' } # query for no results
         expect(assigns(:response).docs).to be_empty
-        assigns(:response).aggregations.each do |_key, facet|
+        assigns(:response).aggregations.each_value do |facet|
           expect(facet.items).to be_empty
         end
       end
@@ -815,7 +815,7 @@ end
 def assert_facets_have_values(aggregations)
   expect(aggregations).not_to be_empty
   # should have at least one value for each facet
-  aggregations.each do |_key, facet|
+  aggregations.each_value do |facet|
     expect(facet.items).to have_at_least(1).item
   end
 end