caches and dispose

remix-run · pcattori · Feb 15, 2024 · Feb 13, 2024 · Feb 13, 2024 · Feb 13, 2024
commit 6e9ccec70fa886619a8f9721d75dff046786116b
diff --git a/integration/vite-cloudflare-test.ts b/integration/vite-cloudflare-test.ts
@@ -66,9 +66,10 @@ const files: Files = async ({ port }) => ({
     import { type AppLoadContext } from "@remix-run/cloudflare";
     import { type PlatformProxy } from "wrangler";
 
-    type Cloudflare = PlatformProxy<{
+    type Env = {
       MY_KV: KVNamespace;
-    }>;
+    }
+    type Cloudflare = Omit<PlatformProxy<Env>, 'dispose'>;
 
     declare module "@remix-run/cloudflare" {
       export interface AppLoadContext {

diff --git a/packages/remix-cloudflare-pages/worker.ts b/packages/remix-cloudflare-pages/worker.ts
@@ -1,5 +1,6 @@
 import type { AppLoadContext, ServerBuild } from "@remix-run/cloudflare";
 import { createRequestHandler as createRemixRequestHandler } from "@remix-run/cloudflare";
+import { type CacheStorage } from "@cloudflare/workers-types";
 
 /**
  * A function that returns the value to use as `context` in route `loader` and
@@ -25,6 +26,7 @@ export type GetLoadContextFunction<
           Data
         >["passThroughOnException"];
       };
+      caches: CacheStorage;
     };
   };
 }) => AppLoadContext | Promise<AppLoadContext>;
@@ -61,6 +63,7 @@ export function createRequestHandler<Env = any>({
             waitUntil: cloudflare.waitUntil,
             passThroughOnException: cloudflare.passThroughOnException,
           },
+          caches,
         },
       },
     });