Skip to content

Commit c553709

Browse files
authored
Merge pull request #3565 from projectblacklight/bootstrap535
Upgrade bootstrap to 5.3.5
2 parents e8afb1d + 271075f commit c553709

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

Diff for: lib/generators/blacklight/assets/importmap_generator.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ def import_javascript_assets
1010
<<~CONTENT
1111
pin "@github/auto-complete-element", to: "https://cdn.skypack.dev/@github/auto-complete-element"
1212
pin "@popperjs/core", to: "https://ga.jspm.io/npm:@popperjs/[email protected]/dist/umd/popper.min.js"
13-
pin "bootstrap", to: "https://ga.jspm.io/npm:bootstrap@#{(defined?(Bootstrap) && Bootstrap::VERSION) || '5.3.3'}/dist/js/bootstrap.js"
13+
pin "bootstrap", to: "https://ga.jspm.io/npm:bootstrap@#{(defined?(Bootstrap) && Bootstrap::VERSION) || '5.3.5'}/dist/js/bootstrap.js"
1414
CONTENT
1515
end
1616

@@ -50,7 +50,7 @@ def add_stylesheet
5050
append_to_file 'app/assets/stylesheets/application.css' do
5151
<<~CONTENT
5252
@import url("blacklight.css");
53-
@import url(https://cdn.jsdelivr.net/npm/[email protected].3/dist/css/bootstrap.min.css);
53+
@import url(https://cdn.jsdelivr.net/npm/[email protected].5/dist/css/bootstrap.min.css);
5454
CONTENT
5555
end
5656
end

Diff for: lib/generators/blacklight/assets_generator.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
module Blacklight
44
class AssetsGenerator < Rails::Generators::Base
5-
class_option :'bootstrap-version', type: :string, default: ENV.fetch('BOOTSTRAP_VERSION', '5.3.3'), desc: "Set the generated app's bootstrap version"
5+
class_option :'bootstrap-version', type: :string, default: ENV.fetch('BOOTSTRAP_VERSION', '5.3.5'), desc: "Set the generated app's bootstrap version"
66

77
def run_asset_pipeline_specific_generator
88
generated_options = "--bootstrap-version='#{options[:'bootstrap-version']}'" if options[:'bootstrap-version']

Diff for: package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"rollup": "^4.24.0",
3535
"rollup-plugin-includepaths": "^0.2.4",
3636
"sass": "^1.80.3",
37-
"bootstrap": "^5.3.3"
37+
"bootstrap": "^5.3.5"
3838
},
3939
"browserslist": [
4040
"defaults",

0 commit comments

Comments
 (0)