bootstrap 4.6.2 → 4.6.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 26f3252ccbfe53a40fd0cdf9d0d9f3d717dcf854d19a9535c903cd072796313d
4
- data.tar.gz: bce01fe328a2cd98599d10c0ee56a356754159bc49ecf99593652ae227f29210
3
+ metadata.gz: dd382f63309c8fbf7da627ee4990fdaeb3e9eb7f25ba5d06f77346c0dcc68de4
4
+ data.tar.gz: 2c24101f290892643a48f3d530132cca24fb35b9d05e8b19c5305056508065ac
5
5
  SHA512:
6
- metadata.gz: c303b1722240f8db43117ae7b11680738e3f5dc1a0f41d65e3e0ddda579ec10d13f80e210e8e15819e56230844962325fd470b3fc0add59ee44441f0b15f7681
7
- data.tar.gz: 3e74aa08bcbdf56c5ee25eda907c2b4a57a67abc2bef1ce02485e4aab3c3067e7119f847fb3bb6d3c7278680c0ce46b7950d614e899ccbb8e701b9f06fccfafc
6
+ metadata.gz: ed3113b844e211e9bd1875de399f167043a7b57c81d399fedaa9fb2a6e9b49dd01d1164c89801476bf6ccce66baf3c88fa88d086895cfc655429f14f821c6b2b
7
+ data.tar.gz: b79d08b3e67931da95f530aea47619c1eb486f7f1cf3eae873645b875f65aec62f30018fbd169a490add197037650f0f3cca4dd11de4a7b07f603bbb6c2fb0c8
data/CHANGELOG.md CHANGED
@@ -6,6 +6,10 @@ The changelog only includes changes specific to the RubyGem.
6
6
  The Bootstrap framework changes can be found in [the Releases section of twbs/bootstrap](https://github.com/twbs/bootstrap/releases).
7
7
  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.
8
8
 
9
+ # 4.6.2.1
10
+
11
+ * Adds support for other Sass compilers. [#278](https://github.com/twbs/bootstrap-rubygem/pull/278)
12
+
9
13
  # 4.2.1
10
14
 
11
15
  * Bootstrap rubygem now depends on SassC instead of Sass.
data/README.md CHANGED
@@ -17,9 +17,15 @@ Please see the appropriate guide for your environment of choice:
17
17
  Add `bootstrap` to your Gemfile:
18
18
 
19
19
  ```ruby
20
- gem 'bootstrap', '~> 4.6.2'
20
+ gem 'bootstrap', '~> 4.6.2.1'
21
21
  ```
22
22
 
23
+ This gem requires a Sass engine, so make sure you have **one** of these four gems in your Gemfile:
24
+ - [`dartsass-sprockets`](https://github.com/tablecheck/dartsass-sprockets): Dart Sass engine, recommended but only works for Ruby 2.6+ and Rails 5+
25
+ - [`dartsass-rails`](https://github.com/rails/dartsass-rails): Dart Sass engine, recommended for Rails projects that use Propshaft
26
+ - [`cssbundling-rails`](https://github.com/rails/cssbundling-rails): External Sass engine
27
+ - [`sassc-rails`](https://github.com/sass/sassc-rails): SassC engine, deprecated but compatible with Ruby 2.3+ and Rails 4
28
+
23
29
  Ensure that `sprockets-rails` is at least v2.3.2.
24
30
 
25
31
  `bundle install` and restart your server to make the files available through the pipeline.
data/Rakefile CHANGED
@@ -45,16 +45,28 @@ end
45
45
 
46
46
  desc 'Dumps output to a CSS file for testing'
47
47
  task :debug do
48
- require 'sassc'
48
+ begin
49
+ require 'sass-embedded'
50
+ rescue LoadError
51
+ begin
52
+ require 'sassc'
53
+ rescue LoadError
54
+ raise LoadError.new("bootstrap-rubygem requires a Sass engine. Please add dartsass-sprockets or sassc-rails to your dependencies.")
55
+ end
56
+ end
49
57
  require './lib/bootstrap'
50
58
  require 'term/ansicolor'
51
59
  require 'autoprefixer-rails'
52
60
  path = Bootstrap.stylesheets_path
53
61
  %w(_bootstrap _bootstrap-reboot _bootstrap-grid).each do |file|
54
- engine = SassC::Engine.new(File.read("#{path}/#{file}.scss"), syntax: :scss, load_paths: [path])
55
- out = File.join('tmp', "#{file[1..-1]}.css")
56
- css = engine.render
62
+ filename = "#{path}/#{file}.scss"
63
+ css = if defined?(SassC::Engine)
64
+ SassC::Engine.new(File.read(filename), filename: filename, syntax: :scss).render
65
+ else
66
+ Sass.compile(filename).css
67
+ end
57
68
  css = AutoprefixerRails.process(css)
69
+ out = File.join('tmp', "#{file[1..-1]}.css")
58
70
  File.write(out, css)
59
71
  $stderr.puts Term::ANSIColor.green "Compiled #{out}"
60
72
  end
data/bootstrap.gemspec CHANGED
@@ -15,8 +15,6 @@ Gem::Specification.new do |s|
15
15
  s.required_ruby_version = '>= 2.3.3'
16
16
 
17
17
  s.add_runtime_dependency 'popper_js', '>= 1.16.1', '< 2'
18
-
19
- s.add_runtime_dependency 'sassc-rails', '>= 2.0.0'
20
18
  s.add_runtime_dependency 'autoprefixer-rails', '>= 9.1.0'
21
19
 
22
20
  # Testing dependencies
@@ -1,7 +1,23 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  require 'autoprefixer-rails'
4
- require 'sassc-rails'
4
+ begin
5
+ require 'dartsass-sprockets'
6
+ rescue LoadError
7
+ begin
8
+ require 'sassc-rails'
9
+ rescue LoadError
10
+ begin
11
+ require 'dartsass-rails'
12
+ rescue LoadError
13
+ begin
14
+ require 'cssbundling-rails'
15
+ rescue LoadError
16
+ raise LoadError.new("bootstrap-rubygem requires a Sass engine. Please add dartsass-sprockets, sassc-rails, dartsass-rails or cssbundling-rails to your dependencies.")
17
+ end
18
+ end
19
+ end
20
+ end
5
21
 
6
22
  module Bootstrap
7
23
  module Rails
@@ -1,6 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Bootstrap
4
- VERSION = '4.6.2'
4
+ VERSION = '4.6.2.1'
5
5
  BOOTSTRAP_SHA = 'e5643aaa89eb67327a5b4abe7db976f0ea276b70'
6
6
  end
@@ -0,0 +1,8 @@
1
+ source 'https://rubygems.org'
2
+
3
+ gem 'actionpack', '~> 7.0.4'
4
+ gem 'activesupport', '~> 7.0.4'
5
+ gem 'autoprefixer-rails', '>= 9.7.6'
6
+ gem 'dartsass-sprockets', '~> 3.0'
7
+
8
+ gemspec path: '../../'
@@ -0,0 +1,8 @@
1
+ source 'https://rubygems.org'
2
+
3
+ gem 'actionpack', '~> 7.0.4'
4
+ gem 'activesupport', '~> 7.0.4'
5
+ gem 'autoprefixer-rails', '>= 9.7.6'
6
+ gem 'sassc-rails', '~> 2.0'
7
+
8
+ gemspec path: '../../'
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bootstrap
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.6.2
4
+ version: 4.6.2.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Twitter, Inc.
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-09-18 00:00:00.000000000 Z
11
+ date: 2024-08-24 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: popper_js
@@ -30,20 +30,6 @@ dependencies:
30
30
  - - "<"
31
31
  - !ruby/object:Gem::Version
32
32
  version: '2'
33
- - !ruby/object:Gem::Dependency
34
- name: sassc-rails
35
- requirement: !ruby/object:Gem::Requirement
36
- requirements:
37
- - - ">="
38
- - !ruby/object:Gem::Version
39
- version: 2.0.0
40
- type: :runtime
41
- prerelease: false
42
- version_requirements: !ruby/object:Gem::Requirement
43
- requirements:
44
- - - ">="
45
- - !ruby/object:Gem::Version
46
- version: 2.0.0
47
33
  - !ruby/object:Gem::Dependency
48
34
  name: autoprefixer-rails
49
35
  requirement: !ruby/object:Gem::Requirement
@@ -388,6 +374,8 @@ files:
388
374
  - test/gemfiles/rails_5_0.gemfile
389
375
  - test/gemfiles/rails_5_1.gemfile
390
376
  - test/gemfiles/rails_6_0.gemfile
377
+ - test/gemfiles/rails_7_0_dartsass.gemfile
378
+ - test/gemfiles/rails_7_0_sassc.gemfile
391
379
  - test/rails_test.rb
392
380
  - test/support/dummy_rails_integration.rb
393
381
  - test/support/reporting.rb
@@ -412,7 +400,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
412
400
  - !ruby/object:Gem::Version
413
401
  version: '0'
414
402
  requirements: []
415
- rubygems_version: 3.1.2
403
+ rubygems_version: 3.4.20
416
404
  signing_key:
417
405
  specification_version: 4
418
406
  summary: The most popular HTML, CSS, and JavaScript framework for developing responsive,
@@ -452,6 +440,8 @@ test_files:
452
440
  - test/gemfiles/rails_5_0.gemfile
453
441
  - test/gemfiles/rails_5_1.gemfile
454
442
  - test/gemfiles/rails_6_0.gemfile
443
+ - test/gemfiles/rails_7_0_dartsass.gemfile
444
+ - test/gemfiles/rails_7_0_sassc.gemfile
455
445
  - test/rails_test.rb
456
446
  - test/support/dummy_rails_integration.rb
457
447
  - test/support/reporting.rb