@graphql-hive/gateway 2.0.0-alpha-7c4daa14687333c83ca23d8c74c7779e1bc5ac03 → 2.0.0-alpha-7184bde516d9890379b9bed7d06426fad8c16546

package/CHANGELOG.md

@@ -1,34 +1,73 @@
 # @graphql-hive/gateway
 
-## 2.0.0-alpha-7c4daa14687333c83ca23d8c74c7779e1bc5ac03
+## 2.0.0-alpha-7184bde516d9890379b9bed7d06426fad8c16546
 
 ### Major Changes
 
-- [#1030](https://github.com/graphql-hive/gateway/pull/1030) [`a165a2f`](https://github.com/graphql-hive/gateway/commit/a165a2f73f5f04b3b7179792d54be448e17dca19) Thanks [@enisdenjo](https://github.com/enisdenjo)! - Introduce and use the new Hive Logger
+- [#1030](https://github.com/graphql-hive/gateway/pull/1030) [`4e0a76f`](https://github.com/graphql-hive/gateway/commit/4e0a76f970b95bf318707a57c7d301f9025f14b3) Thanks [@enisdenjo](https://github.com/enisdenjo)! - Introduce and use the new Hive Logger
 
   - [Read more about it on the Hive Logger documentation here.](https://the-guild.dev/graphql/hive/docs/logger)
   - If coming from Hive Gateway v1, [read the migration guide here.](https://the-guild.dev/graphql/hive/docs/migration-guides/gateway-v1-v2)
 
 ### Patch Changes
 
-- [#1030](https://github.com/graphql-hive/gateway/pull/1030) [`ce6e879`](https://github.com/graphql-hive/gateway/commit/ce6e8793bed7390cfbf4a2cd0a66bd3e7eb30a1e) Thanks [@enisdenjo](https://github.com/enisdenjo)! - dependencies updates:
+- [#1030](https://github.com/graphql-hive/gateway/pull/1030) [`ae4c7dd`](https://github.com/graphql-hive/gateway/commit/ae4c7ddc671d363b6b3791a9664e85e266f369de) Thanks [@enisdenjo](https://github.com/enisdenjo)! - dependencies updates:
 
   - Added dependency [`@graphql-hive/logger@workspace:^` ↗︎](https://www.npmjs.com/package/@graphql-hive/logger/v/workspace:^) (to `dependencies`)
 
+- Updated dependencies [[`ae4c7dd`](https://github.com/graphql-hive/gateway/commit/ae4c7ddc671d363b6b3791a9664e85e266f369de), [`cdc959c`](https://github.com/graphql-hive/gateway/commit/cdc959c57dd770fd5f0bcd05a5de7e3102dacfe2), [`cdc959c`](https://github.com/graphql-hive/gateway/commit/cdc959c57dd770fd5f0bcd05a5de7e3102dacfe2), [`4bab6a3`](https://github.com/graphql-hive/gateway/commit/4bab6a3048cd6a9b20b221d625ed94a1e2cf8689), [`4fd18a1`](https://github.com/graphql-hive/gateway/commit/4fd18a1a7d95654d8bffd14026ee3c8861b5b4f6), [`2bd7a17`](https://github.com/graphql-hive/gateway/commit/2bd7a1708b7e1984a9bf7ca3eb763bf8ad3313c0), [`c190214`](https://github.com/graphql-hive/gateway/commit/c19021425af92ddb12195eb0b11b51cd6ac1d22f), [`ae4c7dd`](https://github.com/graphql-hive/gateway/commit/ae4c7ddc671d363b6b3791a9664e85e266f369de), [`4e0a76f`](https://github.com/graphql-hive/gateway/commit/4e0a76f970b95bf318707a57c7d301f9025f14b3), [`680a646`](https://github.com/graphql-hive/gateway/commit/680a6467be70b53d3bb6089114072fb25c172283), [`7decf1d`](https://github.com/graphql-hive/gateway/commit/7decf1d355e1cda9e688f2736abea86106afd3a0), [`e2f1c30`](https://github.com/graphql-hive/gateway/commit/e2f1c30d24e94e2cf388b2f1fe4e4f71c591bece), [`d1cdc67`](https://github.com/graphql-hive/gateway/commit/d1cdc6724bc67f17abd36d9cabbd26b7ef0e3adb), [`c190214`](https://github.com/graphql-hive/gateway/commit/c19021425af92ddb12195eb0b11b51cd6ac1d22f), [`5c34afe`](https://github.com/graphql-hive/gateway/commit/5c34afed1ead2f7ec2b4d988479a28118d2323ac)]:
+  - @graphql-hive/gateway-runtime@2.0.0-alpha-7184bde516d9890379b9bed7d06426fad8c16546
+  - @graphql-hive/plugin-aws-sigv4@1.0.12-alpha-7184bde516d9890379b9bed7d06426fad8c16546
+  - @graphql-mesh/plugin-opentelemetry@2.0.0-alpha-7184bde516d9890379b9bed7d06426fad8c16546
+  - @graphql-mesh/plugin-prometheus@2.0.0-alpha-7184bde516d9890379b9bed7d06426fad8c16546
+  - @graphql-mesh/hmac-upstream-signature@2.0.0-alpha-7184bde516d9890379b9bed7d06426fad8c16546
+  - @graphql-mesh/transport-http-callback@1.0.0-alpha-7184bde516d9890379b9bed7d06426fad8c16546
+  - @graphql-mesh/plugin-jwt-auth@2.0.0-alpha-7184bde516d9890379b9bed7d06426fad8c16546
+  - @graphql-mesh/transport-ws@2.0.0-alpha-7184bde516d9890379b9bed7d06426fad8c16546
+  - @graphql-hive/logger@1.0.0-alpha-7184bde516d9890379b9bed7d06426fad8c16546
+  - @graphql-hive/plugin-deduplicate-request@1.0.0
+  - @graphql-mesh/transport-http@0.6.43-alpha-7184bde516d9890379b9bed7d06426fad8c16546
+
+## 1.15.0
+
+### Minor Changes
+
+- [#1172](https://github.com/graphql-hive/gateway/pull/1172) [`dacad53`](https://github.com/graphql-hive/gateway/commit/dacad5390e4ab54a74bb7ee0d86ebc5a014c55a8) Thanks [@ardatan](https://github.com/ardatan)! - Serve GraphiQL offline by default instead of fetching it from CDN
+
+### Patch Changes
+
+- [#1156](https://github.com/graphql-hive/gateway/pull/1156) [`fb74009`](https://github.com/graphql-hive/gateway/commit/fb740098652dba2e9107981d1f4e362143478451) Thanks [@dependabot](https://github.com/apps/dependabot)! - dependencies updates:
+
+  - Updated dependency [`graphql-yoga@^5.13.5` ↗︎](https://www.npmjs.com/package/graphql-yoga/v/5.13.5) (from `^5.13.4`, in `dependencies`)
+
+- [#1158](https://github.com/graphql-hive/gateway/pull/1158) [`a5d18da`](https://github.com/graphql-hive/gateway/commit/a5d18da95716c8e5ed231244c7dcae4f11843c08) Thanks [@dependabot](https://github.com/apps/dependabot)! - dependencies updates:
+
+  - Updated dependency [`@commander-js/extra-typings@^14.0.0` ↗︎](https://www.npmjs.com/package/@commander-js/extra-typings/v/14.0.0) (from `^13.1.0`, in `dependencies`)
+
+- [#1161](https://github.com/graphql-hive/gateway/pull/1161) [`3be8206`](https://github.com/graphql-hive/gateway/commit/3be82065790f1cb24cbe0655d7e8b90207fff52e) Thanks [@dependabot](https://github.com/apps/dependabot)! - dependencies updates:
+
+  - Updated dependency [`@commander-js/extra-typings@^13.1.0` ↗︎](https://www.npmjs.com/package/@commander-js/extra-typings/v/13.1.0) (from `^14.0.0`, in `dependencies`)
+
+- [#1172](https://github.com/graphql-hive/gateway/pull/1172) [`dacad53`](https://github.com/graphql-hive/gateway/commit/dacad5390e4ab54a74bb7ee0d86ebc5a014c55a8) Thanks [@ardatan](https://github.com/ardatan)! - dependencies updates:
+
+  - Added dependency [`@graphql-yoga/render-graphiql@^5.13.5` ↗︎](https://www.npmjs.com/package/@graphql-yoga/render-graphiql/v/5.13.5) (to `dependencies`)
+
+- [#1182](https://github.com/graphql-hive/gateway/pull/1182) [`f3615ca`](https://github.com/graphql-hive/gateway/commit/f3615cab4e8b596e5ba21b03fddb66e9a3090e31) Thanks [@dependabot](https://github.com/apps/dependabot)! - dependencies updates:
+
+  - Updated dependency [`@graphql-tools/graphql-file-loader@^8.0.20` ↗︎](https://www.npmjs.com/package/@graphql-tools/graphql-file-loader/v/8.0.20) (from `^8.0.14`, in `dependencies`)
+
 - [#1141](https://github.com/graphql-hive/gateway/pull/1141) [`d8892f2`](https://github.com/graphql-hive/gateway/commit/d8892f2713388fcea37dfa74a8ae42294f07d362) Thanks [@EmrysMyrddin](https://github.com/EmrysMyrddin)! - **Security Update:** The Docker image have been updated to fix a CVE affecting `passwd` command. This CVE was not directly affecting Hive Gateway software, since it's not using impacted components.
 
-- Updated dependencies [[`ce6e879`](https://github.com/graphql-hive/gateway/commit/ce6e8793bed7390cfbf4a2cd0a66bd3e7eb30a1e), [`11cff4f`](https://github.com/graphql-hive/gateway/commit/11cff4f8ff28ca7d709b5b962029e17d5843110e), [`54beb7a`](https://github.com/graphql-hive/gateway/commit/54beb7acde7558eee81ec0e20c123717865b8e18), [`2640dbf`](https://github.com/graphql-hive/gateway/commit/2640dbf8c81819efe326bf3efead85be3b6cbea6), [`2adc7f1`](https://github.com/graphql-hive/gateway/commit/2adc7f14f282349831af926864c0ecb3f3e65d73), [`c84b528`](https://github.com/graphql-hive/gateway/commit/c84b52850a290c2741d5bd72464a06a1ab99d000), [`ce6e879`](https://github.com/graphql-hive/gateway/commit/ce6e8793bed7390cfbf4a2cd0a66bd3e7eb30a1e), [`54beb7a`](https://github.com/graphql-hive/gateway/commit/54beb7acde7558eee81ec0e20c123717865b8e18), [`a165a2f`](https://github.com/graphql-hive/gateway/commit/a165a2f73f5f04b3b7179792d54be448e17dca19), [`f4a5e1c`](https://github.com/graphql-hive/gateway/commit/f4a5e1c71c47666b44511cea1f9a19fa04680deb), [`14b38b2`](https://github.com/graphql-hive/gateway/commit/14b38b2b841b52de57207bcbc0e0b3748c24a3fa), [`3a4f65c`](https://github.com/graphql-hive/gateway/commit/3a4f65c861156a1e1ca6075d8796697cc3eb15db), [`ab6c98a`](https://github.com/graphql-hive/gateway/commit/ab6c98a3e386a023cb1735c0b58da429a9319078), [`11cff4f`](https://github.com/graphql-hive/gateway/commit/11cff4f8ff28ca7d709b5b962029e17d5843110e), [`c84b528`](https://github.com/graphql-hive/gateway/commit/c84b52850a290c2741d5bd72464a06a1ab99d000), [`e2b3a4d`](https://github.com/graphql-hive/gateway/commit/e2b3a4d4c9edee01152074f5f8a6224125ace83b)]:
-  - @graphql-hive/gateway-runtime@2.0.0-alpha-7c4daa14687333c83ca23d8c74c7779e1bc5ac03
-  - @graphql-mesh/plugin-opentelemetry@2.0.0-alpha-7c4daa14687333c83ca23d8c74c7779e1bc5ac03
-  - @graphql-mesh/plugin-prometheus@2.0.0-alpha-7c4daa14687333c83ca23d8c74c7779e1bc5ac03
-  - @graphql-mesh/transport-http-callback@1.0.0-alpha-7c4daa14687333c83ca23d8c74c7779e1bc5ac03
-  - @graphql-mesh/hmac-upstream-signature@2.0.0-alpha-7c4daa14687333c83ca23d8c74c7779e1bc5ac03
-  - @graphql-mesh/plugin-jwt-auth@2.0.0-alpha-7c4daa14687333c83ca23d8c74c7779e1bc5ac03
-  - @graphql-mesh/transport-ws@2.0.0-alpha-7c4daa14687333c83ca23d8c74c7779e1bc5ac03
-  - @graphql-hive/logger@1.0.0-alpha-7c4daa14687333c83ca23d8c74c7779e1bc5ac03
-  - @graphql-hive/plugin-aws-sigv4@1.0.11-alpha-7c4daa14687333c83ca23d8c74c7779e1bc5ac03
+- Updated dependencies [[`11cff4f`](https://github.com/graphql-hive/gateway/commit/11cff4f8ff28ca7d709b5b962029e17d5843110e), [`54beb7a`](https://github.com/graphql-hive/gateway/commit/54beb7acde7558eee81ec0e20c123717865b8e18), [`fb74009`](https://github.com/graphql-hive/gateway/commit/fb740098652dba2e9107981d1f4e362143478451), [`f3615ca`](https://github.com/graphql-hive/gateway/commit/f3615cab4e8b596e5ba21b03fddb66e9a3090e31), [`d459f37`](https://github.com/graphql-hive/gateway/commit/d459f3702c500c321164abec826700120649c180), [`fb74009`](https://github.com/graphql-hive/gateway/commit/fb740098652dba2e9107981d1f4e362143478451), [`fb74009`](https://github.com/graphql-hive/gateway/commit/fb740098652dba2e9107981d1f4e362143478451), [`fb74009`](https://github.com/graphql-hive/gateway/commit/fb740098652dba2e9107981d1f4e362143478451), [`54beb7a`](https://github.com/graphql-hive/gateway/commit/54beb7acde7558eee81ec0e20c123717865b8e18), [`b4ba778`](https://github.com/graphql-hive/gateway/commit/b4ba778776140b66b8368daf0299105fd8035e46), [`11cff4f`](https://github.com/graphql-hive/gateway/commit/11cff4f8ff28ca7d709b5b962029e17d5843110e)]:
+  - @graphql-hive/gateway-runtime@1.9.0
+  - @graphql-hive/plugin-aws-sigv4@1.0.11
+  - @graphql-mesh/plugin-jwt-auth@1.5.5
+  - @graphql-mesh/plugin-prometheus@1.3.46
+  - @graphql-mesh/transport-http-callback@0.6.1
   - @graphql-hive/plugin-deduplicate-request@1.0.0
-  - @graphql-mesh/transport-http@0.6.42-alpha-7c4daa14687333c83ca23d8c74c7779e1bc5ac03
+  - @graphql-mesh/hmac-upstream-signature@1.2.27
+  - @graphql-mesh/plugin-opentelemetry@1.3.58
+  - @graphql-mesh/transport-http@0.6.42
 
 ## 1.14.2
 

package/dist/bin.cjs

@@ -3,11 +3,12 @@
 require('dotenv/config');
 var module$1 = require('node:module');
 var logger = require('@graphql-hive/logger');
-var cli = require('./cli-_WmSliwb.cjs');
+var cli = require('./cli-BuM-InLk.cjs');
 require('node:cluster');
 require('node:os');
 require('node:path');
 require('@commander-js/extra-typings');
+require('@graphql-yoga/render-graphiql');
 require('@graphql-hive/gateway-runtime');
 require('@graphql-hive/pubsub');
 require('@graphql-mesh/utils');

package/dist/bin.js

@@ -2,11 +2,12 @@
 import 'dotenv/config';
 import module from 'node:module';
 import { Logger } from '@graphql-hive/logger';
-import { e as enableModuleCachingIfPossible, h as handleNodeWarnings, r as run } from './cli-BBlJHQNF.js';
+import { e as enableModuleCachingIfPossible, h as handleNodeWarnings, r as run } from './cli-BvnQIP6H.js';
 import 'node:cluster';
 import 'node:os';
 import 'node:path';
 import '@commander-js/extra-typings';
+import '@graphql-yoga/render-graphiql';
 import '@graphql-hive/gateway-runtime';
 import '@graphql-hive/pubsub';
 import '@graphql-mesh/utils';

package/dist/{cli-_WmSliwb.cjs → cli-BuM-InLk.cjs}

@@ -6,6 +6,7 @@ var node_os = require('node:os');
 var node_path = require('node:path');
 var extraTypings = require('@commander-js/extra-typings');
 var logger = require('@graphql-hive/logger');
+var renderGraphiql = require('@graphql-yoga/render-graphiql');
 var gatewayRuntime = require('@graphql-hive/gateway-runtime');
 var pubsub = require('@graphql-hive/pubsub');
 var utils = require('@graphql-mesh/utils');
@@ -298,7 +299,7 @@ async function startBunServer(gwRuntime, opts) {
     };
   }
   const server = Bun.serve(serverOptions);
-  opts.log.info("Listening on %s", server.url);
+  opts.log.info(`Listening on ${server.url}`);
   gwRuntime.disposableStack.use(server);
 }
 
@@ -365,7 +366,7 @@ async function startNodeHttpServer(gwRuntime, opts) {
     );
   }
   const url = `${protocol}://${host}:${port}`.replace("0.0.0.0", "localhost");
-  log.debug("Starting server on %s", url);
+  log.debug(`Starting server on ${url}`);
   if (!disableWebsockets) {
     log.debug("Setting up WebSocket server");
     const { WebSocketServer } = await import('ws');
@@ -397,7 +398,7 @@ async function startNodeHttpServer(gwRuntime, opts) {
   return new Promise((resolve, reject) => {
     server.once("error", reject);
     server.listen(port, host, () => {
-      log.info("Listening on %s", url);
+      log.info(`Listening on ${url}`);
       gwRuntime.disposableStack.defer(
         () => new Promise((resolve2) => {
           process.stderr.write("\n");
@@ -445,7 +446,7 @@ function handleFork(log, config) {
     if (cluster__default.default.isPrimary && config.fork && config.fork > 1) {
       const workers = /* @__PURE__ */ new Set();
       let expectedToExit = false;
-      log.debug("Forking %d workers", config.fork);
+      log.debug(`Forking ${config.fork} workers`);
       for (let i = 0; i < config.fork; i++) {
         const worker = cluster__default.default.fork();
         const workerLogger = log.child({ worker: worker.id });
@@ -473,7 +474,7 @@ function handleFork(log, config) {
         workers.add(worker);
       }
       utils.registerTerminateHandler((signal) => {
-        log.info("Killing workers on %s", signal);
+        log.info(`Killing workers on ${signal}`);
         expectedToExit = true;
         workers.forEach((w) => {
           w.kill(signal);
@@ -577,6 +578,7 @@ const addCommand$2 = (ctx, cli) => cli.command("proxy").description(
     hivePersistedDocumentsToken,
     ...opts
   } = this.optsWithGlobals();
+  ctx.log.info(`Starting ${ctx.productName} ${ctx.version} in proxy mode`);
   const loadedConfig = await loadConfig({
     log: ctx.log,
     configPath: opts.configPath,
@@ -733,6 +735,7 @@ const addCommand$1 = (ctx, cli) => cli.command("subgraph").description(
     hivePersistedDocumentsToken,
     ...opts
   } = this.optsWithGlobals();
+  ctx.log.info(`Starting ${ctx.productName} ${ctx.version} as subgraph`);
   const loadedConfig = await loadConfig({
     log: ctx.log,
     configPath: opts.configPath,
@@ -876,21 +879,23 @@ const addCommand = (ctx, cli) => cli.command("supergraph").description(
     ...opts
   } = this.optsWithGlobals();
   const { apolloUplink } = this.opts();
+  ctx.log.info(
+    `Starting ${ctx.productName} ${ctx.version} with supergraph`
+  );
   const loadedConfig = await loadConfig({
     log: ctx.log,
     configPath: opts.configPath,
     quiet: !cluster__default.default.isPrimary,
     configFileName: ctx.configFileName
   });
-  let supergraph2 = "supergraph.graphql";
+  let supergraph2 = "./supergraph.graphql";
   if (schemaPathOrUrl) {
-    ctx.log.info("Supergraph will be loaded from %s", schemaPathOrUrl);
+    ctx.log.info(`Supergraph will be loaded from ${schemaPathOrUrl}`);
     if (hiveCdnKey) {
       ctx.log.info("Using Hive CDN key");
       if (!utils.isUrl(schemaPathOrUrl)) {
         ctx.log.error(
-          "Hive CDN endpoint must be a URL when providing --hive-cdn-key but got %s",
-          schemaPathOrUrl
+          `Hive CDN endpoint must be a URL when providing --hive-cdn-key but got ${schemaPathOrUrl}`
         );
         process.exit(1);
       }
@@ -903,8 +908,7 @@ const addCommand = (ctx, cli) => cli.command("supergraph").description(
       ctx.log.info("Using GraphOS API key");
       if (!schemaPathOrUrl.includes("@")) {
         ctx.log.error(
-          `Apollo GraphOS requires a graph ref in the format <graph-id>@<graph-variant> when providing --apollo-key. Please provide a valid graph ref not %s.`,
-          schemaPathOrUrl
+          `Apollo GraphOS requires a graph ref in the format <graph-id>@<graph-variant> when providing --apollo-key. Please provide a valid graph ref not ${schemaPathOrUrl}.`
         );
         process.exit(1);
       }
@@ -930,7 +934,7 @@ const addCommand = (ctx, cli) => cli.command("supergraph").description(
       );
       process.exit(1);
     }
-    ctx.log.info("Using Hive CDN endpoint %s", hiveCdnEndpoint);
+    ctx.log.info(`Using Hive CDN endpoint ${hiveCdnEndpoint}`);
     supergraph2 = {
       type: "hive",
       endpoint: hiveCdnEndpoint,
@@ -939,8 +943,7 @@ const addCommand = (ctx, cli) => cli.command("supergraph").description(
   } else if (apolloGraphRef) {
     if (!apolloGraphRef.includes("@")) {
       ctx.log.error(
-        "Apollo GraphOS requires a graph ref in the format <graph-id>@<graph-variant>. Please provide a valid graph ref not %s.",
-        apolloGraphRef
+        `Apollo GraphOS requires a graph ref in the format <graph-id>@<graph-variant>. Please provide a valid graph ref not ${apolloGraphRef}.`
       );
       process.exit(1);
     }
@@ -950,7 +953,7 @@ const addCommand = (ctx, cli) => cli.command("supergraph").description(
       );
       process.exit(1);
     }
-    ctx.log.info("Using Apollo Graph Ref %s", apolloGraphRef);
+    ctx.log.info(`Using Apollo Graph Ref ${apolloGraphRef}`);
     supergraph2 = {
       type: "graphos",
       apiKey: apolloKey,
@@ -960,7 +963,7 @@ const addCommand = (ctx, cli) => cli.command("supergraph").description(
   } else if ("supergraph" in loadedConfig) {
     supergraph2 = loadedConfig.supergraph;
   } else {
-    ctx.log.info("Using default supergraph location %s", supergraph2);
+    ctx.log.info(`Using default supergraph location "${supergraph2}"`);
   }
   const registryConfig = {};
   const reporting = handleReportingConfig(ctx, loadedConfig, {
@@ -1044,13 +1047,13 @@ async function runSupergraph({ log }, config) {
   if (typeof config.supergraph === "string" && utils$1.isValidPath(config.supergraph) && !utils.isUrl(config.supergraph)) {
     const supergraphPath = config.supergraph;
     absSchemaPath = node_path.isAbsolute(supergraphPath) ? String(supergraphPath) : node_path.resolve(process.cwd(), supergraphPath);
-    log.info("Reading supergraph from %s", absSchemaPath);
+    log.info({ path: absSchemaPath }, "Reading supergraph");
     try {
       await promises.lstat(absSchemaPath);
-    } catch {
+    } catch (err) {
       log.error(
-        "Could not read supergraph from %s. Make sure the file exists.",
-        absSchemaPath
+        { path: absSchemaPath, err },
+        "Could not read supergraph. Make sure the file exists."
       );
       process.exit(1);
     }
@@ -1058,10 +1061,13 @@ async function runSupergraph({ log }, config) {
   if (absSchemaPath) {
     delete config.pollingInterval;
     if (cluster__default.default.isPrimary) {
-      log.info("Watching %s for changes", absSchemaPath);
+      log.info({ path: absSchemaPath }, "Watching supergraph for changes");
       const ctrl = new AbortController();
       utils.registerTerminateHandler((signal) => {
-        log.info("Closing watcher for %s on %s", absSchemaPath, signal);
+        log.info(
+          { path: absSchemaPath },
+          `Closing watcher for supergraph on ${signal}`
+        );
         return ctrl.abort(`Process terminated on ${signal}`);
       });
       (async function watcher() {
@@ -1071,7 +1077,10 @@ async function runSupergraph({ log }, config) {
           if (f.eventType === "rename") {
             throw new Error(`Supergraph file was renamed to "${f.filename}"`);
           }
-          log.info("%s changed. Invalidating supergraph...", absSchemaPath);
+          log.info(
+            { path: absSchemaPath },
+            "Supergraph changed. Invalidating..."
+          );
           if (config.fork && config.fork > 1) {
             for (const workerId in cluster__default.default.workers) {
               cluster__default.default.workers[workerId].send("invalidateUnifiedGraph");
@@ -1082,9 +1091,15 @@ async function runSupergraph({ log }, config) {
         }
       })().catch((e) => {
         if (e.name === "AbortError") return;
-        log.error(e, "Watcher for %s closed with an error", absSchemaPath);
+        log.error(
+          { path: absSchemaPath, err: e },
+          "Supergraph watcher closed with an error"
+        );
       }).then(() => {
-        log.info("Watcher for %s successfuly closed", absSchemaPath);
+        log.info(
+          { path: absSchemaPath },
+          "Supergraph watcher successfuly closed"
+        );
       });
     }
   }
@@ -1114,13 +1129,13 @@ async function runSupergraph({ log }, config) {
   }
   const runtime = gatewayRuntime.createGatewayRuntime(config);
   if (absSchemaPath) {
-    log.info("Serving local supergraph from %s", absSchemaPath);
+    log.info({ path: absSchemaPath }, "Serving local supergraph");
   } else if (utils.isUrl(String(config.supergraph))) {
-    log.info("Serving remote supergraph from %s", config.supergraph);
+    log.info({ url: config.supergraph }, "Serving remote supergraph");
   } else if (typeof config.supergraph === "object" && "type" in config.supergraph && config.supergraph.type === "hive") {
     log.info(
-      "Serving supergraph from Hive CDN at %s",
-      config.supergraph.endpoint
+      { endpoint: config.supergraph.endpoint },
+      "Serving supergraph from Hive CDN"
     );
   } else {
     log.info("Serving supergraph from config");
@@ -1163,7 +1178,8 @@ const defaultOptions = {
   host: node_os.platform().toLowerCase() === "win32" || // is WSL?
   node_os.release().toLowerCase().includes("microsoft") ? "127.0.0.1" : "0.0.0.0",
   port: 4e3,
-  pollingInterval: 1e4
+  pollingInterval: 1e4,
+  renderGraphiQL: renderGraphiql.renderGraphiQL
 };
 let cli = new extraTypings.Command().configureHelp({
   // will print help of global options for each command

package/dist/{cli-BBlJHQNF.js → cli-BvnQIP6H.js}

@@ -4,6 +4,7 @@ import { availableParallelism, freemem, platform, release } from 'node:os';
 import { join, isAbsolute, resolve } from 'node:path';
 import { Option, Command, InvalidArgumentError } from '@commander-js/extra-typings';
 import { LegacyLogger, Logger } from '@graphql-hive/logger';
+import { renderGraphiQL } from '@graphql-yoga/render-graphiql';
 import { getGraphQLWSOptions, createLoggerFromLogging, createGatewayRuntime } from '@graphql-hive/gateway-runtime';
 import { PubSub } from '@graphql-hive/pubsub';
 import { registerTerminateHandler, isUrl } from '@graphql-mesh/utils';
@@ -291,7 +292,7 @@ async function startBunServer(gwRuntime, opts) {
     };
   }
   const server = Bun.serve(serverOptions);
-  opts.log.info("Listening on %s", server.url);
+  opts.log.info(`Listening on ${server.url}`);
   gwRuntime.disposableStack.use(server);
 }
 
@@ -358,7 +359,7 @@ async function startNodeHttpServer(gwRuntime, opts) {
     );
   }
   const url = `${protocol}://${host}:${port}`.replace("0.0.0.0", "localhost");
-  log.debug("Starting server on %s", url);
+  log.debug(`Starting server on ${url}`);
   if (!disableWebsockets) {
     log.debug("Setting up WebSocket server");
     const { WebSocketServer } = await import('ws');
@@ -390,7 +391,7 @@ async function startNodeHttpServer(gwRuntime, opts) {
   return new Promise((resolve, reject) => {
     server.once("error", reject);
     server.listen(port, host, () => {
-      log.info("Listening on %s", url);
+      log.info(`Listening on ${url}`);
       gwRuntime.disposableStack.defer(
         () => new Promise((resolve2) => {
           process.stderr.write("\n");
@@ -438,7 +439,7 @@ function handleFork(log, config) {
     if (cluster.isPrimary && config.fork && config.fork > 1) {
       const workers = /* @__PURE__ */ new Set();
       let expectedToExit = false;
-      log.debug("Forking %d workers", config.fork);
+      log.debug(`Forking ${config.fork} workers`);
       for (let i = 0; i < config.fork; i++) {
         const worker = cluster.fork();
         const workerLogger = log.child({ worker: worker.id });
@@ -466,7 +467,7 @@ function handleFork(log, config) {
         workers.add(worker);
       }
       registerTerminateHandler((signal) => {
-        log.info("Killing workers on %s", signal);
+        log.info(`Killing workers on ${signal}`);
         expectedToExit = true;
         workers.forEach((w) => {
           w.kill(signal);
@@ -570,6 +571,7 @@ const addCommand$2 = (ctx, cli) => cli.command("proxy").description(
     hivePersistedDocumentsToken,
     ...opts
   } = this.optsWithGlobals();
+  ctx.log.info(`Starting ${ctx.productName} ${ctx.version} in proxy mode`);
   const loadedConfig = await loadConfig({
     log: ctx.log,
     configPath: opts.configPath,
@@ -726,6 +728,7 @@ const addCommand$1 = (ctx, cli) => cli.command("subgraph").description(
     hivePersistedDocumentsToken,
     ...opts
   } = this.optsWithGlobals();
+  ctx.log.info(`Starting ${ctx.productName} ${ctx.version} as subgraph`);
   const loadedConfig = await loadConfig({
     log: ctx.log,
     configPath: opts.configPath,
@@ -869,21 +872,23 @@ const addCommand = (ctx, cli) => cli.command("supergraph").description(
     ...opts
   } = this.optsWithGlobals();
   const { apolloUplink } = this.opts();
+  ctx.log.info(
+    `Starting ${ctx.productName} ${ctx.version} with supergraph`
+  );
   const loadedConfig = await loadConfig({
     log: ctx.log,
     configPath: opts.configPath,
     quiet: !cluster.isPrimary,
     configFileName: ctx.configFileName
   });
-  let supergraph2 = "supergraph.graphql";
+  let supergraph2 = "./supergraph.graphql";
   if (schemaPathOrUrl) {
-    ctx.log.info("Supergraph will be loaded from %s", schemaPathOrUrl);
+    ctx.log.info(`Supergraph will be loaded from ${schemaPathOrUrl}`);
     if (hiveCdnKey) {
       ctx.log.info("Using Hive CDN key");
       if (!isUrl(schemaPathOrUrl)) {
         ctx.log.error(
-          "Hive CDN endpoint must be a URL when providing --hive-cdn-key but got %s",
-          schemaPathOrUrl
+          `Hive CDN endpoint must be a URL when providing --hive-cdn-key but got ${schemaPathOrUrl}`
         );
         process.exit(1);
       }
@@ -896,8 +901,7 @@ const addCommand = (ctx, cli) => cli.command("supergraph").description(
       ctx.log.info("Using GraphOS API key");
       if (!schemaPathOrUrl.includes("@")) {
         ctx.log.error(
-          `Apollo GraphOS requires a graph ref in the format <graph-id>@<graph-variant> when providing --apollo-key. Please provide a valid graph ref not %s.`,
-          schemaPathOrUrl
+          `Apollo GraphOS requires a graph ref in the format <graph-id>@<graph-variant> when providing --apollo-key. Please provide a valid graph ref not ${schemaPathOrUrl}.`
         );
         process.exit(1);
       }
@@ -923,7 +927,7 @@ const addCommand = (ctx, cli) => cli.command("supergraph").description(
       );
       process.exit(1);
     }
-    ctx.log.info("Using Hive CDN endpoint %s", hiveCdnEndpoint);
+    ctx.log.info(`Using Hive CDN endpoint ${hiveCdnEndpoint}`);
     supergraph2 = {
       type: "hive",
       endpoint: hiveCdnEndpoint,
@@ -932,8 +936,7 @@ const addCommand = (ctx, cli) => cli.command("supergraph").description(
   } else if (apolloGraphRef) {
     if (!apolloGraphRef.includes("@")) {
       ctx.log.error(
-        "Apollo GraphOS requires a graph ref in the format <graph-id>@<graph-variant>. Please provide a valid graph ref not %s.",
-        apolloGraphRef
+        `Apollo GraphOS requires a graph ref in the format <graph-id>@<graph-variant>. Please provide a valid graph ref not ${apolloGraphRef}.`
       );
       process.exit(1);
     }
@@ -943,7 +946,7 @@ const addCommand = (ctx, cli) => cli.command("supergraph").description(
       );
       process.exit(1);
     }
-    ctx.log.info("Using Apollo Graph Ref %s", apolloGraphRef);
+    ctx.log.info(`Using Apollo Graph Ref ${apolloGraphRef}`);
     supergraph2 = {
       type: "graphos",
       apiKey: apolloKey,
@@ -953,7 +956,7 @@ const addCommand = (ctx, cli) => cli.command("supergraph").description(
   } else if ("supergraph" in loadedConfig) {
     supergraph2 = loadedConfig.supergraph;
   } else {
-    ctx.log.info("Using default supergraph location %s", supergraph2);
+    ctx.log.info(`Using default supergraph location "${supergraph2}"`);
   }
   const registryConfig = {};
   const reporting = handleReportingConfig(ctx, loadedConfig, {
@@ -1037,13 +1040,13 @@ async function runSupergraph({ log }, config) {
   if (typeof config.supergraph === "string" && isValidPath(config.supergraph) && !isUrl(config.supergraph)) {
     const supergraphPath = config.supergraph;
     absSchemaPath = isAbsolute(supergraphPath) ? String(supergraphPath) : resolve(process.cwd(), supergraphPath);
-    log.info("Reading supergraph from %s", absSchemaPath);
+    log.info({ path: absSchemaPath }, "Reading supergraph");
     try {
       await lstat(absSchemaPath);
-    } catch {
+    } catch (err) {
       log.error(
-        "Could not read supergraph from %s. Make sure the file exists.",
-        absSchemaPath
+        { path: absSchemaPath, err },
+        "Could not read supergraph. Make sure the file exists."
       );
       process.exit(1);
     }
@@ -1051,10 +1054,13 @@ async function runSupergraph({ log }, config) {
   if (absSchemaPath) {
     delete config.pollingInterval;
     if (cluster.isPrimary) {
-      log.info("Watching %s for changes", absSchemaPath);
+      log.info({ path: absSchemaPath }, "Watching supergraph for changes");
       const ctrl = new AbortController();
       registerTerminateHandler((signal) => {
-        log.info("Closing watcher for %s on %s", absSchemaPath, signal);
+        log.info(
+          { path: absSchemaPath },
+          `Closing watcher for supergraph on ${signal}`
+        );
         return ctrl.abort(`Process terminated on ${signal}`);
       });
       (async function watcher() {
@@ -1064,7 +1070,10 @@ async function runSupergraph({ log }, config) {
           if (f.eventType === "rename") {
             throw new Error(`Supergraph file was renamed to "${f.filename}"`);
           }
-          log.info("%s changed. Invalidating supergraph...", absSchemaPath);
+          log.info(
+            { path: absSchemaPath },
+            "Supergraph changed. Invalidating..."
+          );
           if (config.fork && config.fork > 1) {
             for (const workerId in cluster.workers) {
               cluster.workers[workerId].send("invalidateUnifiedGraph");
@@ -1075,9 +1084,15 @@ async function runSupergraph({ log }, config) {
         }
       })().catch((e) => {
         if (e.name === "AbortError") return;
-        log.error(e, "Watcher for %s closed with an error", absSchemaPath);
+        log.error(
+          { path: absSchemaPath, err: e },
+          "Supergraph watcher closed with an error"
+        );
       }).then(() => {
-        log.info("Watcher for %s successfuly closed", absSchemaPath);
+        log.info(
+          { path: absSchemaPath },
+          "Supergraph watcher successfuly closed"
+        );
       });
     }
   }
@@ -1107,13 +1122,13 @@ async function runSupergraph({ log }, config) {
   }
   const runtime = createGatewayRuntime(config);
   if (absSchemaPath) {
-    log.info("Serving local supergraph from %s", absSchemaPath);
+    log.info({ path: absSchemaPath }, "Serving local supergraph");
   } else if (isUrl(String(config.supergraph))) {
-    log.info("Serving remote supergraph from %s", config.supergraph);
+    log.info({ url: config.supergraph }, "Serving remote supergraph");
   } else if (typeof config.supergraph === "object" && "type" in config.supergraph && config.supergraph.type === "hive") {
     log.info(
-      "Serving supergraph from Hive CDN at %s",
-      config.supergraph.endpoint
+      { endpoint: config.supergraph.endpoint },
+      "Serving supergraph from Hive CDN"
     );
   } else {
     log.info("Serving supergraph from config");
@@ -1156,7 +1171,8 @@ const defaultOptions = {
   host: platform().toLowerCase() === "win32" || // is WSL?
   release().toLowerCase().includes("microsoft") ? "127.0.0.1" : "0.0.0.0",
   port: 4e3,
-  pollingInterval: 1e4
+  pollingInterval: 1e4,
+  renderGraphiQL
 };
 let cli = new Command().configureHelp({
   // will print help of global options for each command

package/dist/index.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var cli = require('./cli-_WmSliwb.cjs');
+var cli = require('./cli-BuM-InLk.cjs');
 var logger = require('@graphql-hive/logger');
 var gatewayRuntime = require('@graphql-hive/gateway-runtime');
 var pubsub = require('@graphql-hive/pubsub');
@@ -24,6 +24,7 @@ require('node:module');
 require('node:os');
 require('node:path');
 require('@commander-js/extra-typings');
+require('@graphql-yoga/render-graphiql');
 require('@graphql-mesh/utils');
 require('node:fs/promises');
 require('node:url');

package/dist/index.d.cts

@@ -1,3 +1,4 @@
+import * as graphql_yoga from 'graphql-yoga';
 import { Command } from '@commander-js/extra-typings';
 import { GatewayConfigContext, GatewayConfigSupergraph, GatewayHiveReportingOptions, GatewayGraphOSReportingOptions, GatewayConfigSubgraph, GatewayConfigProxy, GatewayPlugin } from '@graphql-hive/gateway-runtime';
 export * from '@graphql-hive/gateway-runtime';
@@ -258,6 +259,7 @@ declare const defaultOptions: {
     host: string;
     port: number;
     pollingInterval: number;
+    renderGraphiQL: (opts?: graphql_yoga.GraphiQLOptions) => string;
 };
 /** Root cli for the gateway. */
 declare let cli: Command<[], {

package/dist/index.d.ts

@@ -1,3 +1,4 @@
+import * as graphql_yoga from 'graphql-yoga';
 import { Command } from '@commander-js/extra-typings';
 import { GatewayConfigContext, GatewayConfigSupergraph, GatewayHiveReportingOptions, GatewayGraphOSReportingOptions, GatewayConfigSubgraph, GatewayConfigProxy, GatewayPlugin } from '@graphql-hive/gateway-runtime';
 export * from '@graphql-hive/gateway-runtime';
@@ -258,6 +259,7 @@ declare const defaultOptions: {
     host: string;
     port: number;
     pollingInterval: number;
+    renderGraphiQL: (opts?: graphql_yoga.GraphiQLOptions) => string;
 };
 /** Root cli for the gateway. */
 declare let cli: Command<[], {

package/dist/index.js

@@ -1,4 +1,4 @@
-export { b as defaultOptions, d as defineConfig, e as enableModuleCachingIfPossible, a as getBuiltinPluginsFromConfig, g as getCacheInstanceFromConfig, h as handleNodeWarnings, r as run } from './cli-BBlJHQNF.js';
+export { b as defaultOptions, d as defineConfig, e as enableModuleCachingIfPossible, a as getBuiltinPluginsFromConfig, g as getCacheInstanceFromConfig, h as handleNodeWarnings, r as run } from './cli-BvnQIP6H.js';
 export * from '@graphql-hive/logger';
 export * from '@graphql-hive/gateway-runtime';
 export { PubSub } from '@graphql-hive/pubsub';
@@ -23,6 +23,7 @@ import 'node:module';
 import 'node:os';
 import 'node:path';
 import '@commander-js/extra-typings';
+import '@graphql-yoga/render-graphiql';
 import '@graphql-mesh/utils';
 import 'node:fs/promises';
 import 'node:url';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-hive/gateway",
-  "version": "2.0.0-alpha-7c4daa14687333c83ca23d8c74c7779e1bc5ac03",
+  "version": "2.0.0-alpha-7184bde516d9890379b9bed7d06426fad8c16546",
   "type": "module",
   "repository": {
     "type": "git",
@@ -53,10 +53,10 @@
     "@escape.tech/graphql-armor-block-field-suggestions": "^3.0.0",
     "@escape.tech/graphql-armor-max-depth": "^2.4.0",
     "@escape.tech/graphql-armor-max-tokens": "^2.5.0",
-    "@graphql-hive/gateway-runtime": "2.0.0-alpha-7c4daa14687333c83ca23d8c74c7779e1bc5ac03",
+    "@graphql-hive/gateway-runtime": "2.0.0-alpha-7184bde516d9890379b9bed7d06426fad8c16546",
     "@graphql-hive/importer": "^1.1.0",
-    "@graphql-hive/logger": "1.0.0-alpha-7c4daa14687333c83ca23d8c74c7779e1bc5ac03",
-    "@graphql-hive/plugin-aws-sigv4": "1.0.11-alpha-7c4daa14687333c83ca23d8c74c7779e1bc5ac03",
+    "@graphql-hive/logger": "1.0.0-alpha-7184bde516d9890379b9bed7d06426fad8c16546",
+    "@graphql-hive/plugin-aws-sigv4": "1.0.12-alpha-7184bde516d9890379b9bed7d06426fad8c16546",
     "@graphql-hive/plugin-deduplicate-request": "^1.0.0",
     "@graphql-hive/pubsub": "^1.0.0",
     "@graphql-mesh/cache-cfw-kv": "^0.105.0",
@@ -64,33 +64,34 @@
     "@graphql-mesh/cache-redis": "^0.104.0",
     "@graphql-mesh/cache-upstash-redis": "^0.1.0",
     "@graphql-mesh/cross-helpers": "^0.4.10",
-    "@graphql-mesh/hmac-upstream-signature": "2.0.0-alpha-7c4daa14687333c83ca23d8c74c7779e1bc5ac03",
+    "@graphql-mesh/hmac-upstream-signature": "2.0.0-alpha-7184bde516d9890379b9bed7d06426fad8c16546",
     "@graphql-mesh/plugin-http-cache": "^0.105.2",
     "@graphql-mesh/plugin-jit": "^0.2.0",
-    "@graphql-mesh/plugin-jwt-auth": "2.0.0-alpha-7c4daa14687333c83ca23d8c74c7779e1bc5ac03",
+    "@graphql-mesh/plugin-jwt-auth": "2.0.0-alpha-7184bde516d9890379b9bed7d06426fad8c16546",
     "@graphql-mesh/plugin-mock": "^0.105.0",
-    "@graphql-mesh/plugin-opentelemetry": "2.0.0-alpha-7c4daa14687333c83ca23d8c74c7779e1bc5ac03",
-    "@graphql-mesh/plugin-prometheus": "2.0.0-alpha-7c4daa14687333c83ca23d8c74c7779e1bc5ac03",
+    "@graphql-mesh/plugin-opentelemetry": "2.0.0-alpha-7184bde516d9890379b9bed7d06426fad8c16546",
+    "@graphql-mesh/plugin-prometheus": "2.0.0-alpha-7184bde516d9890379b9bed7d06426fad8c16546",
     "@graphql-mesh/plugin-rate-limit": "^0.104.0",
     "@graphql-mesh/plugin-snapshot": "^0.104.0",
-    "@graphql-mesh/transport-http": "0.6.42-alpha-7c4daa14687333c83ca23d8c74c7779e1bc5ac03",
-    "@graphql-mesh/transport-http-callback": "1.0.0-alpha-7c4daa14687333c83ca23d8c74c7779e1bc5ac03",
-    "@graphql-mesh/transport-ws": "2.0.0-alpha-7c4daa14687333c83ca23d8c74c7779e1bc5ac03",
+    "@graphql-mesh/transport-http": "0.6.43-alpha-7184bde516d9890379b9bed7d06426fad8c16546",
+    "@graphql-mesh/transport-http-callback": "1.0.0-alpha-7184bde516d9890379b9bed7d06426fad8c16546",
+    "@graphql-mesh/transport-ws": "2.0.0-alpha-7184bde516d9890379b9bed7d06426fad8c16546",
     "@graphql-mesh/types": "^0.104.0",
     "@graphql-mesh/utils": "^0.104.2",
     "@graphql-tools/code-file-loader": "^8.1.15",
-    "@graphql-tools/graphql-file-loader": "^8.0.14",
+    "@graphql-tools/graphql-file-loader": "^8.0.20",
     "@graphql-tools/load": "^8.0.14",
     "@graphql-tools/utils": "^10.8.1",
+    "@graphql-yoga/render-graphiql": "^5.13.5",
     "commander": "^13.1.0",
     "dotenv": "^16.4.7",
     "graphql-ws": "^6.0.4",
-    "graphql-yoga": "^5.13.4",
+    "graphql-yoga": "^5.13.5",
     "tslib": "^2.8.1",
     "ws": "^8.18.0"
   },
   "devDependencies": {
-    "@graphql-mesh/transport-common": "1.0.0-alpha-7c4daa14687333c83ca23d8c74c7779e1bc5ac03",
+    "@graphql-mesh/transport-common": "1.0.0-alpha-7184bde516d9890379b9bed7d06426fad8c16546",
     "@graphql-mesh/transport-soap": "^0.10.0",
     "@graphql-tools/executor": "^1.4.7",
     "@rollup/plugin-commonjs": "^28.0.0",
@@ -99,17 +100,17 @@
     "@rollup/plugin-sucrase": "^5.0.2",
     "@tsconfig/node18": "^18.2.4",
     "@types/adm-zip": "^0.5.5",
-    "@types/bun": "1.2.13",
+    "@types/bun": "1.2.15",
     "@types/ws": "^8.5.12",
     "@whatwg-node/fetch": "^0.10.8",
     "adm-zip": "^0.5.15",
-    "bun": "^1.1.34",
+    "bun": "^1.2.15",
     "graphql": "^16.9.0",
     "parse-duration": "^2.0.0",
     "pkgroll": "2.12.2",
     "postject": "^1.0.0-alpha.6",
     "rimraf": "^6.0.1",
-    "rollup": "^4.18.1",
+    "rollup": "4.40.2",
     "rollup-plugin-tsconfig-paths": "^1.5.2",
     "tsx": "4.19.4"
   },