Merge pull request #1205 from USEPA/main

Version 2023-10-11
USEPA · Nov 6, 2023 · 6603887 · 6603887
2 parents 03bb51c + f1cc161
commit 6603887
Show file tree

Hide file tree

Showing 97 changed files with 30,183 additions and 16,243 deletions.
diff --git a/services/drupal/.ddev/docker-compose.gesso.yaml b/services/drupal/.ddev/docker-compose.gesso.yaml
@@ -2,7 +2,7 @@ version: '3.6'
 services:
   gesso:
     container_name: ddev-${DDEV_SITENAME}-gesso
-    image: forumone/gesso:3-node-v12-php-7.4
+    image: forumone/gesso:3-node-v16-php-8.0
     command: "sleep infinity"
     volumes:
       - ./../web/themes/epa_theme:/var/www/html/web/themes/epa_theme:cached
@@ -11,4 +11,4 @@ services:
     networks: [default, ddev_default]
     labels:
       com.ddev.site-name: ${DDEV_SITENAME}
-      com.ddev.approot: $DDEV_APPROOT
+      com.ddev.approot: $DDEV_APPROOT
diff --git a/services/drupal/.ddev/docker-compose.simplesaml.yaml b/services/drupal/.ddev/docker-compose.simplesaml.yaml
@@ -6,6 +6,5 @@ services:
     depends_on:
       - web
     networks: [default, ddev_default]
-    network_mode: service:web
     build: ./simplesaml
-    tty: true
+    tty: true
diff --git a/services/drupal/Dockerfile b/services/drupal/Dockerfile
@@ -149,7 +149,7 @@ RUN composer install \
 RUN rm auth.json
 
 # Build Gesso, the WebCMS' theme
-FROM forumone/gesso:3-node-v12-php-8.0 AS gesso
+FROM forumone/gesso:3-node-v16-php-8.0 AS gesso
 
 WORKDIR /app
 

diff --git a/services/drupal/composer.json b/services/drupal/composer.json
@@ -234,22 +234,23 @@
         "drupal/config_filter": "^1.10",
         "drupal/config_ignore": "^2.3",
         "drupal/config_split": "^1.9",
-        "drupal/content_moderation_notifications": "dev-3.x#9ab3da5",
+        "drupal/content_moderation_notifications": "^3.6",
         "drupal/content_moderation_revert": "1.x-dev",
         "drupal/core-composer-scaffold": "~9.5.0",
         "drupal/core-recommended": "~9.5.0",
         "drupal/cshs": "^4.0",
         "drupal/default_content": "^2.0@alpha",
         "drupal/devel": "^5.0",
         "drupal/diff": "^1.0",
+        "drupal/domain": "^2.0@beta",
         "drupal/duration_field": "^2.0",
         "drupal/editor_advanced_link": "^2.1",
         "drupal/editoria11y": "^2.0",
         "drupal/elasticsearch_connector": "^7.0-alpha4",
         "drupal/embed": "^1.4",
         "drupal/entity_browser": "^2.9",
         "drupal/entity_clone": "^2@beta",
-        "drupal/entity_embed": "^1.x-dev",
+        "drupal/entity_embed": "1.x-dev",
         "drupal/entity_usage": "^2.0-beta3",
         "drupal/entitygroupfield": "^1.0@alpha",
         "drupal/environment_indicator": "4.0.10",
@@ -302,7 +303,7 @@
         "drupal/native_lazy_loading": "^1.1@RC",
         "drupal/page_manager": "^4.0@RC",
         "drupal/paragraphs": "^1.9",
-        "drupal/paragraphs_entity_embed": "^2.x-dev",
+        "drupal/paragraphs_entity_embed": "2.x-dev",
         "drupal/path_redirect_import": "^1.0@beta",
         "drupal/pathauto": "^1.4",
         "drupal/pathologic": "^1.0-alpha2",
@@ -359,9 +360,9 @@
         "nodespark/des-connector": "dev-php-update#d699e59 as 7.x-dev",
         "popperjs/popperjs": "^2.11",
         "ruflin/elastica": "7.x-dev#72a4598544e3f99b5dd8cacb05d009ee75c2a701 as dev-master",
+        "sabre/vobject": "^4.0",
         "tippyjs/tippyjs": "*",
         "vlucas/phpdotenv": "^5.0",
-        "sabre/vobject": "^4.0",
         "webflo/drupal-finder": "^1.0.0",
         "webmozart/path-util": "^2.3",
         "wikimedia/composer-merge-plugin": "^2.0",
@@ -398,7 +399,8 @@
             "dealerdirect/phpcodesniffer-composer-installer": true,
             "wikimedia/composer-merge-plugin": true,
             "phpstan/extension-installer": true,
-            "drupal/core-project-message": true
+            "drupal/core-project-message": true,
+            "mglaman/composer-drupal-lenient": true
         }
     },
     "autoload": {