From 0a6c35e56c0e0ffa4368ec81fbfb0eb9eeb9cd8d Mon Sep 17 00:00:00 2001
From: Todd Martin <106564991+trmartin4@users.noreply.github.com>
Date: Tue, 27 Aug 2024 12:24:02 -0400
Subject: [PATCH] Updated bootstrap to 5.3.3 (#4697)

* Updated bootstrap to 5.3.3

* Removed locking of bootstrap version
---
 .github/renovate.json                       | 6 ------
 bitwarden_license/src/Sso/package-lock.json | 4 ++--
 bitwarden_license/src/Sso/package.json      | 2 +-
 src/Admin/package-lock.json                 | 4 ++--
 src/Admin/package.json                      | 2 +-
 5 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/.github/renovate.json b/.github/renovate.json
index 46c0d1c350..efab875d66 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -40,12 +40,6 @@
       "commitMessagePrefix": "[deps] Auth:",
       "reviewers": ["team:team-auth-dev"]
     },
-    {
-      "matchPackageNames": ["bootstrap"],
-      "matchUpdateTypes": ["major"],
-      "description": "Lock bootstrap major versions due to ASP.NET conflicts",
-      "enabled": false
-    },
     {
       "matchPackageNames": [
         "AspNetCoreRateLimit",
diff --git a/bitwarden_license/src/Sso/package-lock.json b/bitwarden_license/src/Sso/package-lock.json
index cd1f00d291..f973a5c3c1 100644
--- a/bitwarden_license/src/Sso/package-lock.json
+++ b/bitwarden_license/src/Sso/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.0.0",
       "license": "-",
       "dependencies": {
-        "bootstrap": "4.6.2",
+        "bootstrap": "5.3.3",
         "font-awesome": "4.7.0",
         "jquery": "3.7.1",
         "popper.js": "1.16.1"
@@ -426,7 +426,7 @@
       }
     },
     "node_modules/bootstrap": {
-      "version": "4.6.2",
+      "version": "5.3.3",
       "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.2.tgz",
       "integrity": "sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ==",
       "funding": [
diff --git a/bitwarden_license/src/Sso/package.json b/bitwarden_license/src/Sso/package.json
index 638a26b98f..82b7e14cfd 100644
--- a/bitwarden_license/src/Sso/package.json
+++ b/bitwarden_license/src/Sso/package.json
@@ -8,7 +8,7 @@
     "build": "webpack"
   },
   "dependencies": {
-    "bootstrap": "4.6.2",
+    "bootstrap": "5.3.3",
     "font-awesome": "4.7.0",
     "jquery": "3.7.1",
     "popper.js": "1.16.1"
diff --git a/src/Admin/package-lock.json b/src/Admin/package-lock.json
index e3c9d4889f..6c140e1b34 100644
--- a/src/Admin/package-lock.json
+++ b/src/Admin/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.0.0",
       "license": "GPL-3.0",
       "dependencies": {
-        "bootstrap": "4.6.2",
+        "bootstrap": "5.3.3",
         "font-awesome": "4.7.0",
         "jquery": "3.7.1",
         "popper.js": "1.16.1",
@@ -427,7 +427,7 @@
       }
     },
     "node_modules/bootstrap": {
-      "version": "4.6.2",
+      "version": "5.3.3",
       "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.2.tgz",
       "integrity": "sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ==",
       "funding": [
diff --git a/src/Admin/package.json b/src/Admin/package.json
index 667cd367e5..25c598867e 100644
--- a/src/Admin/package.json
+++ b/src/Admin/package.json
@@ -8,7 +8,7 @@
     "build": "webpack"
   },
   "dependencies": {
-    "bootstrap": "4.6.2",
+    "bootstrap": "5.3.3",
     "font-awesome": "4.7.0",
     "jquery": "3.7.1",
     "popper.js": "1.16.1",