Merge branch 'master' into editor

package.json

@@ -38,13 +38,13 @@
     ]
   },
   "dependencies": {
-    "@nuxtjs/apollo": "4.0.0-rc3",
+    "@nuxtjs/apollo": "4.0.0-rc4",
     "@nuxtjs/axios": "~5.3.6",
     "@nuxtjs/dotenv": "~1.3.0",
     "@nuxtjs/style-resources": "~0.1.2",
     "accounting": "~0.4.1",
-    "apollo-cache-inmemory": "~1.4.2",
-    "apollo-client": "~2.4.12",
+    "apollo-cache-inmemory": "~1.4.3",
+    "apollo-client": "~2.4.13",
     "cookie-universal-nuxt": "~2.0.14",
     "cross-env": "~5.2.0",
     "date-fns": "2.0.0-alpha.26",
@@ -53,7 +53,7 @@
     "jsonwebtoken": "~8.4.0",
     "linkify-it": "~2.1.0",
     "nuxt": "~2.4.3",
-    "nuxt-env": "~0.0.4",
+    "nuxt-env": "~0.1.0",
     "portal-vue": "~1.5.1",
     "string-hash": "^1.1.3",
     "tiptap": "^1.13.0",
@@ -87,8 +87,5 @@
     "sass-loader": "~7.1.0",
     "vue-jest": "~3.0.3",
     "vue-svg-loader": "~0.11.0"
-  },
-  "resolutions": {
-    "vue-apollo": "3.0.0-beta.25"
   }
 }