chore: v3.0.0-beta.28

Author: Guillaume Chau

dist/vue-apollo.esm.js

@@ -413,10 +413,6 @@ function () {
     this._watchers = [];
     this._destroyed = false;
 
-    if (this.vm.$isServer) {
-      this.options.fetchPolicy = 'cache-first';
-    }
-
     if (autostart) {
       this.autostart();
     }
@@ -724,14 +720,23 @@ function (_SmartApollo) {
       });
     }
 
-    _this = _possibleConstructorReturn(this, _getPrototypeOf(SmartQuery).call(this, vm, key, options, autostart));
+    _this = _possibleConstructorReturn(this, _getPrototypeOf(SmartQuery).call(this, vm, key, options, false));
 
     _defineProperty(_assertThisInitialized(_assertThisInitialized(_this)), "type", 'query');
 
     _defineProperty(_assertThisInitialized(_assertThisInitialized(_this)), "vueApolloSpecialKeys", VUE_APOLLO_QUERY_KEYWORDS);
 
     _defineProperty(_assertThisInitialized(_assertThisInitialized(_this)), "_loading", false);
 
+    _this.firstRun = new Promise(function (resolve, reject) {
+      _this._firstRunResolve = resolve;
+      _this._firstRunReject = reject;
+    });
+
+    if (_this.vm.$isServer) {
+      _this.options.fetchPolicy = 'network-only';
+    }
+
     if (!options.manual) {
       _this.hasDataField = _this.vm.$data.hasOwnProperty(key);
 
@@ -754,6 +759,10 @@ function (_SmartApollo) {
       }
     }
 
+    if (autostart) {
+      _this.autostart();
+    }
+
     return _this;
   }
 
@@ -827,7 +836,12 @@ function (_SmartApollo) {
       _get(_getPrototypeOf(SmartQuery.prototype), "nextResult", this).call(this, result);
 
       var data = result.data,
-          loading = result.loading;
+          loading = result.loading,
+          error = result.error;
+
+      if (error) {
+        this.firstRunReject();
+      }
 
       if (!loading) {
         this.loadingDone();
@@ -861,7 +875,8 @@ function (_SmartApollo) {
     value: function catchError(error) {
       _get(_getPrototypeOf(SmartQuery.prototype), "catchError", this).call(this, error);
 
-      this.loadingDone();
+      this.firstRunReject();
+      this.loadingDone(error);
       this.nextResult(this.observer.currentResult()); // The observable closes the sub if an error occurs
 
       this.resubscribeToQuery();
@@ -901,11 +916,17 @@ function (_SmartApollo) {
   }, {
     key: "loadingDone",
     value: function loadingDone() {
+      var error = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
+
       if (this.loading) {
         this.applyLoadingModifier(-1);
       }
 
       this.loading = false;
+
+      if (!error) {
+        this.firstRunResolve();
+      }
     }
   }, {
     key: "fetchMore",
@@ -995,6 +1016,24 @@ function (_SmartApollo) {
         return (_this$observer4 = this.observer).stopPolling.apply(_this$observer4, arguments);
       }
     }
+  }, {
+    key: "firstRunResolve",
+    value: function firstRunResolve() {
+      if (this._firstRunResolve) {
+        this._firstRunResolve();
+
+        this._firstRunResolve = null;
+      }
+    }
+  }, {
+    key: "firstRunReject",
+    value: function firstRunReject() {
+      if (this._firstRunReject) {
+        this._firstRunReject();
+
+        this._firstRunReject = null;
+      }
+    }
   }, {
     key: "destroy",
     value: function destroy() {
@@ -1733,7 +1772,7 @@ function hasProperty(holder, key) {
   return typeof holder !== 'undefined' && Object.prototype.hasOwnProperty.call(holder, key);
 }
 
-function initDollarApollo() {
+function initProvider() {
   var options = this.$options; // ApolloProvider injection
 
   var optionValue = options.apolloProvider;
@@ -1797,6 +1836,8 @@ function launch() {
   var apollo = this.$options.apollo;
 
   if (apollo) {
+    this.$_apolloPromises = [];
+
     if (!apollo.$init) {
       apollo.$init = true; // Default options applied to `apollo` options
 
@@ -1824,7 +1865,11 @@ function launch() {
     for (var key in apollo) {
       if (key.charAt(0) !== '$') {
         var options = apollo[key];
-        this.$apollo.addSmartQuery(key, options);
+        var smart = this.$apollo.addSmartQuery(key, options);
+
+        if (options.prefetch !== false && apollo.$prefetch !== false) {
+          this.$_apolloPromises.push(smart.firstRun);
+        }
       }
     }
 
@@ -1850,9 +1895,16 @@ function defineReactiveSetter($apollo, key, value, deep) {
   }
 }
 
+function destroy() {
+  if (this.$_apollo) {
+    this.$_apollo.destroy();
+    this.$_apollo = null;
+  }
+}
+
 function installMixin(Vue, vueVersion) {
   Vue.mixin(_objectSpread({}, vueVersion === '1' ? {
-    init: initDollarApollo
+    init: initProvider
   } : {}, vueVersion === '2' ? {
     data: function data() {
       return {
@@ -1864,17 +1916,17 @@ function installMixin(Vue, vueVersion) {
       };
     },
     beforeCreate: function beforeCreate() {
-      initDollarApollo.call(this);
+      initProvider.call(this);
       proxyData.call(this);
+    },
+    serverPrefetch: function serverPrefetch() {
+      if (this.$_apolloPromises) {
+        return Promise.all(this.$_apolloPromises);
+      }
     }
   } : {}, {
     created: launch,
-    destroyed: function destroyed() {
-      if (this.$_apollo) {
-        this.$_apollo.destroy();
-        this.$_apollo = null;
-      }
-    }
+    destroyed: destroy
   }));
 }
 
@@ -1925,7 +1977,7 @@ function install(Vue, options) {
 }
 ApolloProvider.install = install; // eslint-disable-next-line no-undef
 
-ApolloProvider.version = "3.0.0-beta.27"; // Apollo provider
+ApolloProvider.version = "3.0.0-beta.28"; // Apollo provider
 
 var ApolloProvider$1 = ApolloProvider; // Components