MIR-1418-Upgrade to Bootstrap v5

- prepare versions for bootstrap 5
MyCoRe-Org · Jan 21, 2025 · 4e71f85 · 4e71f85
1 parent 0bec304
commit 4e71f85
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 17 deletions.
diff --git a/mir-layout/package.json b/mir-layout/package.json
@@ -12,9 +12,9 @@
     },
     "engineStrict": true,
     "devDependencies": {
-        "@fortawesome/fontawesome-free": "5.11.2",
-        "bootstrap": "4.6.1",
-        "bootswatch": "4.6.1",
+        "@fortawesome/fontawesome-free": "6.7.2",
+        "bootstrap": "5.3.3",
+        "bootswatch": "5.3.3",
         "grunt": "^1.5.3",
         "grunt-cli": "^1.2.0",
         "grunt-contrib-concat": "^1.0.1",

diff --git a/mir-layout/src/main/resources/config/mir-layout/mycore.properties b/mir-layout/src/main/resources/config/mir-layout/mycore.properties
@@ -15,8 +15,18 @@ MIR.DefaultLayout.CSS=flatly.min
 ##############################################################################
 # extra viewer configuration strategy to include the right bootstrap theme files and scripts
 MCR.Viewer.configuration.strategy=org.mycore.mir.viewer.MIRViewerConfigurationStrategy
-# empty property means the default bootstrap is not included
-MCR.Viewer.bootstrapURL=
+# empty property means the default bootstrap, popper and Fontawesome and is not included
+MCR.Viewer.Bootstrap.Css.URL=
+MCR.Viewer.Bootstrap.Css.Integrity=
+MCR.Viewer.Bootstrap.Js.URL=
+MCR.Viewer.Bootstrap.Js.Integrity=
+MCR.Viewer.Popper.Js.URL=
+MCR.Viewer.Popper.Js.Integrity=
+MCR.Viewer.Fontawesome.Css.URL=
+MCR.Viewer.Fontawesome.Css.Integrity=
+MCR.Viewer.Fontawesome.Js.URL=
+MCR.Viewer.Fontawesome.Js.Integrity=
+
 # disables the mini overview in the bottom right corner
 MCR.Viewer.canvas.overview.enabled=true
 # if this property set to true the viewer will fit image width on startup

diff --git a/mir-layout/yarn.lock b/mir-layout/yarn.lock
@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@fortawesome/fontawesome-free@5.11.2":
-  version "5.11.2"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.11.2.tgz#8644bc25b19475779a7b7c1fc104bc0a794f4465"
-  integrity sha512-XiUPoS79r1G7PcpnNtq85TJ7inJWe0v+b5oZJZKb0pGHNIV6+UiNeQWiFGmuQ0aj7GEhnD/v9iqxIsjuRKtEnQ==
+"@fortawesome/fontawesome-free@6.7.2":
+  version "6.7.2"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.7.2.tgz#8249de9b7e22fcb3ceb5e66090c30a1d5492b81a"
+  integrity sha512-JUOtgFW6k9u4Y+xeIaEiLr3+cjoUPiAuLXoyKOJSia6Duzb7pq+A76P9ZdPDoAoxHdHzq6gE9/jKBGXlZT8FbA==
 
 "@fortawesome/fontawesome-free@^5.8.2":
   version "5.13.0"
@@ -87,15 +87,15 @@ body@^5.1.0:
     raw-body "~1.1.0"
     safe-json-parse "~1.0.1"
 
-bootstrap@4.6.1:
-  version "4.6.1"
-  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.6.1.tgz#bc25380c2c14192374e8dec07cf01b2742d222a2"
-  integrity sha512-0dj+VgI9Ecom+rvvpNZ4MUZJz8dcX7WCX+eTID9+/8HgOkv3dsRzi8BGeZJCQU6flWQVYxwTQnEZFrmJSEO7og==
+bootstrap@5.3.3:
+  version "5.3.3"
+  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.3.3.tgz#de35e1a765c897ac940021900fcbb831602bac38"
+  integrity sha512-8HLCdWgyoMguSO9o+aH+iuZ+aht+mzW0u3HIMzVu7Srrpv7EBBxTnrFlSCskwdY1+EOFQSm7uMJhNQHkdPcmjg==
 
-bootswatch@4.6.1:
-  version "4.6.1"
-  resolved "https://registry.yarnpkg.com/bootswatch/-/bootswatch-4.6.1.tgz#e58101a891998487d396c2a97d1bc5278d168ac9"
-  integrity sha512-5vRhlIIvgZ2rH3QLHcVVa+Z+jNpn1/zEvGlJYkp4/g1LmsGY42S6IOpYyBu40RGjqqiYIjoeX/uWDdAAIYVG7A==
+bootswatch@5.3.3:
+  version "5.3.3"
+  resolved "https://registry.yarnpkg.com/bootswatch/-/bootswatch-5.3.3.tgz#fb8f671862165a06a70aee10f84ee2cc77b52120"
+  integrity sha512-cJLhobnZsVCelU7zdH/L7wpcXAyUoTX4/5l2dWQ0JXgaVK80BdTQNU/ImWwoyIGBeyms4iQDAdNtOfPQZf0Atg==
 
 brace-expansion@^1.0.0, brace-expansion@^1.1.7:
   version "1.1.11"