From 17ad1879d69458dd4e053b51e0e309c166526e76 Mon Sep 17 00:00:00 2001
From: Grzegorz Leoniec <greg@app-interactive.de>
Date: Fri, 8 Feb 2019 13:32:32 +0100
Subject: [PATCH] Fixed Apollo SSR issue

---
 package.json |  7 ++++---
 yarn.lock    | 19 ++++++++++++-------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index d86ff871a..fd067f612 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     ]
   },
   "dependencies": {
-    "@nuxtjs/apollo": "~4.0.0-rc3",
+    "@nuxtjs/apollo": "4.0.0-rc3",
     "@nuxtjs/axios": "~5.3.6",
     "@nuxtjs/dotenv": "~1.3.0",
     "accounting": "~0.4.1",
@@ -49,14 +49,12 @@
     "date-fns": "2.0.0-alpha.26",
     "express": "~4.16.4",
     "graphql": "~14.1.1",
-    "graphql-tag": "~2.10.1",
     "jsonwebtoken": "~8.4.0",
     "nuxt": "~2.3.4",
     "nuxt-env": "~0.0.4",
     "nuxt-sass-resources-loader": "~2.0.5",
     "portal-vue": "~1.5.1",
     "v-tooltip": "~2.0.0-rc.33",
-    "vue-apollo": "3.0.0-beta.28",
     "vue-count-to": "~1.0.13",
     "vue-izitoast": "1.1.2",
     "vue-sweetalert-icons": "~3.2.0",
@@ -84,5 +82,8 @@
     "sass-loader": "~7.1.0",
     "vue-jest": "~3.0.2",
     "vue-svg-loader": "~0.12.0"
+  },
+  "resolutions": {
+    "vue-apollo": "3.0.0-beta.25"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 63ecacd65..2dd385ff9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1061,7 +1061,7 @@
     webpack-node-externals "^1.7.2"
     webpackbar "^3.1.3"
 
-"@nuxtjs/apollo@~4.0.0-rc3":
+"@nuxtjs/apollo@4.0.0-rc3":
   version "4.0.0-rc3"
   resolved "https://registry.yarnpkg.com/@nuxtjs/apollo/-/apollo-4.0.0-rc3.tgz#b0a1fd76e19c04a556b7874f225a3fd7510e2958"
   integrity sha512-A0iykdW7msvmChkCaRmNbchC0RB9w+I4AanMUo4kDAaSR20lDaPx4SRcIWdEPpfM/uqP/FQhPR1dDy7R7zFOdg==
@@ -1241,11 +1241,16 @@
   resolved "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.1.tgz#dc488842312a7f075149312905b5e3c0b054c79d"
   integrity sha512-FwI9gX75FgVBJ7ywgnq/P7tw+/o1GUbtP0KzbtusLigAOgIgNISRK0ZPl4qertvXSIE8YbsVJueQ90cDt9YYyw==
 
-"@types/node@*", "@types/node@^10.1.0", "@types/node@^10.11.7":
+"@types/node@*", "@types/node@^10.1.0":
   version "10.12.21"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-10.12.21.tgz#7e8a0c34cf29f4e17a36e9bd0ea72d45ba03908e"
   integrity sha512-CBgLNk4o3XMnqMc0rhb6lc77IwShMEglz05deDcn2lQxyXEZivfwgYJu7SMha9V5XcrP6qZuevTHV/QrN2vjKQ==
 
+"@types/node@^10.11.7":
+  version "10.12.23"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.12.23.tgz#308a3acdc5d1c842aeadc50b867d99c46cfae868"
+  integrity sha512-EKhb5NveQ3NlW5EV7B0VRtDKwUfVey8LuJRl9pp5iW0se87/ZqLjG0PMf2MCzPXAJYWZN5Ltg7pHIAf9/Dm1tQ==
+
 "@types/q@^1.5.1":
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.1.tgz#48fd98c1561fe718b61733daed46ff115b496e18"
@@ -5729,7 +5734,7 @@ graphql-subscriptions@^1.0.0:
   dependencies:
     iterall "^1.2.1"
 
-graphql-tag@^2.9.2, graphql-tag@~2.10.1:
+graphql-tag@^2.9.2:
   version "2.10.1"
   resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.10.1.tgz#10aa41f1cd8fae5373eaf11f1f67260a3cad5e02"
   integrity sha512-jApXqWBzNXQ8jYa/HLkZJaVw9jgwNqZkywa2zfFn16Iv1Zb7ELNHkJaXHR7Quvd5SIGsy6Ny7SUKATgnu05uEg==
@@ -11697,10 +11702,10 @@ vm-browserify@^1.0.0:
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.0.tgz#bd76d6a23323e2ca8ffa12028dc04559c75f9019"
   integrity sha512-iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw==
 
-vue-apollo@3.0.0-beta.28, vue-apollo@^3.0.0-beta.25:
-  version "3.0.0-beta.28"
-  resolved "https://registry.yarnpkg.com/vue-apollo/-/vue-apollo-3.0.0-beta.28.tgz#be6a3a1504be2096cbfb23996537e2fc95c8c239"
-  integrity sha512-ceCc1xTyxpNtiSeJMQgSkfgJue6pnv+TIvp75CwZlwMxRtNZjITj4MGvBWFwnoIEhVrUAw45ff/5udgJ8z9sdQ==
+vue-apollo@3.0.0-beta.25, vue-apollo@^3.0.0-beta.25:
+  version "3.0.0-beta.25"
+  resolved "https://registry.yarnpkg.com/vue-apollo/-/vue-apollo-3.0.0-beta.25.tgz#05a9a699b2ba6103639e9bd6c3bb88ca04c4b637"
+  integrity sha512-M7/l3h0NlFvaZ/s/wrtRiOt3xXMbaNNuteGaCY+U5D0ABrQqvCgy5mayIZHurQxbloluNkbCt18wRKAgJTAuKA==
   dependencies:
     chalk "^2.4.1"
     throttle-debounce "^2.0.0"