From 393b96cafd538fe0835b400db977aa6a16a11509 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Nov 2024 18:16:02 +0000 Subject: [PATCH 1/2] Updates: (deps): Update drupal/graphql requirement from 4.6.0 to 4.9.0 Updates the requirements on drupal/graphql to permit the latest version. --- updated-dependencies: - dependency-name: drupal/graphql dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index b68a534e3d8..07995871df9 100644 --- a/composer.json +++ b/composer.json @@ -142,7 +142,7 @@ "drupal/flexible_permissions": "2.0.1", "drupal/gin": "3.0.0-rc13", "drupal/ginvite": "3.0.0-beta4", - "drupal/graphql": "4.6.0", + "drupal/graphql": "4.9.0", "drupal/graphql_oauth": "1.0.0-alpha3", "drupal/group": "2.3.0", "drupal/hux": "1.6.0", From aa3156a445387effd52435041e85dce9386ff6df Mon Sep 17 00:00:00 2001 From: Denis Kolmerschlag Date: Wed, 20 Nov 2024 15:01:32 +0100 Subject: [PATCH 2/2] Add patch to fix graphql schema building. --- composer.json | 3 ++- .../social_graphql/graphql/open_social.graphqls | 14 ++++++++++++-- .../tests/src/Kernel/SocialGraphQLTestBase.php | 1 + 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 07995871df9..1f7c247625e 100644 --- a/composer.json +++ b/composer.json @@ -70,7 +70,8 @@ "Add relationship to flagged entities when Flagging is base table": "https://www.drupal.org/files/issues/2021-11-08/2723703-76.patch" }, "drupal/graphql": { - "Issue #3191622: Remove leaked cache metadata check until Open Social properly avoids leaking cache metadata in entity query connections": "https://www.drupal.org/files/issues/2022-11-01/3191622-Implement-cache-metadata-for-ConnectionQueryHelperInterface-3.patch" + "Issue #3191622: Remove leaked cache metadata check until Open Social properly avoids leaking cache metadata in entity query connections": "https://www.drupal.org/files/issues/2022-11-01/3191622-Implement-cache-metadata-for-ConnectionQueryHelperInterface-3.patch", + "Issue #3488581: example/composable_extension.base.graphqls loaded in schema when module disabled" : "https://git.drupalcode.org/project/graphql/-/merge_requests/14/diffs.patch" }, "drupal/group": { "Missing config schema for condition.plugin.group_type": "https://www.drupal.org/files/issues/2018-12-14/group-group_type_condition_plugin_config_schema-3020554-2.patch", diff --git a/modules/custom/social_graphql/graphql/open_social.graphqls b/modules/custom/social_graphql/graphql/open_social.graphqls index 00ac5b00246..72be8695d30 100644 --- a/modules/custom/social_graphql/graphql/open_social.graphqls +++ b/modules/custom/social_graphql/graphql/open_social.graphqls @@ -37,7 +37,12 @@ API from which all subscriptions must start. A real-time process must be implemented and deployed to support subscriptions. """ -type Subscription +type Subscription { + """ + Type Subscription can not be empty, so we add an empty field. + """ + _empty: String +} ################################################################################ # Basic Types # @@ -311,7 +316,12 @@ interface Connection { """ The base mutation type. """ -type Mutation +type Mutation { + """ + Type Mutation can not be empty, so we add an empty field. + """ + _empty: String +} """ A violation indicates an error in the GraphQL query or other incorrect diff --git a/modules/custom/social_graphql/tests/src/Kernel/SocialGraphQLTestBase.php b/modules/custom/social_graphql/tests/src/Kernel/SocialGraphQLTestBase.php index b847a3d142b..c9eee261cda 100644 --- a/modules/custom/social_graphql/tests/src/Kernel/SocialGraphQLTestBase.php +++ b/modules/custom/social_graphql/tests/src/Kernel/SocialGraphQLTestBase.php @@ -20,6 +20,7 @@ abstract class SocialGraphQLTestBase extends GraphQLTestBase { */ protected static $modules = [ "entity", + "file", "social_graphql", ];