Merge pull request #1271 from dof-dss/development

Dev to main for release

Author: neilblair

.env.example

@@ -31,3 +31,6 @@ GA_CLIENT_SECRET=
 GA_REDIRECT_URI=
 GOOGLE_MAP_API_KEY=
 GOOGLE_MAP_API_SERVER_KEY=
+PRISON_VISITS_API_PERMITTED_IPS=
+PRISON_VISITS_API_PERMITTED_TOKENS=
+SILKTIDE_API_KEY=

.lando/config/drupal.settings.php

@@ -58,6 +58,8 @@
 $config['geolocation_google_maps.settings']['google_map_api_server_key'] = getenv('GOOGLE_MAP_API_SERVER_KEY');
 // Geocoder module API key.
 $config['geocoder.settings']['plugins_options']['googlemaps']['apikey'] = getenv('GOOGLE_MAP_API_SERVER_KEY');
+// Silktide module API key.
+$config['silktide.settings']['apikey'] = getenv('SILKTIDE_API_KEY');
 
 // Environment indicator defaults.
 $env_colour = !empty(getenv('SIMPLEI_ENV_COLOUR')) ? getenv('SIMPLEI_ENV_COLOUR') : '#000000';

composer.json

@@ -87,7 +87,7 @@
         "drupal/feeds_ex": "^1.0@beta",
         "drupal/feeds_fetcher_headers": "1.0.x-dev@dev",
         "drupal/feeds_tamper": "^2.0@beta",
-        "drupal/field_group": "^3.2",
+        "drupal/field_group": "^3.6",
         "drupal/file_delete_ui": "^1.0@alpha",
         "drupal/filelog": "^2.1",
         "drupal/flag": "4.x-dev",
@@ -127,6 +127,7 @@
         "drupal/search_api_spellcheck": "4.0.x-dev@dev",
         "drupal/seven": "^1.0",
         "drupal/shs": "^2.0@RC",
+        "drupal/silktide": "^10.3",
         "drupal/simple_sitemap": "^4.1",
         "drupal/simplei": "^2.1",
         "drupal/sitewide_alert": "^2.1",
@@ -215,6 +216,9 @@
             "drupal/easy_install": {
                 "Handle missing core version": "https://www.drupal.org/files/issues/2019-12-19/easy_install_core_version-3101883-0.patch"
             },
+            "drupal/eu_cookie_compliance": {
+                "JS Aggregation breaks in 10.1 when disabling other javascripts": "https://git.drupalcode.org/issue/eu_cookie_compliance-3412431/-/commit/3433c67b039e2319206ab68fd83a32cd161a99cb.diff"
+            },
             "drupal/filelog": {
                 "Circular refernce detected for service": "https://www.drupal.org/files/issues/2024-01-25/filelog_with_tests.patch"
             },

composer.lock

@@ -1,6 +1,6 @@
 _core:
   default_config_hash: 3YUV4RQQ4k8drO7uzYJ7lNc5Az0iDAH5YW8KbZVxjeY
 use_cdn: true
-cdn_base_url: 'https://cdn.jsdelivr.net/npm/jquery-validation@1.17.0/dist/'
+cdn_base_url: 'https://cdn.jsdelivr.net/npm/jquery-validation@1.20.0/dist/'
 validate_all_ajax_forms: 1
 force_validate_on_blur: 0