diff --git a/lib/generators/blacklight/assets_generator.rb b/lib/generators/blacklight/assets_generator.rb index b1c33e893d..fc7525138e 100644 --- a/lib/generators/blacklight/assets_generator.rb +++ b/lib/generators/blacklight/assets_generator.rb @@ -34,7 +34,6 @@ def assets # rubocop:disable Metrics/MethodLength <<~CONTENT 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@5.2.2/dist/js/bootstrap.js" - pin "jquery", to: "https://ga.jspm.io/npm:jquery@3.6.1/dist/jquery.js" pin "blacklight", to: "blacklight/blacklight.js" pin "dialog-polyfill", to: "https://ga.jspm.io/npm:dialog-polyfill@0.5.6/dist/dialog-polyfill.js" CONTENT @@ -42,10 +41,8 @@ def assets # rubocop:disable Metrics/MethodLength append_to_file 'app/javascript/application.js' do <<~CONTENT - import $ from "jquery" import bootstrap from "bootstrap" window.bootstrap = bootstrap // Required for Blacklight 7 so it can manage the modals - window.$ = $ // required as long as blacklight requires jquery import "blacklight" import dialogPolyfill from "dialog-polyfill" Blacklight.onLoad(() => { @@ -55,12 +52,10 @@ def assets # rubocop:disable Metrics/MethodLength CONTENT end else - gem 'jquery-rails' create_file 'app/assets/javascripts/application.js' do <<~CONTENT //= require turbolinks //= require rails-ujs - //= require jquery3 // Required by Blacklight //= require popper diff --git a/package.json b/package.json index 1ee424c611..419b179310 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,6 @@ "not IE 11" ], "dependencies": { - "bootstrap": ">=4.3.1 <6.0.0", - "jquery": "^3.5.1" + "bootstrap": ">=4.3.1 <6.0.0" } } diff --git a/spec/controllers/bookmarks_controller_spec.rb b/spec/controllers/bookmarks_controller_spec.rb index 1db251e994..9e7730d758 100644 --- a/spec/controllers/bookmarks_controller_spec.rb +++ b/spec/controllers/bookmarks_controller_spec.rb @@ -11,7 +11,6 @@ end end - # jquery 1.9 ajax does error callback if 200 returns empty body. so use 204 instead. describe "update" do it "has a 200 status code when creating a new one" do put :update, xhr: true, params: { id: '2007020969', format: :js }