fix: non-index pages with trailing slash rewriting to /index for rs…

…c requests (#291)

* fix: non-index pages with trailing slash rewriting to `/index`

* chore: changeset

.changeset/smooth-pumpkins-press.md

@@ -0,0 +1,5 @@
+---
+'@cloudflare/next-on-pages': patch
+---
+
+Fix non-index pages with trailing slash rewriting to /index for rsc requests.

templates/_worker.js/routes-matcher.ts

@@ -275,7 +275,7 @@ export class RoutesMatcher {
 		// NOTE: Special handling for `/index` RSC routes. Sometimes the Vercel build output config
 		// has a record to rewrite `^/` to `/index.rsc`, however, this will hit requests to pages
 		// that aren't `/`. In this case, we should check that the previous path is `/`.
-		if (/\/index\.rsc$/i.test(this.path) && !/\/(?:index)?$/i.test(prevPath)) {
+		if (/\/index\.rsc$/i.test(this.path) && !/^\/(?:index)?$/i.test(prevPath)) {
 			this.path = prevPath;
 		}
 

tests/templates/requestTestData/basicEdgeAppDir.ts

@@ -92,6 +92,8 @@ export const testSet: TestSet = {
 			api: { 'hello.func': createValidFuncDir('/api/hello') },
 			'index.func': createValidFuncDir('/index'),
 			'index.rsc.func': createValidFuncDir('/index.rsc'),
+			'alternative.func': createValidFuncDir('/alternative'),
+			'alternative.rsc.func': createValidFuncDir('/alternative.rsc'),
 		},
 		static: {
 			_next: {
@@ -235,5 +237,19 @@ export const testSet: TestSet = {
 				},
 			},
 		},
+		{
+			name: "non-index page with trailing slash and rsc header doesn't redirect to /index",
+			paths: ['/alternative/'],
+			headers: { rsc: '1' },
+			expected: {
+				status: 200,
+				data: JSON.stringify({ file: '/alternative', params: [] }),
+				headers: {
+					'content-type': 'text/plain;charset=UTF-8',
+					'x-matched-path': '/alternative.rsc',
+					vary: 'RSC, Next-Router-State-Tree, Next-Router-Prefetch',
+				},
+			},
+		},
 	],
 };