bootstrap 4.6.1 → 4.6.2.1

data/assets/stylesheets/bootstrap/_variables.scss

@@ -257,6 +257,7 @@ $caret-spacing:               $caret-width * .85 !default;
 $transition-base:             all .2s ease-in-out !default;
 $transition-fade:             opacity .15s linear !default;
 $transition-collapse:         height .35s ease !default;
+$transition-collapse-width:   width .35s ease !default;
 
 $embed-responsive-aspect-ratios: () !default;
 $embed-responsive-aspect-ratios: join(
@@ -319,7 +320,7 @@ $display-line-height:         $headings-line-height !default;
 $lead-font-size:              $font-size-base * 1.25 !default;
 $lead-font-weight:            300 !default;
 
-$small-font-size:             80% !default;
+$small-font-size:             .875em !default;
 
 $text-muted:                  $gray-600 !default;
 

data/assets/stylesheets/bootstrap/mixins/_reset-text.scss

@@ -11,7 +11,7 @@
   text-transform: none;
   letter-spacing: normal;
   word-break: normal;
-  word-spacing: normal;
   white-space: normal;
+  word-spacing: normal;
   line-break: auto;
 }

data/bootstrap.gemspec

@@ -14,9 +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 'sassc-rails', '>= 2.0.0'
+  s.add_runtime_dependency 'popper_js', '>= 1.16.1', '< 2'
   s.add_runtime_dependency 'autoprefixer-rails', '>= 9.1.0'
 
   # Testing dependencies

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       = '4.6.1'
-  BOOTSTRAP_SHA = '043a03c95a2ad6738f85b65e53b9dbdfb03b8d10'
+  VERSION       = '4.6.2.1'
+  BOOTSTRAP_SHA = 'e5643aaa89eb67327a5b4abe7db976f0ea276b70'
 end

data/tasks/updater/js.rb

@@ -1,7 +1,11 @@
+require 'pathname'
 require 'tsort'
 
 class Updater
   module Js
+    INLINED_SRCS = %w[index.js tools/sanitizer.js].freeze
+    EXTERNAL_JS = %w[popper.js].freeze
+
     def update_javascript_assets
       log_status 'Updating javascripts...'
       save_to  = @save_to[:js]
@@ -29,13 +33,15 @@ 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 do |f|
+            Pathname.new(name).dirname.join(f.end_with?(".js") ? f : "#{f}.js").cleanpath.to_s
+          end.uniq
+          imports.add name, *(file_imports - INLINED_SRCS - EXTERNAL_JS)
         end
         imports.tsort
       end
@@ -53,11 +59,17 @@ 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)
-        @imports[node].each(&block)
+        node_imports = @imports[node]
+        if node_imports.nil?
+          raise "No imports found for #{node.inspect}\nImports:\n#{@imports.inspect}"
+        end
+        node_imports.each(&block)
       end
 
       def tsort_each_node(&block)

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] = URI.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)

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: '../../'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap
 version: !ruby/object:Gem::Version
-  version: 4.6.1
+  version: 4.6.2.1
 platform: ruby
 authors:
 - Twitter, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-05 00:00:00.000000000 Z
+date: 2024-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: popper_js
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.14.3
+        version: 1.16.1
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -26,24 +26,10 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.14.3
+        version: 1.16.1
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
-- !ruby/object:Gem::Dependency
-  name: sassc-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: autoprefixer-rails
   requirement: !ruby/object:Gem::Requirement
@@ -388,6 +374,8 @@ files:
 - test/gemfiles/rails_5_0.gemfile
 - test/gemfiles/rails_5_1.gemfile
 - test/gemfiles/rails_6_0.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
@@ -412,7 +400,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.4.20
 signing_key: 
 specification_version: 4
 summary: The most popular HTML, CSS, and JavaScript framework for developing responsive,
@@ -452,6 +440,8 @@ test_files:
 - test/gemfiles/rails_5_0.gemfile
 - test/gemfiles/rails_5_1.gemfile
 - test/gemfiles/rails_6_0.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