Add server island route to the front of the route list (#12263)

* Add server island route to the front of the route list * Add changeset
withastro · Oct 21, 2024 · e9e8080 · e9e8080
1 parent 388d237
commit e9e8080
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/.changeset/honest-dots-jump.md b/.changeset/honest-dots-jump.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Fixes conflict between server islands and on-demand dynamic routes in the form of `/[...rest]` or `/[paramA]/[paramB]`.
diff --git a/packages/astro/e2e/fixtures/server-islands/src/pages/[conflicting]/[dynamicRoute].astro b/packages/astro/e2e/fixtures/server-islands/src/pages/[conflicting]/[dynamicRoute].astro
@@ -0,0 +1,14 @@
+---
+export const prerender = false;
+---
+
+<html>
+	<head>
+		<title>Conflicting route</title>
+	</head>
+	<body>
+		This route would conflict with the route generated for server islands.
+		<br />
+		This file is here so the tests break if that happens.
+	</body>
+</html>
diff --git a/packages/astro/src/core/server-islands/endpoint.ts b/packages/astro/src/core/server-islands/endpoint.ts
@@ -44,7 +44,7 @@ export function ensureServerIslandRoute(config: ConfigFields, routeManifest: Man
 		return;
 	}
 
-	routeManifest.routes.push(getServerIslandRouteData(config));
+	routeManifest.routes.unshift(getServerIslandRouteData(config));
 }
 
 type RenderOptions = {
-Original file line number
+Diff line change
@@ Expand Up @@
     		return;
     	}
-    	routeManifest.routes.push(getServerIslandRouteData(config));
+    	routeManifest.routes.unshift(getServerIslandRouteData(config));
     }
     type RenderOptions = {
@@ Expand Down @@