..

Author: ardatan

e2e/subscriptions-type-merging/gateway.config.ts

@@ -1,7 +1,6 @@
 import { Redis } from 'ioredis';
 import { defineConfig as defineGatewayConfig } from '@graphql-hive/gateway';
 import { RedisPubSub } from '@graphql-hive/pubsub/redis';
-import { toMeshPubSub } from '@graphql-mesh/types';
 
 /**
  * When a Redis connection enters "subscriber mode" (after calling SUBSCRIBE), it can only execute
@@ -20,12 +19,10 @@ const sub = new Redis({
 });
 
 export const gatewayConfig = defineGatewayConfig({
-  pubsub: toMeshPubSub(
-    new RedisPubSub(
-      { pub, sub },
-      {
-        channelPrefix: 'gw',
-      },
-    ),
+  pubsub: new RedisPubSub(
+    { pub, sub },
+    {
+      channelPrefix: 'gw',
+    },
   ),
 });

e2e/subscriptions-type-merging/package.json

@@ -3,7 +3,7 @@
   "private": true,
   "dependencies": {
     "@graphql-hive/gateway": "^2.0.0",
-    "@graphql-hive/pubsub": "next",
+    "@graphql-hive/pubsub": "^2.1.0",
     "graphql": "^16.9.0",
     "graphql-sse": "^2.5.4",
     "ioredis": "^5.7.0"

packages/legacy/types/package.json

@@ -35,7 +35,7 @@
     "graphql": "*"
   },
   "dependencies": {
-    "@graphql-hive/pubsub": "next",
+    "@graphql-hive/pubsub": "^2.1.0",
     "@graphql-mesh/store": "^0.104.11",
     "@graphql-tools/batch-delegate": "^10.0.0",
     "@graphql-tools/delegate": "^11.0.0",

packages/plugins/http-cache/src/index.ts

@@ -159,6 +159,7 @@ export default function useHTTPCache<TContext extends Record<string, any>>({
                   );
                 },
               );
+              // @ts-expect-error - Promise type mismatch
               context?.waitUntil?.(store$);
             }
             if (policy) {

packages/plugins/operation-headers/src/index.ts

@@ -22,7 +22,7 @@ export function useOperationHeaders(factoryFn: OperationHeadersFactory): Gateway
             url,
             options,
             context,
-          }),
+          } as OperationHeadersFactoryPayload),
         newHeaders =>
           setOptions({
             ...options,

packages/plugins/response-cache/src/index.ts

@@ -256,15 +256,16 @@ export default function useMeshResponseCache(
         const cacheControlHeader = response.headers.get('cache-control');
         if (cacheControlHeader != null) {
           const parsedCacheControl = CacheControlParser.parse(cacheControlHeader);
-          if (parsedCacheControl['max-age'] != null) {
-            const maxAgeInSeconds = parsedCacheControl['max-age'];
-            const maxAgeInMs = maxAgeInSeconds * 1000;
-            checkTtl(context, maxAgeInMs);
+          const headerNames = ['max-age', 's-maxage'];
+          function checkHeaderTtl(headerName: string) {
+            if (parsedCacheControl[headerName] != null) {
+              const maxAgeInSeconds = parsedCacheControl[headerName];
+              const maxAgeInMs = maxAgeInSeconds * 1000;
+              checkTtl(context as GatewayContext, maxAgeInMs);
+            }
           }
-          if (parsedCacheControl['s-maxage'] != null) {
-            const sMaxAgeInSeconds = parsedCacheControl['s-maxage'];
-            const sMaxAgeInMs = sMaxAgeInSeconds * 1000;
-            checkTtl(context, sMaxAgeInMs);
+          for (const headerName of headerNames) {
+            checkHeaderTtl(headerName);
           }
         }
       };

yarn.lock

@@ -4273,7 +4273,7 @@ __metadata:
   resolution: "@e2e/subscriptions-type-merging@workspace:e2e/subscriptions-type-merging"
   dependencies:
     "@graphql-hive/gateway": "npm:^2.0.0"
-    "@graphql-hive/pubsub": "npm:next"
+    "@graphql-hive/pubsub": "npm:^2.1.0"
     graphql: "npm:^16.9.0"
     graphql-sse: "npm:^2.5.4"
     ioredis: "npm:^5.7.0"
@@ -6662,22 +6662,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@graphql-hive/pubsub@npm:next":
-  version: 2.0.0-next-4830ed6f34eb399e328ddb4d05f88aaff04fab46
-  resolution: "@graphql-hive/pubsub@npm:2.0.0-next-4830ed6f34eb399e328ddb4d05f88aaff04fab46"
-  dependencies:
-    "@repeaterjs/repeater": "npm:^3.0.6"
-    "@whatwg-node/disposablestack": "npm:^0.0.6"
-    "@whatwg-node/promise-helpers": "npm:^1.3.0"
-  peerDependencies:
-    ioredis: ^5
-  peerDependenciesMeta:
-    ioredis:
-      optional: true
-  checksum: 10c0/0478579aeabb3579aa96c4b746c34aaca07876df5af94521f786f64ac45e1f714825049f5b4850d07714daec1d5cd28cd07098bbf325fc657f9d03e6d6668a9a
-  languageName: node
-  linkType: hard
-
 "@graphql-hive/signal@npm:^1.0.0":
   version: 1.0.0
   resolution: "@graphql-hive/signal@npm:1.0.0"
@@ -8238,7 +8222,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@graphql-mesh/types@workspace:packages/legacy/types"
   dependencies:
-    "@graphql-hive/pubsub": "npm:next"
+    "@graphql-hive/pubsub": "npm:^2.1.0"
     "@graphql-mesh/store": "npm:^0.104.11"
     "@graphql-tools/batch-delegate": "npm:^10.0.0"
     "@graphql-tools/delegate": "npm:^11.0.0"