bootstrap 4.6.2 → 4.6.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26f3252ccbfe53a40fd0cdf9d0d9f3d717dcf854d19a9535c903cd072796313d
-  data.tar.gz: bce01fe328a2cd98599d10c0ee56a356754159bc49ecf99593652ae227f29210
+  metadata.gz: dd382f63309c8fbf7da627ee4990fdaeb3e9eb7f25ba5d06f77346c0dcc68de4
+  data.tar.gz: 2c24101f290892643a48f3d530132cca24fb35b9d05e8b19c5305056508065ac
 SHA512:
-  metadata.gz: c303b1722240f8db43117ae7b11680738e3f5dc1a0f41d65e3e0ddda579ec10d13f80e210e8e15819e56230844962325fd470b3fc0add59ee44441f0b15f7681
-  data.tar.gz: 3e74aa08bcbdf56c5ee25eda907c2b4a57a67abc2bef1ce02485e4aab3c3067e7119f847fb3bb6d3c7278680c0ce46b7950d614e899ccbb8e701b9f06fccfafc
+  metadata.gz: ed3113b844e211e9bd1875de399f167043a7b57c81d399fedaa9fb2a6e9b49dd01d1164c89801476bf6ccce66baf3c88fa88d086895cfc655429f14f821c6b2b
+  data.tar.gz: b79d08b3e67931da95f530aea47619c1eb486f7f1cf3eae873645b875f65aec62f30018fbd169a490add197037650f0f3cca4dd11de4a7b07f603bbb6c2fb0c8

data/CHANGELOG.md

@@ -6,6 +6,10 @@ The changelog only includes changes specific to the RubyGem.
 The Bootstrap framework changes can be found in [the Releases section of twbs/bootstrap](https://github.com/twbs/bootstrap/releases).
 Release announcement posts on [the official Bootstrap blog](http://blog.getbootstrap.com) contain summaries of the most noteworthy changes made in each release of Bootstrap.
 
+# 4.6.2.1
+
+* Adds support for other Sass compilers. [#278](https://github.com/twbs/bootstrap-rubygem/pull/278)
+
 # 4.2.1
 
 * Bootstrap rubygem now depends on SassC instead of Sass.

data/README.md

@@ -17,9 +17,15 @@ Please see the appropriate guide for your environment of choice:
 Add `bootstrap` to your Gemfile:
 
 ```ruby
-gem 'bootstrap', '~> 4.6.2'
+gem 'bootstrap', '~> 4.6.2.1'
 ```
 
+This gem requires a Sass engine, so make sure you have **one** of these four gems in your Gemfile:
+- [`dartsass-sprockets`](https://github.com/tablecheck/dartsass-sprockets): Dart Sass engine, recommended but only works for Ruby 2.6+ and Rails 5+
+- [`dartsass-rails`](https://github.com/rails/dartsass-rails): Dart Sass engine, recommended for Rails projects that use Propshaft
+- [`cssbundling-rails`](https://github.com/rails/cssbundling-rails): External Sass engine
+- [`sassc-rails`](https://github.com/sass/sassc-rails): SassC engine, deprecated but compatible with Ruby 2.3+ and Rails 4
+
 Ensure that `sprockets-rails` is at least v2.3.2.
 
 `bundle install` and restart your server to make the files available through the pipeline.

data/Rakefile

@@ -45,16 +45,28 @@ end
 
 desc 'Dumps output to a CSS file for testing'
 task :debug do
-  require 'sassc'
+  begin
+    require 'sass-embedded'
+  rescue LoadError
+    begin
+      require 'sassc'
+    rescue LoadError
+      raise LoadError.new("bootstrap-rubygem requires a Sass engine. Please add dartsass-sprockets or sassc-rails to your dependencies.")
+    end
+  end
   require './lib/bootstrap'
   require 'term/ansicolor'
   require 'autoprefixer-rails'
   path = Bootstrap.stylesheets_path
   %w(_bootstrap _bootstrap-reboot _bootstrap-grid).each do |file|
-    engine = SassC::Engine.new(File.read("#{path}/#{file}.scss"), syntax: :scss, load_paths: [path])
-    out = File.join('tmp', "#{file[1..-1]}.css")
-    css = engine.render
+    filename = "#{path}/#{file}.scss"
+    css = if defined?(SassC::Engine)
+            SassC::Engine.new(File.read(filename), filename: filename, syntax: :scss).render
+          else
+            Sass.compile(filename).css
+          end
     css = AutoprefixerRails.process(css)
+    out = File.join('tmp', "#{file[1..-1]}.css")
     File.write(out, css)
     $stderr.puts Term::ANSIColor.green "Compiled #{out}"
   end

data/bootstrap.gemspec

@@ -15,8 +15,6 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 2.3.3'
 
   s.add_runtime_dependency 'popper_js', '>= 1.16.1', '< 2'
-
-  s.add_runtime_dependency 'sassc-rails', '>= 2.0.0'
   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.2'
+  VERSION       = '4.6.2.1'
   BOOTSTRAP_SHA = 'e5643aaa89eb67327a5b4abe7db976f0ea276b70'
 end

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.2
+  version: 4.6.2.1
 platform: ruby
 authors:
 - Twitter, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-18 00:00:00.000000000 Z
+date: 2024-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: popper_js
@@ -30,20 +30,6 @@ dependencies:
     - - "<"
       - !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