fix(cloudflare): _routes.json deduplication (#171)

Co-authored-by: Sarah Rainsberger <[email protected]>
withastro · Feb 27, 2024 · 0463483 · 0463483
1 parent de62fa8
commit 0463483
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/.changeset/sharp-cameras-rescue.md b/.changeset/sharp-cameras-rescue.md
@@ -0,0 +1,5 @@
+---
+'@astrojs/cloudflare': patch
+---
+
+Fixes an error with automatic deduplication of `_routes.json` for more complex project structures
diff --git a/packages/cloudflare/src/utils/deduplicatePatterns.ts b/packages/cloudflare/src/utils/deduplicatePatterns.ts
@@ -13,7 +13,7 @@ export function deduplicatePatterns(patterns: string[]) {
 	const uniquePatterns = [...new Set(patterns)];
 	for (const pattern of uniquePatterns) {
 		if (pattern.endsWith('*')) {
-			openPatterns.push(new RegExp(`^${pattern.replace(/(\*\/)*\*$/g, '[^*\n]*$')}`));
+			openPatterns.push(new RegExp(`^${pattern.replace(/(\*\/)*\*$/g, '(?=.{2,}).+[^*\n]$')}`));
 		}
 	}
 

diff --git a/packages/cloudflare/test/routes-json.test.js b/packages/cloudflare/test/routes-json.test.js
@@ -202,7 +202,7 @@ describe('_routes.json generation', () => {
 						assert.deepEqual(routes, {
 							version: 1,
 							include: ['/a/*', '/_image'],
-							exclude: ['/a/*', '/another'],
+							exclude: ['/a/', '/a/*', '/another'],
 						});
 					});
 				});