Merge branch '11.6.1-release' of github.com:SU-HSDO/suhumsci into SHS…

…-5808--remove-webform
SU-HSDO · Nov 27, 2024 · 524ea20 · 524ea20
2 parents 85cd03c + 64b6bf1
commit 524ea20
Show file tree

Hide file tree

Showing 198 changed files with 1,699 additions and 2,101 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -21,7 +21,7 @@ add_known_hosts: &add_known_hosts
 ## Defines images and working directory.
 defaults: &defaults
   docker:
-    - image: pookmish/drupal8ci:latest
+    - image: pookmish/drupal8ci:php8.3
     - image: circleci/mysql:5.7
       environment:
         MYSQL_DATABASE: drupal

diff --git a/.github/workflows/acquia-cleanup.yml b/.github/workflows/acquia-cleanup.yml
@@ -9,7 +9,7 @@ jobs:
   acquia_cleanup:
     runs-on: ubuntu-latest
     container:
-      image: pookmish/drupal8ci:latest
+      image: pookmish/drupal8ci:php8.3
     steps:
       - uses: actions/checkout@v4
       - name: Restore Cache
@@ -20,11 +20,11 @@ jobs:
             docroot/core
             docroot/libraries
             docroot/modules/contrib
-          key: 1.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
+          key: 1.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
           restore-keys: |
-            1.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
-            1.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-
-            1.x-${{ hashFiles('blt/blt.yml') }}-
+            1.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
+            1.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-
+            1.0-${{ hashFiles('blt/blt.yml') }}-
       - name: Clean up backups and branches
         env:
           SLACK_NOTIFICATION_URL: ${{ secrets.SLACK_NOTIFICATION_URL }}

diff --git a/.github/workflows/content-stage.yml b/.github/workflows/content-stage.yml
@@ -6,7 +6,7 @@ jobs:
   Copy-Prod-Database-Down:
     runs-on: ubuntu-latest
     container:
-      image: pookmish/drupal8ci:latest
+      image: pookmish/drupal8ci:php8.3
     steps:
       - uses: actions/checkout@v4
       - name: Restore Cache
@@ -17,11 +17,11 @@ jobs:
             docroot/core
             docroot/libraries
             docroot/modules/contrib
-          key: 1.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
+          key: 1.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
           restore-keys: |
-            1.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
-            1.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-
-            1.x-${{ hashFiles('blt/blt.yml') }}-
+            1.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
+            1.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-
+            1.0-${{ hashFiles('blt/blt.yml') }}-
       - name: Copy databases
         env:
           SLACK_NOTIFICATION_URL: ${{ secrets.SLACK_NOTIFICATION_URL }}

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -10,7 +10,7 @@ jobs:
     permissions: write-all
     if: github.event.pull_request.merged
     container:
-      image: pookmish/drupal8ci:latest
+      image: pookmish/drupal8ci:php8.3
     steps:
       - name: Get Next Release
         id: tag
@@ -53,11 +53,11 @@ jobs:
             docroot/core
             docroot/libraries
             docroot/modules/contrib
-          key: 1.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
+          key: 1.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
           restore-keys: |
-            1.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
-            1.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-
-            1.x-${{ hashFiles('blt/blt.yml') }}-
+            1.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
+            1.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-
+            1.0-${{ hashFiles('blt/blt.yml') }}-
       - name: Deploy Tag
         if: ${{ steps.tag.outputs.tag }}
         run: |

diff --git a/.github/workflows/sites-test.yml b/.github/workflows/sites-test.yml
@@ -9,7 +9,7 @@ jobs:
   test_phpunit:
     runs-on: ubuntu-latest
     container:
-      image: pookmish/drupal8ci:latest
+      image: pookmish/drupal8ci:php8.3
       options: '--network-alias drupal8ci'
     env:
       REAL_AES_ENCRYPTION: ${{secrets.REAL_AES_ENCRYPTION}}
@@ -38,11 +38,11 @@ jobs:
             docroot/core
             docroot/libraries
             docroot/modules/contrib
-          key: 1.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
+          key: 1.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
           restore-keys: |
-            1.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
-            1.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-
-            1.x-
+            1.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
+            1.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-
+            1.0-
       - run: git config --system --add safe.directory '*'
       - name: Install Dependencies
         run: |
@@ -60,7 +60,7 @@ jobs:
   set_sites:
     runs-on: ubuntu-latest
     container:
-      image: pookmish/drupal8ci:latest
+      image: pookmish/drupal8ci:php8.3
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
@@ -73,11 +73,11 @@ jobs:
             docroot/core
             docroot/libraries
             docroot/modules/contrib
-          key: 1.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
+          key: 1.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
           restore-keys: |
-            1.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
-            1.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-
-            1.x-${{ hashFiles('blt/blt.yml') }}-
+            1.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
+            1.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-
+            1.0-${{ hashFiles('blt/blt.yml') }}-
       - id: set-matrix
         run: |
           composer install -n &&
@@ -87,7 +87,7 @@ jobs:
   lint_theme:
     runs-on: ubuntu-latest
     container:
-      image: pookmish/drupal8ci:latest
+      image: pookmish/drupal8ci:php8.3
     steps:
       - uses: actions/checkout@v4
       - name: Cache theme node_modules
@@ -110,7 +110,7 @@ jobs:
       matrix: ${{fromJSON(needs.set_sites.outputs.matrix)}}
     runs-on: ubuntu-latest
     container:
-      image: pookmish/drupal8ci:latest
+      image: pookmish/drupal8ci:php8.3
       options: '--network-alias drupal8ci'
     env:
       REAL_AES_ENCRYPTION: ${{secrets.REAL_AES_ENCRYPTION}}
@@ -142,11 +142,11 @@ jobs:
             docroot/core
             docroot/libraries
             docroot/modules/contrib
-          key: 1.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
+          key: 1.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
           restore-keys: |
-            1.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
-            1.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-
-            1.x-${{ hashFiles('blt/blt.yml') }}-
+            1.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
+            1.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-
+            1.0-${{ hashFiles('blt/blt.yml') }}-
       - name: Install SSH key
         uses: shimataro/ssh-key-action@v2
         with:
@@ -186,7 +186,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: lint_theme
     container:
-      image: pookmish/drupal8ci:latest
+      image: pookmish/drupal8ci:php8.3
       options: '--network-alias drupal8ci'
     env:
       REAL_AES_ENCRYPTION: ${{secrets.REAL_AES_ENCRYPTION}}
@@ -218,11 +218,11 @@ jobs:
             docroot/core
             docroot/libraries
             docroot/modules/contrib
-          key: 1.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
+          key: 1.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
           restore-keys: |
-            1.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
-            1.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-
-            1.x-${{ hashFiles('blt/blt.yml') }}-
+            1.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
+            1.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-
+            1.0-${{ hashFiles('blt/blt.yml') }}-
       - run: git config --system --add safe.directory '*'
       - name: Install Site
         run: |
@@ -262,7 +262,7 @@ jobs:
       - test_new_site
     runs-on: ubuntu-latest
     container:
-      image: pookmish/drupal8ci:latest
+      image: pookmish/drupal8ci:php8.3
       options: '--network-alias drupal8ci'
     steps:
       - uses: actions/checkout@v4
@@ -274,11 +274,11 @@ jobs:
             docroot/core
             docroot/libraries
             docroot/modules/contrib
-          key: 1.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
+          key: 1.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
           restore-keys: |
-            1.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
-            1.x-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-
-            1.x-${{ hashFiles('blt/blt.yml') }}-
+            1.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-${{ hashFiles('composer.lock') }}
+            1.0-${{ hashFiles('blt/blt.yml') }}-${{ hashFiles('composer.json') }}-
+            1.0-${{ hashFiles('blt/blt.yml') }}-
       - name: Install SSH key
         uses: shimataro/ssh-key-action@v2
         with:

diff --git a/composer.json b/composer.json
@@ -41,7 +41,7 @@
         }
     ],
     "require": {
-        "php": ">=8.2",
+        "php": ">=8.3",
         "acquia/blt": "^13.5",
         "acquia/blt-multisite": "^1.0",
         "composer/installers": "^1.9",
@@ -55,7 +55,7 @@
         "drupal/allowed_formats": "^3.0",
         "drupal/asset_injector": "^2.7",
         "drupal/auto_entitylabel": "^3.0@beta",
-        "drupal/better_exposed_filters": "^6.0",
+        "drupal/better_exposed_filters": "^7.0",
         "drupal/better_normalizers": "^2.0",
         "drupal/block_class": "^2.0",
         "drupal/block_content_permissions": "^1.10",
@@ -69,14 +69,14 @@
         "drupal/config_filter": "^1.0",
         "drupal/config_ignore": "^2.2",
         "drupal/config_pages_overrides": "^2.0",
-        "drupal/config_readonly": "1.0-beta5",
+        "drupal/config_readonly": "^1.0",
         "drupal/config_split": "^1.0",
         "drupal/config_update": "^2.0@alpha",
         "drupal/confirm_leave": "^1.0@beta",
         "drupal/content_access": "^2.0",
-        "drupal/core": "~10.2.0",
-        "drupal/core-composer-scaffold": "~10.2.0",
-        "drupal/core-recommended": "~10.2.0",
+        "drupal/core": "~10.3.0",
+        "drupal/core-composer-scaffold": "~10.3.0",
+        "drupal/core-recommended": "~10.3.0",
         "drupal/cshs": "^4.0",
         "drupal/default_content": "^2.0",
         "drupal/diff": "^1.0",
@@ -94,11 +94,11 @@
         "drupal/entity_reference_revisions": "^1.3",
         "drupal/entityqueue": "^1.2",
         "drupal/environment_indicator": "^4.0",
-        "drupal/extlink": "^1.5",
+        "drupal/extlink": "^1.7",
         "drupal/fast_404": "^3.2",
         "drupal/fast_404_generator": "^1.0",
         "drupal/field_formatter_class": "^1.4",
-        "drupal/field_group": "3.4",
+        "drupal/field_group": "^3.5",
         "drupal/field_permissions": "^1.1",
         "drupal/field_validation": "^1.1",
         "drupal/fontawesome": "^2.22",
@@ -108,19 +108,23 @@
         "drupal/hal": "^2.0",
         "drupal/honeypot": "^2.0",
         "drupal/hook_event_dispatcher": "^4.0@alpha",
-        "drupal/imagemagick": "^3.1",
+        "drupal/imagemagick": "^4.0",
         "drupal/insert": "^3.0",
+        "drupal/jquery_ui_accordion": "^2.1",
+        "drupal/jquery_ui_datepicker": "^2.0",
         "drupal/jquery_ui_draggable": "^2.0",
         "drupal/jquery_ui_menu": "^2.0",
+        "drupal/jquery_ui_slider": "^2.0",
+        "drupal/jquery_ui_touch_punch": "^1.0",
         "drupal/jsonapi_extras": "^3.21",
         "drupal/key": "^1.14",
         "drupal/layout_builder_component_attributes": "^2.0",
-        "drupal/layout_builder_modal": "^1.1",
+        "drupal/layout_builder_modal": "^2.0",
         "drupal/linkit": "^6.0@RC",
         "drupal/mail_safety": "^2.0",
         "drupal/markup": "^2.0@beta",
         "drupal/masquerade": "^2.0@beta",
-        "drupal/maxlength": "^2.0@RC",
+        "drupal/maxlength": "^3.0",
         "drupal/media_entity_download": "^2.2",
         "drupal/menu_admin_per_menu": "^1.3",
         "drupal/menu_block": "^1.10",
@@ -129,12 +133,10 @@
         "drupal/menu_link_weight": "^2.0",
         "drupal/menu_position": "^1.0@beta",
         "drupal/metatag": "^2.0",
-        "drupal/migrate_plus": "6.0.2",
         "drupal/migrate_source_csv": "^3.4",
         "drupal/mysql56": "^1.1",
         "drupal/nobots": "^1.0",
-        "drupal/node_revision_delete": "^1.0@RC",
-        "drupal/page_cache_query_ignore": "^2.2",
+        "drupal/node_revision_delete": "^2.0",
         "drupal/paragraphs_browser": "^1.1",
         "drupal/paragraphs_edit": "^3.0",
         "drupal/paragraphs_ee": "^10.0",
@@ -158,7 +160,7 @@
         "drupal/smart_date": "^4.0",
         "drupal/smart_trim": "^2.0",
         "drupal/spamspan": "^3.0@beta",
-        "drupal/stage_file_proxy": "^2.0",
+        "drupal/stage_file_proxy": "^3.0",
         "drupal/term_condition": "^2.0",
         "drupal/token_or": "^2.2",
         "drupal/transliterate_filenames": "^2.0",
@@ -168,7 +170,7 @@
         "drupal/view_unpublished": "^1.0",
         "drupal/viewfield": "^3.0@beta",
         "drupal/views_block_filter_block": "^2.0",
-        "drupal/views_bulk_edit": "^2.4",
+        "drupal/views_bulk_edit": "^3.0",
         "drupal/views_bulk_operations": "^4.0",
         "drupal/views_custom_cache_tag": "^1.2",
         "drupal/views_data_export": "^1.0",
@@ -181,6 +183,7 @@
         "drush/drush": "^12",
         "harvesthq/chosen": "^1.8",
         "kenwheeler/slick": "^1.8",
+        "leongersen/nouislider": "15.5.1",
         "onlyextart/colorbox": "dev-master#e58476becbc89dc671093d1bcd9f99b2167fa8f7",
         "sainsburys/guzzle-oauth2-plugin": "^3.0",
         "su-sws/ckeditor5_plugins": "^1.0",
@@ -201,8 +204,7 @@
     },
     "conflict": {
         "drupal/drupal": "*",
-        "drupal/readonly_field_widget": ">1.5",
-        "drupal/shortcut_menu": ">3.0.0-beta5"
+        "drupal/gin": ">3.0.0-rc13"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
@@ -238,23 +240,22 @@
                 "https://www.drupal.org/project/config_ignore/issues/2865419": "https://www.drupal.org/files/issues/2020-07-20/config_ignore-wildcard_force_import.patch"
             },
             "drupal/core": {
-                "https://www.drupal.org/project/drupal/issues/2999491": "https://www.drupal.org/files/issues/2020-10-06/2999491--reusable-title-display--56.patch",
+                "https://www.drupal.org/project/drupal/issues/2999491": "https://www.drupal.org/files/issues/2024-07-17/drupal-2999491-162.patch",
                 "https://www.drupal.org/project/drupal/issues/2981837": "https://www.drupal.org/files/issues/2019-05-22/findMigrationDependencies-null-process-value-2981837-5.patch",
-                "https://www.drupal.org/project/drupal/issues/1349080": "https://git.drupalcode.org/project/drupal/-/commit/c271adbb22f28a66ff4321b2fb7f86f20fe0c838.patch",
                 "https://www.drupal.org/project/drupal/issues/3306916": "https://www.drupal.org/files/issues/2023-12-19/3306916-18.patch",
-                "https://www.drupal.org/project/drupal/issues/3207813: ModuleHandler skips all hook implementations when invoked before the module files have been loaded": "patches/core-mr-6976.patch",
-                "views form null fix": "patches/core-views.patch",
                 "CKEditor 5 headings plugin paragraph label change": "patches/ckeditor5-paragraph-rename.patch",
                 "Allow hs group blocks in layout_builder": "patches/layout_builder-allow-hs-blocks.patch",
                 "Allow media items to be edited in a modal when using the field widget https://www.drupal.org/project/drupal/issues/2985168": "https://www.drupal.org/files/issues/2023-12-18/2985168-172.patch",
-                "Cannot read properties of undefined (reading 'settings') with dialog.position.js https://www.drupal.org/project/drupal/issues/3356667": "https://www.drupal.org/files/issues/2024-08-09/3356667-undefined-settings-dialog-position-51.patch"
+                "Cannot read properties of undefined (reading 'settings') with dialog.position.js https://www.drupal.org/project/drupal/issues/3356667": "patches/core/core-mr-8892.patch",
+                "https://www.drupal.org/project/drupal/issues/3207813: ModuleHandler skips all hook implementations when invoked before the module files have been loaded": "patches/core/core-mr-6976.patch",
+                "https://www.drupal.org/project/drupal/issues/3487031: Twig 13.4.2 performance degradation": "patches/core/core-mr-10177.patch"
             },
             "drupal/entity_reference_exposed_filters": {
                 "https://www.drupal.org/project/entity_reference_exposed_filters/issues/3189025": "https://www.drupal.org/files/issues/2023-10-17/entity_reference_exposed_filters-empty_target-3189025-4.patch"
             },
             "drupal/field_group": {
-                "https://www.drupal.org/project/field_group/issues/2969051": "https://www.drupal.org/files/issues/2023-04-24/2969051-99.patch",
-                "https://www.drupal.org/project/field_group/issues/2787179": "https://www.drupal.org/files/issues/2023-04-07/2787179-highlight-html5-validation-85.patch"
+                "https://www.drupal.org/project/field_group/issues/2969051": "https://www.drupal.org/files/issues/2024-09-13/2969051-166.patch",
+                "https://www.drupal.org/project/field_group/issues/2787179": "https://www.drupal.org/files/issues/2024-08-05/2787179-highlight-html5-validation-101.patch"
             },
             "drupal/google_analytics": {
                 "https://www.drupal.org/project/google_analytics/issues/3373921": "https://www.drupal.org/files/issues/2023-08-07/google-analytics-issues-3373921-cannot-install-from-existing-config-11.patch"
@@ -309,6 +310,9 @@
         "drupal-scaffold": {
             "locations": {
                 "web-root": "docroot/"
+            },
+            "file-mapping": {
+                "[web-root]/libraries/nouislider/nouislider.min.js": "vendor/leongersen/nouislider/dist/nouislider.min.js"
             }
         },
         "installer-paths": {