Merge branch 'main' into VACMS-9885-site-previewer

department-of-veterans-affairs · Nov 15, 2023 · ac2602b · ac2602b
2 parents 714b1c8 + 5effa82
commit ac2602b
Show file tree

Hide file tree

Showing 103 changed files with 635 additions and 305 deletions.
diff --git a/composer.json b/composer.json
@@ -8,6 +8,7 @@
     "require-dev": {
         "behat/mink": "^1.10",
         "behat/mink-browserkit-driver": "^2.1",
+        "digitalrevolution/php-codesniffer-baseline": "^1.1",
         "drupal/devel": "^5.0",
         "drupal/html_tag_usage": "^1.0@beta",
         "drupal/media_entity_generic": "^1.0"
@@ -82,7 +83,7 @@
         "drupal/geofield_map": "^3.0",
         "drupal/google_analytics": "^4.0",
         "drupal/govdelivery_bulletins": "^1.2",
-        "drupal/graphql": "3.1.0",
+        "drupal/graphql": "^3.4",
         "drupal/graphql_core": "^3.1.0",
         "drupal/graphql_menu": "^1.0@alpha",
         "drupal/graphql_metatag": "^1.0",
@@ -207,7 +208,7 @@
         "symfony/phpunit-bridge": "^5.1",
         "symfony/process": "^4.0",
         "symfony/routing": "^4.0",
-        "va-gov/content-build": "^0.0.3384",
+        "va-gov/content-build": "^0.0.3386",
         "vlucas/phpdotenv": "^5.3",
         "webflo/drupal-finder": "^1.0.0",
         "webmozart/path-util": "^2.3",
@@ -289,7 +290,8 @@
             "dealerdirect/phpcodesniffer-composer-installer": true,
             "php-http/discovery": true,
             "cweagans/composer-patches": true,
-            "orakili/composer-drupal-info-file-patch-helper": true
+            "orakili/composer-drupal-info-file-patch-helper": true,
+            "digitalrevolution/php-codesniffer-baseline": true
         }
     },
     "extra": {
@@ -426,10 +428,6 @@
             "drupal/flysystem_s3": {
                 "3297257 - Automated Drupal 10 compatibility fixes": "https://www.drupal.org/files/issues/2023-04-27/3297257-drupal-10-compatibility-fixes_0.patch"
             },
-            "drupal/graphql": {
-                "Fix Explorer with Layout Builder enabled - https://github.com/drupal-graphql/graphql/pull/1144": "patches/graphql_8x3x_layout_builder_incompat.patch",
-                "Remove outdated RouteQueryEnhancer controller reference - https://github.com/drupal-graphql/graphql/pull/1230": "patches/graphql_8x3x_query_route_enhancer_update.patch"
-            },
             "drupal/hms_field": {
                 "3351452 - Argument #1 ($seconds) must be of type string|int, null given": "https://www.drupal.org/files/issues/2023-03-31/hms_field-field_null_value-3351452-1.patch"
             },