bootstrap 5.1.3 → 5.3.5

data/assets/stylesheets/bootstrap/mixins/_utilities.scss

@@ -1,6 +1,6 @@
 // Utility generator
 // Used to generate utilities & print utilities
-@mixin generate-utility($utility, $infix, $is-rfs-media-query: false) {
+@mixin generate-utility($utility, $infix: "", $is-rfs-media-query: false) {
   $values: map-get($utility, values);
 
   // If the values are a list or string, convert it into a map
@@ -20,12 +20,15 @@
     $property-class: if(map-has-key($utility, class), map-get($utility, class), nth($properties, 1));
     $property-class: if($property-class == null, "", $property-class);
 
+    // Use custom CSS variable name if present, otherwise default to `class`
+    $css-variable-name: if(map-has-key($utility, css-variable-name), map-get($utility, css-variable-name), map-get($utility, class));
+
     // State params to generate pseudo-classes
     $state: if(map-has-key($utility, state), map-get($utility, state), ());
 
     $infix: if($property-class == "" and str-slice($infix, 1, 1) == "-", str-slice($infix, 2), $infix);
 
-    // Don't prefix if value key is null (eg. with shadow class)
+    // Don't prefix if value key is null (e.g. with shadow class)
     $property-class-modifier: if($key, if($property-class == "" and $infix == "", "", "-") + $key, "");
 
     @if map-get($utility, rfs) {
@@ -52,20 +55,20 @@
 
       @if $is-css-var {
         .#{$property-class + $infix + $property-class-modifier} {
-          --#{$variable-prefix}#{$property-class}: #{$value};
+          --#{$prefix}#{$css-variable-name}: #{$value};
         }
 
         @each $pseudo in $state {
           .#{$property-class + $infix + $property-class-modifier}-#{$pseudo}:#{$pseudo} {
-            --#{$variable-prefix}#{$property-class}: #{$value};
+            --#{$prefix}#{$css-variable-name}: #{$value};
           }
         }
       } @else {
         .#{$property-class + $infix + $property-class-modifier} {
           @each $property in $properties {
             @if $is-local-vars {
-              @each $local-var, $value in $is-local-vars {
-                --#{$variable-prefix}#{$local-var}: #{$value};
+              @each $local-var, $variable in $is-local-vars {
+                --#{$prefix}#{$local-var}: #{$variable};
               }
             }
             #{$property}: $value if($enable-important-utilities, !important, null);
@@ -75,6 +78,11 @@
         @each $pseudo in $state {
           .#{$property-class + $infix + $property-class-modifier}-#{$pseudo}:#{$pseudo} {
             @each $property in $properties {
+              @if $is-local-vars {
+                @each $local-var, $variable in $is-local-vars {
+                  --#{$prefix}#{$local-var}: #{$variable};
+                }
+              }
               #{$property}: $value if($enable-important-utilities, !important, null);
             }
           }

data/assets/stylesheets/bootstrap/mixins/_visually-hidden.scss

@@ -6,7 +6,6 @@
 // See: https://kittygiraudel.com/2016/10/13/css-hide-and-seek/
 
 @mixin visually-hidden() {
-  position: absolute !important;
   width: 1px !important;
   height: 1px !important;
   padding: 0 !important;
@@ -15,12 +14,17 @@
   clip: rect(0, 0, 0, 0) !important;
   white-space: nowrap !important;
   border: 0 !important;
+
+  // Fix for positioned table caption that could become anonymous cells
+  &:not(caption) {
+    position: absolute !important;
+  }
 }
 
 // Use to only display content when it's focused, or one of its child elements is focused
 // (i.e. when focus is within the element/container that the class was applied to)
 //
-// Useful for "Skip to main content" links; see https://www.w3.org/TR/2013/NOTE-WCAG20-TECHS-20130905/G1
+// Useful for "Skip to main content" links; see https://www.w3.org/WAI/WCAG22/Techniques/general/G1.html
 
 @mixin visually-hidden-focusable() {
   &:not(:focus):not(:focus-within) {

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

@@ -1,4 +1,4 @@
-// stylelint-disable property-blacklist, scss/dollar-variable-default
+// stylelint-disable scss/dimension-no-non-numeric-values
 
 // SCSS RFS mixin
 //
@@ -154,8 +154,7 @@ $rfs-mq-property-height: if($rfs-mode == max-media-query, max-height, min-height
     &.enable-rfs {
       @content;
     }
-  }
-  @else {
+  } @else {
     @content;
   }
 }
@@ -168,7 +167,7 @@ $rfs-mq-property-height: if($rfs-mode == max-media-query, max-height, min-height
       @content;
     }
 
-    @include _rfs-media-query {
+    @include _rfs-media-query () {
       .enable-rfs &,
       &.enable-rfs {
         @content;
@@ -182,7 +181,7 @@ $rfs-mq-property-height: if($rfs-mode == max-media-query, max-height, min-height
         @content;
       }
     }
-    @include _rfs-media-query {
+    @include _rfs-media-query () {
       @content;
     }
   }
@@ -193,12 +192,12 @@ $rfs-mq-property-height: if($rfs-mode == max-media-query, max-height, min-height
   // Convert to list
   $values: if(type-of($values) != list, ($values,), $values);
 
-  $val: '';
+  $val: "";
 
   // Loop over each value and calculate value
   @each $value in $values {
     @if $value == 0 {
-      $val: $val + ' 0';
+      $val: $val + " 0";
     }
     @else {
       // Cache $value unit
@@ -206,15 +205,14 @@ $rfs-mq-property-height: if($rfs-mode == max-media-query, max-height, min-height
 
       @if $unit == px {
         // Convert to rem if needed
-        $val: $val + ' ' + if($rfs-unit == rem, #{divide($value, $value * 0 + $rfs-rem-value)}rem, $value);
+        $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 {
+        $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;
+        $val: $val + " " + $value;
       }
     }
   }
@@ -228,30 +226,26 @@ $rfs-mq-property-height: if($rfs-mode == max-media-query, max-height, min-height
   // Convert to list
   $values: if(type-of($values) != list, ($values,), $values);
 
-  $val: '';
+  $val: "";
 
   // Loop over each value and calculate value
   @each $value in $values {
     @if $value == 0 {
-      $val: $val + ' 0';
-    }
-
-    @else {
+      $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 {
+        $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);
+          $val: $val + " " + if($rfs-unit == rem, #{divide($value, $rfs-rem-value)}rem, #{$value}px);
         }
         @else {
           // Calculate the minimum value
@@ -273,7 +267,7 @@ $rfs-mq-property-height: if($rfs-mode == max-media-query, max-height, min-height
           $variable-width: #{divide($value-diff * 100, $rfs-breakpoint)}#{$variable-unit};
 
           // Return the calculated value
-          $val: $val + ' calc(' + $min-width + if($value < 0, ' - ', ' + ') + $variable-width + ')';
+          $val: $val + " calc(" + $min-width + if($value < 0, " - ", " + ") + $variable-width + ")";
         }
       }
     }
@@ -287,22 +281,22 @@ $rfs-mq-property-height: if($rfs-mode == max-media-query, max-height, min-height
 @mixin rfs($values, $property: font-size) {
   @if $values != null {
     $val: rfs-value($values);
-    $fluidVal: rfs-fluid-value($values);
+    $fluid-val: rfs-fluid-value($values);
 
     // Do not print the media query if responsive & non-responsive values are the same
-    @if $val == $fluidVal {
+    @if $val == $fluid-val {
       #{$property}: $val;
     }
     @else {
-      @include _rfs-rule {
-        #{$property}: if($rfs-mode == max-media-query, $val, $fluidVal);
+      @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, $fluidVal, $val);
+      @include _rfs-media-query-rule () {
+        #{$property}: if($rfs-mode == max-media-query, $fluid-val, $val);
       }
     }
   }

data/bootstrap.gemspec

@@ -14,10 +14,9 @@ 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', '>= 2.9.3', '< 3'
+  s.add_runtime_dependency 'popper_js', '>= 2.11.8', '< 3'
 
-  s.add_runtime_dependency 'sassc-rails', '>= 2.0.0'
-  s.add_runtime_dependency 'autoprefixer-rails', '>= 9.1.0'
+  s.add_development_dependency 'rake'
 
   # Testing dependencies
   s.add_development_dependency 'minitest', '~> 5.14.4'
@@ -27,6 +26,7 @@ Gem::Specification.new do |s|
   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'

data/lib/bootstrap/engine.rb

@@ -1,7 +1,22 @@
 # frozen_string_literal: true
 
-require 'autoprefixer-rails'
-require 'sassc-rails'
+begin
+  require 'dartsass-sprockets'
+rescue LoadError
+  begin
+    require 'sassc-rails'
+  rescue LoadError
+    begin
+      require 'dartsass-rails'
+    rescue LoadError
+      begin
+        require 'cssbundling-rails'
+      rescue LoadError
+        raise LoadError.new("bootstrap-rubygem requires a Sass engine. Please add dartsass-sprockets, sassc-rails, dartsass-rails or cssbundling-rails to your dependencies.")
+      end
+    end
+  end
+end
 
 module Bootstrap
   module Rails

data/lib/bootstrap/version.rb

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

data/tasks/updater/js.rb

@@ -1,8 +1,9 @@
+require 'pathname'
 require 'tsort'
 
 class Updater
   module Js
-    INLINED_SRCS = %w[util/backdrop.js util/component-functions.js util/focustrap.js util/index.js util/sanitizer.js util/scrollbar.js].freeze
+    INLINED_SRCS = %w[].freeze
 
     def update_javascript_assets
       log_status 'Updating javascripts...'
@@ -24,7 +25,7 @@ class Updater
           '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,
+              "@popperjs/core": window.Popper,
               _originalGlobalThis: window['globalThis']
             };
             window['globalThis'] = window['bootstrap'];
@@ -49,7 +50,9 @@ class Updater
         imports = Deps.new
         # 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 { |f| "#{f}.js" }.uniq
+          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).cleanpath.to_s
+          end.uniq
           imports.add name, *(file_imports - INLINED_SRCS)
         end
         imports.tsort
@@ -68,13 +71,15 @@ class Updater
       end
 
       def add(from, *tos)
-        (@imports[from] ||= []).push(*tos.sort)
+        imports = (@imports[from] ||= [])
+        imports.push(*tos)
+        imports.sort!
       end
 
       def tsort_each_child(node, &block)
         node_imports = @imports[node]
         if node_imports.nil?
-          raise "No imports found for #{node.inspect}"
+          raise "No imports found for #{node.inspect}\nImports:\n#{@imports.inspect}"
         end
         node_imports.each(&block)
       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/config/application.rb

@@ -10,7 +10,6 @@ require 'rails'
   require "#{framework}/railtie"
 end
 
-require 'autoprefixer-rails'
 require 'uglifier'
 require 'bootstrap'
 
@@ -29,4 +28,3 @@ module Dummy
     end
   end
 end
-

data/test/gemfiles/rails_4_2.gemfile

@@ -2,6 +2,7 @@ source 'https://rubygems.org'
 
 gem 'actionpack', '~> 4.2.7'
 gem 'activesupport', '~> 4.2.7'
+gem 'sassc-rails', '~> 2.0'
+gem 'bigdecimal', '1.3.5'
 
 gemspec path: '../../'
-

data/test/gemfiles/rails_5_0.gemfile

@@ -2,7 +2,6 @@ source 'https://rubygems.org'
 
 gem 'actionpack', '~> 5.0.0'
 gem 'activesupport', '~> 5.0.0'
-gem 'autoprefixer-rails', '>= 6.3.6.1'
+gem 'sassc-rails', '~> 2.0'
 
 gemspec path: '../../'
-

data/test/gemfiles/rails_5_1.gemfile

@@ -2,7 +2,6 @@ source 'https://rubygems.org'
 
 gem 'actionpack', '~> 5.1.0'
 gem 'activesupport', '~> 5.1.0'
-gem 'autoprefixer-rails', '>= 7.1.1'
+gem 'sassc-rails', '~> 2.0'
 
 gemspec path: '../../'
-

data/test/gemfiles/rails_5_2.gemfile

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+gem 'actionpack', '~> 5.2.8'
+gem 'activesupport', '~> 5.2.8'
+gem 'sassc-rails', '~> 2.0'
+
+gemspec path: '../../'

data/test/gemfiles/rails_6_0.gemfile

@@ -2,6 +2,6 @@ source 'https://rubygems.org'
 
 gem 'actionpack', '~> 6.0.3'
 gem 'activesupport', '~> 6.0.3'
-gem 'autoprefixer-rails', '>= 9.7.6'
+gem 'sassc-rails', '~> 2.0'
 
 gemspec path: '../../'

data/test/gemfiles/rails_6_1.gemfile

@@ -2,6 +2,6 @@ source 'https://rubygems.org'
 
 gem 'actionpack', '~> 6.1.3'
 gem 'activesupport', '~> 6.1.3'
-gem 'autoprefixer-rails', '>= 9.7.6'
+gem 'sassc-rails', '~> 2.0'
 
 gemspec path: '../../'

data/test/gemfiles/rails_7_0_dartsass.gemfile

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+gem 'actionpack', '~> 7.0.4'
+gem 'activesupport', '~> 7.0.4'
+gem 'dartsass-sprockets', '~> 3.0'
+
+gemspec path: '../../'

data/test/gemfiles/rails_7_0_sassc.gemfile

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+gem 'actionpack', '~> 7.0.4'
+gem 'activesupport', '~> 7.0.4'
+gem 'sassc-rails', '~> 2.0'
+
+gemspec path: '../../'

data/test/rails_test.rb

@@ -12,11 +12,6 @@ class RailsTest < ActionDispatch::IntegrationTest
     screenshot!
   end
 
-  def test_autoprefixer
-    get ActionController::Base.helpers.stylesheet_path('application.css')
-    assert_match(/-webkit-(?:transition|transform)/, response.body)
-  end
-
   def test_precompile
     Dummy::Application.load_tasks
     Rake::Task['assets:precompile'].invoke

data/test/test_helper.rb

@@ -24,7 +24,9 @@ browser_path = ENV['CHROMIUM_BIN'] || %w[
 
 Capybara.register_driver :cuprite do |app|
   options = {
-      window_size: [1280, 1024]
+      window_size: [1280, 1024],
+      timeout: 30,
+      process_timeout: 30
   }
   options[:browser_path] = browser_path if browser_path
   Capybara::Cuprite::Driver.new(app, options)
@@ -38,4 +40,3 @@ Capybara.configure do |config|
   config.server_port = 7000
   config.default_max_wait_time = 10
 end
-