Merge branch 'master' of https://github.com/unacms/una

README.md

@@ -61,4 +61,4 @@ MIT
 
 ---
 
-This project is tested with BrowserStack.
+This project is tested with BrowserStack

composer.json

@@ -91,7 +91,7 @@
         "erusev/parsedown": "@dev",
         "paypal/paypal-checkout-sdk": "^1.0",
         "phpmailer/phpmailer": "^6.5",
-        "stripe/stripe-php": "^16.5.0",
+        "stripe/stripe-php": "^17.4.0",
         "twilio/sdk": "^8.3",
         "avto-dev/composer-cleanup-plugin": "dev-master",
         "mpratt/embera": "~2.0",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "2404a77bf9dfe90fbd0a166b35626c0d",
+    "content-hash": "9e4ed3470283527d25bcc5fd9d5d19fa",
     "packages": [
         {
             "name": "achingbrain/php5-akismet",
@@ -1764,16 +1764,16 @@
         },
         {
             "name": "stripe/stripe-php",
-            "version": "v16.6.0",
+            "version": "v17.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/stripe/stripe-php.git",
-                "reference": "d6de0a536f00b5c5c74f36b8f4d0d93b035499ff"
+                "reference": "893946057e43b145826b0dfd7f398673e381e2ae"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/stripe/stripe-php/zipball/d6de0a536f00b5c5c74f36b8f4d0d93b035499ff",
-                "reference": "d6de0a536f00b5c5c74f36b8f4d0d93b035499ff",
+                "url": "https://api.github.com/repos/stripe/stripe-php/zipball/893946057e43b145826b0dfd7f398673e381e2ae",
+                "reference": "893946057e43b145826b0dfd7f398673e381e2ae",
                 "shasum": ""
             },
             "require": {
@@ -1783,7 +1783,7 @@
                 "php": ">=5.6.0"
             },
             "require-dev": {
-                "friendsofphp/php-cs-fixer": "3.5.0",
+                "friendsofphp/php-cs-fixer": "3.72.0",
                 "phpstan/phpstan": "^1.2",
                 "phpunit/phpunit": "^5.7 || ^9.0"
             },
@@ -1817,9 +1817,9 @@
             ],
             "support": {
                 "issues": "https://github.com/stripe/stripe-php/issues",
-                "source": "https://github.com/stripe/stripe-php/tree/v16.6.0"
+                "source": "https://github.com/stripe/stripe-php/tree/v17.4.0"
             },
-            "time": "2025-02-24T22:35:29+00:00"
+            "time": "2025-07-01T20:23:15+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",

inc/js/classes/BxDolPage.js

@@ -30,9 +30,10 @@ function BxDolPage(oOptions) {
 BxDolPage.prototype.init = function() {
     var $this = this;
     if ($this._isStickyColumns && !$('html').hasClass('bx-media-phone')) {
-        $('.bx-layout-col').theiaStickySidebar({
-            additionalMarginTop: 70
-        });
+        window.glTheiaStickySidebar = new TheiaStickySidebar.TheiaStickySidebar($.extend({}, {
+            elements: '.bx-layout-col',
+            additionalMarginTop:70
+        }, typeof(window.glTheiaStickySidebarSettings) !== 'undefined' ? window.glTheiaStickySidebarSettings : {}));
     }
 
     // process embeds

package.json

@@ -34,7 +34,7 @@
     "headroom.js": "^0.12.0",
     "highlight.js": "github:highlightjs/highlight.js",
     "hls.js": "^1.5.18",
-    "htmx.org": "^1.9.12",
+    "htmx.org": "^2.0.6",
     "jekyll-toc": "https://github.com/ghiculescu/jekyll-table-of-contents",
     "jquery": "^3.7.1",
     "jquery-form": "^4.3.0",
@@ -56,7 +56,7 @@
     "moment-timezone": "^0.6.0",
     "npm": "^11.0.0",
     "ovenplayer": "^0.10.37",
-    "pdfjs-dist": "^4.10.38",
+    "pdfjs-dist": "^5.3.93",
     "photoswipe": "github:dimsemenov/PhotoSwipe#v4.1.3",
     "player.js": "^0.1.0",
     "prismjs": "^1.29.0",
@@ -75,7 +75,7 @@
     "spin.js": "^4.1.2",
     "stackedit-js": "^1.0.7",
     "tablesorter": "^2.32.0",
-    "theia-sticky-sidebar": "^1.7.0",
+    "theia-sticky-sidebar": "^2.0.0",
     "urijs": "^1.19.11"
   },
   "scripts": {

template/scripts/BxBasePage.php

@@ -1005,7 +1005,7 @@ class BxBasePage extends BxDolPage
      */
     protected function _addJsCss()
     {
-        $this->_oTemplate->addJs(array('BxDolPage.js', 'theia-sticky-sidebar/theia-sticky-sidebar.min.js', 'theia-sticky-sidebar/ResizeSensor.min.js'));
+        $this->_oTemplate->addJs(array('BxDolPage.js', 'theia-sticky-sidebar/theia-sticky-sidebar.umd.js', 'theia-sticky-sidebar/ResizeSensor.min.js'));
         $this->_oTemplate->addCss('page_layouts.css');
     }
 

yarn.lock

@@ -175,7 +175,7 @@
   resolved "https://registry.yarnpkg.com/@napi-rs/canvas-win32-x64-msvc/-/canvas-win32-x64-msvc-0.1.73.tgz#6e4bc501dca4e409d11c19e78be922d9645a8c70"
   integrity sha512-YQmHXBufFBdWqhx+ympeTPkMfs3RNxaOgWm59vyjpsub7Us07BwCcmu1N5kildhO8Fm0syoI2kHnzGkJBLSvsg==
 
-"@napi-rs/canvas@^0.1.65":
+"@napi-rs/canvas@^0.1.71":
   version "0.1.73"
   resolved "https://registry.yarnpkg.com/@napi-rs/canvas/-/canvas-0.1.73.tgz#4cb1093f2674b122088dfc6d5f0b2f5bdde3c71a"
   integrity sha512-9iwPZrNlCK4rG+vWyDvyvGeYjck9MoP0NVQP6N60gqJNFA1GsN0imG05pzNsqfCvFxUxgiTYlR8ff0HC1HXJiw==
@@ -1677,10 +1677,10 @@ html-entities@~1.4.0:
   resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.4.0.tgz#cfbd1b01d2afaf9adca1b10ae7dffab98c71d2dc"
   integrity sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA==
 
-htmx.org@^1.9.12:
-  version "1.9.12"
-  resolved "https://registry.yarnpkg.com/htmx.org/-/htmx.org-1.9.12.tgz#1c5bc7fb4d3eb4e8c0d72323dc774a6b9b66addc"
-  integrity sha512-VZAohXyF7xPGS52IM8d1T1283y+X4D+Owf3qY1NZ9RuBypyu9l8cGsxUMAG5fEAb/DhT7rDoJ9Hpu5/HxFD3cw==
+htmx.org@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/htmx.org/-/htmx.org-2.0.6.tgz#42573483c72112e7e332dfe93043cd0eb32cda01"
+  integrity sha512-7ythjYneGSk3yCHgtCnQeaoF+D+o7U2LF37WU3O0JYv3gTZSicdEFiI/Ai/NJyC5ZpYJWMpUb11OC5Lr6AfAqA==
 
 http-cache-semantics@^4.1.1:
   version "4.2.0"
@@ -2089,7 +2089,7 @@ jquery.easing@^1.4.1:
   resolved "https://registry.yarnpkg.com/jquery.easing/-/jquery.easing-1.4.1.tgz#47982c5836bd758fd48494923c4a101ef6e93e3b"
   integrity sha512-BVpRacWCbNfo/ALWxnLkIY/WRa4Ydg/LtwzIJZvDm7vrhV8Txv+ACi6EGnU11zT19sTc3KEPathWx6CtjWLD1w==
 
-"jquery@>=1.12.0 <5.0.0", jquery@>=1.2.6, jquery@>=1.7.0, jquery@>=1.7.2, jquery@^3.5.0, jquery@^3.7.1:
+"jquery@>=1.12.0 <5.0.0", jquery@>=1.2.6, jquery@>=1.7.2, jquery@^3.5.0, jquery@^3.7.1:
   version "3.7.1"
   resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.7.1.tgz#083ef98927c9a6a74d05a6af02806566d16274de"
   integrity sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==
@@ -2879,12 +2879,12 @@ path-type@^3.0.0:
   dependencies:
     pify "^3.0.0"
 
-pdfjs-dist@^4.10.38:
-  version "4.10.38"
-  resolved "https://registry.yarnpkg.com/pdfjs-dist/-/pdfjs-dist-4.10.38.tgz#3ee698003790dc266cc8b55c0e662ccb9ae18f53"
-  integrity sha512-/Y3fcFrXEAsMjJXeL9J8+ZG9U01LbuWaYypvDW2ycW1jL269L3js3DVBjDJ0Up9Np1uqDXsDrRihHANhZOlwdQ==
+pdfjs-dist@^5.3.93:
+  version "5.3.93"
+  resolved "https://registry.yarnpkg.com/pdfjs-dist/-/pdfjs-dist-5.3.93.tgz#d1ef9bd9dce1bfcc421c00a96df195d27b7bbf4f"
+  integrity sha512-w3fQKVL1oGn8FRyx5JUG5tnbblggDqyx2XzA5brsJ5hSuS+I0NdnJANhmeWKLjotdbPQucLBug5t0MeWr0AAdg==
   optionalDependencies:
-    "@napi-rs/canvas" "^0.1.65"
+    "@napi-rs/canvas" "^0.1.71"
 
 "photoswipe@github:dimsemenov/PhotoSwipe#v4.1.3":
   version "4.1.3"
@@ -3711,12 +3711,10 @@ text-table@~0.2.0:
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
   integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
 
-theia-sticky-sidebar@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/theia-sticky-sidebar/-/theia-sticky-sidebar-1.7.0.tgz#0fbb924e84eaff987368fd284d00caea7a7ec35a"
-  integrity sha512-ySa+jt8kfcCstdVq3GPbuNxPSkd4/voott1fHKrTc/uBoNE8gdGQHynYfIoaVFBcsc0vk3yw4C4N4uZ+fpECOA==
-  dependencies:
-    jquery ">=1.7.0"
+theia-sticky-sidebar@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/theia-sticky-sidebar/-/theia-sticky-sidebar-2.0.0.tgz#ebc66c8e4e9690b5c2d87c392b838c912a8e1fb5"
+  integrity sha512-MMjaEb/1LJPpcTbxN3803ZO5jMEAq99miOD+bNRvRi636y2TJxb5UFS21Pzg2qrCls9quuxcLzDlUSBw2qL6xQ==
 
 thenify-all@^1.0.0:
   version "1.6.0"