fix(cloudflare): env vars in middleware & prerendering (#341)

withastro · Aug 3, 2024 · a430ab1 · a430ab1 · nlnw · Aug 3, 2024
1 parent e031aed
commit a430ab1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/.changeset/tall-shrimps-jump.md b/.changeset/tall-shrimps-jump.md
@@ -0,0 +1,5 @@
+---
+'@astrojs/cloudflare': patch
+---
+
+Fixes an issue if environment variables where used inside the middleware and a prerendering occured.
diff --git a/packages/cloudflare/src/entrypoints/middleware.ts b/packages/cloudflare/src/entrypoints/middleware.ts
@@ -1,7 +1,12 @@
 import { When, whenAmI } from '@it-astro:when';
 import type { MiddlewareHandler } from 'astro';
 
-const middlewares: Record<any, MiddlewareHandler> = {
+const middlewares: Record<When, MiddlewareHandler> = {
+	[When.Client]: () => {
+		throw new Error('Client should not run a middleware!');
+	},
+	[When.DevServer]: (_, next) => next(),
+	[When.Server]: (_, next) => next(),
 	[When.Prerender]: (ctx, next) => {
 		if (ctx.locals.runtime === undefined) {
 			ctx.locals.runtime = {
@@ -10,6 +15,7 @@ const middlewares: Record<any, MiddlewareHandler> = {
 		}
 		return next();
 	},
+	[When.StaticBuild]: (_, next) => next(),
 };
 
 export const onRequest = middlewares[whenAmI];