From c85f182959fe65c6e6d4274bc956538604440376 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 10 Jan 2025 11:04:29 +0000
Subject: [PATCH] fix(deps): update gateway dependencies (#8244)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .changeset/shaggy-cooks-pull.md               |   6 +
 .../hive-example/sources/authors/package.json |   2 +-
 .../hive-example/sources/books/package.json   |   2 +-
 .../hive-example/my-graphql/package.json      |   2 +-
 .../v1-next/hive-example/my-rest/package.json |   2 +-
 package.json                                  |   4 +-
 packages/legacy/transforms/hive/package.json  |   3 +-
 packages/legacy/transforms/hive/src/index.ts  |  25 +-
 packages/loaders/openapi/package.json         |   2 +-
 .../plugins/deduplicate-request/package.json  |   2 +-
 packages/plugins/hive/package.json            |   5 +-
 packages/plugins/hive/src/index.ts            |  30 +-
 yarn.lock                                     | 367 ++++++------------
 13 files changed, 144 insertions(+), 308 deletions(-)
 create mode 100644 .changeset/shaggy-cooks-pull.md

diff --git a/.changeset/shaggy-cooks-pull.md b/.changeset/shaggy-cooks-pull.md
new file mode 100644
index 0000000000000..d6e15ccdd93a4
--- /dev/null
+++ b/.changeset/shaggy-cooks-pull.md
@@ -0,0 +1,6 @@
+---
+'@graphql-mesh/transform-hive': patch
+'@graphql-mesh/plugin-hive': patch
+---
+
+Bump Hive Console dependencies
diff --git a/examples/hive-example/sources/authors/package.json b/examples/hive-example/sources/authors/package.json
index 36ed2e5d32452..acf897319fdfc 100644
--- a/examples/hive-example/sources/authors/package.json
+++ b/examples/hive-example/sources/authors/package.json
@@ -13,7 +13,7 @@
     "typescript": "^5.4.2"
   },
   "devDependencies": {
-    "@graphql-hive/cli": "0.44.5",
+    "@graphql-hive/cli": "0.45.0",
     "@graphql-mesh/cli": "0.98.17",
     "@graphql-mesh/openapi": "0.108.13",
     "graphql": "16.10.0"
diff --git a/examples/hive-example/sources/books/package.json b/examples/hive-example/sources/books/package.json
index cc6bf3344860b..5ec7f81782abe 100644
--- a/examples/hive-example/sources/books/package.json
+++ b/examples/hive-example/sources/books/package.json
@@ -13,7 +13,7 @@
     "typescript": "^5.4.2"
   },
   "devDependencies": {
-    "@graphql-hive/cli": "0.44.5",
+    "@graphql-hive/cli": "0.45.0",
     "@graphql-mesh/cli": "0.98.17",
     "@graphql-mesh/openapi": "0.108.13",
     "graphql": "16.10.0"
diff --git a/examples/v1-next/hive-example/my-graphql/package.json b/examples/v1-next/hive-example/my-graphql/package.json
index ae3903fefa98c..41f874890d1a6 100644
--- a/examples/v1-next/hive-example/my-graphql/package.json
+++ b/examples/v1-next/hive-example/my-graphql/package.json
@@ -6,7 +6,7 @@
     "start": "node --import tsx index.ts"
   },
   "dependencies": {
-    "@graphql-hive/cli": "0.44.5",
+    "@graphql-hive/cli": "0.45.0",
     "graphql": "16.10.0",
     "graphql-yoga": "5.10.9"
   }
diff --git a/examples/v1-next/hive-example/my-rest/package.json b/examples/v1-next/hive-example/my-rest/package.json
index 385744bc6fd13..eccec83a4068e 100644
--- a/examples/v1-next/hive-example/my-rest/package.json
+++ b/examples/v1-next/hive-example/my-rest/package.json
@@ -7,7 +7,7 @@
     "start": "node --import tsx index.ts"
   },
   "dependencies": {
-    "@graphql-hive/cli": "0.44.5",
+    "@graphql-hive/cli": "0.45.0",
     "@graphql-mesh/compose-cli": "workspace:*",
     "@omnigraph/openapi": "workspace:*",
     "fets": "0.8.4",
diff --git a/package.json b/package.json
index 8338997869158..92c2502be83a6 100644
--- a/package.json
+++ b/package.json
@@ -107,8 +107,8 @@
   },
   "resolutions": {
     "@changesets/assemble-release-plan": "patch:@changesets/assemble-release-plan@npm%3A5.2.3#~/.yarn/patches/@changesets-assemble-release-plan-npm-5.2.3-296454a28f.patch",
-    "@whatwg-node/fetch": "0.10.1",
-    "@whatwg-node/node-fetch": "0.7.5",
+    "@whatwg-node/fetch": "0.10.3",
+    "@whatwg-node/node-fetch": "0.7.7",
     "@whatwg-node/server": "0.9.65",
     "es5-ext": "0.10.64",
     "esbuild": "^0.24.0",
diff --git a/packages/legacy/transforms/hive/package.json b/packages/legacy/transforms/hive/package.json
index 16afa213bac2e..8af36b406e063 100644
--- a/packages/legacy/transforms/hive/package.json
+++ b/packages/legacy/transforms/hive/package.json
@@ -35,8 +35,7 @@
     "graphql": "*"
   },
   "dependencies": {
-    "@graphql-hive/core": "^0.8.1",
-    "@graphql-hive/yoga": "^0.39.0",
+    "@graphql-hive/core": "^0.8.3",
     "@graphql-mesh/cross-helpers": "^0.4.9",
     "@graphql-mesh/string-interpolation": "^0.5.7",
     "@graphql-mesh/types": "^0.103.11",
diff --git a/packages/legacy/transforms/hive/src/index.ts b/packages/legacy/transforms/hive/src/index.ts
index b137169855caf..013d6862a8269 100644
--- a/packages/legacy/transforms/hive/src/index.ts
+++ b/packages/legacy/transforms/hive/src/index.ts
@@ -1,6 +1,5 @@
-import { isSchema, Kind, visit, type ExecutionResult, type GraphQLSchema } from 'graphql';
-import type { HiveClient, HivePluginOptions } from '@graphql-hive/core';
-import { createHive } from '@graphql-hive/yoga';
+import { Kind, visit, type ExecutionResult, type GraphQLSchema } from 'graphql';
+import { createHive, type HiveClient, type HivePluginOptions } from '@graphql-hive/core';
 import { process } from '@graphql-mesh/cross-helpers';
 import { stringInterpolator } from '@graphql-mesh/string-interpolation';
 import type { MeshTransform, MeshTransformOptions, YamlConfig } from '@graphql-mesh/types';
@@ -16,7 +15,7 @@ export default class HiveTransform implements MeshTransform {
   private hiveClient: HiveClient;
   private logger: MeshTransformOptions<YamlConfig.HivePlugin>['logger'];
   private schema: GraphQLSchema;
-  constructor({ config, pubsub, logger }: MeshTransformOptions<YamlConfig.HivePlugin>) {
+  constructor({ config, logger }: MeshTransformOptions<YamlConfig.HivePlugin>) {
     this.logger = logger;
     const enabled =
       // eslint-disable-next-line no-new-func
@@ -77,26 +76,8 @@ export default class HiveTransform implements MeshTransform {
       agent,
       usage,
       reporting,
-      autoDispose: false,
       selfHosting: config.selfHosting,
     });
-    const id = pubsub.subscribe('destroy', () => {
-      try {
-        mapMaybePromise(
-          this.hiveClient.dispose(),
-          () => {
-            pubsub.unsubscribe(id);
-          },
-          e => {
-            logger.error(`Hive client failed to dispose`, e);
-            pubsub.unsubscribe(id);
-          },
-        );
-      } catch (e) {
-        logger.error(`Failed to dispose hive client`, e);
-        pubsub.unsubscribe(id);
-      }
-    });
   }
 
   transformSchema(schema: GraphQLSchema) {
diff --git a/packages/loaders/openapi/package.json b/packages/loaders/openapi/package.json
index 9cfba92c0405f..88505d1dfbdd9 100644
--- a/packages/loaders/openapi/package.json
+++ b/packages/loaders/openapi/package.json
@@ -48,7 +48,7 @@
     "tslib": "^2.4.0"
   },
   "devDependencies": {
-    "@whatwg-node/fetch": "0.10.1",
+    "@whatwg-node/fetch": "0.10.3",
     "fets": "0.8.4",
     "graphql-yoga": "5.10.9",
     "json-bigint-patch": "0.0.8"
diff --git a/packages/plugins/deduplicate-request/package.json b/packages/plugins/deduplicate-request/package.json
index 00fbc02f099e8..c9ba3501195f5 100644
--- a/packages/plugins/deduplicate-request/package.json
+++ b/packages/plugins/deduplicate-request/package.json
@@ -41,7 +41,7 @@
     "tslib": "^2.4.0"
   },
   "devDependencies": {
-    "@whatwg-node/fetch": "0.10.1"
+    "@whatwg-node/fetch": "0.10.3"
   },
   "publishConfig": {
     "access": "public",
diff --git a/packages/plugins/hive/package.json b/packages/plugins/hive/package.json
index ba613cf9c6599..b7b19b90e80dd 100644
--- a/packages/plugins/hive/package.json
+++ b/packages/plugins/hive/package.json
@@ -35,12 +35,11 @@
     "graphql": "*"
   },
   "dependencies": {
-    "@graphql-hive/core": "^0.8.1",
-    "@graphql-hive/yoga": "^0.39.0",
+    "@graphql-hive/core": "^0.8.3",
+    "@graphql-hive/yoga": "^0.39.2",
     "@graphql-mesh/cross-helpers": "^0.4.9",
     "@graphql-mesh/string-interpolation": "0.5.7",
     "@graphql-mesh/types": "^0.103.11",
-    "@graphql-mesh/utils": "^0.103.11",
     "tslib": "^2.4.0"
   },
   "publishConfig": {
diff --git a/packages/plugins/hive/src/index.ts b/packages/plugins/hive/src/index.ts
index 810cc33fb36a8..f82eb38926fbf 100644
--- a/packages/plugins/hive/src/index.ts
+++ b/packages/plugins/hive/src/index.ts
@@ -1,14 +1,12 @@
 import type { HivePluginOptions } from '@graphql-hive/core';
-import { createHive, useHive } from '@graphql-hive/yoga';
+import { useHive } from '@graphql-hive/yoga';
 import { process } from '@graphql-mesh/cross-helpers';
 import { stringInterpolator } from '@graphql-mesh/string-interpolation';
-import type { Logger, MeshPlugin, MeshPubSub, YamlConfig } from '@graphql-mesh/types';
-import { makeAsyncDisposable } from '@graphql-mesh/utils';
+import type { Logger, MeshPlugin, YamlConfig } from '@graphql-mesh/types';
 
 export default function useMeshHive<TContext>(
   pluginOptions: YamlConfig.HivePlugin & {
     logger?: Logger;
-    pubsub?: MeshPubSub;
   },
 ): MeshPlugin<TContext> {
   const enabled =
@@ -106,7 +104,7 @@ export default function useMeshHive<TContext>(
       }),
     };
   }
-  const hiveClient = createHive({
+  const yogaPluginOpts: HivePluginOptions = {
     enabled:
       // eslint-disable-next-line no-unneeded-ternary -- for brevity
       persistedDocuments && !token
@@ -118,24 +116,8 @@ export default function useMeshHive<TContext>(
     usage,
     reporting,
     selfHosting,
-    // Mesh already disposes the client below on Mesh's `destroy` event
-    autoDispose: false,
     experimental__persistedDocuments: persistedDocuments,
-  });
-  // TODO: Remove later after v0
-  // Pubsub.destroy will no longer
-  function onTerminate() {
-    return hiveClient
-      .dispose()
-      .catch(e => pluginOptions.logger?.error(`Hive client failed to dispose`, e));
-  }
-  const id: number = pluginOptions.pubsub?.subscribe('destroy', () =>
-    onTerminate().finally(() => pluginOptions.pubsub.unsubscribe(id)),
-  );
-
-  return makeAsyncDisposable<MeshPlugin<TContext>>(
-    // @ts-expect-error - Typings are wrong
-    useHive(hiveClient),
-    onTerminate,
-  );
+  };
+  // @ts-expect-error - Typings are incorrect
+  return useHive(yogaPluginOpts);
 }
diff --git a/yarn.lock b/yarn.lock
index b7a90b83207f2..0c5df102a4281 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -80,7 +80,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@apollo/client@npm:3.12.5":
+"@apollo/client@npm:3.12.5, @apollo/client@npm:^3.8.0":
   version: 3.12.5
   resolution: "@apollo/client@npm:3.12.5"
   dependencies:
@@ -117,43 +117,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@apollo/client@npm:^3.8.0":
-  version: 3.12.4
-  resolution: "@apollo/client@npm:3.12.4"
-  dependencies:
-    "@graphql-typed-document-node/core": "npm:^3.1.1"
-    "@wry/caches": "npm:^1.0.0"
-    "@wry/equality": "npm:^0.5.6"
-    "@wry/trie": "npm:^0.5.0"
-    graphql-tag: "npm:^2.12.6"
-    hoist-non-react-statics: "npm:^3.3.2"
-    optimism: "npm:^0.18.0"
-    prop-types: "npm:^15.7.2"
-    rehackt: "npm:^0.1.0"
-    response-iterator: "npm:^0.2.6"
-    symbol-observable: "npm:^4.0.0"
-    ts-invariant: "npm:^0.10.3"
-    tslib: "npm:^2.3.0"
-    zen-observable-ts: "npm:^1.2.5"
-  peerDependencies:
-    graphql: ^15.0.0 || ^16.0.0
-    graphql-ws: ^5.5.5
-    react: ^16.8.0 || ^17.0.0 || ^18.0.0 || >=19.0.0-rc
-    react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || >=19.0.0-rc
-    subscriptions-transport-ws: ^0.9.0 || ^0.11.0
-  peerDependenciesMeta:
-    graphql-ws:
-      optional: true
-    react:
-      optional: true
-    react-dom:
-      optional: true
-    subscriptions-transport-ws:
-      optional: true
-  checksum: 10c0/6b30b14d576230cb56b0bb9b328c81f33631640e3d97a1185a20ede7e200dfa79502d695c347920e8c930a36e50870a41f5244ae2167d0123ad56973642528e6
-  languageName: node
-  linkType: hard
-
 "@apollo/composition@npm:2.9.3":
   version: 2.9.3
   resolution: "@apollo/composition@npm:2.9.3"
@@ -1712,7 +1675,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@aws-sdk/types@npm:3.714.0, @aws-sdk/types@npm:^3.222.0":
+"@aws-sdk/types@npm:3.714.0":
   version: 3.714.0
   resolution: "@aws-sdk/types@npm:3.714.0"
   dependencies:
@@ -1722,7 +1685,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@aws-sdk/types@npm:3.723.0":
+"@aws-sdk/types@npm:3.723.0, @aws-sdk/types@npm:^3.222.0":
   version: 3.723.0
   resolution: "@aws-sdk/types@npm:3.723.0"
   dependencies:
@@ -5226,7 +5189,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@examples-v1-next/hive-example-my-graphql@workspace:examples/v1-next/hive-example/my-graphql"
   dependencies:
-    "@graphql-hive/cli": "npm:0.44.5"
+    "@graphql-hive/cli": "npm:0.45.0"
     graphql: "npm:16.10.0"
     graphql-yoga: "npm:5.10.9"
   languageName: unknown
@@ -5236,7 +5199,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@examples-v1-next/hive-example-my-rest@workspace:examples/v1-next/hive-example/my-rest"
   dependencies:
-    "@graphql-hive/cli": "npm:0.44.5"
+    "@graphql-hive/cli": "npm:0.45.0"
     "@graphql-mesh/compose-cli": "workspace:*"
     "@omnigraph/openapi": "workspace:*"
     fets: "npm:0.8.4"
@@ -5572,7 +5535,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@examples/hive-example-sources-authors@workspace:examples/hive-example/sources/authors"
   dependencies:
-    "@graphql-hive/cli": "npm:0.44.5"
+    "@graphql-hive/cli": "npm:0.45.0"
     "@graphql-mesh/cli": "npm:0.98.17"
     "@graphql-mesh/openapi": "npm:0.108.13"
     fets: "npm:^0.8.0"
@@ -5586,7 +5549,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@examples/hive-example-sources-books@workspace:examples/hive-example/sources/books"
   dependencies:
-    "@graphql-hive/cli": "npm:0.44.5"
+    "@graphql-hive/cli": "npm:0.45.0"
     "@graphql-mesh/cli": "npm:0.98.17"
     "@graphql-mesh/openapi": "npm:0.108.13"
     fets: "npm:^0.8.0"
@@ -6505,18 +6468,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@graphql-hive/cli@npm:0.44.5":
-  version: 0.44.5
-  resolution: "@graphql-hive/cli@npm:0.44.5"
+"@graphql-hive/cli@npm:0.45.0":
+  version: 0.45.0
+  resolution: "@graphql-hive/cli@npm:0.45.0"
   dependencies:
-    "@graphql-hive/core": "npm:0.8.2"
+    "@graphql-hive/core": "npm:0.8.3"
     "@graphql-inspector/core": "npm:5.1.0-alpha-20231208113249-34700c8a"
     "@graphql-tools/code-file-loader": "npm:~8.1.0"
     "@graphql-tools/graphql-file-loader": "npm:~8.0.0"
     "@graphql-tools/json-file-loader": "npm:~8.0.0"
     "@graphql-tools/load": "npm:~8.0.0"
     "@graphql-tools/url-loader": "npm:~8.0.0"
-    "@graphql-tools/utils": "npm:10.5.6"
+    "@graphql-tools/utils": "npm:10.7.2"
     "@graphql-typed-document-node/core": "npm:3.2.0"
     "@oclif/core": "npm:^3.26.6"
     "@oclif/plugin-help": "npm:6.0.22"
@@ -6531,22 +6494,22 @@ __metadata:
     zod: "npm:3.24.1"
   bin:
     hive: bin/run
-  checksum: 10c0/22937fb3c1c7f7928a6a1adf6e59b43a3f33278964940db459901f893692e08511935170bf754fc884550c7819e974abac79d979836438aaed9734aa210c3a37
+  checksum: 10c0/4644c81ff49cee1e15e6cabf016ceacc4a4204309b6b85989bff829dbcb35d0be2027bb1f18536305ba4c875f45e434854c7a9749a3293c2adea9edd9ec43f0d
   languageName: node
   linkType: hard
 
-"@graphql-hive/core@npm:0.8.2, @graphql-hive/core@npm:^0.8.1":
-  version: 0.8.2
-  resolution: "@graphql-hive/core@npm:0.8.2"
+"@graphql-hive/core@npm:0.8.3, @graphql-hive/core@npm:^0.8.1, @graphql-hive/core@npm:^0.8.3":
+  version: 0.8.3
+  resolution: "@graphql-hive/core@npm:0.8.3"
   dependencies:
     "@graphql-tools/utils": "npm:^10.0.0"
-    "@whatwg-node/fetch": "npm:0.9.21"
+    "@whatwg-node/fetch": "npm:0.10.1"
     async-retry: "npm:1.3.3"
     lodash.sortby: "npm:4.7.0"
     tiny-lru: "npm:8.0.2"
   peerDependencies:
     graphql: ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0
-  checksum: 10c0/3a483ccadfb1a94b734a9f80d35aa19fe68401217399cf77c75ac50466af1e100bcf57f689a37a66a3e5e68ef4cc3b1707ff654911330426a9f4fef8dfb59373
+  checksum: 10c0/66a26df49c0ade6f3623b9ecc2e24bb4aafc6748392a3abdb38c7b842425e637863554b2d2592c10ad16aa11184eaf0960ce494e8be192175717153063cf3d4d
   languageName: node
   linkType: hard
 
@@ -6655,17 +6618,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@graphql-hive/yoga@npm:^0.39.0":
-  version: 0.39.1
-  resolution: "@graphql-hive/yoga@npm:0.39.1"
+"@graphql-hive/yoga@npm:^0.39.2":
+  version: 0.39.2
+  resolution: "@graphql-hive/yoga@npm:0.39.2"
   dependencies:
-    "@graphql-hive/core": "npm:0.8.2"
+    "@graphql-hive/core": "npm:0.8.3"
     "@graphql-yoga/plugin-persisted-operations": "npm:^3.9.0"
-    tiny-lru: "npm:8.0.2"
   peerDependencies:
     graphql: ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0
-    graphql-yoga: ^5.9.0
-  checksum: 10c0/f197aa0f0069247c393b0d298817a9f513026e73bee8a8dca2fd61e93b71c43ebf3b66c35cceea5056e89a1f7dc3ecd1f313765dab8ce16f20809211fb4af1f7
+    graphql-yoga: ^5.10.8
+  checksum: 10c0/b6baefef4d1fe2deff3f7eb0415dd22711cfdec7ba1b10d0290c285b6e4db3384c6fb6f59222d6c71e5cabfbedf0e0ab91ca6fa2e8c761899282f42a11610109
   languageName: node
   linkType: hard
 
@@ -7187,7 +7149,7 @@ __metadata:
     "@graphql-mesh/types": "npm:^0.103.11"
     "@graphql-mesh/utils": "npm:^0.103.11"
     "@graphql-tools/utils": "npm:^10.6.0"
-    "@whatwg-node/fetch": "npm:0.10.1"
+    "@whatwg-node/fetch": "npm:0.10.3"
     tslib: "npm:^2.4.0"
   peerDependencies:
     graphql: "*"
@@ -7198,12 +7160,11 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@graphql-mesh/plugin-hive@workspace:packages/plugins/hive"
   dependencies:
-    "@graphql-hive/core": "npm:^0.8.1"
-    "@graphql-hive/yoga": "npm:^0.39.0"
+    "@graphql-hive/core": "npm:^0.8.3"
+    "@graphql-hive/yoga": "npm:^0.39.2"
     "@graphql-mesh/cross-helpers": "npm:^0.4.9"
     "@graphql-mesh/string-interpolation": "npm:0.5.7"
     "@graphql-mesh/types": "npm:^0.103.11"
-    "@graphql-mesh/utils": "npm:^0.103.11"
     tslib: "npm:^2.4.0"
   peerDependencies:
     graphql: "*"
@@ -7706,8 +7667,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@graphql-mesh/transform-hive@workspace:packages/legacy/transforms/hive"
   dependencies:
-    "@graphql-hive/core": "npm:^0.8.1"
-    "@graphql-hive/yoga": "npm:^0.39.0"
+    "@graphql-hive/core": "npm:^0.8.3"
     "@graphql-mesh/cross-helpers": "npm:^0.4.9"
     "@graphql-mesh/string-interpolation": "npm:^0.5.7"
     "@graphql-mesh/types": "npm:^0.103.11"
@@ -8470,7 +8430,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@graphql-tools/graphql-tag-pluck@npm:8.3.11, @graphql-tools/graphql-tag-pluck@npm:^8.3.11":
+"@graphql-tools/graphql-tag-pluck@npm:8.3.11":
   version: 8.3.11
   resolution: "@graphql-tools/graphql-tag-pluck@npm:8.3.11"
   dependencies:
@@ -8487,7 +8447,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@graphql-tools/graphql-tag-pluck@npm:8.3.12":
+"@graphql-tools/graphql-tag-pluck@npm:8.3.12, @graphql-tools/graphql-tag-pluck@npm:^8.3.11":
   version: 8.3.12
   resolution: "@graphql-tools/graphql-tag-pluck@npm:8.3.12"
   dependencies:
@@ -8859,10 +8819,9 @@ __metadata:
   linkType: hard
 
 "@graphql-tools/url-loader@npm:^8.0.0, @graphql-tools/url-loader@npm:^8.0.15, @graphql-tools/url-loader@npm:^8.0.9, @graphql-tools/url-loader@npm:~8.0.0":
-  version: 8.0.23
-  resolution: "@graphql-tools/url-loader@npm:8.0.23"
+  version: 8.0.24
+  resolution: "@graphql-tools/url-loader@npm:8.0.24"
   dependencies:
-    "@ardatan/sync-fetch": "npm:^0.0.1"
     "@graphql-tools/executor-graphql-ws": "npm:^1.3.2"
     "@graphql-tools/executor-http": "npm:^1.1.9"
     "@graphql-tools/executor-legacy-ws": "npm:^1.1.10"
@@ -8871,26 +8830,13 @@ __metadata:
     "@types/ws": "npm:^8.0.0"
     "@whatwg-node/fetch": "npm:^0.10.0"
     isomorphic-ws: "npm:^5.0.0"
+    sync-fetch: "npm:0.6.0-2"
     tslib: "npm:^2.4.0"
     value-or-promise: "npm:^1.0.11"
     ws: "npm:^8.17.1"
   peerDependencies:
     graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
-  checksum: 10c0/097a5112399933f5a2613a6ce6dc5db0de87819930e75fc57f12e95f148e24e141b41d4dd1985def50c9acc890c9b01d2f8718bbecf0e8b36a2e7722de542c4a
-  languageName: node
-  linkType: hard
-
-"@graphql-tools/utils@npm:10.5.6":
-  version: 10.5.6
-  resolution: "@graphql-tools/utils@npm:10.5.6"
-  dependencies:
-    "@graphql-typed-document-node/core": "npm:^3.1.1"
-    cross-inspect: "npm:1.0.1"
-    dset: "npm:^3.1.2"
-    tslib: "npm:^2.4.0"
-  peerDependencies:
-    graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
-  checksum: 10c0/b71d47ccaf937a4b658f9441c8d49acdb77e3b0f0fe0075a1987c8738ada8cbb3aab1181d6b2cb8e0585e40cac3099487be5309896b0dcfd5dbd76b5f1a86808
+  checksum: 10c0/76f9b862292c5204405bf2fe1dc97bdee2c76fc44298d0bad42a540521c46e185b7bf0cc3d69e4afd7e011a795e9ccd645e2566769972a4575d137613799739a
   languageName: node
   linkType: hard
 
@@ -9015,7 +8961,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@graphql-yoga/plugin-apollo-inline-trace@npm:3.10.9":
+"@graphql-yoga/plugin-apollo-inline-trace@npm:3.10.9, @graphql-yoga/plugin-apollo-inline-trace@npm:^3.10.8":
   version: 3.10.9
   resolution: "@graphql-yoga/plugin-apollo-inline-trace@npm:3.10.9"
   dependencies:
@@ -9031,22 +8977,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@graphql-yoga/plugin-apollo-inline-trace@npm:^3.10.8":
-  version: 3.10.8
-  resolution: "@graphql-yoga/plugin-apollo-inline-trace@npm:3.10.8"
-  dependencies:
-    "@apollo/usage-reporting-protobuf": "npm:^4.1.1"
-    "@envelop/on-resolve": "npm:^4.1.1"
-    tslib: "npm:^2.5.2"
-  peerDependencies:
-    "@graphql-tools/utils": ^10.6.1
-    "@whatwg-node/fetch": ^0.10.1
-    graphql: ^15.2.0 || ^16.0.0
-    graphql-yoga: ^5.10.8
-  checksum: 10c0/9609706f0cb61c8be51191fade0fca6ffbb8150329e7846ee82372f1ddec37759a28abbf6f04db91faffc6e35231604fdea552cd74c7f86b5f42af55192e2d44
-  languageName: node
-  linkType: hard
-
 "@graphql-yoga/plugin-apollo-usage-report@npm:^0.5.3":
   version: 0.5.5
   resolution: "@graphql-yoga/plugin-apollo-usage-report@npm:0.5.5"
@@ -10211,13 +10141,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@kamilkisiela/fast-url-parser@npm:^1.1.4":
-  version: 1.1.4
-  resolution: "@kamilkisiela/fast-url-parser@npm:1.1.4"
-  checksum: 10c0/2c85202cb4924720ac812c8bc06967fd5df4db759a68aa3acc2962b8cf9e2b3bc131de863f00473c0b0602df13891b35140f667a87eea04c9b897b6c1ae89c4a
-  languageName: node
-  linkType: hard
-
 "@leichtgewicht/ip-codec@npm:^2.0.1":
   version: 2.0.5
   resolution: "@leichtgewicht/ip-codec@npm:2.0.5"
@@ -11010,7 +10933,7 @@ __metadata:
     "@graphql-mesh/utils": "npm:^0.103.11"
     "@graphql-tools/utils": "npm:^10.6.4"
     "@omnigraph/json-schema": "npm:^0.108.11"
-    "@whatwg-node/fetch": "npm:0.10.1"
+    "@whatwg-node/fetch": "npm:0.10.3"
     change-case: "npm:^4.1.2"
     fets: "npm:0.8.4"
     graphql-yoga: "npm:5.10.9"
@@ -15071,7 +14994,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/eslint-plugin@npm:8.19.1":
+"@typescript-eslint/eslint-plugin@npm:8.19.1, @typescript-eslint/eslint-plugin@npm:^5.4.2 || ^6.0.0 || ^7.0.0 || ^8.0.0":
   version: 8.19.1
   resolution: "@typescript-eslint/eslint-plugin@npm:8.19.1"
   dependencies:
@@ -15092,27 +15015,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/eslint-plugin@npm:^5.4.2 || ^6.0.0 || ^7.0.0 || ^8.0.0":
-  version: 8.19.0
-  resolution: "@typescript-eslint/eslint-plugin@npm:8.19.0"
-  dependencies:
-    "@eslint-community/regexpp": "npm:^4.10.0"
-    "@typescript-eslint/scope-manager": "npm:8.19.0"
-    "@typescript-eslint/type-utils": "npm:8.19.0"
-    "@typescript-eslint/utils": "npm:8.19.0"
-    "@typescript-eslint/visitor-keys": "npm:8.19.0"
-    graphemer: "npm:^1.4.0"
-    ignore: "npm:^5.3.1"
-    natural-compare: "npm:^1.4.0"
-    ts-api-utils: "npm:^1.3.0"
-  peerDependencies:
-    "@typescript-eslint/parser": ^8.0.0 || ^8.0.0-alpha.0
-    eslint: ^8.57.0 || ^9.0.0
-    typescript: ">=4.8.4 <5.8.0"
-  checksum: 10c0/ceaa5063b68684b5608950b5e69f0caf1eadfc356cba82625240d6aae55f769faff599c38d35252dcb77a40d92e6fbf6d6264bc0c577d5c549da25061c3bd796
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/eslint-plugin@npm:^5.5.0":
   version: 5.62.0
   resolution: "@typescript-eslint/eslint-plugin@npm:5.62.0"
@@ -15148,7 +15050,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/parser@npm:8.19.1":
+"@typescript-eslint/parser@npm:8.19.1, @typescript-eslint/parser@npm:^5.4.2 || ^6.0.0 || ^7.0.0 || ^8.0.0":
   version: 8.19.1
   resolution: "@typescript-eslint/parser@npm:8.19.1"
   dependencies:
@@ -15164,22 +15066,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/parser@npm:^5.4.2 || ^6.0.0 || ^7.0.0 || ^8.0.0":
-  version: 8.19.0
-  resolution: "@typescript-eslint/parser@npm:8.19.0"
-  dependencies:
-    "@typescript-eslint/scope-manager": "npm:8.19.0"
-    "@typescript-eslint/types": "npm:8.19.0"
-    "@typescript-eslint/typescript-estree": "npm:8.19.0"
-    "@typescript-eslint/visitor-keys": "npm:8.19.0"
-    debug: "npm:^4.3.4"
-  peerDependencies:
-    eslint: ^8.57.0 || ^9.0.0
-    typescript: ">=4.8.4 <5.8.0"
-  checksum: 10c0/064b0997963060490fc3f92c90cebc7c694f47a7657f7882ce9eb314786e0cf3e917bfccfad614d23038439d84e69a978bdc7054515b23201001dd427e524e64
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/parser@npm:^5.5.0":
   version: 5.62.0
   resolution: "@typescript-eslint/parser@npm:5.62.0"
@@ -15207,16 +15093,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:8.19.0":
-  version: 8.19.0
-  resolution: "@typescript-eslint/scope-manager@npm:8.19.0"
-  dependencies:
-    "@typescript-eslint/types": "npm:8.19.0"
-    "@typescript-eslint/visitor-keys": "npm:8.19.0"
-  checksum: 10c0/5052863d00db7ae939de27e91dc6c92df3c37a877e1ff44015ae9aa754d419b44d97d98b25fbb30a80dc58cf92606dad599e27f32b86d20c13b77ac12b4f2abc
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/scope-manager@npm:8.19.1":
   version: 8.19.1
   resolution: "@typescript-eslint/scope-manager@npm:8.19.1"
@@ -15244,21 +15120,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/type-utils@npm:8.19.0":
-  version: 8.19.0
-  resolution: "@typescript-eslint/type-utils@npm:8.19.0"
-  dependencies:
-    "@typescript-eslint/typescript-estree": "npm:8.19.0"
-    "@typescript-eslint/utils": "npm:8.19.0"
-    debug: "npm:^4.3.4"
-    ts-api-utils: "npm:^1.3.0"
-  peerDependencies:
-    eslint: ^8.57.0 || ^9.0.0
-    typescript: ">=4.8.4 <5.8.0"
-  checksum: 10c0/5a460b4d26fd68ded3567390cbac310500e94e9c69583fda3fb9930877663719e6831699bb6d85de6b940bcb7951a51ab1ef67c5fea8b76a13ea3a3783bbae28
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/type-utils@npm:8.19.1":
   version: 8.19.1
   resolution: "@typescript-eslint/type-utils@npm:8.19.1"
@@ -15281,13 +15142,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:8.19.0":
-  version: 8.19.0
-  resolution: "@typescript-eslint/types@npm:8.19.0"
-  checksum: 10c0/0062e7dce5f374e293c97f1f50fe450187f6b0eaf4971c818e18ef2f6baf4e9aa4e8605fba8d8fc464a504ee1130527b71ecb39d31687c31825942b9f569d902
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/types@npm:8.19.1":
   version: 8.19.1
   resolution: "@typescript-eslint/types@npm:8.19.1"
@@ -15313,24 +15167,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:8.19.0":
-  version: 8.19.0
-  resolution: "@typescript-eslint/typescript-estree@npm:8.19.0"
-  dependencies:
-    "@typescript-eslint/types": "npm:8.19.0"
-    "@typescript-eslint/visitor-keys": "npm:8.19.0"
-    debug: "npm:^4.3.4"
-    fast-glob: "npm:^3.3.2"
-    is-glob: "npm:^4.0.3"
-    minimatch: "npm:^9.0.4"
-    semver: "npm:^7.6.0"
-    ts-api-utils: "npm:^1.3.0"
-  peerDependencies:
-    typescript: ">=4.8.4 <5.8.0"
-  checksum: 10c0/ff47004588e8ff585af740b3e0bda07dc52310dbfeb2317eb4a723935740cf0c1953fc9ba57f14cf192bcfe373c46be833ba29d3303df8b501181bb852c7b822
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/typescript-estree@npm:8.19.1":
   version: 8.19.1
   resolution: "@typescript-eslint/typescript-estree@npm:8.19.1"
@@ -15367,21 +15203,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/utils@npm:8.19.0":
-  version: 8.19.0
-  resolution: "@typescript-eslint/utils@npm:8.19.0"
-  dependencies:
-    "@eslint-community/eslint-utils": "npm:^4.4.0"
-    "@typescript-eslint/scope-manager": "npm:8.19.0"
-    "@typescript-eslint/types": "npm:8.19.0"
-    "@typescript-eslint/typescript-estree": "npm:8.19.0"
-  peerDependencies:
-    eslint: ^8.57.0 || ^9.0.0
-    typescript: ">=4.8.4 <5.8.0"
-  checksum: 10c0/7731f7fb66d54491769ca68fd04728138ceb6b785778ad491f8e9b2147802fa0ff480e520f6ea5fb73c8484d13a2ed3e35d44635f5bf4cfbdb04c313154097a9
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/utils@npm:8.19.1":
   version: 8.19.1
   resolution: "@typescript-eslint/utils@npm:8.19.1"
@@ -15407,16 +15228,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:8.19.0":
-  version: 8.19.0
-  resolution: "@typescript-eslint/visitor-keys@npm:8.19.0"
-  dependencies:
-    "@typescript-eslint/types": "npm:8.19.0"
-    eslint-visitor-keys: "npm:^4.2.0"
-  checksum: 10c0/a293def05018bb2259506e23cd8f14349f4386d0e51231893fbddf96ef73c219d5f9fe17b82e3c104f5c23956dbd9b87af3cff5e84b887af243139a3b4bbbe0d
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/visitor-keys@npm:8.19.1":
   version: 8.19.1
   resolution: "@typescript-eslint/visitor-keys@npm:8.19.1"
@@ -15655,26 +15466,24 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@whatwg-node/fetch@npm:0.10.1":
-  version: 0.10.1
-  resolution: "@whatwg-node/fetch@npm:0.10.1"
+"@whatwg-node/fetch@npm:0.10.3":
+  version: 0.10.3
+  resolution: "@whatwg-node/fetch@npm:0.10.3"
   dependencies:
-    "@whatwg-node/node-fetch": "npm:^0.7.1"
+    "@whatwg-node/node-fetch": "npm:^0.7.7"
     urlpattern-polyfill: "npm:^10.0.0"
-  checksum: 10c0/8db24a980181683676a503d63ff22e7ac9ce70bb842f3a1a83d260ffd0682cc0fdcab24d825cb742364bf075fedaa404d08508703ecf7302e3332612bdb35d61
+  checksum: 10c0/9ddffea0d97cd465c6d531a3af8c68d702591670367976daeeff4a94737cf9022b56e4070fcd4bdf9a5e05aad558518f4fdd9e6bdf60b2b285818ddf1934c7a9
   languageName: node
   linkType: hard
 
-"@whatwg-node/node-fetch@npm:0.7.5":
-  version: 0.7.5
-  resolution: "@whatwg-node/node-fetch@npm:0.7.5"
+"@whatwg-node/node-fetch@npm:0.7.7":
+  version: 0.7.7
+  resolution: "@whatwg-node/node-fetch@npm:0.7.7"
   dependencies:
-    "@kamilkisiela/fast-url-parser": "npm:^1.1.4"
     "@whatwg-node/disposablestack": "npm:^0.0.5"
     busboy: "npm:^1.6.0"
-    fast-querystring: "npm:^1.1.1"
     tslib: "npm:^2.6.3"
-  checksum: 10c0/d0693ff047f0e51e94a36e77d3d39f323f74a4205c2116add44e2fc0991e4d6044bde55a867d1cf78d7c4a406d73d75df5975876a32831c0cc5829811172335e
+  checksum: 10c0/f61c45f256363f1c98ddcbcfc9265c8a98a64d09461a19ce32bcf76ab38619c7d7ee52ee7abfe80e49ddc7d6336e85ee481552294146ae934fca453feb970d23
   languageName: node
   linkType: hard
 
@@ -19379,6 +19188,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"data-uri-to-buffer@npm:^4.0.0":
+  version: 4.0.1
+  resolution: "data-uri-to-buffer@npm:4.0.1"
+  checksum: 10c0/20a6b93107597530d71d4cb285acee17f66bcdfc03fd81040921a81252f19db27588d87fc8fc69e1950c55cfb0bf8ae40d0e5e21d907230813eb5d5a7f9eb45b
+  languageName: node
+  linkType: hard
+
 "data-urls@npm:^2.0.0":
   version: 2.0.0
   resolution: "data-urls@npm:2.0.0"
@@ -21863,7 +21679,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fast-querystring@npm:^1.0.0, fast-querystring@npm:^1.1.1":
+"fast-querystring@npm:^1.0.0":
   version: 1.1.2
   resolution: "fast-querystring@npm:1.1.2"
   dependencies:
@@ -22030,6 +21846,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"fetch-blob@npm:^3.1.2, fetch-blob@npm:^3.1.4":
+  version: 3.2.0
+  resolution: "fetch-blob@npm:3.2.0"
+  dependencies:
+    node-domexception: "npm:^1.0.0"
+    web-streams-polyfill: "npm:^3.0.3"
+  checksum: 10c0/60054bf47bfa10fb0ba6cb7742acec2f37c1f56344f79a70bb8b1c48d77675927c720ff3191fa546410a0442c998d27ab05e9144c32d530d8a52fbe68f843b69
+  languageName: node
+  linkType: hard
+
 "fets@npm:0.8.4, fets@npm:^0.8.0, fets@npm:^0.8.1":
   version: 0.8.4
   resolution: "fets@npm:0.8.4"
@@ -22376,6 +22202,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"formdata-polyfill@npm:^4.0.10":
+  version: 4.0.10
+  resolution: "formdata-polyfill@npm:4.0.10"
+  dependencies:
+    fetch-blob: "npm:^3.1.2"
+  checksum: 10c0/5392ec484f9ce0d5e0d52fb5a78e7486637d516179b0eb84d81389d7eccf9ca2f663079da56f761355c0a65792810e3b345dc24db9a8bbbcf24ef3c8c88570c6
+  languageName: node
+  linkType: hard
+
 "formidable@npm:^3.5.2":
   version: 3.5.2
   resolution: "formidable@npm:3.5.2"
@@ -29784,6 +29619,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"node-domexception@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "node-domexception@npm:1.0.0"
+  checksum: 10c0/5e5d63cda29856402df9472335af4bb13875e1927ad3be861dc5ebde38917aecbf9ae337923777af52a48c426b70148815e890a5d72760f1b4d758cc671b1a2b
+  languageName: node
+  linkType: hard
+
 "node-fetch@npm:2.6.0":
   version: 2.6.0
   resolution: "node-fetch@npm:2.6.0"
@@ -29805,6 +29647,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"node-fetch@npm:^3.3.2":
+  version: 3.3.2
+  resolution: "node-fetch@npm:3.3.2"
+  dependencies:
+    data-uri-to-buffer: "npm:^4.0.0"
+    fetch-blob: "npm:^3.1.4"
+    formdata-polyfill: "npm:^4.0.10"
+  checksum: 10c0/f3d5e56190562221398c9f5750198b34cf6113aa304e34ee97c94fd300ec578b25b2c2906edba922050fce983338fde0d5d34fcb0fc3336ade5bd0e429ad7538
+  languageName: node
+  linkType: hard
+
 "node-forge@npm:^1":
   version: 1.3.1
   resolution: "node-forge@npm:1.3.1"
@@ -35853,6 +35706,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"sync-fetch@npm:0.6.0-2":
+  version: 0.6.0-2
+  resolution: "sync-fetch@npm:0.6.0-2"
+  dependencies:
+    node-fetch: "npm:^3.3.2"
+    timeout-signal: "npm:^2.0.0"
+    whatwg-mimetype: "npm:^4.0.0"
+  checksum: 10c0/1b3e96dfe12de520d9530abb0765baa3ce5921b6fc33ff23171cf838916a58956e755eb359669fba59bfba9b0eefd7e5b6eed737db0ba03bc2cb98a93de5cdb3
+  languageName: node
+  linkType: hard
+
 "sync-request@npm:^6.1.0":
   version: 6.1.0
   resolution: "sync-request@npm:6.1.0"
@@ -36213,6 +36077,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"timeout-signal@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "timeout-signal@npm:2.0.0"
+  checksum: 10c0/dd0a41712552fd45e075664edbdb5d1715a0791e6a206f1d00f5808b954b18046f87b71a7b9216a5030ba772516212b696bbbfb3115bf81b3277b04f62aab135
+  languageName: node
+  linkType: hard
+
 "timers-ext@npm:^0.1.5, timers-ext@npm:^0.1.7":
   version: 0.1.8
   resolution: "timers-ext@npm:0.1.8"
@@ -36453,15 +36324,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ts-api-utils@npm:^1.3.0":
-  version: 1.4.3
-  resolution: "ts-api-utils@npm:1.4.3"
-  peerDependencies:
-    typescript: ">=4.2.0"
-  checksum: 10c0/e65dc6e7e8141140c23e1dc94984bf995d4f6801919c71d6dc27cf0cd51b100a91ffcfe5217626193e5bea9d46831e8586febdc7e172df3f1091a7384299e23a
-  languageName: node
-  linkType: hard
-
 "ts-api-utils@npm:^2.0.0":
   version: 2.0.0
   resolution: "ts-api-utils@npm:2.0.0"
@@ -37854,6 +37716,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"web-streams-polyfill@npm:^3.0.3":
+  version: 3.3.3
+  resolution: "web-streams-polyfill@npm:3.3.3"
+  checksum: 10c0/64e855c47f6c8330b5436147db1c75cb7e7474d924166800e8e2aab5eb6c76aac4981a84261dd2982b3e754490900b99791c80ae1407a9fa0dcff74f82ea3a7f
+  languageName: node
+  linkType: hard
+
 "web-vitals@npm:4.2.4":
   version: 4.2.4
   resolution: "web-vitals@npm:4.2.4"
@@ -38126,7 +37995,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"whatwg-mimetype@npm:4.0.0":
+"whatwg-mimetype@npm:4.0.0, whatwg-mimetype@npm:^4.0.0":
   version: 4.0.0
   resolution: "whatwg-mimetype@npm:4.0.0"
   checksum: 10c0/a773cdc8126b514d790bdae7052e8bf242970cebd84af62fb2f35a33411e78e981f6c0ab9ed1fe6ec5071b09d5340ac9178e05b52d35a9c4bcf558ba1b1551df