bootstrap 5.2.2 → 5.3.3

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,11 +14,11 @@ 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.11.6', '< 3'
-
-  s.add_runtime_dependency 'sassc-rails', '>= 2.0.0'
+  s.add_runtime_dependency 'popper_js', '>= 2.11.8', '< 3'
   s.add_runtime_dependency 'autoprefixer-rails', '>= 9.1.0'
 
+  s.add_development_dependency 'rake'
+
   # Testing dependencies
   s.add_development_dependency 'minitest', '~> 5.14.4'
   s.add_development_dependency 'minitest-reporters', '~> 1.4.3'
@@ -27,6 +27,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,23 @@
 # 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.2.2'
-  BOOTSTRAP_SHA = '961d5ff9844372a4e294980c667bbe7e0651cdeb'
+  VERSION       = '5.3.3'
+  BOOTSTRAP_SHA = '6e1f75f420f68e1d52733b8e407fc7c3766c9dba'
 end

data/tasks/updater/js.rb

@@ -51,7 +51,7 @@ 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}.js").cleanpath.to_s
+            Pathname.new(name).dirname.join(f).cleanpath.to_s
           end.uniq
           imports.add name, *(file_imports - INLINED_SRCS)
         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/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

@@ -3,6 +3,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

@@ -3,6 +3,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,8 @@
+source 'https://rubygems.org'
+
+gem 'actionpack', '~> 5.2.8'
+gem 'activesupport', '~> 5.2.8'
+gem 'autoprefixer-rails', '>= 7.1.1'
+gem 'sassc-rails', '~> 2.0'
+
+gemspec path: '../../'

data/test/gemfiles/rails_6_0.gemfile

@@ -3,5 +3,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

@@ -3,5 +3,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,8 @@
+source 'https://rubygems.org'
+
+gem 'actionpack', '~> 7.0.4'
+gem 'activesupport', '~> 7.0.4'
+gem 'autoprefixer-rails', '>= 9.7.6'
+gem 'dartsass-sprockets', '~> 3.0'
+
+gemspec path: '../../'

data/test/gemfiles/rails_7_0_sassc.gemfile

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

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
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap
 version: !ruby/object:Gem::Version
-  version: 5.2.2
+  version: 5.3.3
 platform: ruby
 authors:
 - Twitter, Inc.
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-15 00:00:00.000000000 Z
+date: 2024-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: popper_js
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.11.6
+        version: 2.11.8
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
@@ -26,38 +26,38 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.11.6
+        version: 2.11.8
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
-  name: sassc-rails
+  name: autoprefixer-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 9.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 9.1.0
 - !ruby/object:Gem::Dependency
-  name: autoprefixer-rails
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 9.1.0
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 9.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -128,6 +128,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: railties
+  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: actionpack
   requirement: !ruby/object:Gem::Requirement
@@ -198,15 +212,15 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email: glex.spb@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitattributes"
+- ".github/workflows/ci.yml"
 - ".gitignore"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -245,6 +259,7 @@ files:
 - assets/javascripts/bootstrap/util/template-factory.js
 - assets/stylesheets/_bootstrap-grid.scss
 - assets/stylesheets/_bootstrap-reboot.scss
+- assets/stylesheets/_bootstrap-utilities.scss
 - assets/stylesheets/_bootstrap.scss
 - assets/stylesheets/bootstrap/_accordion.scss
 - assets/stylesheets/bootstrap/_alert.scss
@@ -282,8 +297,8 @@ files:
 - assets/stylesheets/bootstrap/_transitions.scss
 - assets/stylesheets/bootstrap/_type.scss
 - assets/stylesheets/bootstrap/_utilities.scss
+- assets/stylesheets/bootstrap/_variables-dark.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
@@ -296,6 +311,8 @@ files:
 - assets/stylesheets/bootstrap/helpers/_clearfix.scss
 - assets/stylesheets/bootstrap/helpers/_color-bg.scss
 - assets/stylesheets/bootstrap/helpers/_colored-links.scss
+- assets/stylesheets/bootstrap/helpers/_focus-ring.scss
+- assets/stylesheets/bootstrap/helpers/_icon-link.scss
 - assets/stylesheets/bootstrap/helpers/_position.scss
 - assets/stylesheets/bootstrap/helpers/_ratio.scss
 - assets/stylesheets/bootstrap/helpers/_stacks.scss
@@ -312,6 +329,7 @@ files:
 - assets/stylesheets/bootstrap/mixins/_buttons.scss
 - assets/stylesheets/bootstrap/mixins/_caret.scss
 - assets/stylesheets/bootstrap/mixins/_clearfix.scss
+- assets/stylesheets/bootstrap/mixins/_color-mode.scss
 - assets/stylesheets/bootstrap/mixins/_color-scheme.scss
 - assets/stylesheets/bootstrap/mixins/_container.scss
 - assets/stylesheets/bootstrap/mixins/_deprecate.scss
@@ -373,8 +391,11 @@ files:
 - test/gemfiles/rails_4_2.gemfile
 - test/gemfiles/rails_5_0.gemfile
 - test/gemfiles/rails_5_1.gemfile
+- test/gemfiles/rails_5_2.gemfile
 - test/gemfiles/rails_6_0.gemfile
 - test/gemfiles/rails_6_1.gemfile
+- test/gemfiles/rails_7_0_dartsass.gemfile
+- test/gemfiles/rails_7_0_sassc.gemfile
 - test/rails_test.rb
 - test/support/dummy_rails_integration.rb
 - test/support/reporting.rb
@@ -384,7 +405,7 @@ homepage: https://github.com/twbs/bootstrap-rubygem
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -399,8 +420,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.5.3
+signing_key:
 specification_version: 4
 summary: The most popular HTML, CSS, and JavaScript framework for developing responsive,
   mobile first projects on the web. http://getbootstrap.com
@@ -438,8 +459,11 @@ test_files:
 - test/gemfiles/rails_4_2.gemfile
 - test/gemfiles/rails_5_0.gemfile
 - test/gemfiles/rails_5_1.gemfile
+- test/gemfiles/rails_5_2.gemfile
 - test/gemfiles/rails_6_0.gemfile
 - test/gemfiles/rails_6_1.gemfile
+- test/gemfiles/rails_7_0_dartsass.gemfile
+- test/gemfiles/rails_7_0_sassc.gemfile
 - test/rails_test.rb
 - test/support/dummy_rails_integration.rb
 - test/support/reporting.rb

data/.travis.yml

@@ -1,32 +0,0 @@
-language: ruby
-dist: focal
-addons:
-  apt:
-    packages:
-      - chromium-browser
-rvm:
-  - 2.5
-  - 2.6
-  - 2.7
-
-gemfile:
-  - 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
-
-jobs:
-  exclude:
-    rvm: 2.7
-    gemfile: test/gemfiles/rails_4_2.gemfile
-
-cache: bundler
-bundler_args: --path ../../vendor/bundle --without debug
-notifications:
-  slack: heybb:3n88HHilXn76ji9vV4gL819Y
-env:
-  global:
-  - VERBOSE=1
-script:
-  bundle exec rake --trace

data/assets/stylesheets/bootstrap/bootstrap-utilities.scss

@@ -1,15 +0,0 @@
-@import "mixins/banner";
-@include bsBanner(Utilities);
-
-// Configuration
-@import "functions";
-@import "variables";
-@import "maps";
-@import "mixins";
-@import "utilities";
-
-// Helpers
-@import "helpers";
-
-// Utilities
-@import "utilities/api";