fix(cloudflare): routes.json order (#247)

withastro · Apr 24, 2024 · e08cd4c · e08cd4c
1 parent 87eb46c
commit e08cd4c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/.changeset/thirty-apricots-marry.md b/.changeset/thirty-apricots-marry.md
@@ -0,0 +1,5 @@
+---
+'@astrojs/cloudflare': patch
+---
+
+Fixes an issue where redirect rules where not excluded from routing due to ordering issues
diff --git a/packages/cloudflare/src/utils/generate-routes-json.ts b/packages/cloudflare/src/utils/generate-routes-json.ts
@@ -170,6 +170,10 @@ export async function createRoutesFile(
 	);
 	excludePaths.push(assetsPath);
 
+	for (const redirect of redirects) {
+		excludePaths.push(segmentsToCfSyntax(redirect, _config));
+	}
+
 	if (existsSync(fileURLToPath(_config.publicDir))) {
 		const staticFiles = await glob(`${fileURLToPath(_config.publicDir)}/**/*`, {
 			cwd: fileURLToPath(_config.publicDir),
@@ -190,10 +194,6 @@ export async function createRoutesFile(
 		}
 	}
 
-	for (const redirect of redirects) {
-		excludePaths.push(segmentsToCfSyntax(redirect, _config));
-	}
-
 	let hasPrerendered404 = false;
 	for (const route of routes) {
 		const convertedPath = segmentsToCfSyntax(route.segments, _config);

diff --git a/packages/cloudflare/test/routes-json.test.js b/packages/cloudflare/test/routes-json.test.js
@@ -24,7 +24,7 @@ describe('_routes.json generation', () => {
 			assert.deepEqual(routes, {
 				version: 1,
 				include: ['/_image', '/a/*'],
-				exclude: ['/_astro/*', '/public.txt', '/redirectme', '/a', '/a/redirect', '/404', '/b'],
+				exclude: ['/_astro/*', '/redirectme', '/public.txt', '/a', '/a/redirect', '/404', '/b'],
 			});
 		});
 	});
@@ -48,7 +48,7 @@ describe('_routes.json generation', () => {
 			assert.deepEqual(routes, {
 				version: 1,
 				include: ['/*'],
-				exclude: ['/_astro/*', '/public.txt', '/redirectme', '/a/redirect'],
+				exclude: ['/_astro/*', '/redirectme', '/public.txt', '/a/redirect'],
 			});
 		});
 	});
@@ -102,7 +102,7 @@ describe('_routes.json generation', () => {
 			assert.deepEqual(routes, {
 				version: 1,
 				include: ['/_image', '/a/*', '/another'],
-				exclude: ['/_astro/*', '/public.txt', '/redirectme', '/a', '/a/redirect', '/404', '/b'],
+				exclude: ['/_astro/*', '/redirectme', '/public.txt', '/a', '/a/redirect', '/404', '/b'],
 			});
 		});
 	});
@@ -134,8 +134,8 @@ describe('_routes.json generation', () => {
 				include: ['/_image', '/a/*'],
 				exclude: [
 					'/_astro/*',
-					'/public.txt',
 					'/redirectme',
+					'/public.txt',
 					'/a',
 					'/a/redirect',
 					'/404',