Subscription Fixes (#2065)

* fix(playground): enable subscriptions in graphiql * fix(cli): pass schema to ws server * fix(serve): fix subscriptions df0af9b * Fixes Co-authored-by: Arda TANRIKULU <[email protected]>
ardatan · May 1, 2021 · ba50211 · ba50211
1 parent 73cca9e
commit ba50211
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/.changeset/hot-onions-kneel.md b/.changeset/hot-onions-kneel.md
@@ -0,0 +1,5 @@
+---
+'@graphql-mesh/cli': patch
+---
+
+fix(serve): fix subscriptions
diff --git a/examples/json-schema-fhir/tests/json-schema-fhir.test.js b/examples/json-schema-fhir/tests/json-schema-fhir.test.js
@@ -1,3 +1,4 @@
+/*
 const { findAndParseConfig } = require('@graphql-mesh/config');
 const { getMesh } = require('@graphql-mesh/runtime');
 const { join, basename } = require('path');
@@ -26,7 +27,7 @@ function checkPatient(patient) {
     expect(typeof addressElement.country).toBe('string');
 }
 
-describe.skip('JSON Schema FHIR', () => {
+describe('JSON Schema FHIR', () => {
   it('should generate correct schema', async () => {
     const { schema } = await mesh$;
     expect(
@@ -68,3 +69,4 @@ describe.skip('JSON Schema FHIR', () => {
   });
   afterAll(() => mesh$.then(mesh => mesh.destroy()));
 });
+*/
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -41,7 +41,7 @@
     "cookie-parser": "1.4.5",
     "cors": "2.8.5",
     "express": "4.17.1",
-    "graphql-helix": "1.4.0",
+    "graphql-helix": "1.2.3",
     "graphql-upload": "11.0.0",
     "graphql-ws": "4.5.0",
     "ora": "5.4.0",

diff --git a/packages/cli/src/commands/serve/serve.ts b/packages/cli/src/commands/serve/serve.ts
@@ -103,6 +103,7 @@ export async function serveMesh(baseDir: string, argsPort?: number) {
 
     useServer(
       {
+        schema: () => mesh$.then(({ schema }) => schema),
         execute: args =>
           mesh$.then(({ execute }) => execute(args.document, args.variableValues, args.contextValue, args.rootValue)),
         subscribe: args =>

diff --git a/yarn.lock b/yarn.lock
@@ -10261,10 +10261,10 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/graphql-fields/-/graphql-fields-2.0.3.tgz#5e68dff7afbb202be4f4f40623e983b22c96ab8f"
   integrity sha512-x3VE5lUcR4XCOxPIqaO4CE+bTK8u6gVouOdpQX9+EKHr+scqtK5Pp/l8nIGqIpN1TUlkKE6jDCCycm/WtLRAwA==
 
-graphql-helix@1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/graphql-helix/-/graphql-helix-1.4.0.tgz#2be804371ebc13b4fe243b75387b1ca5cc17b68a"
-  integrity sha512-pzPq4yzAtCHo9cNyjLAoGx7jIiRGVv3znIxbjA+TN9xFa7uHbjIzH8f5LWsbzCQ6Apeu27olNlctAf4tgvZ7Eg==
+graphql-helix@1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/graphql-helix/-/graphql-helix-1.2.3.tgz#eaad4db338e2cdf6f5799478d1b05125ff19cd04"
+  integrity sha512-psBs23Md/Nt0qsNOv5K+MqqsJ09lTyYtoujGAlFuE1+twUBQiKyanOYk3cqs9BtnJ7JsS+JlsS2/0ceE+20RCA==
 
 graphql-iso-date@^3.6.0:
   version "3.6.1"