From e6031209b0c7b229737078b54b5ecb37e21c15cd Mon Sep 17 00:00:00 2001 From: Justin Coyne Date: Tue, 14 Feb 2023 21:52:12 -0600 Subject: [PATCH] Make the clipboard dependency an NPM dependency The rails version is out of date with the javascript version and hasn't been updated in 6 years --- app/assets/javascripts/spotlight/admin/index.js | 2 +- blacklight-spotlight.gemspec | 1 - lib/generators/spotlight/install_generator.rb | 3 +++ lib/spotlight/engine.rb | 3 ++- package.json | 1 + 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/spotlight/admin/index.js b/app/assets/javascripts/spotlight/admin/index.js index 0fe86d7dcd..92918b519a 100644 --- a/app/assets/javascripts/spotlight/admin/index.js +++ b/app/assets/javascripts/spotlight/admin/index.js @@ -5,7 +5,7 @@ //= require parameterize //= require bootstrap-tagsinput //= require jquery.serializejson -//= require clipboard +//= require clipboard/dist/clipboard //= require leaflet //= require leaflet-iiif //= require Leaflet.Editable diff --git a/blacklight-spotlight.gemspec b/blacklight-spotlight.gemspec index f84269a7e0..5dbfea4264 100644 --- a/blacklight-spotlight.gemspec +++ b/blacklight-spotlight.gemspec @@ -29,7 +29,6 @@ these collections.) s.add_dependency 'breadcrumbs_on_rails', '>= 3.0', '< 5' s.add_dependency 'cancancan' s.add_dependency 'carrierwave', '~> 2.2' - s.add_dependency 'clipboard-rails', '~> 1.5' s.add_dependency 'devise', '~> 4.1' s.add_dependency 'devise_invitable' s.add_dependency 'faraday' diff --git a/lib/generators/spotlight/install_generator.rb b/lib/generators/spotlight/install_generator.rb index f4ba599c20..22b1f468d3 100644 --- a/lib/generators/spotlight/install_generator.rb +++ b/lib/generators/spotlight/install_generator.rb @@ -11,6 +11,9 @@ class Install < Rails::Generators::Base class_option :mailer_default_url_host, type: :string, default: '' # e.g. localhost:3000 def add_js + say 'Install Clipboard' + run 'yarn add clipboard@1.7.1' + gem 'shakapacker' Bundler.with_clean_env { run 'bundle install' } diff --git a/lib/spotlight/engine.rb b/lib/spotlight/engine.rb index 106daae769..4b599db37b 100644 --- a/lib/spotlight/engine.rb +++ b/lib/spotlight/engine.rb @@ -9,7 +9,6 @@ require 'activejob-status' require 'autoprefixer-rails' require 'blacklight' -require 'clipboard/rails' require 'faraday' require 'faraday/follow_redirects' require 'friendly_id' @@ -67,6 +66,8 @@ class Engine < ::Rails::Engine end initializer 'spotlight.assets.precompile' do |app| + config.assets.paths << Rails.root.join('node_modules') + app.config.assets.precompile += %w[spotlight/default_thumbnail.jpg spotlight/default_browse_thumbnail.jpg] Sprockets::ES6.configuration = { 'modules' => 'umd', 'moduleIds' => true } diff --git a/package.json b/package.json index f7054ba327..60ae97e4e9 100644 --- a/package.json +++ b/package.json @@ -25,5 +25,6 @@ "not IE 11" ], "dependencies": { + "clipboard": "1.7.1" } }