Merge pull request #1409 from dof-dss/development

Dev to main for release

Author: neilblair

.circleci/config.yml

@@ -260,6 +260,10 @@ jobs:
             platform environment:drush sapi-r -p $PLATFORM_PROJECT -e $EDGE_BUILD_BRANCH
             platform environment:drush sapi-i -p $PLATFORM_PROJECT -e $EDGE_BUILD_BRANCH
           when: always
+      - run:
+          name: Reset QA account passwords
+          command: |
+            platform environment:drush password_qa_accounts -e $EDGE_BUILD_BRANCH
 
   # Create new release marker in New Relic
   mark_release:

.env.sample

@@ -0,0 +1,34 @@
+# SAFE ENV VARS, RELEVANT FOR LOCAL DEVELOPMENT.
+CONFIG_READONLY=0
+CPPFLAGS=-DPNG_ARM_NEON_OPT=0
+DB_HOST=db
+DB_USER=db
+DB_PASS=db
+DB_NAME=db
+DB_PORT=3306
+DB_DRIVER=mysql
+
+MIGRATE_SOURCE_DB_HOST=db
+MIGRATE_SOURCE_DB_USER=db
+MIGRATE_SOURCE_DB_PASS=db
+MIGRATE_SOURCE_DB_NAME=drupal7db
+MIGRATE_SOURCE_DB_PORT=3306
+MIGRATE_SOURCE_DB_DRIVER=mysql
+SIMPLEI_ENV_COLOUR=#637C16
+SIMPLEI_ENV_NAME=Local
+
+# SENSITIVE ENV VARS. KEYS ONLY. FETCH VALUES VIA PSH SSH.
+CONFIG_SYNC_DIRECTORY=
+FILE_PRIVATE_PATH=
+HASH_SALT=
+TEST_USER=
+TEST_PASS=
+TEST_D7_URL=
+NW_TEST_USER_PREFIX=nw_test
+QA_PASSWORD=
+GA_CLIENT_ID=
+GA_CLIENT_SECRET=
+GA_REDIRECT_URI=
+GOOGLE_MAP_API_KEY=
+GOOGLE_MAP_API_SERVER_KEY=
+

composer.json

@@ -44,7 +44,7 @@
         "ext-simplexml": "*",
         "composer/installers": "^2.0",
         "cweagans/composer-patches": "^1.6.5",
-        "dof-dss/nicsdru_origins_modules": "^10.4",
+        "dof-dss/nicsdru_origins_modules": "^10.5",
         "dof-dss/nicsdru_origins_theme": "^10.1",
         "drupal/address": "^2.0",
         "drupal/admin_toolbar": "^3.5",
@@ -55,6 +55,7 @@
         "drupal/block_content_permissions": "^1.10",
         "drupal/block_field": "^1.0@RC",
         "drupal/block_list_override": "^1.0",
+        "drupal/book": "^1.0",
         "drupal/chosen": "^4.0",
         "drupal/chosen_lib": "^4.0",
         "drupal/ckeditor": "^1.0",
@@ -68,10 +69,10 @@
         "drupal/config_split": "^2.0",
         "drupal/config_update": "^2.0@alpha",
         "drupal/cookie_content_blocker": "^2.4",
-        "drupal/core-composer-scaffold": "^10.4",
+        "drupal/core-composer-scaffold": "10.4.8",
         "drupal/core-dev": "^10.4",
-        "drupal/core-project-message": "^10.4",
-        "drupal/core-recommended": "^10.4",
+        "drupal/core-project-message": "10.4.8",
+        "drupal/core-recommended": "10.4.8",
         "drupal/csp": "^1.33",
         "drupal/csv_serialization": "^4.0",
         "drupal/ctools": "^4.0",
@@ -97,7 +98,7 @@
         "drupal/filelog": "^3.0",
         "drupal/flag": "4.x-dev",
         "drupal/geocoder": "^4.26",
-        "drupal/geolocation": "4.x-dev@dev",
+        "drupal/geolocation": "^3.14",
         "drupal/google_tag": "^2.0",
         "drupal/handy_cache_tags": "^1.5",
         "drupal/honeypot": "^2.0",
@@ -106,6 +107,7 @@
         "drupal/jquery_ui": "^1.6",
         "drupal/jquery_ui_autocomplete": "^2.0",
         "drupal/jquery_ui_menu": "^2.0",
+        "drupal/js_cookie": "^1.0",
         "drupal/layout_builder_modal": "^1.3",
         "drupal/layout_builder_restrictions": "^2.9",
         "drupal/linkit": "^6.1",
@@ -172,7 +174,6 @@
         "drupal/devel_kint_extras": "^1.1",
         "drupal/easy_install_d10": "^10.0@dev",
         "drupal/masquerade": "^2.0",
-        "drupal/multiline_config": "1.x-dev",
         "drupal/restui": "^1.22",
         "drupal/stage_file_proxy": "^3.1",
         "kint-php/kint": "^6.0",
@@ -215,7 +216,9 @@
             "drupal/core": {
                 "Cannot save unpublished versions of published content for users without manage book privileges": "https://www.drupal.org/files/issues/2022-12-14/2918537-92.patch",
                 "Layout builder fails to assign inline block access dependencies for the overrides section storage on entities with pending revisions": "https://www.drupal.org/files/issues/2021-03-22/3047022-71.patch",
-                "Determine if there is a better message for AJAX errors": "https://www.drupal.org/files/issues/2023-12-11/core-ajax-error-3349901-2.patch"
+                "Determine if there is a better message for AJAX errors": "https://www.drupal.org/files/issues/2023-12-11/core-ajax-error-3349901-2.patch",
+                "The link on the Image tag is redirecting to an undefined page from the node preview screen #3308432": "https://www.drupal.org/files/issues/2025-06-09/3308432-42.patch",
+                "Increase claro xs font size": "patches/claro-font-size.patch"
             },
             "drupal/easy_install": {
                 "Handle missing core version": "https://www.drupal.org/files/issues/2019-12-19/easy_install_core_version-3101883-0.patch"