fix: ISR opt out for routes with rest parameters (#373)

hrabiel · bholmesdev · web-flow · commit 5b802a409974 · 2024-10-07T17:37:26.000+02:00
Co-authored-by: Ben Holmes &lt;hey@bholmes.dev&gt;
diff --git a/.changeset/early-scissors-wait.md b/.changeset/early-scissors-wait.md
@@ -0,0 +1,5 @@
+---
+'@astrojs/vercel': patch
+---
+
+Fix excluding routes with rest parameters from ISR
diff --git a/packages/vercel/src/lib/redirects.ts b/packages/vercel/src/lib/redirects.ts
@@ -45,25 +45,31 @@ function getParts(part: string, file: string) {
 // 2022-04-26
 function getMatchPattern(segments: RoutePart[][]) {
 	return segments
-		.map((segment) => {
-			return segment[0].spread
+		.map((segment, segmentIndex) => {
+			return segment.length === 1 && segment[0].spread
 				? '(?:\\/(.*?))?'
-				: segment
-						.map((part) => {
-							if (part)
-								return part.dynamic
-									? '([^/]+?)'
-									: part.content
-											.normalize()
-											.replace(/\?/g, '%3F')
-											.replace(/#/g, '%23')
-											.replace(/%5B/g, '[')
-											.replace(/%5D/g, ']')
-											.replace(/[*+?^${}()|[\]\\]/g, '\\$&');
-						})
-						.join('');
+				: // Omit leading slash if segment is a spread.
+					// This is handled using a regex in Astro core.
+					// To avoid complex data massaging, we handle in-place here.
+					(segmentIndex === 0 ? '' : '/') +
+						segment
+							.map((part) => {
+								if (part)
+									return part.spread
+										? '(.*?)'
+										: part.dynamic
+											? '([^/]+?)'
+											: part.content
+													.normalize()
+													.replace(/\?/g, '%3F')
+													.replace(/#/g, '%23')
+													.replace(/%5B/g, '[')
+													.replace(/%5D/g, ']')
+													.replace(/[*+?^${}()|[\]\\]/g, '\\$&');
+							})
+							.join('');
 		})
-		.join('/');
+		.join('');
 }
 
 function getReplacePattern(segments: RoutePart[][]) {
diff --git a/packages/vercel/test/fixtures/isr/astro.config.mjs b/packages/vercel/test/fixtures/isr/astro.config.mjs
@@ -7,7 +7,7 @@ export default defineConfig({
 		isr: {
 			bypassToken: "1c9e601d-9943-4e7c-9575-005556d774a8",
 			expiration: 120,
-			exclude: ["/two", "/excluded/[dynamic]"]
+			exclude: ["/two", "/excluded/[dynamic]", "/excluded/[...rest]"]
 		}
 	})
 });
diff --git a/packages/vercel/test/fixtures/isr/src/pages/excluded/[...rest].astro b/packages/vercel/test/fixtures/isr/src/pages/excluded/[...rest].astro
@@ -0,0 +1,8 @@
+<html>
+	<head>
+		<title>Rest</title>
+	</head>
+	<body>
+		<h1>Rest</h1>
+	</body>
+</html>
diff --git a/packages/vercel/test/isr.test.js b/packages/vercel/test/isr.test.js
@@ -37,6 +37,10 @@ describe('ISR', () => {
 				src: '^/excluded/([^/]+?)$',
 				dest: '_render',
 			},
+			{
+				src: '^/excluded(?:\\/(.*?))?$',
+				dest: '_render',
+			},
 			{
 				src: '^\\/_image$',
 				dest: '_render',
@@ -45,6 +49,10 @@ describe('ISR', () => {
 				src: '^\\/excluded\\/([^/]+?)\\/?$',
 				dest: '/_isr?x_astro_path=$0',
 			},
+			{
+				src: '^\\/excluded(?:\\/(.*?))?\\/?$',
+				dest: '/_isr?x_astro_path=$0',
+			},
 			{
 				src: '^\\/one\\/?$',
 				dest: '/_isr?x_astro_path=$0',

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ export default defineConfig({`
`7`	`7`	`isr: {`
`8`	`8`	`bypassToken: "1c9e601d-9943-4e7c-9575-005556d774a8",`
`9`	`9`	`expiration: 120,`
`10`		`- exclude: ["/two", "/excluded/[dynamic]"]`
	`10`	`+ exclude: ["/two", "/excluded/[dynamic]", "/excluded/[...rest]"]`
`11`	`11`	`}`
`12`	`12`	`})`
`13`	`13`	`});`