fix(cloudflare): adapter returning an empty 404 page (#66)

Co-authored-by: Arsh <69170106+lilnasy@users.noreply.github.com> Co-authored-by: lilnasy <69170106+lilnasy@users.noreply.github.com> Co-authored-by: Alexander Niebuhr <alexander@nbhr.io>
withastro · Nov 16, 2023 · 5b62509 · 5b62509
1 parent 79c4176
commit 5b62509
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 16 deletions.
diff --git a/.changeset/twelve-grapes-dream.md b/.changeset/twelve-grapes-dream.md
@@ -0,0 +1,5 @@
+---
+'@astrojs/cloudflare': patch
+---
+
+Fixes a regression which caused the adapter to falsely return an empty 404 response, caused by an upstream change https://github.com/withastro/astro/pull/7754.
diff --git a/packages/cloudflare/src/entrypoints/server.advanced.ts b/packages/cloudflare/src/entrypoints/server.advanced.ts
@@ -39,8 +39,7 @@ export function createExports(manifest: SSRManifest) {
 			return env.ASSETS.fetch(request);
 		}
 
-		let routeData = app.match(request, { matchNotFound: true });
-		if (routeData) {
+		let routeData = app.match(request);
 			Reflect.set(
 				request,
 				Symbol.for('astro.clientAddress'),
@@ -67,12 +66,6 @@ export function createExports(manifest: SSRManifest) {
 			}
 
 			return response;
-		}
-
-		return new Response(null, {
-			status: 404,
-			statusText: 'Not found',
-		});
 	};
 
 	return { default: { fetch } };

diff --git a/packages/cloudflare/src/entrypoints/server.directory.ts b/packages/cloudflare/src/entrypoints/server.directory.ts
@@ -32,8 +32,7 @@ export function createExports(manifest: SSRManifest) {
 			return env.ASSETS.fetch(request);
 		}
 
-		let routeData = app.match(request, { matchNotFound: true });
-		if (routeData) {
+		let routeData = app.match(request);
 			Reflect.set(
 				request,
 				Symbol.for('astro.clientAddress'),
@@ -60,12 +59,6 @@ export function createExports(manifest: SSRManifest) {
 			}
 
 			return response;
-		}
-
-		return new Response(null, {
-			status: 404,
-			statusText: 'Not found',
-		});
 	};
 
 	return { onRequest, manifest };