From 1aa53efd7b4e12138573d488766250f57d98a776 Mon Sep 17 00:00:00 2001 From: Steve Taylor Date: Mon, 13 Jan 2025 12:01:07 -0800 Subject: [PATCH 1/2] Add config for updated gems --- lib/generators/spotlight/install_generator.rb | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/lib/generators/spotlight/install_generator.rb b/lib/generators/spotlight/install_generator.rb index 818ece397..57c62563e 100644 --- a/lib/generators/spotlight/install_generator.rb +++ b/lib/generators/spotlight/install_generator.rb @@ -122,6 +122,25 @@ def add_osd_viewer generate 'blacklight_gallery:install' end + def configure_osd_for_sprockets + return unless defined?(Sprockets) + + append_to_file 'app/assets/javascripts/application.js', "\n//= require openseadragon\n//= require openseadragon-rails/index\n" + + append_to_file 'config/initializers/assets.rb' do + <<~CONTENT + Rails.application.config.assets.paths << Rails.root.join('node_modules/openseadragon/build/openseadragon') + Rails.application.config.assets.paths << Rails.root.join('node_modules/openseadragon/build/openseadragon/images') + CONTENT + end + + append_to_file 'app/assets/config/manifest.js', "//= link_tree ../../../node_modules/openseadragon/build/openseadragon/images\n" + + inject_into_file 'app/controllers/application_controller.rb', after: 'class ApplicationController < ActionController::Base' do + "\n helper Openseadragon::OpenseadragonHelper\n" + end + end + def add_oembed unless Bundler.locked_gems.dependencies.key? 'blacklight-oembed' gem 'blacklight-oembed', '~> 1.0' @@ -129,6 +148,12 @@ def add_oembed end generate 'blacklight_oembed:install' copy_file 'config/initializers/oembed.rb' + + return unless defined?(Sprockets) + + # Use the rolled up assets from blacklight-oembed for sprockets + gsub_file 'app/assets/javascripts/blacklight_oembed.js', "import oembed from 'blacklight_oembed/oembed'", + '//= require blacklight_oembed/oembed' end def add_mailer_defaults From 0eae0f1013ee0bab4b8d3bb77d14491157946c7a Mon Sep 17 00:00:00 2001 From: Steve Taylor Date: Wed, 15 Jan 2025 08:53:44 -0800 Subject: [PATCH 2/2] Update name of OSD bundled assets --- lib/generators/spotlight/install_generator.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/generators/spotlight/install_generator.rb b/lib/generators/spotlight/install_generator.rb index 57c62563e..4464dd435 100644 --- a/lib/generators/spotlight/install_generator.rb +++ b/lib/generators/spotlight/install_generator.rb @@ -125,7 +125,7 @@ def add_osd_viewer def configure_osd_for_sprockets return unless defined?(Sprockets) - append_to_file 'app/assets/javascripts/application.js', "\n//= require openseadragon\n//= require openseadragon-rails/index\n" + append_to_file 'app/assets/javascripts/application.js', "\n//= require openseadragon\n//= require openseadragon-rails/openseadragon-rails\n" append_to_file 'config/initializers/assets.rb' do <<~CONTENT