From 6cb8972c99519b699e23c8f7524c2879da801bf5 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Tue, 15 Nov 2022 18:19:29 +0000
Subject: [PATCH] Bug 32212: Add separate Bootstrap 4 node module for the OPAC

This patch updates package.json so that Bootstrap 4 will be installed
alongside Bootstrap 5. The addition of ERM changed the installed version
of Bootstrap to 5.2.x but the OPAC still requires 4.x.

To test, apply the patch and run 'yarn install.'

After packages install, run 'yarn build --view opac'

The build process should complete correctly and the OPAC should look the
same as before.
---
 .../opac-tmpl/bootstrap/css/src/_common.scss  | 92 +++++++++----------
 package.json                                  |  1 +
 2 files changed, 47 insertions(+), 46 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/css/src/_common.scss b/koha-tmpl/opac-tmpl/bootstrap/css/src/_common.scss
index ec6da81fe1..2afb0273bc 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/css/src/_common.scss
+++ b/koha-tmpl/opac-tmpl/bootstrap/css/src/_common.scss
@@ -34,52 +34,52 @@ $high-contrast-grey: #666666;
 }
 
 /* Bootstrap imports */
-@import "../../../../../node_modules/bootstrap/scss/functions";
-@import "../../../../../node_modules/bootstrap/scss/variables";
-@import "../../../../../node_modules/bootstrap/scss/mixins";
-@import "../../../../../node_modules/bootstrap/scss/alert";
-
-// @import "../../../../../node_modules/bootstrap/scss/badge";
-@import "../../../../../node_modules/bootstrap/scss/breadcrumb";
-@import "../../../../../node_modules/bootstrap/scss/button-group";
-@import "../../../../../node_modules/bootstrap/scss/buttons";
-@import "../../../../../node_modules/bootstrap/scss/card";
-
-// @import "../../../../../node_modules/bootstrap/scss/carousel";
-@import "../../../../../node_modules/bootstrap/scss/close";
-
-// @import "../../../../../node_modules/bootstrap/scss/code";
-@import "../../../../../node_modules/bootstrap/scss/custom-forms";
-@import "../../../../../node_modules/bootstrap/scss/dropdown";
-@import "../../../../../node_modules/bootstrap/scss/forms";
-@import "../../../../../node_modules/bootstrap/scss/grid";
-
-// @import "../../../../../node_modules/bootstrap/scss/images";
-@import "../../../../../node_modules/bootstrap/scss/input-group";
-
-// @import "../../../../../node_modules/bootstrap/scss/jumbotron";
-// @import "../../../../../node_modules/bootstrap/scss/list-group";
-// @import "../../../../../node_modules/bootstrap/scss/media";
-@import "../../../../../node_modules/bootstrap/scss/modal";
-@import "../../../../../node_modules/bootstrap/scss/navbar";
-@import "../../../../../node_modules/bootstrap/scss/nav";
-@import "../../../../../node_modules/bootstrap/scss/pagination";
-
-// @import "../../../../../node_modules/bootstrap/scss/popover";
-@import "../../../../../node_modules/bootstrap/scss/print";
-
-// @import "../../../../../node_modules/bootstrap/scss/progress";
-@import "../../../../../node_modules/bootstrap/scss/reboot";
-@import "../../../../../node_modules/bootstrap/scss/root";
-
-// @import "../../../../../node_modules/bootstrap/scss/spinners";
-@import "../../../../../node_modules/bootstrap/scss/tables";
-
-// @import "../../../../../node_modules/bootstrap/scss/toasts";
-@import "../../../../../node_modules/bootstrap/scss/tooltip";
-@import "../../../../../node_modules/bootstrap/scss/transitions";
-@import "../../../../../node_modules/bootstrap/scss/type";
-@import "../../../../../node_modules/bootstrap/scss/utilities";
+@import "../../../../../node_modules/bootstrap4/scss/functions";
+@import "../../../../../node_modules/bootstrap4/scss/variables";
+@import "../../../../../node_modules/bootstrap4/scss/mixins";
+@import "../../../../../node_modules/bootstrap4/scss/alert";
+
+// @import "../../../../../node_modules/bootstrap4/scss/badge";
+@import "../../../../../node_modules/bootstrap4/scss/breadcrumb";
+@import "../../../../../node_modules/bootstrap4/scss/button-group";
+@import "../../../../../node_modules/bootstrap4/scss/buttons";
+@import "../../../../../node_modules/bootstrap4/scss/card";
+
+// @import "../../../../../node_modules/bootstrap4/scss/carousel";
+@import "../../../../../node_modules/bootstrap4/scss/close";
+
+// @import "../../../../../node_modules/bootstrap4/scss/code";
+@import "../../../../../node_modules/bootstrap4/scss/custom-forms";
+@import "../../../../../node_modules/bootstrap4/scss/dropdown";
+@import "../../../../../node_modules/bootstrap4/scss/forms";
+@import "../../../../../node_modules/bootstrap4/scss/grid";
+
+// @import "../../../../../node_modules/bootstrap4/scss/images";
+@import "../../../../../node_modules/bootstrap4/scss/input-group";
+
+// @import "../../../../../node_modules/bootstrap4/scss/jumbotron";
+// @import "../../../../../node_modules/bootstrap4/scss/list-group";
+// @import "../../../../../node_modules/bootstrap4/scss/media";
+@import "../../../../../node_modules/bootstrap4/scss/modal";
+@import "../../../../../node_modules/bootstrap4/scss/navbar";
+@import "../../../../../node_modules/bootstrap4/scss/nav";
+@import "../../../../../node_modules/bootstrap4/scss/pagination";
+
+// @import "../../../../../node_modules/bootstrap4/scss/popover";
+@import "../../../../../node_modules/bootstrap4/scss/print";
+
+// @import "../../../../../node_modules/bootstrap4/scss/progress";
+@import "../../../../../node_modules/bootstrap4/scss/reboot";
+@import "../../../../../node_modules/bootstrap4/scss/root";
+
+// @import "../../../../../node_modules/bootstrap4/scss/spinners";
+@import "../../../../../node_modules/bootstrap4/scss/tables";
+
+// @import "../../../../../node_modules/bootstrap4/scss/toasts";
+@import "../../../../../node_modules/bootstrap4/scss/tooltip";
+@import "../../../../../node_modules/bootstrap4/scss/transitions";
+@import "../../../../../node_modules/bootstrap4/scss/type";
+@import "../../../../../node_modules/bootstrap4/scss/utilities";
 @import "flatpickr";
 
 /* Koha imports */
diff --git a/package.json b/package.json
index 93faa22143..dc8a374e59 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
     "babel-core": "^7.0.0-beta.3",
     "bootstrap": "^5.1.3",
     "bootstrap-vue-3": "^0.1.7",
+    "bootstrap4": "npm:bootstrap@^4.6.2",
     "css-loader": "^6.6.0",
     "cypress": "^9.5.2",
     "gulp": "^4.0.2",
-- 
2.20.1