Merge pull request #585 from USEPA/main

Merge main to live for deployment

docker-compose.cli.yml

@@ -34,7 +34,7 @@ services:
 
   # This `composer' definition is what enables `f1 composer' to work.
   composer:
-    image: composer:2
+    image: forumone/composer:2
     volumes:
       - ./services/drupal:/app:cached
 

services/drupal/composer.json

@@ -211,7 +211,7 @@
         "drupal/config_split": "~1.5",
         "drupal/content_moderation_notifications": "dev-3.x#7ffa936",
         "drupal/content_moderation_revert": "1.x-dev",
-        "drupal/core-composer-scaffold": "~9.1.0",
+        "drupal/core-composer-scaffold": "~9.2.0",
         "drupal/core-recommended": "~9.2.0",
         "drupal/cshs": "^3.5",
         "drupal/csv_serialization": "^1.5",
@@ -222,6 +222,7 @@
         "drupal/editor_advanced_link": "^1.8",
         "drupal/elasticsearch_connector": "^7.0-alpha3",
         "drupal/embed": "^1.4",
+        "drupal/entity_browser": "^2.6",
         "drupal/entity_clone": "^1.0@beta",
         "drupal/entity_usage": "^2.0-beta3",
         "drupal/entitygroupfield": "^1.0@alpha",
@@ -314,7 +315,7 @@
         "zaporylie/composer-drupal-optimizations": "^1.0"
     },
     "require-dev": {
-        "drupal/core-dev": "~9.1.0"
+        "drupal/core-dev": "~9.2.0"
     },
     "conflict": {
         "drupal/drupal": "*"
@@ -329,6 +330,12 @@
             "ext-opcache": "1.0.0",
             "ext-pdo": "1.0.0",
             "php": "7.4"
+        },
+        "allow-plugins": {
+            "composer/installers": true,
+            "cweagans/composer-patches": true,
+            "drupal/core-composer-scaffold": true,
+            "zaporylie/composer-drupal-optimizations": true
         }
     },
     "autoload": {