From c152105eeed34be2f6380406739a57310729f353 Mon Sep 17 00:00:00 2001
From: Arda TANRIKULU <ardatanrikulu@gmail.com>
Date: Tue, 20 Dec 2022 14:13:15 +0300
Subject: [PATCH] enhance(cors): call CORS headers factory once (#2238)

---
 .changeset/long-spiders-pay.md               | 5 +++++
 packages/graphql-yoga/src/plugins/useCORS.ts | 6 ------
 2 files changed, 5 insertions(+), 6 deletions(-)
 create mode 100644 .changeset/long-spiders-pay.md

diff --git a/.changeset/long-spiders-pay.md b/.changeset/long-spiders-pay.md
new file mode 100644
index 0000000000..4a4f4078c2
--- /dev/null
+++ b/.changeset/long-spiders-pay.md
@@ -0,0 +1,5 @@
+---
+'graphql-yoga': patch
+---
+
+Do not call CORS headers factory twice
diff --git a/packages/graphql-yoga/src/plugins/useCORS.ts b/packages/graphql-yoga/src/plugins/useCORS.ts
index fd7405bd73..2f60856069 100644
--- a/packages/graphql-yoga/src/plugins/useCORS.ts
+++ b/packages/graphql-yoga/src/plugins/useCORS.ts
@@ -144,14 +144,8 @@ export function useCORS<TServerContext extends Record<string, any>>(
   return {
     async onRequest({ request, serverContext, fetchAPI, endResponse }) {
       if (request.method.toUpperCase() === 'OPTIONS') {
-        const headers = await getCORSResponseHeaders<any>(
-          request,
-          corsOptionsFactory,
-          serverContext,
-        )
         const response = new fetchAPI.Response(null, {
           status: 204,
-          headers,
         })
         endResponse(response)
       }