Do not assign request if already defined

dotansimha · Oct 13, 2023 · daaace6 · daaace6
1 parent abed431
commit daaace6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/examples/service-worker/src/index.ts b/examples/service-worker/src/index.ts
@@ -1,10 +1,7 @@
 import { createSchema, createYoga, Repeater } from 'graphql-yoga';
 
-// We can define GraphQL Route dynamically using env vars.
-declare let GRAPHQL_ROUTE: string;
-
 const yoga = createYoga({
-  graphqlEndpoint: GRAPHQL_ROUTE || '/graphql',
+  graphqlEndpoint: globalThis.GRAPHQL_ROUTE || '/graphql',
   schema: createSchema({
     typeDefs: /* GraphQL */ `
       type Query {

diff --git a/packages/graphql-yoga/src/server.ts b/packages/graphql-yoga/src/server.ts
@@ -448,10 +448,14 @@ export class YogaServer<
       }
 
       if (result == null) {
-        const additionalContext = {
-          request,
-          params,
-        };
+        const additionalContext = args[0]?.request
+          ? {
+              params,
+            }
+          : {
+              request,
+              params,
+            };
 
         const initialContext = args[0]
           ? batched
@@ -548,6 +552,7 @@ export class YogaServer<
           {
             params: requestParserResult,
             request,
+            batched: false,
           },
           serverContext,
         ))) as ResultProcessorInput;