Merge 68e2f4b into d634e41

graphql · Apr 6, 2020 · db3dcef · db3dcef
2 parents d634e41 + 68e2f4b
commit db3dcef
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/index.js b/src/index.js
@@ -88,7 +88,9 @@ export type OptionsData = {|
    * An optional function which will be used to execute instead of default `execute`
    * from `graphql-js`.
    */
-  customExecuteFn?: ?(args: ExecutionArgs) => Promise<ExecutionResult>,
+  customExecuteFn?: ?(
+    args: ExecutionArgs,
+  ) => ExecutionResult | Promise<ExecutionResult>,
 
   /**
    * An optional function which will be used to format any errors produced by

diff --git a/types/index.d.ts b/types/index.d.ts
@@ -85,7 +85,7 @@ declare namespace graphqlHTTP {
      * from `graphql-js`.
      */
     customExecuteFn?:
-      | ((args: ExecutionArgs) => Promise<ExecutionResult>)
+      | ((args: ExecutionArgs) => ExecutionResult | Promise<ExecutionResult>)
       | null;
 
     /**