[TASK] Update frontend dependencies

benjaminkott · Sep 17, 2021 · 151f487 · 151f487
1 parent 168b6c9
commit 151f487
Show file tree

Hide file tree

Showing 17 changed files with 84 additions and 89 deletions.
diff --git a/Build/package-lock.json b/Build/package-lock.json
diff --git a/Build/package.json b/Build/package.json
@@ -8,9 +8,9 @@
   "version": "12.0.2-dev",
   "license": "MIT",
   "devDependencies": {
-    "@popperjs/core": "^2.9.3",
+    "@popperjs/core": "^2.10.1",
     "bootstrap4": "npm:bootstrap@^4.6.0",
-    "bootstrap5": "npm:bootstrap@^5.1.0",
+    "bootstrap5": "npm:[email protected].1",
     "chalk": "^4.1.2",
     "cookieconsent": "^3.1.1",
     "fantasticon": "^1.2.2",
@@ -25,7 +25,7 @@
     "grunt-sass": "^3.1.0",
     "grunt-stylelint": "^0.16.0",
     "jquery": "^3.6.0",
-    "modernizr": "^3.11.7",
+    "modernizr": "^3.11.8",
     "node-sass": "^6.0.1",
     "photoswipe": "^4.1.3",
     "popper.js": "^1.16.1",

diff --git a/Resources/Public/Contrib/bootstrap5/js/bootstrap.min.js b/Resources/Public/Contrib/bootstrap5/js/bootstrap.min.js
diff --git a/Resources/Public/Contrib/bootstrap5/scss/_functions.scss b/Resources/Public/Contrib/bootstrap5/scss/_functions.scss
@@ -37,11 +37,17 @@
   @return red($value), green($value), blue($value);
 }
 
+// stylelint-disable scss/dollar-variable-pattern
 @function rgba-css-var($identifier, $target) {
-  @return rgba(var(--#{$variable-prefix}#{$identifier}-rgb), var(--#{$variable-prefix}#{$target}-opacity));
+  @if $identifier == "body" and $target == "bg" {
+    @return rgba(var(--#{$variable-prefix}#{$identifier}-bg-rgb), var(--#{$variable-prefix}#{$target}-opacity));
+  } @if $identifier == "body" and $target == "text" {
+    @return rgba(var(--#{$variable-prefix}#{$identifier}-color-rgb), var(--#{$variable-prefix}#{$target}-opacity));
+  } @else {
+    @return rgba(var(--#{$variable-prefix}#{$identifier}-rgb), var(--#{$variable-prefix}#{$target}-opacity));
+  }
 }
 
-// stylelint-disable scss/dollar-variable-pattern
 @function map-loop($map, $func, $args...) {
   $_map: ();
 

diff --git a/Resources/Public/Contrib/bootstrap5/scss/_reboot.scss b/Resources/Public/Contrib/bootstrap5/scss/_reboot.scss
@@ -27,7 +27,7 @@
 
 :root {
   @if $font-size-root != null {
-    font-size: var(--#{$variable-prefix}-root-font-size);
+    font-size: var(--#{$variable-prefix}root-font-size);
   }
 
   @if $enable-smooth-scroll {

diff --git a/Resources/Public/Contrib/bootstrap5/scss/_root.scss b/Resources/Public/Contrib/bootstrap5/scss/_root.scss
@@ -23,7 +23,8 @@
 
   --#{$variable-prefix}white-rgb: #{to-rgb($white)};
   --#{$variable-prefix}black-rgb: #{to-rgb($black)};
-  --#{$variable-prefix}body-rgb: #{to-rgb($body-color)};
+  --#{$variable-prefix}body-color-rgb: #{to-rgb($body-color)};
+  --#{$variable-prefix}body-bg-rgb: #{to-rgb($body-bg)};
 
   // Fonts
 

diff --git a/Resources/Public/Contrib/bootstrap5/scss/_variables.scss b/Resources/Public/Contrib/bootstrap5/scss/_variables.scss
@@ -409,23 +409,33 @@ $body-text-align:           null !default;
 //
 // Extends the default `$theme-colors` maps to help create our utilities.
 
+// Come v6, we'll de-dupe these variables. Until then, for backward compatibility, we keep them to reassign.
 // scss-docs-start utilities-colors
-$utilities-colors: map-merge(
-  $theme-colors-rgb,
+$utilities-colors: $theme-colors-rgb !default;
+// scss-docs-end utilities-colors
+
+// scss-docs-start utilities-text-colors
+$utilities-text: map-merge(
+  $utilities-colors,
   (
     "black": to-rgb($black),
     "white": to-rgb($white),
-    "body":  to-rgb($body-color)
+    "body": to-rgb($body-color)
   )
 ) !default;
-// scss-docs-end utilities-colors
-
-// scss-docs-start utilities-text-colors
-$utilities-text-colors: map-loop($utilities-colors, rgba-css-var, "$key", "text") !default;
+$utilities-text-colors: map-loop($utilities-text, rgba-css-var, "$key", "text") !default;
 // scss-docs-end utilities-text-colors
 
 // scss-docs-start utilities-bg-colors
-$utilities-bg-colors: map-loop($utilities-colors, rgba-css-var, "$key", "bg") !default;
+$utilities-bg: map-merge(
+  $utilities-colors,
+  (
+    "black": to-rgb($black),
+    "white": to-rgb($white),
+    "body": to-rgb($body-bg)
+  )
+) !default;
+$utilities-bg-colors: map-loop($utilities-bg, rgba-css-var, "$key", "bg") !default;
 // scss-docs-end utilities-bg-colors
 
 // Links
@@ -1157,7 +1167,7 @@ $dropdown-divider-margin-y:         $spacer * .5 !default;
 $dropdown-box-shadow:               $box-shadow !default;
 
 $dropdown-link-color:               $gray-900 !default;
-$dropdown-link-hover-color:         shade-color($gray-900, 10%) !default;
+$dropdown-link-hover-color:         shade-color($dropdown-link-color, 10%) !default;
 $dropdown-link-hover-bg:            $gray-200 !default;
 
 $dropdown-link-active-color:        $component-active-color !default;

diff --git a/Resources/Public/Contrib/bootstrap5/scss/bootstrap-grid.scss b/Resources/Public/Contrib/bootstrap5/scss/bootstrap-grid.scss
@@ -1,5 +1,5 @@
 /*!
- * Bootstrap Grid v5.1.0 (https://getbootstrap.com/)
+ * Bootstrap Grid v5.1.1 (https://getbootstrap.com/)
  * Copyright 2011-2021 The Bootstrap Authors
  * Copyright 2011-2021 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
@@ -18,6 +18,8 @@ $include-column-box-sizing: true !default;
 
 @import "vendor/rfs";
 
+@import "root";
+
 @import "containers";
 @import "grid";
 

diff --git a/Resources/Public/Contrib/bootstrap5/scss/bootstrap-reboot.scss b/Resources/Public/Contrib/bootstrap5/scss/bootstrap-reboot.scss
@@ -1,5 +1,5 @@
 /*!
- * Bootstrap Reboot v5.1.0 (https://getbootstrap.com/)
+ * Bootstrap Reboot v5.1.1 (https://getbootstrap.com/)
  * Copyright 2011-2021 The Bootstrap Authors
  * Copyright 2011-2021 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
@@ -8,8 +8,6 @@
 
 @import "functions";
 @import "variables";
-// Prevent the usage of custom properties since we don't add them to `:root` in reboot
-$font-family-base: $font-family-sans-serif; // stylelint-disable-line scss/dollar-variable-default
-$font-family-code: $font-family-monospace; // stylelint-disable-line scss/dollar-variable-default
 @import "mixins";
+@import "root";
 @import "reboot";
diff --git a/Resources/Public/Contrib/bootstrap5/scss/bootstrap-utilities.scss b/Resources/Public/Contrib/bootstrap5/scss/bootstrap-utilities.scss
@@ -1,5 +1,5 @@
 /*!
- * Bootstrap Utilities v5.1.0 (https://getbootstrap.com/)
+ * Bootstrap Utilities v5.1.1 (https://getbootstrap.com/)
  * Copyright 2011-2021 The Bootstrap Authors
  * Copyright 2011-2021 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)

diff --git a/Resources/Public/Contrib/bootstrap5/scss/bootstrap.scss b/Resources/Public/Contrib/bootstrap5/scss/bootstrap.scss
@@ -1,5 +1,5 @@
 /*!
- * Bootstrap v5.1.0 (https://getbootstrap.com/)
+ * Bootstrap v5.1.1 (https://getbootstrap.com/)
  * Copyright 2011-2021 The Bootstrap Authors
  * Copyright 2011-2021 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)