diff --git a/src/dollar-apollo.js b/src/dollar-apollo.js index 8fc8785..bb69857 100644 --- a/src/dollar-apollo.js +++ b/src/dollar-apollo.js @@ -90,12 +90,15 @@ export class DollarApollo { const apollo = this.vm.$options.apollo const defaultOptions = this.provider.defaultOptions let $query - if (apollo && apollo.$query) { - $query = apollo.$query - } - if ((!apollo || !apollo.$query) && defaultOptions && defaultOptions.$query) { + if (defaultOptions && defaultOptions.$query) { $query = defaultOptions.$query } + if (apollo && apollo.$query) { + $query = { + ...$query || {}, + ...apollo.$query, + } + } if ($query) { // Also replaces 'undefined' values for (const key in $query) {