Pass getLoaderContext into [[page]] function

benvinegar · Jun 21, 2024 · 7f9c6a2 · 7f9c6a2
1 parent c91f97a
commit 7f9c6a2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 15 deletions.
diff --git a/app/routes/dashboard.tsx b/app/routes/dashboard.tsx
@@ -36,17 +36,15 @@ export const meta: MetaFunction = () => {
 const MAX_RETENTION_DAYS = 90;
 
 export const loader = async ({ context, request }: LoaderFunctionArgs) => {
+    // NOTE: probably duped from getLoadContext / need to de-duplicate
     if (
         !context.cloudflare.env.CF_BEARER_TOKEN ||
         !context.cloudflare.env.CF_ACCOUNT_ID
     ) {
         throw new Error("Missing Cloudflare credentials");
     }
 
-    const analyticsEngine = new AnalyticsEngineAPI(
-        context.cloudflare.env.CF_ACCOUNT_ID,
-        context.cloudflare.env.CF_BEARER_TOKEN,
-    );
+    const { analyticsEngine } = context;
 
     const url = new URL(request.url);
 

diff --git a/functions/[[page]].ts b/functions/[[page]].ts
@@ -2,7 +2,10 @@ import { createPagesFunctionHandler } from "@remix-run/cloudflare-pages";
 
 import * as build from "../build/server";
 
+import { getLoadContext } from "../load-context";
+
 export const onRequest = createPagesFunctionHandler({
     // @ts-expect-error - the server build file is generated by `remix vite:build`
     build,
+    getLoadContext,
 });
diff --git a/load-context.ts b/load-context.ts
@@ -15,17 +15,6 @@ declare module "@remix-run/cloudflare" {
     }
 }
 
-// declare module "@remix-run/server-runtime" {
-//     export interface AppLoadContext {
-//         analyticsEngine: AnalyticsEngineAPI;
-//         env: {
-//             VERSION: string;
-//             CF_BEARER_TOKEN: string;
-//             CF_ACCOUNT_ID: string;
-//         };
-//     }
-// }
-
 type GetLoadContext = (args: {
     request: Request;
     context: { cloudflare: Cloudflare }; // load context _before_ augmentation