bootstrap 4.4.1 → 5.0.1

data/bootstrap.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   # SassC requires Ruby 2.3.3. Also specify here to make it obvious.
   s.required_ruby_version = '>= 2.3.3'
 
-  s.add_runtime_dependency 'popper_js', '>= 1.14.3', '< 2'
+  s.add_runtime_dependency 'popper_js', '>= 2.9.2', '< 3'
 
   s.add_runtime_dependency 'sassc-rails', '>= 2.0.0'
   s.add_runtime_dependency 'autoprefixer-rails', '>= 9.1.0'
@@ -31,8 +31,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'activesupport', '>= 4.1.5'
   s.add_development_dependency 'json', '>= 1.8.1'
   s.add_development_dependency 'sprockets-rails', '>= 2.3.2'
-  s.add_development_dependency 'jquery-rails', '>= 3.1.0'
-  s.add_development_dependency 'slim-rails'
   s.add_development_dependency 'uglifier'
 
   s.files      = `git ls-files`.split("\n")

data/lib/bootstrap/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Bootstrap
-  VERSION       = '4.4.1'
-  BOOTSTRAP_SHA = 'dca1ab7d877bc4b664b43604657a2b5fbe2b4ecb'
+  VERSION       = '5.0.1'
+  BOOTSTRAP_SHA = '58b1be927f43c779377e478df2d119f2ddf956ca'
 end

data/tasks/updater/js.rb

@@ -2,6 +2,8 @@ require 'tsort'
 
 class Updater
   module Js
+    INLINED_SRCS = %w[util/index.js util/backdrop.js util/sanitizer.js util/scrollbar.js].freeze
+
     def update_javascript_assets
       log_status 'Updating javascripts...'
       save_to  = @save_to[:js]
@@ -11,13 +13,26 @@ class Updater
       log_processed "#{bootstrap_js_files * ' '}"
 
       log_status 'Updating javascript manifest'
-      manifest = ''
+      manifest = "//= require ./bootstrap-global-this-define\n"
       bootstrap_js_files.each do |name|
         name = name.gsub(/\.js$/, '')
         manifest << "//= require ./bootstrap/#{name}\n"
       end
+      manifest << "//= require ./bootstrap-global-this-undefine\n"
       dist_js = read_files('dist/js', %w(bootstrap.js bootstrap.min.js))
       {
+          'assets/javascripts/bootstrap-global-this-define.js' => <<~JS,
+            // Set a `globalThis` so that bootstrap components are defined on window.bootstrap instead of window.
+            window['bootstrap'] = {
+              Popper: window.Popper,
+              _originalGlobalThis: window['globalThis']
+            };
+            window['globalThis'] = window['bootstrap'];
+          JS
+          'assets/javascripts/bootstrap-global-this-undefine.js' => <<~JS,
+            window['globalThis'] = window['bootstrap']._originalGlobalThis;
+            window['bootstrap']._originalGlobalThis = null;
+          JS
           'assets/javascripts/bootstrap-sprockets.js' => manifest,
           'assets/javascripts/bootstrap.js'           => dist_js['bootstrap.js'],
           'assets/javascripts/bootstrap.min.js'       => dist_js['bootstrap.min.js'],
@@ -29,13 +44,13 @@ class Updater
 
     def bootstrap_js_files
       @bootstrap_js_files ||= begin
-        src_files = get_paths_by_type('js/src', /\.js$/) - %w[index.js tools/sanitizer.js]
+        src_files = get_paths_by_type('js/src', /\.js$/) - INLINED_SRCS
+        puts "src_files: #{src_files.inspect}"
         imports = Deps.new
         # Get the imports from the ES6 files to order requires correctly.
         read_files('js/src', src_files).each do |name, content|
-          imports.add name,
-                      *content.scan(%r{import [a-zA-Z]* from '\./(\w+)})
-                           .flatten(1).map { |f| "#{f}.js" }
+          file_imports = content.scan(%r{import *(?:[a-zA-Z]*|\{[a-zA-Z ,]*\}) *from '\./([\w/-]+)}).flatten(1).map { |f| "#{f}.js" }.uniq
+          imports.add name, *(file_imports - INLINED_SRCS)
         end
         imports.tsort
       end

data/tasks/updater/network.rb

@@ -25,7 +25,13 @@ class Updater
       log_http_get_files files, path_url, false
       files.map do |name|
         Thread.start {
-          contents[name] = open("#{path_url}/#{name}").read
+          begin
+            url = "#{path_url}/#{name}"
+            contents[name] = URI.open(url).read
+          rescue Exception => e
+            log "Error downloading #{url}: #{e}"
+            exit 1
+          end
           WRITE_FILES_MUTEX.synchronize { write_cached_files path, name => contents[name] }
         }
       end.each(&:join)
@@ -62,7 +68,7 @@ class Updater
         File.read(cache_path, mode: 'rb')
       else
         log_http_get_file url, false
-        content = open(url).read
+        content = URI.open(url).read
         File.open(cache_path, 'wb') { |f| f.write content }
         content
       end

data/test/dummy_rails/app/assets/javascripts/application.js

@@ -1,7 +1,8 @@
-//= require jquery
 //= require popper.js
 //= require bootstrap-sprockets
 
-jQuery(function ($) {
-    $('[data-toggle="tooltip"]').tooltip()
+document.addEventListener('DOMContentLoaded', () => {
+    for (const tooltipTriggerEl of document.querySelectorAll('[data-bs-toggle="tooltip"]')) {
+        new bootstrap.Tooltip(tooltipTriggerEl)
+    }
 });

data/test/dummy_rails/app/views/layouts/application.html.erb

@@ -1,14 +1,16 @@
 <!DOCTYPE html>
 <html>
 <head>
+  <meta charset="utf-8">
   <title>bootstrap Dummy App</title>
+  <meta name="viewport" content="width=device-width, initial-scale=1">
   <%= stylesheet_link_tag 'application', media: "all", 'data-turbolinks-track' => true %>
-  <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
   <%= csrf_meta_tags %>
 </head>
 
 <body>
 <%= yield %>
+<%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
 </body>
 
 </html>

data/test/dummy_rails/app/views/pages/root.html

@@ -0,0 +1,89 @@
+<nav class="navbar navbar-expand-lg navbar-light bg-light">
+  <div class="container-fluid">
+    <a class="navbar-brand" href="#">Navbar</a>
+    <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent"
+      aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+      <span class="navbar-toggler-icon"></span>
+    </button>
+    <div class="collapse navbar-collapse" id="navbarSupportedContent">
+      <ul class="navbar-nav me-auto mb-2 mb-lg-0">
+        <li class="nav-item">
+          <a class="nav-link active" aria-current="page" href="#">Home</a>
+        </li>
+        <li class="nav-item">
+          <a class="nav-link" href="#">Link</a>
+        </li>
+        <li class="nav-item dropdown">
+          <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-bs-toggle="dropdown"
+            aria-expanded="false">
+            Dropdown
+          </a>
+          <ul class="dropdown-menu" aria-labelledby="navbarDropdown">
+            <li><a class="dropdown-item" href="#">Action</a></li>
+            <li><a class="dropdown-item" href="#">Another action</a></li>
+            <li>
+              <hr class="dropdown-divider">
+            </li>
+            <li><a class="dropdown-item" href="#">Something else here</a></li>
+          </ul>
+        </li>
+        <li class="nav-item">
+          <a class="nav-link disabled" href="#" tabindex="-1" aria-disabled="true">Disabled</a>
+        </li>
+      </ul>
+      <form class="d-flex">
+        <input class="form-control me-2" type="search" placeholder="Search" aria-label="Search">
+        <button class="btn btn-outline-success" type="submit">Search</button>
+      </form>
+    </div>
+  </div>
+</nav>
+
+<div class="container">
+  <div class="row">
+    <div class="card" style="width: 18rem;">
+      <div class="card-body">
+        <h5 class="card-title">Card title</h5>
+        <p class="card-text">Some quick example text to build on the card title and make up the bulk of the card's
+          content.</p>
+        <a href="#" class="btn btn-primary">Go somewhere</a>
+      </div>
+    </div>
+  </div>
+  <div class="row">
+    <div class="col-sm">
+      <div class="card" style="width: 18rem;">
+        <ul class="list-group list-group-flush">
+          <li class="list-group-item">An item</li>
+          <li class="list-group-item">A second item</li>
+          <li class="list-group-item">A third item</li>
+        </ul>
+      </div>
+    </div>
+    <div class="col-sm">
+      <div class="btn-group" role="group" aria-label="Basic mixed styles example">
+        <button type="button" class="btn btn-danger">Left</button>
+        <button type="button" class="btn btn-warning">Middle</button>
+        <button type="button" class="btn btn-success">Right</button>
+      </div>
+    </div>
+    <div class="col-sm">
+      <button type="button" class="btn btn-secondary" data-bs-toggle="tooltip" data-bs-placement="top"
+        title="Tooltip on top">
+        Tooltip on top
+      </button>
+      <button type="button" class="btn btn-secondary" data-bs-toggle="tooltip" data-bs-placement="right"
+        title="Tooltip on right">
+        Tooltip on right
+      </button>
+      <button type="button" class="btn btn-secondary" data-bs-toggle="tooltip" data-bs-placement="bottom"
+        title="Tooltip on bottom">
+        Tooltip on bottom
+      </button>
+      <button type="button" class="btn btn-secondary" data-bs-toggle="tooltip" data-bs-placement="left"
+        title="Tooltip on left">
+        Tooltip on left
+      </button>
+    </div>
+  </div>
+</div>

data/test/dummy_rails/config/application.rb

@@ -11,11 +11,8 @@ require 'rails'
 end
 
 require 'autoprefixer-rails'
-require 'slim-rails'
 require 'uglifier'
-
 require 'bootstrap'
-require 'jquery-rails'
 
 module Dummy
   class Application < Rails::Application

data/test/gemfiles/rails_6_0.gemfile

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+gem 'actionpack', '~> 6.0.3'
+gem 'activesupport', '~> 6.0.3'
+gem 'autoprefixer-rails', '>= 9.7.6'
+
+gemspec path: '../../'

data/test/gemfiles/rails_6_1.gemfile

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+gem 'actionpack', '~> 6.1.3'
+gem 'activesupport', '~> 6.1.3'
+gem 'autoprefixer-rails', '>= 9.7.6'
+
+gemspec path: '../../'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap
 version: !ruby/object:Gem::Version
-  version: 4.4.1
+  version: 5.0.1
 platform: ruby
 authors:
 - Twitter, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-05 00:00:00.000000000 Z
+date: 2021-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: popper_js
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.14.3
+        version: 2.9.2
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.14.3
+        version: 2.9.2
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: sassc-rails
   requirement: !ruby/object:Gem::Requirement
@@ -184,34 +184,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.2
-- !ruby/object:Gem::Dependency
-  name: jquery-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.1.0
-- !ruby/object:Gem::Dependency
-  name: slim-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: uglifier
   requirement: !ruby/object:Gem::Requirement
@@ -240,24 +212,32 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- assets/javascripts/bootstrap-global-this-define.js
+- assets/javascripts/bootstrap-global-this-undefine.js
 - assets/javascripts/bootstrap-sprockets.js
 - assets/javascripts/bootstrap.js
 - assets/javascripts/bootstrap.min.js
 - assets/javascripts/bootstrap/alert.js
+- assets/javascripts/bootstrap/base-component.js
 - assets/javascripts/bootstrap/button.js
 - assets/javascripts/bootstrap/carousel.js
 - assets/javascripts/bootstrap/collapse.js
+- assets/javascripts/bootstrap/dom/data.js
+- assets/javascripts/bootstrap/dom/event-handler.js
+- assets/javascripts/bootstrap/dom/manipulator.js
+- assets/javascripts/bootstrap/dom/selector-engine.js
 - assets/javascripts/bootstrap/dropdown.js
 - assets/javascripts/bootstrap/modal.js
+- assets/javascripts/bootstrap/offcanvas.js
 - assets/javascripts/bootstrap/popover.js
 - assets/javascripts/bootstrap/scrollspy.js
 - assets/javascripts/bootstrap/tab.js
 - assets/javascripts/bootstrap/toast.js
 - assets/javascripts/bootstrap/tooltip.js
-- assets/javascripts/bootstrap/util.js
 - assets/stylesheets/_bootstrap-grid.scss
 - assets/stylesheets/_bootstrap-reboot.scss
 - assets/stylesheets/_bootstrap.scss
+- assets/stylesheets/bootstrap/_accordion.scss
 - assets/stylesheets/bootstrap/_alert.scss
 - assets/stylesheets/bootstrap/_badge.scss
 - assets/stylesheets/bootstrap/_breadcrumb.scss
@@ -266,24 +246,21 @@ files:
 - assets/stylesheets/bootstrap/_card.scss
 - assets/stylesheets/bootstrap/_carousel.scss
 - assets/stylesheets/bootstrap/_close.scss
-- assets/stylesheets/bootstrap/_code.scss
-- assets/stylesheets/bootstrap/_custom-forms.scss
+- assets/stylesheets/bootstrap/_containers.scss
 - assets/stylesheets/bootstrap/_dropdown.scss
 - assets/stylesheets/bootstrap/_forms.scss
 - assets/stylesheets/bootstrap/_functions.scss
 - assets/stylesheets/bootstrap/_grid.scss
+- assets/stylesheets/bootstrap/_helpers.scss
 - assets/stylesheets/bootstrap/_images.scss
-- assets/stylesheets/bootstrap/_input-group.scss
-- assets/stylesheets/bootstrap/_jumbotron.scss
 - assets/stylesheets/bootstrap/_list-group.scss
-- assets/stylesheets/bootstrap/_media.scss
 - assets/stylesheets/bootstrap/_mixins.scss
 - assets/stylesheets/bootstrap/_modal.scss
 - assets/stylesheets/bootstrap/_nav.scss
 - assets/stylesheets/bootstrap/_navbar.scss
+- assets/stylesheets/bootstrap/_offcanvas.scss
 - assets/stylesheets/bootstrap/_pagination.scss
 - assets/stylesheets/bootstrap/_popover.scss
-- assets/stylesheets/bootstrap/_print.scss
 - assets/stylesheets/bootstrap/_progress.scss
 - assets/stylesheets/bootstrap/_reboot.scss
 - assets/stylesheets/bootstrap/_root.scss
@@ -295,54 +272,48 @@ files:
 - assets/stylesheets/bootstrap/_type.scss
 - assets/stylesheets/bootstrap/_utilities.scss
 - assets/stylesheets/bootstrap/_variables.scss
+- assets/stylesheets/bootstrap/bootstrap-utilities.scss
+- assets/stylesheets/bootstrap/forms/_floating-labels.scss
+- assets/stylesheets/bootstrap/forms/_form-check.scss
+- assets/stylesheets/bootstrap/forms/_form-control.scss
+- assets/stylesheets/bootstrap/forms/_form-range.scss
+- assets/stylesheets/bootstrap/forms/_form-select.scss
+- assets/stylesheets/bootstrap/forms/_form-text.scss
+- assets/stylesheets/bootstrap/forms/_input-group.scss
+- assets/stylesheets/bootstrap/forms/_labels.scss
+- assets/stylesheets/bootstrap/forms/_validation.scss
+- assets/stylesheets/bootstrap/helpers/_clearfix.scss
+- assets/stylesheets/bootstrap/helpers/_colored-links.scss
+- assets/stylesheets/bootstrap/helpers/_position.scss
+- assets/stylesheets/bootstrap/helpers/_ratio.scss
+- assets/stylesheets/bootstrap/helpers/_stretched-link.scss
+- assets/stylesheets/bootstrap/helpers/_text-truncation.scss
+- assets/stylesheets/bootstrap/helpers/_visually-hidden.scss
 - assets/stylesheets/bootstrap/mixins/_alert.scss
-- assets/stylesheets/bootstrap/mixins/_background-variant.scss
-- assets/stylesheets/bootstrap/mixins/_badge.scss
 - assets/stylesheets/bootstrap/mixins/_border-radius.scss
 - assets/stylesheets/bootstrap/mixins/_box-shadow.scss
 - assets/stylesheets/bootstrap/mixins/_breakpoints.scss
 - assets/stylesheets/bootstrap/mixins/_buttons.scss
 - assets/stylesheets/bootstrap/mixins/_caret.scss
 - assets/stylesheets/bootstrap/mixins/_clearfix.scss
+- assets/stylesheets/bootstrap/mixins/_color-scheme.scss
+- assets/stylesheets/bootstrap/mixins/_container.scss
 - assets/stylesheets/bootstrap/mixins/_deprecate.scss
-- assets/stylesheets/bootstrap/mixins/_float.scss
 - assets/stylesheets/bootstrap/mixins/_forms.scss
 - assets/stylesheets/bootstrap/mixins/_gradients.scss
-- assets/stylesheets/bootstrap/mixins/_grid-framework.scss
 - assets/stylesheets/bootstrap/mixins/_grid.scss
-- assets/stylesheets/bootstrap/mixins/_hover.scss
 - assets/stylesheets/bootstrap/mixins/_image.scss
 - assets/stylesheets/bootstrap/mixins/_list-group.scss
 - assets/stylesheets/bootstrap/mixins/_lists.scss
-- assets/stylesheets/bootstrap/mixins/_nav-divider.scss
 - assets/stylesheets/bootstrap/mixins/_pagination.scss
 - assets/stylesheets/bootstrap/mixins/_reset-text.scss
 - assets/stylesheets/bootstrap/mixins/_resize.scss
-- assets/stylesheets/bootstrap/mixins/_screen-reader.scss
-- assets/stylesheets/bootstrap/mixins/_size.scss
-- assets/stylesheets/bootstrap/mixins/_table-row.scss
-- assets/stylesheets/bootstrap/mixins/_text-emphasis.scss
-- assets/stylesheets/bootstrap/mixins/_text-hide.scss
+- assets/stylesheets/bootstrap/mixins/_table-variants.scss
 - assets/stylesheets/bootstrap/mixins/_text-truncate.scss
 - assets/stylesheets/bootstrap/mixins/_transition.scss
-- assets/stylesheets/bootstrap/mixins/_visibility.scss
-- assets/stylesheets/bootstrap/utilities/_align.scss
-- assets/stylesheets/bootstrap/utilities/_background.scss
-- assets/stylesheets/bootstrap/utilities/_borders.scss
-- assets/stylesheets/bootstrap/utilities/_clearfix.scss
-- assets/stylesheets/bootstrap/utilities/_display.scss
-- assets/stylesheets/bootstrap/utilities/_embed.scss
-- assets/stylesheets/bootstrap/utilities/_flex.scss
-- assets/stylesheets/bootstrap/utilities/_float.scss
-- assets/stylesheets/bootstrap/utilities/_overflow.scss
-- assets/stylesheets/bootstrap/utilities/_position.scss
-- assets/stylesheets/bootstrap/utilities/_screenreaders.scss
-- assets/stylesheets/bootstrap/utilities/_shadows.scss
-- assets/stylesheets/bootstrap/utilities/_sizing.scss
-- assets/stylesheets/bootstrap/utilities/_spacing.scss
-- assets/stylesheets/bootstrap/utilities/_stretched-link.scss
-- assets/stylesheets/bootstrap/utilities/_text.scss
-- assets/stylesheets/bootstrap/utilities/_visibility.scss
+- assets/stylesheets/bootstrap/mixins/_utilities.scss
+- assets/stylesheets/bootstrap/mixins/_visually-hidden.scss
+- assets/stylesheets/bootstrap/utilities/_api.scss
 - assets/stylesheets/bootstrap/vendor/_rfs.scss
 - bootstrap.gemspec
 - lib/bootstrap.rb
@@ -364,7 +335,7 @@ files:
 - test/dummy_rails/app/controllers/pages_controller.rb
 - test/dummy_rails/app/helpers/application_helper.rb
 - test/dummy_rails/app/views/layouts/application.html.erb
-- test/dummy_rails/app/views/pages/root.html.slim
+- test/dummy_rails/app/views/pages/root.html
 - test/dummy_rails/config.ru
 - test/dummy_rails/config/application.rb
 - test/dummy_rails/config/boot.rb
@@ -386,6 +357,8 @@ files:
 - test/gemfiles/rails_4_2.gemfile
 - test/gemfiles/rails_5_0.gemfile
 - test/gemfiles/rails_5_1.gemfile
+- test/gemfiles/rails_6_0.gemfile
+- test/gemfiles/rails_6_1.gemfile
 - test/rails_test.rb
 - test/support/dummy_rails_integration.rb
 - test/support/reporting.rb
@@ -410,7 +383,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: The most popular HTML, CSS, and JavaScript framework for developing responsive,
@@ -427,7 +400,7 @@ test_files:
 - test/dummy_rails/app/controllers/pages_controller.rb
 - test/dummy_rails/app/helpers/application_helper.rb
 - test/dummy_rails/app/views/layouts/application.html.erb
-- test/dummy_rails/app/views/pages/root.html.slim
+- test/dummy_rails/app/views/pages/root.html
 - test/dummy_rails/config.ru
 - test/dummy_rails/config/application.rb
 - test/dummy_rails/config/boot.rb
@@ -449,6 +422,8 @@ test_files:
 - test/gemfiles/rails_4_2.gemfile
 - test/gemfiles/rails_5_0.gemfile
 - test/gemfiles/rails_5_1.gemfile
+- test/gemfiles/rails_6_0.gemfile
+- test/gemfiles/rails_6_1.gemfile
 - test/rails_test.rb
 - test/support/dummy_rails_integration.rb
 - test/support/reporting.rb