chore: fix PR 3448 (#3457)

Co-authored-by: Tomas Kroupa <tomas.kroupa@applifting.cz>
dotansimha · Nov 5, 2024 · 2523d9f · 2523d9f
1 parent 708d908
commit 2523d9f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/.changeset/changelog1.md b/.changeset/changelog1.md
@@ -0,0 +1,6 @@
+---
+"@graphql-yoga/plugin-apollo-usage-report": patch
+---
+
+### Fixed
+- do not set default values for `clientName` and `clientVersion`
diff --git a/.changeset/changelog2.md b/.changeset/changelog2.md
@@ -0,0 +1,6 @@
+---
+'graphql-yoga': patch
+---
+
+### Fixed
+- propagation of Yoga `version`
diff --git a/package.json b/package.json
@@ -30,7 +30,7 @@
     "apollo"
   ],
   "scripts": {
-    "build": "pnpm --filter=@graphql-yoga/graphiql run build && pnpm --filter=@graphql-yoga/render-graphiql run build && pnpm --filter=graphql-yoga run generate-graphiql-html&& pnpm --filter=graphql-yoga run inject-version && bob build",
+    "build": "pnpm --filter=@graphql-yoga/graphiql run build && pnpm --filter=@graphql-yoga/render-graphiql run build && pnpm --filter=graphql-yoga run generate-graphiql-html && bob build && pnpm --filter=graphql-yoga run inject-version",
     "build-website": "pnpm build && cd website && pnpm build",
     "changeset": "changeset",
     "check": "pnpm -r run check",

diff --git a/packages/plugins/apollo-usage-report/src/index.ts b/packages/plugins/apollo-usage-report/src/index.ts
@@ -88,8 +88,7 @@ export function useApolloUsageReport(options: ApolloUsageReportOptions = {}): Pl
     ]),
   ) as YogaLogger;
 
-  let clientNameFactory: StringFromRequestFn = req =>
-    req.headers.get('apollographql-client-name') || 'graphql-yoga';
+  let clientNameFactory: StringFromRequestFn = req => req.headers.get('apollographql-client-name');
 
   if (typeof options.clientName === 'string') {
     const clientName = options.clientName;
@@ -99,7 +98,7 @@ export function useApolloUsageReport(options: ApolloUsageReportOptions = {}): Pl
   }
 
   let clientVersionFactory: StringFromRequestFn = req =>
-    req.headers.get('apollographql-client-version') || yoga.version;
+    req.headers.get('apollographql-client-version');
 
   if (typeof options.clientVersion === 'string') {
     const clientVersion = options.clientVersion;