Migrate env access from Astro.locals.runtime.env to cloudflare:workers

barckcode · claude · barckcode · commit e045ebd2aa2b · 2026-03-22T13:40:02.000Z
Astro v6 removed locals.runtime.env in favor of the cloudflare:workers
module import. Updated all 15 source files and 2 test files to use
`import { env } from 'cloudflare:workers'` pattern.

Co-Authored-By: Claude Opus 4.6 &lt;noreply@anthropic.com&gt;
diff --git a/src/env.d.ts b/src/env.d.ts
@@ -16,11 +16,13 @@ type RuntimeEnv = {
   CRON_SECRET: string;
 };
 
+declare module 'cloudflare:workers' {
+  const env: RuntimeEnv;
+  export { env };
+}
+
 declare namespace App {
   interface Locals {
-    runtime: {
-      env: RuntimeEnv;
-    };
     member?: typeof import('../db/schema').members.$inferSelect;
   }
 }
diff --git a/src/middleware.ts b/src/middleware.ts
@@ -1,4 +1,5 @@
 import { defineMiddleware } from 'astro:middleware';
+import { env } from 'cloudflare:workers';
 import { getDb } from './lib/db';
 import { validateSession, clearSessionCookie } from './lib/auth';
 
@@ -15,7 +16,6 @@ export const onRequest = defineMiddleware(async (context, next) => {
     return context.redirect('/login');
   }
 
-  const env = context.locals.runtime.env;
   const db = getDb(env.DB);
 
   const result = await validateSession(sessionId, db);
diff --git a/src/pages/api/auth/discord/link.ts b/src/pages/api/auth/discord/link.ts
@@ -1,4 +1,5 @@
 import type { APIContext } from 'astro';
+import { env } from 'cloudflare:workers';
 import { buildOAuthUrl, generateOAuthState } from '../../../../lib/discord';
 
 export async function GET(context: APIContext) {
@@ -7,7 +8,6 @@ export async function GET(context: APIContext) {
     return context.redirect('/login');
   }
 
-  const env = context.locals.runtime.env;
   const baseUrl = env.PUBLIC_URL || context.url.origin;
   const redirectUri = `${baseUrl}/auth/discord/callback`;
 
diff --git a/src/pages/api/auth/logout.ts b/src/pages/api/auth/logout.ts
@@ -1,9 +1,9 @@
 import type { APIContext } from 'astro';
+import { env } from 'cloudflare:workers';
 import { getDb } from '../../../lib/db';
 import { destroySession, clearSessionCookie, verifyCsrfOrigin } from '../../../lib/auth';
 
 export async function POST(context: APIContext) {
-  const env = context.locals.runtime.env;
   const allowedOrigin = env.PUBLIC_URL || context.url.origin;
 
   if (!verifyCsrfOrigin(context.request, allowedOrigin)) {
diff --git a/src/pages/api/auth/magic-link.ts b/src/pages/api/auth/magic-link.ts
@@ -1,4 +1,5 @@
 import type { APIContext } from 'astro';
+import { env } from 'cloudflare:workers';
 import { eq, and, gte } from 'drizzle-orm';
 import { getDb } from '../../../lib/db';
 import { createMagicToken, cleanupExpiredTokens, verifyCsrfOrigin } from '../../../lib/auth';
@@ -8,7 +9,6 @@ import { magicTokens } from '../../../../db/schema';
 const MAX_ACTIVE_TOKENS_PER_EMAIL = 3;
 
 export async function POST(context: APIContext) {
-  const env = context.locals.runtime.env;
   const allowedOrigin = env.PUBLIC_URL || context.url.origin;
 
   if (!verifyCsrfOrigin(context.request, allowedOrigin)) {
diff --git a/src/pages/api/benefits/[id].ts b/src/pages/api/benefits/[id].ts
@@ -1,4 +1,5 @@
 import type { APIContext } from 'astro';
+import { env } from 'cloudflare:workers';
 import { eq, and } from 'drizzle-orm';
 import { getDb } from '../../../lib/db';
 import { validateSession } from '../../../lib/auth';
@@ -10,7 +11,6 @@ export async function GET(context: APIContext) {
     return new Response('Unauthorized', { status: 401 });
   }
 
-  const env = context.locals.runtime.env;
   const db = getDb(env.DB);
 
   const result = await validateSession(sessionId, db);
diff --git a/src/pages/api/benefits/benefits.test.ts b/src/pages/api/benefits/benefits.test.ts
@@ -1,6 +1,13 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 
 // Mock dependencies
+vi.mock('cloudflare:workers', () => ({
+  env: {
+    DB: {},
+    PUBLIC_URL: 'https://nan.builders',
+  },
+}));
+
 vi.mock('../../../lib/db', () => ({
   getDb: vi.fn(),
 }));
@@ -56,15 +63,7 @@ function createMockContext(overrides: Record<string, any> = {}): any {
     url: new URL(overrides.url ?? 'https://nan.builders/api/benefits'),
     request: overrides.request ?? new Request('https://nan.builders/api/benefits'),
     params: overrides.params ?? {},
-    locals: {
-      runtime: {
-        env: {
-          DB: {},
-          PUBLIC_URL: 'https://nan.builders',
-          ...(overrides.env ?? {}),
-        },
-      },
-    },
+    locals: {},
   };
 }
 
diff --git a/src/pages/api/benefits/index.ts b/src/pages/api/benefits/index.ts
@@ -1,4 +1,5 @@
 import type { APIContext } from 'astro';
+import { env } from 'cloudflare:workers';
 import { eq, desc } from 'drizzle-orm';
 import { nanoid } from 'nanoid';
 import { getDb } from '../../../lib/db';
@@ -11,7 +12,6 @@ export async function GET(context: APIContext) {
     return new Response('Unauthorized', { status: 401 });
   }
 
-  const env = context.locals.runtime.env;
   const db = getDb(env.DB);
 
   const result = await validateSession(sessionId, db);
@@ -34,7 +34,6 @@ export async function GET(context: APIContext) {
 const VALID_BENEFIT_TYPES = ['infrastructure', 'tool_access'];
 
 export async function POST(context: APIContext) {
-  const env = context.locals.runtime.env;
   const allowedOrigin = env.PUBLIC_URL || context.url.origin;
 
   if (!verifyCsrfOrigin(context.request, allowedOrigin)) {
diff --git a/src/pages/api/checkout/create.ts b/src/pages/api/checkout/create.ts
@@ -1,4 +1,5 @@
 import type { APIContext } from 'astro';
+import { env } from 'cloudflare:workers';
 import { getDb } from '../../../lib/db';
 import { validateSession, verifyCsrfOrigin } from '../../../lib/auth';
 import {
@@ -9,7 +10,6 @@ import {
 } from '../../../lib/stripe';
 
 export async function POST(context: APIContext) {
-  const env = context.locals.runtime.env;
   const allowedOrigin = env.PUBLIC_URL || context.url.origin;
 
   if (!verifyCsrfOrigin(context.request, allowedOrigin)) {
diff --git a/src/pages/api/cron/discord-reminder.test.ts b/src/pages/api/cron/discord-reminder.test.ts
@@ -6,6 +6,15 @@ const mockUpdate = vi.fn();
 const mockSet = vi.fn();
 const mockWhere = vi.fn();
 
+vi.mock('cloudflare:workers', () => ({
+  env: {
+    DB: {},
+    CRON_SECRET: 'test-secret',
+    RESEND_API_KEY: 're_test',
+    PUBLIC_URL: 'https://nan.builders',
+  },
+}));
+
 vi.mock('../../../lib/email', () => ({
   sendDiscordReminder: (...args: unknown[]) => mockSendDiscordReminder(...args),
 }));
@@ -38,16 +47,6 @@ vi.mock('../../../../db/schema', () => ({
 
 function createContext(authHeader?: string) {
   return {
-    locals: {
-      runtime: {
-        env: {
-          DB: {},
-          CRON_SECRET: 'test-secret',
-          RESEND_API_KEY: 're_test',
-          PUBLIC_URL: 'https://nan.builders',
-        },
-      },
-    },
     request: {
       headers: new Headers(authHeader ? { authorization: authHeader } : {}),
     },
diff --git a/src/pages/api/cron/discord-reminder.ts b/src/pages/api/cron/discord-reminder.ts
@@ -1,4 +1,5 @@
 import type { APIContext } from 'astro';
+import { env } from 'cloudflare:workers';
 import { and, eq, isNull, lt, or } from 'drizzle-orm';
 import { getDb } from '../../../lib/db';
 import { sendDiscordReminder } from '../../../lib/email';
@@ -7,7 +8,6 @@ import { members } from '../../../../db/schema';
 const THIRTY_DAYS_SEC = 30 * 24 * 60 * 60;
 
 export async function GET(context: APIContext) {
-  const env = context.locals.runtime.env;
   const cronSecret = env.CRON_SECRET;
 
   const authHeader = context.request.headers.get('authorization');
diff --git a/src/pages/api/members/count.ts b/src/pages/api/members/count.ts
@@ -1,9 +1,10 @@
 import type { APIContext } from 'astro';
+import { env } from 'cloudflare:workers';
 import { getDb } from '../../../lib/db';
 import { countActivePaidMembers, EARLY_MEMBER_LIMIT } from '../../../lib/stripe';
 
 export async function GET(context: APIContext) {
-  const db = getDb(context.locals.runtime.env.DB);
+  const db = getDb(env.DB);
   const total = await countActivePaidMembers(db);
   const earlySpots = Math.max(0, EARLY_MEMBER_LIMIT - total);
 
diff --git a/src/pages/api/webhooks/stripe.ts b/src/pages/api/webhooks/stripe.ts
@@ -1,4 +1,5 @@
 import type { APIContext } from 'astro';
+import { env } from 'cloudflare:workers';
 import type Stripe from 'stripe';
 import { eq } from 'drizzle-orm';
 import { getDb } from '../../../lib/db';
@@ -8,7 +9,6 @@ import { revokeMemberRole } from '../../../lib/discord';
 import { members } from '../../../../db/schema';
 
 export async function POST(context: APIContext) {
-  const env = context.locals.runtime.env;
   const stripe = getStripeClient(env.STRIPE_SECRET_KEY);
 
   // Read raw body for signature verification
diff --git a/src/pages/auth/discord/callback.astro b/src/pages/auth/discord/callback.astro
@@ -1,4 +1,5 @@
 ---
+import { env } from 'cloudflare:workers';
 import Base from '../../../layouts/Base.astro';
 import { getDb } from '../../../lib/db';
 import { exchangeCode, getDiscordUser, assignMemberRole } from '../../../lib/discord';
@@ -22,7 +23,6 @@ let error: string | null = null;
 if (!code || !state || !storedState || state !== storedState) {
   error = 'invalid_state';
 } else {
-  const env = Astro.locals.runtime.env;
   const baseUrl = env.PUBLIC_URL || Astro.url.origin;
   const redirectUri = `${baseUrl}/auth/discord/callback`;
 
diff --git a/src/pages/auth/verify.astro b/src/pages/auth/verify.astro
@@ -1,4 +1,5 @@
 ---
+import { env } from 'cloudflare:workers';
 import { getDb } from '../../lib/db';
 import { validateMagicToken, markTokenUsed, createSession, setSessionCookie } from '../../lib/auth';
 import { members, sessions } from '../../../db/schema';
@@ -9,8 +10,6 @@ const token = Astro.url.searchParams.get('token');
 if (!token) {
   return Astro.redirect('/login?error=missing_token');
 }
-
-const env = Astro.locals.runtime.env;
 const db = getDb(env.DB);
 
 const magicToken = await validateMagicToken(token, db);
diff --git a/src/pages/login.astro b/src/pages/login.astro
@@ -1,4 +1,5 @@
 ---
+import { env } from 'cloudflare:workers';
 import Base from '../layouts/Base.astro';
 import LoginForm from '../components/LoginForm';
 import { getDb } from '../lib/db';
@@ -7,7 +8,7 @@ import { validateSession } from '../lib/auth';
 // Redirect to portal if user already has a valid session
 const sessionId = Astro.cookies.get('session')?.value;
 if (sessionId) {
-  const db = getDb(Astro.locals.runtime.env.DB);
+  const db = getDb(env.DB);
   const result = await validateSession(sessionId, db);
   if (result) {
     return Astro.redirect('/portal');
diff --git a/src/pages/subscribe.astro b/src/pages/subscribe.astro
@@ -1,4 +1,5 @@
 ---
+import { env } from 'cloudflare:workers';
 import Base from '../layouts/Base.astro';
 import { getDb } from '../lib/db';
 import { validateSession } from '../lib/auth';
@@ -9,8 +10,6 @@ const sessionId = Astro.cookies.get('session')?.value;
 if (!sessionId) {
   return Astro.redirect('/login');
 }
-
-const env = Astro.locals.runtime.env;
 const db = getDb(env.DB);
 
 const result = await validateSession(sessionId, db);
