bootstrap 4.6.2.1 → 5.3.5

data/assets/stylesheets/bootstrap/vendor/_rfs.scss

@@ -1,22 +1,22 @@
-// stylelint-disable property-blacklist, scss/dollar-variable-default
+// stylelint-disable scss/dimension-no-non-numeric-values
 
 // SCSS RFS mixin
 //
-// Automated responsive font sizes
+// Automated responsive values for font sizes, paddings, margins and much more
 //
-// Licensed under MIT (https://github.com/twbs/rfs/blob/v8.x/LICENSE)
+// Licensed under MIT (https://github.com/twbs/rfs/blob/main/LICENSE)
 
 // Configuration
 
-// Base font size
-$rfs-base-font-size: 1.25rem !default;
-$rfs-font-size-unit: rem !default;
+// Base value
+$rfs-base-value: 1.25rem !default;
+$rfs-unit: rem !default;
 
-@if $rfs-font-size-unit != rem and $rfs-font-size-unit != px {
-  @error "`#{$rfs-font-size-unit}` is not a valid unit for $rfs-font-size-unit. Use `px` or `rem`.";
+@if $rfs-unit != rem and $rfs-unit != px {
+  @error "`#{$rfs-unit}` is not a valid unit for $rfs-unit. Use `px` or `rem`.";
 }
 
-// Breakpoint at where font-size starts decreasing if screen width is smaller
+// Breakpoint at where values start decreasing if screen width is smaller
 $rfs-breakpoint: 1200px !default;
 $rfs-breakpoint-unit: px !default;
 
@@ -24,16 +24,19 @@ $rfs-breakpoint-unit: px !default;
   @error "`#{$rfs-breakpoint-unit}` is not a valid unit for $rfs-breakpoint-unit. Use `px`, `em` or `rem`.";
 }
 
-// Resize font size based on screen height and width
+// Resize values based on screen height and width
 $rfs-two-dimensional: false !default;
 
 // Factor of decrease
 $rfs-factor: 10 !default;
 
-@if type-of($rfs-factor) != "number" or $rfs-factor <= 1 {
+@if type-of($rfs-factor) != number or $rfs-factor <= 1 {
   @error "`#{$rfs-factor}` is not a valid  $rfs-factor, it must be greater than 1.";
 }
 
+// Mode. Possibilities: "min-media-query", "max-media-query"
+$rfs-mode: min-media-query !default;
+
 // Generate enable or disable classes. Possibilities: false, "enable" or "disable"
 $rfs-class: false !default;
 
@@ -43,11 +46,11 @@ $rfs-rem-value: 16 !default;
 // Safari iframe resize bug: https://github.com/twbs/rfs/issues/14
 $rfs-safari-iframe-resize-bug-fix: false !default;
 
-// Disable RFS by setting $enable-responsive-font-sizes to false
-$enable-responsive-font-sizes: true !default;
+// Disable RFS by setting $enable-rfs to false
+$enable-rfs: true !default;
 
-// Cache $rfs-base-font-size unit
-$rfs-base-font-size-unit: unit($rfs-base-font-size);
+// Cache $rfs-base-value unit
+$rfs-base-value-unit: unit($rfs-base-value);
 
 @function divide($dividend, $divisor, $precision: 10) {
   $sign: if($dividend > 0 and $divisor > 0 or $dividend < 0 and $divisor < 0, 1, -1);
@@ -91,138 +94,255 @@ $rfs-base-font-size-unit: unit($rfs-base-font-size);
   @return $result;
 }
 
-// Remove px-unit from $rfs-base-font-size for calculations
-@if $rfs-base-font-size-unit == "px" {
-  $rfs-base-font-size: divide($rfs-base-font-size, $rfs-base-font-size * 0 + 1);
+// Remove px-unit from $rfs-base-value for calculations
+@if $rfs-base-value-unit == px {
+  $rfs-base-value: divide($rfs-base-value, $rfs-base-value * 0 + 1);
 }
-@else if $rfs-base-font-size-unit == "rem" {
-  $rfs-base-font-size: divide($rfs-base-font-size, divide($rfs-base-font-size * 0 + 1, $rfs-rem-value));
+@else if $rfs-base-value-unit == rem {
+  $rfs-base-value: divide($rfs-base-value, divide($rfs-base-value * 0 + 1, $rfs-rem-value));
 }
 
 // Cache $rfs-breakpoint unit to prevent multiple calls
 $rfs-breakpoint-unit-cache: unit($rfs-breakpoint);
 
 // Remove unit from $rfs-breakpoint for calculations
-@if $rfs-breakpoint-unit-cache == "px" {
+@if $rfs-breakpoint-unit-cache == px {
   $rfs-breakpoint: divide($rfs-breakpoint, $rfs-breakpoint * 0 + 1);
 }
-@else if $rfs-breakpoint-unit-cache == "rem" or $rfs-breakpoint-unit-cache == "em" {
+@else if $rfs-breakpoint-unit-cache == rem or $rfs-breakpoint-unit-cache == "em" {
   $rfs-breakpoint: divide($rfs-breakpoint, divide($rfs-breakpoint * 0 + 1, $rfs-rem-value));
 }
 
-// Internal mixin that adds disable classes to the selector if needed.
-@mixin _rfs-disable-class {
-  @if $rfs-class == "disable" {
-    // Adding an extra class increases specificity, which prevents the media query to override the font size
-    &,
-    .disable-responsive-font-size &,
-    &.disable-responsive-font-size {
-      @content;
+// Calculate the media query value
+$rfs-mq-value: if($rfs-breakpoint-unit == px, #{$rfs-breakpoint}px, #{divide($rfs-breakpoint, $rfs-rem-value)}#{$rfs-breakpoint-unit});
+$rfs-mq-property-width: if($rfs-mode == max-media-query, max-width, min-width);
+$rfs-mq-property-height: if($rfs-mode == max-media-query, max-height, min-height);
+
+// Internal mixin used to determine which media query needs to be used
+@mixin _rfs-media-query {
+  @if $rfs-two-dimensional {
+    @if $rfs-mode == max-media-query {
+      @media (#{$rfs-mq-property-width}: #{$rfs-mq-value}), (#{$rfs-mq-property-height}: #{$rfs-mq-value}) {
+        @content;
+      }
+    }
+    @else {
+      @media (#{$rfs-mq-property-width}: #{$rfs-mq-value}) and (#{$rfs-mq-property-height}: #{$rfs-mq-value}) {
+        @content;
+      }
     }
   }
   @else {
-    @content;
+    @media (#{$rfs-mq-property-width}: #{$rfs-mq-value}) {
+      @content;
+    }
   }
 }
 
-// Internal mixin that adds enable classes to the selector if needed.
-@mixin _rfs-enable-class {
-  @if $rfs-class == "enable" {
-    .enable-responsive-font-size &,
-    &.enable-responsive-font-size {
+// Internal mixin that adds disable classes to the selector if needed.
+@mixin _rfs-rule {
+  @if $rfs-class == disable and $rfs-mode == max-media-query {
+    // Adding an extra class increases specificity, which prevents the media query to override the property
+    &,
+    .disable-rfs &,
+    &.disable-rfs {
       @content;
     }
   }
-  @else {
+  @else if $rfs-class == enable and $rfs-mode == min-media-query {
+    .enable-rfs &,
+    &.enable-rfs {
+      @content;
+    }
+  } @else {
     @content;
   }
 }
 
-// Internal mixin used to determine which media query needs to be used
-@mixin _rfs-media-query($mq-value) {
-  @if $rfs-two-dimensional {
-    @media (max-width: #{$mq-value}), (max-height: #{$mq-value}) {
+// Internal mixin that adds enable classes to the selector if needed.
+@mixin _rfs-media-query-rule {
+
+  @if $rfs-class == enable {
+    @if $rfs-mode == min-media-query {
       @content;
     }
+
+    @include _rfs-media-query () {
+      .enable-rfs &,
+      &.enable-rfs {
+        @content;
+      }
+    }
   }
   @else {
-    @media (max-width: #{$mq-value}) {
+    @if $rfs-class == disable and $rfs-mode == min-media-query {
+      .disable-rfs &,
+      &.disable-rfs {
+        @content;
+      }
+    }
+    @include _rfs-media-query () {
       @content;
     }
   }
 }
 
-// Responsive font size mixin
-@mixin rfs($fs, $important: false) {
-  // Cache $fs unit
-  $fs-unit: if(type-of($fs) == "number", unit($fs), false);
+// Helper function to get the formatted non-responsive value
+@function rfs-value($values) {
+  // Convert to list
+  $values: if(type-of($values) != list, ($values,), $values);
 
-  // Add !important suffix if needed
-  $rfs-suffix: if($important, " !important", "");
+  $val: "";
 
-  // If $fs isn't a number (like inherit) or $fs has a unit (not px or rem, like 1.5em) or $ is 0, just print the value
-  @if not $fs-unit or $fs-unit != "" and $fs-unit != "px" and $fs-unit != "rem" or $fs == 0 {
-    font-size: #{$fs}#{$rfs-suffix};
-  }
-  @else {
-    // Remove unit from $fs for calculations
-    @if $fs-unit == "px" {
-      $fs: divide($fs, $fs * 0 + 1);
+  // Loop over each value and calculate value
+  @each $value in $values {
+    @if $value == 0 {
+      $val: $val + " 0";
     }
-    @else if $fs-unit == "rem" {
-      $fs: divide($fs, divide($fs * 0 + 1, $rfs-rem-value));
-    }
-
-    // Set default font size
-    $rfs-static: if($rfs-font-size-unit == rem, #{divide($fs, $rfs-rem-value)}rem, #{$fs}px);
+    @else {
+      // Cache $value unit
+      $unit: if(type-of($value) == "number", unit($value), false);
 
-    // Only add the media query if the font size is bigger than the minimum font size
-    @if $fs <= $rfs-base-font-size or not $enable-responsive-font-sizes {
-      font-size: #{$rfs-static}#{$rfs-suffix};
+      @if $unit == px {
+        // Convert to rem if needed
+        $val: $val + " " + if($rfs-unit == rem, #{divide($value, $value * 0 + $rfs-rem-value)}rem, $value);
+      }
+      @else if $unit == rem {
+        // Convert to px if needed
+        $val: $val + " " + if($rfs-unit == px, #{divide($value, $value * 0 + 1) * $rfs-rem-value}px, $value);
+      } @else {
+        // If $value isn't a number (like inherit) or $value has a unit (not px or rem, like 1.5em) or $ is 0, just print the value
+        $val: $val + " " + $value;
+      }
     }
-    @else {
-      // Calculate the minimum font size for $fs
-      $fs-min: $rfs-base-font-size + divide($fs - $rfs-base-font-size, $rfs-factor);
+  }
 
-      // Calculate difference between $fs and the minimum font size
-      $fs-diff: $fs - $fs-min;
+  // Remove first space
+  @return unquote(str-slice($val, 2));
+}
 
-      // Base font-size formatting
-      $min-width: if($rfs-font-size-unit == rem, #{divide($fs-min, $rfs-rem-value)}rem, #{$fs-min}px);
+// Helper function to get the responsive value calculated by RFS
+@function rfs-fluid-value($values) {
+  // Convert to list
+  $values: if(type-of($values) != list, ($values,), $values);
+
+  $val: "";
+
+  // Loop over each value and calculate value
+  @each $value in $values {
+    @if $value == 0 {
+      $val: $val + " 0";
+    } @else {
+      // Cache $value unit
+      $unit: if(type-of($value) == "number", unit($value), false);
+
+      // If $value isn't a number (like inherit) or $value has a unit (not px or rem, like 1.5em) or $ is 0, just print the value
+      @if not $unit or $unit != px and $unit != rem {
+        $val: $val + " " + $value;
+      } @else {
+        // Remove unit from $value for calculations
+        $value: divide($value, $value * 0 + if($unit == px, 1, divide(1, $rfs-rem-value)));
+
+        // Only add the media query if the value is greater than the minimum value
+        @if abs($value) <= $rfs-base-value or not $enable-rfs {
+          $val: $val + " " + if($rfs-unit == rem, #{divide($value, $rfs-rem-value)}rem, #{$value}px);
+        }
+        @else {
+          // Calculate the minimum value
+          $value-min: $rfs-base-value + divide(abs($value) - $rfs-base-value, $rfs-factor);
 
-      // Use `vmin` if two-dimensional is enabled
-      $variable-unit: if($rfs-two-dimensional, vmin, vw);
+          // Calculate difference between $value and the minimum value
+          $value-diff: abs($value) - $value-min;
 
-      // Calculate the variable width between 0 and $rfs-breakpoint
-      $variable-width: #{divide($fs-diff * 100, $rfs-breakpoint)}#{$variable-unit};
+          // Base value formatting
+          $min-width: if($rfs-unit == rem, #{divide($value-min, $rfs-rem-value)}rem, #{$value-min}px);
 
-      // Set the calculated font-size
-      $rfs-fluid: calc(#{$min-width} + #{$variable-width}) #{$rfs-suffix};
+          // Use negative value if needed
+          $min-width: if($value < 0, -$min-width, $min-width);
 
-      // Breakpoint formatting
-      $mq-value: if($rfs-breakpoint-unit == px, #{$rfs-breakpoint}px, #{divide($rfs-breakpoint, $rfs-rem-value)}#{$rfs-breakpoint-unit});
+          // Use `vmin` if two-dimensional is enabled
+          $variable-unit: if($rfs-two-dimensional, vmin, vw);
 
-      @include _rfs-disable-class {
-        font-size: #{$rfs-static}#{$rfs-suffix};
-      }
+          // Calculate the variable width between 0 and $rfs-breakpoint
+          $variable-width: #{divide($value-diff * 100, $rfs-breakpoint)}#{$variable-unit};
 
-      @include _rfs-media-query($mq-value) {
-        @include _rfs-enable-class {
-          font-size: $rfs-fluid;
+          // Return the calculated value
+          $val: $val + " calc(" + $min-width + if($value < 0, " - ", " + ") + $variable-width + ")";
         }
+      }
+    }
+  }
+
+  // Remove first space
+  @return unquote(str-slice($val, 2));
+}
+
+// RFS mixin
+@mixin rfs($values, $property: font-size) {
+  @if $values != null {
+    $val: rfs-value($values);
+    $fluid-val: rfs-fluid-value($values);
+
+    // Do not print the media query if responsive & non-responsive values are the same
+    @if $val == $fluid-val {
+      #{$property}: $val;
+    }
+    @else {
+      @include _rfs-rule () {
+        #{$property}: if($rfs-mode == max-media-query, $val, $fluid-val);
 
         // Include safari iframe resize fix if needed
         min-width: if($rfs-safari-iframe-resize-bug-fix, (0 * 1vw), null);
       }
+
+      @include _rfs-media-query-rule () {
+        #{$property}: if($rfs-mode == max-media-query, $fluid-val, $val);
+      }
     }
   }
 }
 
-// The font-size & responsive-font-size mixins use RFS to rescale the font size
-@mixin font-size($fs, $important: false) {
-  @include rfs($fs, $important);
+// Shorthand helper mixins
+@mixin font-size($value) {
+  @include rfs($value);
+}
+
+@mixin padding($value) {
+  @include rfs($value, padding);
+}
+
+@mixin padding-top($value) {
+  @include rfs($value, padding-top);
+}
+
+@mixin padding-right($value) {
+  @include rfs($value, padding-right);
+}
+
+@mixin padding-bottom($value) {
+  @include rfs($value, padding-bottom);
+}
+
+@mixin padding-left($value) {
+  @include rfs($value, padding-left);
+}
+
+@mixin margin($value) {
+  @include rfs($value, margin);
+}
+
+@mixin margin-top($value) {
+  @include rfs($value, margin-top);
+}
+
+@mixin margin-right($value) {
+  @include rfs($value, margin-right);
+}
+
+@mixin margin-bottom($value) {
+  @include rfs($value, margin-bottom);
 }
 
-@mixin responsive-font-size($fs, $important: false) {
-  @include rfs($fs, $important);
+@mixin margin-left($value) {
+  @include rfs($value, margin-left);
 }

data/bootstrap.gemspec

@@ -14,23 +14,23 @@ 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.16.1', '< 2'
-  s.add_runtime_dependency 'autoprefixer-rails', '>= 9.1.0'
+  s.add_runtime_dependency 'popper_js', '>= 2.11.8', '< 3'
+
+  s.add_development_dependency 'rake'
 
   # Testing dependencies
-  s.add_development_dependency 'minitest', '~> 5.8.0'
-  s.add_development_dependency 'minitest-reporters', '~> 1.0.5'
+  s.add_development_dependency 'minitest', '~> 5.14.4'
+  s.add_development_dependency 'minitest-reporters', '~> 1.4.3'
   s.add_development_dependency 'term-ansicolor'
   # Integration testing
   s.add_development_dependency 'capybara', '>= 2.6.0'
   s.add_development_dependency 'cuprite'
   # Dummy Rails app dependencies
+  s.add_development_dependency 'railties'
   s.add_development_dependency 'actionpack', '>= 4.1.5'
   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/engine.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'autoprefixer-rails'
 begin
   require 'dartsass-sprockets'
 rescue LoadError

data/lib/bootstrap/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Bootstrap
-  VERSION       = '4.6.2.1'
-  BOOTSTRAP_SHA = 'e5643aaa89eb67327a5b4abe7db976f0ea276b70'
+  VERSION       = '5.3.5'
+  BOOTSTRAP_SHA = '85f23534bd2de8041354b297516cf21959091b31'
 end

data/tasks/updater/js.rb

@@ -3,8 +3,7 @@ require 'tsort'
 
 class Updater
   module Js
-    INLINED_SRCS = %w[index.js tools/sanitizer.js].freeze
-    EXTERNAL_JS = %w[popper.js].freeze
+    INLINED_SRCS = %w[].freeze
 
     def update_javascript_assets
       log_status 'Updating javascripts...'
@@ -15,13 +14,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'] = {
+              "@popperjs/core": 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'],
@@ -39,9 +51,9 @@ class Updater
         # Get the imports from the ES6 files to order requires correctly.
         read_files('js/src', src_files).each do |name, content|
           file_imports = content.scan(%r{import *(?:[a-zA-Z]*|\{[a-zA-Z ,]*\}) *from '([\w/.-]+)}).flatten(1).map do |f|
-            Pathname.new(name).dirname.join(f.end_with?(".js") ? f : "#{f}.js").cleanpath.to_s
+            Pathname.new(name).dirname.join(f).cleanpath.to_s
           end.uniq
-          imports.add name, *(file_imports - INLINED_SRCS - EXTERNAL_JS)
+          imports.add name, *(file_imports - INLINED_SRCS)
         end
         imports.tsort
       end

data/tasks/updater/network.rb

@@ -44,7 +44,7 @@ class Updater
       if File.directory?(full_path)
         files.each do |name|
           path = "#{full_path}/#{name}"
-          contents[name] = File.read(path, mode: 'rb') if File.exists?(path)
+          contents[name] = File.read(path, mode: 'rb') if File.exist?(path)
         end
       end
       contents
@@ -63,7 +63,7 @@ class Updater
       uri = URI(url)
       cache_path = "./#@cache_path#{uri.path}#{uri.query.tr('?&=', '-') if uri.query}"
       FileUtils.mkdir_p File.dirname(cache_path)
-      if File.exists?(cache_path)
+      if File.exist?(cache_path)
         log_http_get_file url, true
         File.read(cache_path, mode: 'rb')
       else

data/tasks/updater/scss.rb

@@ -4,7 +4,7 @@ class Updater
       log_status 'Updating scss...'
       save_to = @save_to[:scss]
       contents = {}
-      bootstrap_scss_files = get_paths_by_type('scss', /\.scss$/)
+      bootstrap_scss_files = get_paths_by_type('scss', /\.scss$/).reject { |p| p.start_with?('tests/') }
       read_files('scss', bootstrap_scss_files).each do |name, file|
         contents[name] = file
         save_file("#{save_to}/#{name}", file)
@@ -12,7 +12,7 @@ class Updater
       log_processed "#{bootstrap_scss_files * ' '}"
 
       log_status 'Updating scss main files'
-      %w(bootstrap bootstrap-grid bootstrap-reboot).each do |name|
+      %w(bootstrap bootstrap-grid bootstrap-reboot bootstrap-utilities).each do |name|
         # Compass treats non-partials as targets to copy into the main project, so make them partials.
         # Also move them up a level to clearly indicate entry points.
         from = "#{save_to}/#{name}.scss"

data/tasks/updater.rb

@@ -18,10 +18,10 @@ class Updater
   include Js
   include Scss
 
-  def initialize(repo: 'twbs/bootstrap', branch: 'master', save_to: {}, cache_path: 'tmp/bootstrap-cache')
+  def initialize(repo: 'twbs/bootstrap', branch: 'main', save_to: {}, cache_path: 'tmp/bootstrap-cache')
     @logger     = Logger.new
     @repo       = repo
-    @branch     = branch || 'master'
+    @branch     = branch || 'main'
     @branch_sha = get_branch_sha
     @cache_path = cache_path
     @repo_url   = "https://github.com/#@repo"

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>