bootstrap 5.2.2 → 5.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a293b6bb0f077b3634982eeed77c89bfc3631f890f3df2027ddc45ceab3b18a5
-  data.tar.gz: d8fd6730b835bbe608e62d26359b7530a52cbadbccbe7d3589b895ac37944f79
+  metadata.gz: f5f0f95cef4c5b6abf9fd7a3b2721493ed6c929c1a757823f405270124573f6b
+  data.tar.gz: c3d89d1a7fa09745690ebd7cc1bf258af83bb58eec85ce3dbaf2a0792d9cd9d6
 SHA512:
-  metadata.gz: 6fcbeba2892da722b611946a283a166fa57cc44f80e0ccb8096f903e0d0e9f5d5dd69fbead50e819ce35184a62cb9df29d7aceb59bc215b90e75c8020fde1516
-  data.tar.gz: 8931244575e0476fba2ea27f1d7524043755a2237035abfd6aa1af5fe9da64001f826350f0631d9a7b9164091c4d766b8c0aa80f6d85ee78b8384b03b6b141a8
+  metadata.gz: 03f9c9d2a23faa83d108854e73320bb480c6c6298d3d79fe5c5306ec14d9f67efd82c12a1bc5d9c4458edeef8fc119d61cda59347c660c8e1a3b9cbcc5142a26
+  data.tar.gz: 37a91ba786b9f36a1a446f3fa5a70abed611a41b37bc55d9992ccbf6c685d61a93d15341423a3114bf7aa18140537b6dd9890105f57bbd196c6dfb9366044967

data/.github/workflows/ci.yml

@@ -0,0 +1,61 @@
+name: CI
+
+on:
+  - push
+  - pull_request
+  - workflow_dispatch
+
+jobs:
+  test:
+    env:
+      BUNDLE_GEMFILE: ${{ matrix.gemfile }}
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby_version: ['2.5', '2.6', '2.7', '3.0', '3.1']
+        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_sassc.gemfile
+          - test/gemfiles/rails_7_0_dartsass.gemfile
+        include:
+          - ruby_version: '2.5'
+            gemfile: test/gemfiles/rails_4_2.gemfile
+          - ruby_version: '2.6'
+            gemfile: test/gemfiles/rails_4_2.gemfile
+        exclude:
+          - ruby_version: '2.5'
+            gemfile: test/gemfiles/rails_7_0_sassc.gemfile
+          - ruby_version: '2.5'
+            gemfile: test/gemfiles/rails_7_0_dartsass.gemfile
+          - ruby_version: '2.6'
+            gemfile: test/gemfiles/rails_7_0_sassc.gemfile
+          - ruby_version: '2.6'
+            gemfile: test/gemfiles/rails_7_0_dartsass.gemfile
+          - ruby_version: '3.0'
+            gemfile: test/gemfiles/rails_5_0.gemfile
+          - ruby_version: '3.0'
+            gemfile: test/gemfiles/rails_5_1.gemfile
+          - ruby_version: '3.0'
+            gemfile: test/gemfiles/rails_5_2.gemfile
+          - ruby_version: '3.1'
+            gemfile: test/gemfiles/rails_5_0.gemfile
+          - ruby_version: '3.1'
+            gemfile: test/gemfiles/rails_5_1.gemfile
+          - ruby_version: '3.1'
+            gemfile: test/gemfiles/rails_5_2.gemfile
+          - ruby_version: '3.1'
+            gemfile: test/gemfiles/rails_6_0.gemfile
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby_version }}
+          bundler-cache: true # 'bundle install' and cache
+      - name: Build and test with Rake
+        run: bundle exec rake --trace

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.
 
+# 5.3.3
+
+* Adds support for other Sass engines: dartsass-sprockets, dartsass-rails, and cssbundling-rails.
+
 # 4.2.1
 
 * Bootstrap rubygem now depends on SassC instead of Sass.

data/Gemfile

@@ -4,6 +4,7 @@ gemspec
 
 group :development do
   gem 'popper_js', '>= 1.12.3'
+  gem 'dartsass-sprockets'
 end
 
 group :debug do

data/README.md

@@ -1,4 +1,4 @@
-# Bootstrap Ruby Gem [![Build Status](https://travis-ci.org/twbs/bootstrap-rubygem.svg?branch=master)](https://travis-ci.org/twbs/bootstrap-rubygem) [![Gem](https://img.shields.io/gem/v/bootstrap.svg)](https://rubygems.org/gems/bootstrap)
+# Bootstrap Ruby Gem [![CI](https://github.com/twbs/bootstrap-rubygem/actions/workflows/ci.yml/badge.svg)](https://github.com/twbs/bootstrap-rubygem/actions/workflows/ci.yml) [![Gem](https://img.shields.io/gem/v/bootstrap.svg)](https://rubygems.org/gems/bootstrap)
 
 [Bootstrap 5][bootstrap-home] ruby gem for Ruby on Rails (*Sprockets*/*Importmaps*) and Hanami (formerly Lotus).
 
@@ -21,10 +21,16 @@ Please see the appropriate guide for your environment of choice:
 Add `bootstrap` to your Gemfile:
 
 ```ruby
-gem 'bootstrap', '~> 5.2.2'
+gem 'bootstrap', '~> 5.3.3'
 ```
 
-Ensure that `sprockets-rails` is at least v2.3.2.
+This gem requires a Sass engine, so make sure you have **one** of these two 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
+
+Also 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

@@ -1,4 +1,5 @@
 require 'bundler/gem_tasks'
+require 'bundler/setup'
 
 lib_path = File.join(File.dirname(__FILE__), 'lib')
 $:.unshift(lib_path) unless $:.include?(lib_path)
@@ -45,16 +46,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/assets/javascripts/bootstrap/alert.js

@@ -1,25 +1,22 @@
 /*!
-  * Bootstrap alert.js v5.2.2 (https://getbootstrap.com/)
-  * Copyright 2011-2022 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
+  * Bootstrap alert.js v5.3.3 (https://getbootstrap.com/)
+  * Copyright 2011-2024 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
   * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
   */
 (function (global, factory) {
-  typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory(require('./util/index'), require('./dom/event-handler'), require('./base-component'), require('./util/component-functions')) :
-  typeof define === 'function' && define.amd ? define(['./util/index', './dom/event-handler', './base-component', './util/component-functions'], factory) :
-  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, global.Alert = factory(global.Index, global.EventHandler, global.BaseComponent, global.ComponentFunctions));
-})(this, (function (index, EventHandler, BaseComponent, componentFunctions) { 'use strict';
-
-  const _interopDefaultLegacy = e => e && typeof e === 'object' && 'default' in e ? e : { default: e };
-
-  const EventHandler__default = /*#__PURE__*/_interopDefaultLegacy(EventHandler);
-  const BaseComponent__default = /*#__PURE__*/_interopDefaultLegacy(BaseComponent);
+  typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory(require('./base-component.js'), require('./dom/event-handler.js'), require('./util/component-functions.js'), require('./util/index.js')) :
+  typeof define === 'function' && define.amd ? define(['./base-component', './dom/event-handler', './util/component-functions', './util/index'], factory) :
+  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, global.Alert = factory(global.BaseComponent, global.EventHandler, global.ComponentFunctions, global.Index));
+})(this, (function (BaseComponent, EventHandler, componentFunctions_js, index_js) { 'use strict';
 
   /**
    * --------------------------------------------------------------------------
-   * Bootstrap (v5.2.2): alert.js
+   * Bootstrap alert.js
    * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
    * --------------------------------------------------------------------------
    */
+
+
   /**
    * Constants
    */
@@ -31,68 +28,61 @@
   const EVENT_CLOSED = `closed${EVENT_KEY}`;
   const CLASS_NAME_FADE = 'fade';
   const CLASS_NAME_SHOW = 'show';
+
   /**
    * Class definition
    */
 
-  class Alert extends BaseComponent__default.default {
+  class Alert extends BaseComponent {
     // Getters
     static get NAME() {
       return NAME;
-    } // Public
-
+    }
 
+    // Public
     close() {
-      const closeEvent = EventHandler__default.default.trigger(this._element, EVENT_CLOSE);
-
+      const closeEvent = EventHandler.trigger(this._element, EVENT_CLOSE);
       if (closeEvent.defaultPrevented) {
         return;
       }
-
       this._element.classList.remove(CLASS_NAME_SHOW);
-
       const isAnimated = this._element.classList.contains(CLASS_NAME_FADE);
-
       this._queueCallback(() => this._destroyElement(), this._element, isAnimated);
-    } // Private
-
+    }
 
+    // Private
     _destroyElement() {
       this._element.remove();
-
-      EventHandler__default.default.trigger(this._element, EVENT_CLOSED);
+      EventHandler.trigger(this._element, EVENT_CLOSED);
       this.dispose();
-    } // Static
-
+    }
 
+    // Static
     static jQueryInterface(config) {
       return this.each(function () {
         const data = Alert.getOrCreateInstance(this);
-
         if (typeof config !== 'string') {
           return;
         }
-
         if (data[config] === undefined || config.startsWith('_') || config === 'constructor') {
           throw new TypeError(`No method named "${config}"`);
         }
-
         data[config](this);
       });
     }
-
   }
+
   /**
    * Data API implementation
    */
 
+  componentFunctions_js.enableDismissTrigger(Alert, 'close');
 
-  componentFunctions.enableDismissTrigger(Alert, 'close');
   /**
    * jQuery
    */
 
-  index.defineJQueryPlugin(Alert);
+  index_js.defineJQueryPlugin(Alert);
 
   return Alert;
 

data/assets/javascripts/bootstrap/base-component.js

@@ -1,97 +1,81 @@
 /*!
-  * Bootstrap base-component.js v5.2.2 (https://getbootstrap.com/)
-  * Copyright 2011-2022 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
+  * Bootstrap base-component.js v5.3.3 (https://getbootstrap.com/)
+  * Copyright 2011-2024 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
   * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
   */
 (function (global, factory) {
-  typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory(require('./dom/data'), require('./util/index'), require('./dom/event-handler'), require('./util/config')) :
-  typeof define === 'function' && define.amd ? define(['./dom/data', './util/index', './dom/event-handler', './util/config'], factory) :
-  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, global.BaseComponent = factory(global.Data, global.Index, global.EventHandler, global.Config));
-})(this, (function (Data, index, EventHandler, Config) { 'use strict';
-
-  const _interopDefaultLegacy = e => e && typeof e === 'object' && 'default' in e ? e : { default: e };
-
-  const Data__default = /*#__PURE__*/_interopDefaultLegacy(Data);
-  const EventHandler__default = /*#__PURE__*/_interopDefaultLegacy(EventHandler);
-  const Config__default = /*#__PURE__*/_interopDefaultLegacy(Config);
+  typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory(require('./dom/data.js'), require('./dom/event-handler.js'), require('./util/config.js'), require('./util/index.js')) :
+  typeof define === 'function' && define.amd ? define(['./dom/data', './dom/event-handler', './util/config', './util/index'], factory) :
+  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, global.BaseComponent = factory(global.Data, global.EventHandler, global.Config, global.Index));
+})(this, (function (Data, EventHandler, Config, index_js) { 'use strict';
 
   /**
    * --------------------------------------------------------------------------
-   * Bootstrap (v5.2.2): base-component.js
+   * Bootstrap base-component.js
    * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
    * --------------------------------------------------------------------------
    */
+
+
   /**
    * Constants
    */
 
-  const VERSION = '5.2.2';
+  const VERSION = '5.3.3';
+
   /**
    * Class definition
    */
 
-  class BaseComponent extends Config__default.default {
+  class BaseComponent extends Config {
     constructor(element, config) {
       super();
-      element = index.getElement(element);
-
+      element = index_js.getElement(element);
       if (!element) {
         return;
       }
-
       this._element = element;
       this._config = this._getConfig(config);
-      Data__default.default.set(this._element, this.constructor.DATA_KEY, this);
-    } // Public
-
+      Data.set(this._element, this.constructor.DATA_KEY, this);
+    }
 
+    // Public
     dispose() {
-      Data__default.default.remove(this._element, this.constructor.DATA_KEY);
-      EventHandler__default.default.off(this._element, this.constructor.EVENT_KEY);
-
+      Data.remove(this._element, this.constructor.DATA_KEY);
+      EventHandler.off(this._element, this.constructor.EVENT_KEY);
       for (const propertyName of Object.getOwnPropertyNames(this)) {
         this[propertyName] = null;
       }
     }
-
     _queueCallback(callback, element, isAnimated = true) {
-      index.executeAfterTransition(callback, element, isAnimated);
+      index_js.executeAfterTransition(callback, element, isAnimated);
     }
-
     _getConfig(config) {
       config = this._mergeConfigObj(config, this._element);
       config = this._configAfterMerge(config);
-
       this._typeCheckConfig(config);
-
       return config;
-    } // Static
-
+    }
 
+    // Static
     static getInstance(element) {
-      return Data__default.default.get(index.getElement(element), this.DATA_KEY);
+      return Data.get(index_js.getElement(element), this.DATA_KEY);
     }
-
     static getOrCreateInstance(element, config = {}) {
       return this.getInstance(element) || new this(element, typeof config === 'object' ? config : null);
     }
-
     static get VERSION() {
       return VERSION;
     }
-
     static get DATA_KEY() {
       return `bs.${this.NAME}`;
     }
-
     static get EVENT_KEY() {
       return `.${this.DATA_KEY}`;
     }
-
     static eventName(name) {
       return `${name}${this.EVENT_KEY}`;
     }
-
   }
 
   return BaseComponent;

data/assets/javascripts/bootstrap/button.js

@@ -1,25 +1,22 @@
 /*!
-  * Bootstrap button.js v5.2.2 (https://getbootstrap.com/)
-  * Copyright 2011-2022 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
+  * Bootstrap button.js v5.3.3 (https://getbootstrap.com/)
+  * Copyright 2011-2024 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
   * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
   */
 (function (global, factory) {
-  typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory(require('./util/index'), require('./dom/event-handler'), require('./base-component')) :
-  typeof define === 'function' && define.amd ? define(['./util/index', './dom/event-handler', './base-component'], factory) :
-  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, global.Button = factory(global.Index, global.EventHandler, global.BaseComponent));
-})(this, (function (index, EventHandler, BaseComponent) { 'use strict';
-
-  const _interopDefaultLegacy = e => e && typeof e === 'object' && 'default' in e ? e : { default: e };
-
-  const EventHandler__default = /*#__PURE__*/_interopDefaultLegacy(EventHandler);
-  const BaseComponent__default = /*#__PURE__*/_interopDefaultLegacy(BaseComponent);
+  typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory(require('./base-component.js'), require('./dom/event-handler.js'), require('./util/index.js')) :
+  typeof define === 'function' && define.amd ? define(['./base-component', './dom/event-handler', './util/index'], factory) :
+  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, global.Button = factory(global.BaseComponent, global.EventHandler, global.Index));
+})(this, (function (BaseComponent, EventHandler, index_js) { 'use strict';
 
   /**
    * --------------------------------------------------------------------------
-   * Bootstrap (v5.2.2): button.js
+   * Bootstrap button.js
    * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
    * --------------------------------------------------------------------------
    */
+
+
   /**
    * Constants
    */
@@ -31,50 +28,50 @@
   const CLASS_NAME_ACTIVE = 'active';
   const SELECTOR_DATA_TOGGLE = '[data-bs-toggle="button"]';
   const EVENT_CLICK_DATA_API = `click${EVENT_KEY}${DATA_API_KEY}`;
+
   /**
    * Class definition
    */
 
-  class Button extends BaseComponent__default.default {
+  class Button extends BaseComponent {
     // Getters
     static get NAME() {
       return NAME;
-    } // Public
-
+    }
 
+    // Public
     toggle() {
       // Toggle class and sync the `aria-pressed` attribute with the return value of the `.toggle()` method
       this._element.setAttribute('aria-pressed', this._element.classList.toggle(CLASS_NAME_ACTIVE));
-    } // Static
-
+    }
 
+    // Static
     static jQueryInterface(config) {
       return this.each(function () {
         const data = Button.getOrCreateInstance(this);
-
         if (config === 'toggle') {
           data[config]();
         }
       });
     }
-
   }
+
   /**
    * Data API implementation
    */
 
-
-  EventHandler__default.default.on(document, EVENT_CLICK_DATA_API, SELECTOR_DATA_TOGGLE, event => {
+  EventHandler.on(document, EVENT_CLICK_DATA_API, SELECTOR_DATA_TOGGLE, event => {
     event.preventDefault();
     const button = event.target.closest(SELECTOR_DATA_TOGGLE);
     const data = Button.getOrCreateInstance(button);
     data.toggle();
   });
+
   /**
    * jQuery
    */
 
-  index.defineJQueryPlugin(Button);
+  index_js.defineJQueryPlugin(Button);
 
   return Button;