From 846e0ff649ef8b44bb0a8000c0dab1ad3ba0d56a Mon Sep 17 00:00:00 2001 From: Kim Brandwijk Date: Thu, 2 Nov 2017 00:01:02 +0100 Subject: [PATCH 1/2] `resolvers` parameter should be optional for `mergeSchemas` Per the documentation and runtime behavior. --- src/stitching/mergeSchemas.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stitching/mergeSchemas.ts b/src/stitching/mergeSchemas.ts index bb8851b64a1..66f35f51651 100644 --- a/src/stitching/mergeSchemas.ts +++ b/src/stitching/mergeSchemas.ts @@ -76,7 +76,7 @@ export default function mergeSchemas({ leftType: GraphQLNamedType, rightType: GraphQLNamedType, ) => GraphQLNamedType; - resolvers: (mergeInfo: MergeInfo) => IResolvers; + resolvers?: (mergeInfo: MergeInfo) => IResolvers; }): GraphQLSchema { if (!onTypeConflict) { onTypeConflict = defaultOnTypeConflict; From 39bb98af4c2d5d4a27953041925bdd68ccf60b4b Mon Sep 17 00:00:00 2001 From: Kim Brandwijk Date: Thu, 2 Nov 2017 00:16:07 +0100 Subject: [PATCH 2/2] Updated changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 185f41ba337..fc6e126a86e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ### VNEXT -* ... +* Made `resolvers` parameter optional for `mergeSchemas` [Issue #461](https://github.com/apollographql/graphql-tools/issues/461) [PR #462] (https://github.com/apollographql/graphql-tools/pull/462) ### v2.7.0