Version bump

vuejs · Aug 29, 2017 · f391a6a · f391a6a
1 parent 015e0a1
commit f391a6a
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 6 deletions.
diff --git a/dist/vue-apollo.esm.js b/dist/vue-apollo.esm.js
@@ -3226,7 +3226,7 @@ var ApolloProvider$1 = function () {
       var componentClient = apolloOptions.$client;
       for (var key in apolloOptions) {
         var options = apolloOptions[key];
-        if (!options.query || (typeof options.ssr === 'undefined' || options.ssr) && typeof options.prefetch !== 'undefined' && options.prefetch) {
+        if (key.charAt(0) !== '$' && (!options.query || (typeof options.ssr === 'undefined' || options.ssr) && typeof options.prefetch !== 'undefined' && options.prefetch)) {
           this.willPrefetchQuery(options, options.client || componentClient);
         }
       }
@@ -3403,7 +3403,6 @@ var prepare = function prepare() {
   if (apollo) {
     this._apolloQueries = {};
     this._apolloInitData = {};
-    this.$apollo = new DollarApollo(this);
 
     if (!apollo.$init) {
       apollo.$init = true;
@@ -3493,6 +3492,16 @@ function install(Vue, options) {
     return Object.assign(map, merge(toData, fromData));
   };
 
+  // Lazy creation
+  Object.defineProperty(Vue.prototype, '$apollo', {
+    get: function get() {
+      if (!this._apollo) {
+        this._apollo = new DollarApollo(this);
+      }
+      return this._apollo;
+    }
+  });
+
   Vue.mixin({
 
     // Vue 1.x