Skip to content

Commit

Permalink
Merge branch 'renovate/apollo-graphql-packages'
Browse files Browse the repository at this point in the history
  • Loading branch information
kamilmysliwiec committed Nov 24, 2021
2 parents 956a39b + 60ee0d0 commit 319361d
Show file tree
Hide file tree
Showing 3 changed files with 156 additions and 355 deletions.
11 changes: 5 additions & 6 deletions lib/graphql-schema.builder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,10 @@ export class GraphQLSchemaBuilder {
}

private loadFederationDirectives() {
const { federationDirectives } = loadPackage(
'@apollo/subgraph/dist/directives',
'SchemaBuilder',
() => require('@apollo/subgraph/dist/directives'),
);
return federationDirectives;
const { federationDirectives, directivesWithNoDefinitionNeeded } =
loadPackage('@apollo/subgraph/dist/directives', 'SchemaBuilder', () =>
require('@apollo/subgraph/dist/directives'),
);
return federationDirectives ?? directivesWithNoDefinitionNeeded;
}
}

0 comments on commit 319361d

Please sign in to comment.