From fadc9e01553f73698e35e96f15bade8e7910afe4 Mon Sep 17 00:00:00 2001
From: Manu MA <manu.mtza@gmail.com>
Date: Wed, 26 Apr 2023 16:12:00 +0200
Subject: [PATCH] feat: expose whole cloudflare context (#3931)

fixes #3655
---
 packages/qwik-city/middleware/cloudflare-pages/api.md   | 8 ++++++--
 packages/qwik-city/middleware/cloudflare-pages/index.ts | 9 ++++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/packages/qwik-city/middleware/cloudflare-pages/api.md b/packages/qwik-city/middleware/cloudflare-pages/api.md
index 34f70a019a1..d78763410a3 100644
--- a/packages/qwik-city/middleware/cloudflare-pages/api.md
+++ b/packages/qwik-city/middleware/cloudflare-pages/api.md
@@ -7,7 +7,7 @@
 import type { ServerRenderOptions } from '@builder.io/qwik-city/middleware/request-handler';
 
 // @public (undocumented)
-export function createQwikCity(opts: QwikCityCloudflarePagesOptions): ({ request, env, waitUntil, next }: EventPluginContext) => Promise<Response>;
+export function createQwikCity(opts: QwikCityCloudflarePagesOptions): (ctx: EventPluginContext) => Promise<Response>;
 
 // @public (undocumented)
 export interface EventPluginContext {
@@ -24,7 +24,11 @@ export interface EventPluginContext {
 // @public (undocumented)
 export interface PlatformCloudflarePages {
     // (undocumented)
-    env?: EventPluginContext['env'];
+    env: EventPluginContext['env'];
+    // (undocumented)
+    request: EventPluginContext['env'];
+    // (undocumented)
+    waitUntil: EventPluginContext['waitUntil'];
 }
 
 // @public (undocumented)
diff --git a/packages/qwik-city/middleware/cloudflare-pages/index.ts b/packages/qwik-city/middleware/cloudflare-pages/index.ts
index 804ad594ab0..2409e8e2fa4 100644
--- a/packages/qwik-city/middleware/cloudflare-pages/index.ts
+++ b/packages/qwik-city/middleware/cloudflare-pages/index.ts
@@ -26,8 +26,9 @@ export function createQwikCity(opts: QwikCityCloudflarePagesOptions) {
   if (opts.manifest) {
     setServerPlatform(opts.manifest);
   }
-  async function onCloudflarePagesRequest({ request, env, waitUntil, next }: EventPluginContext) {
+  async function onCloudflarePagesRequest(ctx: EventPluginContext) {
     try {
+      const { request, env, waitUntil, next } = ctx;
       const url = new URL(request.url);
 
       if (isStaticPath(request.method, url)) {
@@ -69,7 +70,7 @@ export function createQwikCity(opts: QwikCityCloudflarePagesOptions) {
           resolve(response);
           return writable;
         },
-        platform: env,
+        platform: ctx,
       };
 
       // send request to qwik city request handler
@@ -130,7 +131,9 @@ export interface EventPluginContext {
  * @public
  */
 export interface PlatformCloudflarePages {
-  env?: EventPluginContext['env'];
+  request: EventPluginContext['env'];
+  waitUntil: EventPluginContext['waitUntil'];
+  env: EventPluginContext['env'];
 }
 
 const resolved = Promise.resolve();