From 0e5b1faf7937b2d5f675d02e3cee23ae6224c630 Mon Sep 17 00:00:00 2001 From: Justin Coyne Date: Wed, 17 Jan 2024 13:32:56 -0600 Subject: [PATCH] Use bootstrap 5.3 for newly generated apps --- app/assets/stylesheets/blacklight/_mixins.scss | 2 +- lib/generators/blacklight/assets/importmap_generator.rb | 4 ++-- lib/generators/blacklight/assets/sprockets_generator.rb | 2 +- lib/generators/blacklight/assets_generator.rb | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/blacklight/_mixins.scss b/app/assets/stylesheets/blacklight/_mixins.scss index c671b9df37..c55eedf6a6 100644 --- a/app/assets/stylesheets/blacklight/_mixins.scss +++ b/app/assets/stylesheets/blacklight/_mixins.scss @@ -15,7 +15,7 @@ } // define a visually-hidden class that applies to a given breakpoint and below -// https://getbootstrap.com/docs/5.2/helpers/visually-hidden/ +// https://getbootstrap.com/docs/5.3/helpers/visually-hidden/ @if mixin-exists(visually-hidden) { @each $infix, $breakpoint in $grid-breakpoints { .visually-hidden-#{$infix} { diff --git a/lib/generators/blacklight/assets/importmap_generator.rb b/lib/generators/blacklight/assets/importmap_generator.rb index 63da40cb46..3fe4b9c354 100644 --- a/lib/generators/blacklight/assets/importmap_generator.rb +++ b/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 @@ def import_javascript_assets <<~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 diff --git a/lib/generators/blacklight/assets/sprockets_generator.rb b/lib/generators/blacklight/assets/sprockets_generator.rb index 7b863a7964..fa3093971b 100644 --- a/lib/generators/blacklight/assets/sprockets_generator.rb +++ b/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 diff --git a/lib/generators/blacklight/assets_generator.rb b/lib/generators/blacklight/assets_generator.rb index 97d7e41b72..4ac576affa 100644 --- a/lib/generators/blacklight/assets_generator.rb +++ b/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']