Merge branch 'master' into subscriptions

This commit is contained in:
Wyatt Johnson
2017-04-05 15:31:08 -06:00
committed by GitHub
2 changed files with 10 additions and 10 deletions
+2 -2
View File
@@ -51,10 +51,10 @@ let resolvers = {
* plugin based ones. This allows plugins to extend existing resolvers as well
* as provide new ones.
*/
resolvers = plugins.get('server', 'resolvers').reduce((resolvers, {plugin}) => {
resolvers = plugins.get('server', 'resolvers').reduce((acc, {plugin, resolvers}) => {
debug(`added plugin '${plugin.name}'`);
return _.merge(resolvers, plugin.resolvers);
return _.merge(acc, resolvers);
}, resolvers);
module.exports = resolvers;