Merge pull request #4219 from Ocelot-Social-Community/resolve-websock…

…ets-env-problem chore: 🍰 Resolve WEBSOCKETS_URI .env Problem
Ocelot-Social-Community · Feb 15, 2021 · 28dd310 · 28dd310
2 parents d67424a + 1168d8c
commit 28dd310
Show file tree

Hide file tree

Showing 6 changed files with 339 additions and 14,020 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/backend/package.json b/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ocelot-social-backend",
-  "version": "0.6.10",
+  "version": "0.6.11",
   "description": "GraphQL Backend for ocelot.social",
   "repository": "https://github.com/Ocelot-Social-Community/Ocelot-Social",
   "author": "ocelot.social Community",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ocelot-social",
-  "version": "0.6.10",
+  "version": "0.6.11",
   "description": "Fullstack and API tests with cypress and cucumber for ocelot.social",
   "author": "ocelot.social Community",
   "license": "MIT",

diff --git a/webapp/config/index.js b/webapp/config/index.js
@@ -18,6 +18,7 @@ const environment = {
 const server = {
   GRAPHQL_URI: process.env.GRAPHQL_URI || 'http://localhost:4000',
   BACKEND_TOKEN: process.env.BACKEND_TOKEN || 'NULL',
+  WEBSOCKETS_URI: process.env.WEBSOCKETS_URI || 'ws://localhost:4000/graphql',
 }
 
 const sentry = {

diff --git a/webapp/package.json b/webapp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ocelot-social-webapp",
-  "version": "0.6.10",
+  "version": "0.6.11",
   "description": "ocelot.social Frontend",
   "repository": "https://github.com/Ocelot-Social-Community/Ocelot-Social",
   "author": "ocelot.social Community",

diff --git a/webapp/plugins/apollo-config.js b/webapp/plugins/apollo-config.js
@@ -11,7 +11,7 @@ export default ({ req, nuxtState }) => {
   const backendUrl = env.GRAPHQL_URI || 'http://localhost:4000'
 
   return {
-    wsEndpoint: env.WEBSOCKETS_URI || 'ws://localhost:4000/graphql',
+    wsEndpoint: env.WEBSOCKETS_URI,
     httpEndpoint: process.server ? backendUrl : '/api',
     httpLinkOptions: {
       credentials: 'same-origin',