wip

remix-run · Feb 13, 2024 · da0b2fb · da0b2fb
1 parent 71f1d59
commit da0b2fb
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 69 deletions.
diff --git a/integration/vite-cloudflare-test.ts b/integration/vite-cloudflare-test.ts
@@ -37,7 +37,7 @@ const files: Files = async ({ port }) => ({
         typescript: "^5.1.6",
         vite: "^5.1.0",
         "vite-tsconfig-paths": "^4.2.1",
-        wrangler: "^3.24.0",
+        wrangler: "^3.28.2",
       },
       engines: {
         node: ">=18.0.0",

diff --git a/packages/remix-cloudflare-pages/worker.ts b/packages/remix-cloudflare-pages/worker.ts
@@ -14,7 +14,19 @@ export type GetLoadContextFunction<
   Data extends Record<string, unknown> = Record<string, unknown>
 > = (args: {
   request: Request;
-  context: { cloudflare: EventContext<Env, Params, Data> };
+  context: {
+    cloudflare: EventContext<Env, Params, Data> & {
+      cf: EventContext<Env, Params, Data>["request"]["cf"];
+      ctx: {
+        waitUntil: EventContext<Env, Params, Data>["waitUntil"];
+        passThroughOnException: EventContext<
+          Env,
+          Params,
+          Data
+        >["passThroughOnException"];
+      };
+    };
+  };
 }) => AppLoadContext | Promise<AppLoadContext>;
 
 export type RequestHandler<Env = any> = PagesFunction<Env>;
@@ -41,7 +53,16 @@ export function createRequestHandler<Env = any>({
   return async (cloudflare) => {
     let loadContext = await getLoadContext({
       request: cloudflare.request,
-      context: { cloudflare },
+      context: {
+        cloudflare: {
+          ...cloudflare,
+          cf: cloudflare.request.cf!,
+          ctx: {
+            waitUntil: cloudflare.waitUntil,
+            passThroughOnException: cloudflare.passThroughOnException,
+          },
+        },
+      },
     });
 
     return handleRequest(cloudflare.request, loadContext);

diff --git a/packages/remix-dev/index.ts b/packages/remix-dev/index.ts
@@ -12,8 +12,4 @@ export type {
   ServerBundlesFunction,
   VitePluginConfig,
 } from "./vite";
-export {
-  vitePlugin,
-  cloudflarePreset,
-  cloudflareProxyVitePlugin,
-} from "./vite";
+export { vitePlugin, cloudflareProxyVitePlugin } from "./vite";
diff --git a/packages/remix-dev/vite/cloudflare-proxy-plugin.ts b/packages/remix-dev/vite/cloudflare-proxy-plugin.ts
@@ -1,11 +1,12 @@
+import { createRequestHandler } from "@remix-run/server-runtime";
 import {
-  createRequestHandler,
+  type AppLoadContext,
   type ServerBuild,
 } from "@remix-run/server-runtime";
 import { type Plugin } from "vite";
-// TODO: make wrangler import lazy??
 import { type PlatformProxy, getPlatformProxy } from "wrangler";
 
+// TODO: make wrangler import lazy??
 // TODO: auto-set ssr resolve conditions for workerd
 
 import {
@@ -16,22 +17,28 @@ import {
 
 let serverBuildId = "virtual:remix/server-build";
 
-type LoadContext = {
-  cloudflare: PlatformProxy;
+type Env = Record<string, unknown>;
+type CfProperties = Record<string, unknown>;
+
+type LoadContext<E extends Env, Cf extends CfProperties> = {
+  cloudflare: PlatformProxy<E, Cf>;
 };
 
-type GetLoadContext = (args: {
+type GetLoadContext<E extends Env, Cf extends CfProperties> = (args: {
   request: Request;
-  context: LoadContext;
-}) => Promise<Record<string, unknown>>;
+  context: LoadContext<E, Cf>;
+}) => AppLoadContext | Promise<AppLoadContext>;
 
-export const cloudflareProxyVitePlugin = (
-  options: { getLoadContext?: GetLoadContext } = {}
+export const cloudflareProxyVitePlugin = <
+  E extends Env,
+  Cf extends CfProperties
+>(
+  options: { getLoadContext?: GetLoadContext<E, Cf> } = {}
 ): Plugin => {
   return {
     name: "vite-plugin-remix-cloudflare-proxy",
     async configureServer(viteDevServer) {
-      let cloudflare = await getPlatformProxy();
+      let cloudflare = await getPlatformProxy<E, Cf>();
       let context = { cloudflare };
       return () => {
         if (!viteDevServer.config.server.middlewareMode) {

diff --git a/packages/remix-dev/vite/index.ts b/packages/remix-dev/vite/index.ts
@@ -15,5 +15,4 @@ export const vitePlugin: RemixVitePlugin = (...args) => {
   return remixVitePlugin(...args);
 };
 
-export { cloudflarePreset } from "./presets/cloudflare";
 export { cloudflareProxyVitePlugin } from "./cloudflare-proxy-plugin";
diff --git a/packages/remix-dev/vite/presets/cloudflare.ts b/packages/remix-dev/vite/presets/cloudflare.ts