Merge remote-tracking branch 'origin/master'

README.md

@@ -1168,6 +1168,8 @@ On the queries you want to prefetch on the server, add the `prefetch` option. It
  - a variables object,
  - a function that gets the context object (which can contain the URL for example) and return a variables object,
  - `true` (query's `variables` is reused).
+
+If you are returning a variables object in the `prefetch` option make sure it matches with the result of the `variables` option. If they do not match the query's data property will not be populated while rendering the template server-side.
 
 **Warning! You don't have access to the component instance when doing prefetching on the server. Don't use `this` in `prefetch`!**
 

dist/vue-apollo.esm.js

@@ -2961,9 +2961,15 @@ var SmartSubscription = function (_SmartApollo2) {
   createClass(SmartSubscription, [{
     key: 'executeApollo',
     value: function executeApollo(variables) {
+      var variablesJson = JSON.stringify(variables);
       if (this.sub) {
+        // do nothing if subscription is already running using exactly the same variables
+        if (variablesJson === this.previousVariablesJson) {
+          return;
+        }
         this.sub.unsubscribe();
       }
+      this.previousVariablesJson = variablesJson;
 
       var apolloOptions = this.generateApolloOptions(variables);
 

dist/vue-apollo.umd.js

@@ -2967,9 +2967,15 @@ var SmartSubscription = function (_SmartApollo2) {
   createClass(SmartSubscription, [{
     key: 'executeApollo',
     value: function executeApollo(variables) {
+      var variablesJson = JSON.stringify(variables);
       if (this.sub) {
+        // do nothing if subscription is already running using exactly the same variables
+        if (variablesJson === this.previousVariablesJson) {
+          return;
+        }
         this.sub.unsubscribe();
       }
+      this.previousVariablesJson = variablesJson;
 
       var apolloOptions = this.generateApolloOptions(variables);
 

src/smart-apollo.js

@@ -344,9 +344,15 @@ export class SmartSubscription extends SmartApollo {
   ]
 
   executeApollo (variables) {
+    const variablesJson = JSON.stringify(variables)
     if (this.sub) {
+      // do nothing if subscription is already running using exactly the same variables
+      if (variablesJson === this.previousVariablesJson) {
+        return
+      }
       this.sub.unsubscribe()
     }
+    this.previousVariablesJson = variablesJson
 
     const apolloOptions = this.generateApolloOptions(variables)