From 17dcfbccaee16ef89a46c185501b9a3a0ce40cc6 Mon Sep 17 00:00:00 2001
From: Takuya N <takninnovationresearch@gmail.com>
Date: Sat, 28 Dec 2024 04:04:44 +0900
Subject: [PATCH] Bump bootstrap from 5.1.3 to 5.2.0 (#729)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Bump bootstrap from 5.1.3 to 5.2.0-beta1

* Bump bootstrap from 5.2.0-beta1 to 5.2.0

---------

Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
---
 assets/javascripts/search.js            |  1 +
 assets/stylesheets/application.css.scss |  7 +++---
 package-lock.json                       | 31 +++++++++++++++----------
 package.json                            |  2 +-
 4 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/assets/javascripts/search.js b/assets/javascripts/search.js
index 2f77b90dfd..e3fda2cc4c 100644
--- a/assets/javascripts/search.js
+++ b/assets/javascripts/search.js
@@ -53,6 +53,7 @@ document.addEventListener('DOMContentLoaded', function () {
     this.showPopover = function (text) {
       this.popoverContent = this.generatePopoverContent(text);
       const popover = Popover.getInstance(this.searchInput);
+      popover._disposePopper();
       popover.show();
       document.querySelector('.popover-body').innerHTML = this.popoverContent;
     };
diff --git a/assets/stylesheets/application.css.scss b/assets/stylesheets/application.css.scss
index f6ec2b5dab..94b03fbec9 100644
--- a/assets/stylesheets/application.css.scss
+++ b/assets/stylesheets/application.css.scss
@@ -11,7 +11,7 @@ $navbar-height: 50px;
 
 // Boostrap 5 customization
 // Document: https://getbootstrap.com/docs/5.2/customize/sass/#importing
-// List of SCSS to load: https://github.com/twbs/bootstrap/blob/v5.1.3/scss/bootstrap.scss
+// List of SCSS to load: https://github.com/twbs/bootstrap/blob/v5.2.0/scss/bootstrap.scss
 @import "~bootstrap/scss/functions";
 
 pre {
@@ -28,6 +28,7 @@ $pre-color: #fff;
 $icon-font-path: '~bootstrap/assets/fonts/bootstrap/';
 
 @import "~bootstrap/scss/variables";
+@import "~bootstrap/scss/maps";
 @import "~bootstrap/scss/mixins";
 @import "~bootstrap/scss/utilities";
 
@@ -35,7 +36,7 @@ $icon-font-path: '~bootstrap/assets/fonts/bootstrap/';
 // Note: tables, dropdown, button-group, accordion, breadcrumb, pagination,
 // badge, alert, progress, list-group, close, toasts, modal, tooltip, carousel,
 // spinners, offcanvas, and placeholders were excluded as they are not used as
-// of Bootstrap 5.1.3
+// of Bootstrap 5.2.0
 @import "~bootstrap/scss/root";
 @import "~bootstrap/scss/reboot";
 @import "~bootstrap/scss/type";
@@ -69,7 +70,7 @@ $icon-font-path: '~bootstrap/assets/fonts/bootstrap/';
 @import "anchorjs";
 @import "search";
 
-// More various utilities extended from Bootstrap 5.1
+// More various utilities extended from Bootstrap 5.2
 @import "opacity";
 
 .row:after {
diff --git a/package-lock.json b/package-lock.json
index bca14c1dc1..1675dfb6a7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,7 +11,7 @@
       "dependencies": {
         "@popperjs/core": "^2.11.8",
         "anchor-js": "^5.0.0",
-        "bootstrap": "^5.1.3",
+        "bootstrap": "^5.2.0",
         "lunr": "^0.7.0"
       },
       "devDependencies": {
@@ -699,15 +699,22 @@
       "integrity": "sha512-2bOqCsBIXAYhjAN3iI4QevoAJtB2gRWAiY9P3P7CVW8lIjA3Dl6ldhDlWeeQvCHif+V5vIndfLOag/5I8tzTzA=="
     },
     "node_modules/bootstrap": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.1.3.tgz",
-      "integrity": "sha512-fcQztozJ8jToQWXxVuEyXWW+dSo8AiXWKwiSSrKWsRB/Qt+Ewwza+JWoLKiTuQLaEPhdNAJ7+Dosc9DOIqNy7Q==",
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/bootstrap"
-      },
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.2.0.tgz",
+      "integrity": "sha512-qlnS9GL6YZE6Wnef46GxGv1UpGGzAwO0aPL1yOjzDIJpeApeMvqV24iL+pjr2kU4dduoBA9fINKWKgMToobx9A==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/twbs"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/bootstrap"
+        }
+      ],
+      "license": "MIT",
       "peerDependencies": {
-        "@popperjs/core": "^2.10.2"
+        "@popperjs/core": "^2.11.5"
       }
     },
     "node_modules/braces": {
@@ -2688,9 +2695,9 @@
       "integrity": "sha512-2bOqCsBIXAYhjAN3iI4QevoAJtB2gRWAiY9P3P7CVW8lIjA3Dl6ldhDlWeeQvCHif+V5vIndfLOag/5I8tzTzA=="
     },
     "bootstrap": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.1.3.tgz",
-      "integrity": "sha512-fcQztozJ8jToQWXxVuEyXWW+dSo8AiXWKwiSSrKWsRB/Qt+Ewwza+JWoLKiTuQLaEPhdNAJ7+Dosc9DOIqNy7Q==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.2.0.tgz",
+      "integrity": "sha512-qlnS9GL6YZE6Wnef46GxGv1UpGGzAwO0aPL1yOjzDIJpeApeMvqV24iL+pjr2kU4dduoBA9fINKWKgMToobx9A==",
       "requires": {}
     },
     "braces": {
diff --git a/package.json b/package.json
index 72ff37d6d5..52f4371738 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
   "dependencies": {
     "@popperjs/core": "^2.11.8",
     "anchor-js": "^5.0.0",
-    "bootstrap": "^5.1.3",
+    "bootstrap": "^5.2.0",
     "lunr": "^0.7.0"
   }
 }