diff --git a/lib/generators/blacklight_range_limit/assets_generator.rb b/lib/generators/blacklight_range_limit/assets_generator.rb deleted file mode 100644 index afbc5e04..00000000 --- a/lib/generators/blacklight_range_limit/assets_generator.rb +++ /dev/null @@ -1,15 +0,0 @@ -# Temporary local override of the plugin's assets generator, See: -# https://github.com/projectblacklight/blacklight_range_limit/blob/main/lib/generators/blacklight_range_limit/assets_generator.rb - -# TODO: remove this file once the plugin is capable of running its install generator -# without failing when yarn/importmap are unsupported. -require 'rails/generators' -require 'rails/generators/base' - -module BlacklightRangeLimit - class AssetsGenerator < Rails::Generators::Base - # Do nothing -- we don't want the assets generator to run because we - # we are using neither importmap-rails nor yarn, and the generator fails - # in that case. - end -end diff --git a/lib/generators/trln_argon/install_generator.rb b/lib/generators/trln_argon/install_generator.rb index b9f4cbfb..1e3819eb 100644 --- a/lib/generators/trln_argon/install_generator.rb +++ b/lib/generators/trln_argon/install_generator.rb @@ -16,9 +16,7 @@ def run_dependency_generators say_status('info', 'Installing Blacklight Range Limit', :magenta) say_status('info', '=================================', :magenta) # TODO: v9.0.0.beta1 of the plugin assumes you are using either yarn or importmap; - # it does not support Sprockets for JS. It also provides no easy way to skip - # running its assets generator (yet). For now, we will use a local version of - # lib/generators/blacklight_range_limit/assets_generator.rb that does nothing. + # it does not support Sprockets for JS. So we'll --skip-assets here. # If we want TRLN Argon to use the plugin this way by default (with no JS), we can. # If we want the chart.js histogram supported by TRLN Argon we will need to @@ -29,7 +27,7 @@ def run_dependency_generators # See: # https://github.com/projectblacklight/blacklight_range_limit/blob/main/lib/generators/blacklight_range_limit/install_generator.rb # https://github.com/projectblacklight/blacklight_range_limit/blob/main/lib/generators/blacklight_range_limit/assets_generator.rb - generate 'blacklight_range_limit:install' + generate 'blacklight_range_limit:install --skip-assets' end # this should match whatever's in trln_argon.gemspec diff --git a/trln_argon.gemspec b/trln_argon.gemspec index 893a73fc..58f713ea 100644 --- a/trln_argon.gemspec +++ b/trln_argon.gemspec @@ -22,7 +22,7 @@ Gem::Specification.new do |s| s.add_dependency 'blacklight', '~> 8.7' s.add_dependency 'blacklight_advanced_search', '~> 8.0.0.alpha2' s.add_dependency 'blacklight-hierarchy', '~> 6.3' - s.add_dependency 'blacklight_range_limit', '9.0.0.beta1' + s.add_dependency 'blacklight_range_limit', '9.0.0.beta2' s.add_dependency 'git', '>= 1.11.0', "< 2" s.add_dependency 'rails_autolink', '~> 1.1' s.add_dependency 'library_stdnums', '~> 1.6'