chore: v3.0.0-beta.16

This commit is contained in:
Guillaume Chau
2018-05-30 14:20:08 +02:00
parent 36faab0a84
commit 5e50581777
4 changed files with 24 additions and 8 deletions
+11 -3
View File
@@ -1116,11 +1116,19 @@ var DollarApollo = function () {
var finalOptions = reapply(options, this.vm);
var apollo = this.vm.$options.apollo;
var defaultOptions = this.provider.defaultOptions;
var $query = void 0;
if (apollo && apollo.$query) {
$query = apollo.$query;
}
if ((!apollo || !apollo.$query) && defaultOptions && defaultOptions.$query) {
$query = defaultOptions.$query;
}
if ($query) {
// Also replaces 'undefined' values
for (var _key in apollo.$query) {
for (var _key in $query) {
if (typeof finalOptions[_key] === 'undefined') {
finalOptions[_key] = apollo.$query[_key];
finalOptions[_key] = $query[_key];
}
}
}
@@ -2007,7 +2015,7 @@ function install(Vue, options) {
ApolloProvider.install = install;
// eslint-disable-next-line no-undef
ApolloProvider.version = "3.0.0-beta.15";
ApolloProvider.version = "3.0.0-beta.16";
// Apollo provider
var ApolloProvider$1 = ApolloProvider;
+1 -1
View File
File diff suppressed because one or more lines are too long
+11 -3
View File
@@ -1122,11 +1122,19 @@ var DollarApollo = function () {
var finalOptions = reapply(options, this.vm);
var apollo = this.vm.$options.apollo;
var defaultOptions = this.provider.defaultOptions;
var $query = void 0;
if (apollo && apollo.$query) {
$query = apollo.$query;
}
if ((!apollo || !apollo.$query) && defaultOptions && defaultOptions.$query) {
$query = defaultOptions.$query;
}
if ($query) {
// Also replaces 'undefined' values
for (var _key in apollo.$query) {
for (var _key in $query) {
if (typeof finalOptions[_key] === 'undefined') {
finalOptions[_key] = apollo.$query[_key];
finalOptions[_key] = $query[_key];
}
}
}
@@ -2013,7 +2021,7 @@ function install(Vue, options) {
ApolloProvider.install = install;
// eslint-disable-next-line no-undef
ApolloProvider.version = "3.0.0-beta.15";
ApolloProvider.version = "3.0.0-beta.16";
// Apollo provider
var ApolloProvider$1 = ApolloProvider;
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "vue-apollo",
"version": "3.0.0-beta.15",
"version": "3.0.0-beta.16",
"description": "Use Apollo and GraphQL with Vue.js",
"main": "dist/vue-apollo.umd.js",
"module": "dist/vue-apollo.esm.js",