chore: simplify trailing slash handling

Author: ascorbic

packages/runtime/src/helpers/utils.ts

@@ -52,13 +52,6 @@ export const toNetlifyRoute = (nextRoute: string): Array<string> => {
     netlifyRoutes.unshift(netlifyRoute)
   }
 
-  // RSC data routes get an extra route with `/index.rsc` so that the router
-  // can match a different URL with and without a trailing slash
-  if (nextRoute.endsWith('.rsc')) {
-    const rscIndexRoute = nextRoute.replace(/\.rsc$/, '/index.rsc')
-    netlifyRoutes.push(rscIndexRoute)
-  }
-
   return netlifyRoutes.map((route) =>
     route
       // Replace catch-all, e.g., [...slug]

packages/runtime/src/templates/edge-shared/rsc-data.ts

@@ -27,7 +27,7 @@ const noop = () => {}
 // Ensure that routes with and without a trailing slash map to different ODB paths
 const rscifyPath = (route: string) => {
   if (route.endsWith('/')) {
-    return route + 'index.rsc'
+    return route.slice(0, -1) + '.rsc/'
   }
   return route + '.rsc'
 }

test/__snapshots__/index.spec.js.snap

@@ -1359,18 +1359,6 @@ Array [
     "status": 200,
     "to": "/.netlify/builders/___netlify-odb-handler",
   },
-  Object {
-    "force": false,
-    "from": "/blog/:author/:slug/index.rsc",
-    "status": 200,
-    "to": "/.netlify/builders/___netlify-odb-handler",
-  },
-  Object {
-    "force": false,
-    "from": "/blog/:author/index.rsc",
-    "status": 200,
-    "to": "/.netlify/builders/___netlify-odb-handler",
-  },
   Object {
     "force": true,
     "from": "/blog/erica",
@@ -1383,12 +1371,6 @@ Array [
     "status": 200,
     "to": "/.netlify/builders/___netlify-odb-handler",
   },
-  Object {
-    "force": true,
-    "from": "/blog/erica/index.rsc",
-    "status": 200,
-    "to": "/.netlify/builders/___netlify-odb-handler",
-  },
   Object {
     "force": true,
     "from": "/blog/nick",
@@ -1401,12 +1383,6 @@ Array [
     "status": 200,
     "to": "/.netlify/builders/___netlify-odb-handler",
   },
-  Object {
-    "force": true,
-    "from": "/blog/nick/index.rsc",
-    "status": 200,
-    "to": "/.netlify/builders/___netlify-odb-handler",
-  },
   Object {
     "force": true,
     "from": "/blog/rob",
@@ -1419,12 +1395,6 @@ Array [
     "status": 200,
     "to": "/.netlify/builders/___netlify-odb-handler",
   },
-  Object {
-    "force": true,
-    "from": "/blog/rob/index.rsc",
-    "status": 200,
-    "to": "/.netlify/builders/___netlify-odb-handler",
-  },
   Object {
     "force": true,
     "from": "/blog/sarah",
@@ -1437,12 +1407,6 @@ Array [
     "status": 200,
     "to": "/.netlify/builders/___netlify-odb-handler",
   },
-  Object {
-    "force": true,
-    "from": "/blog/sarah/index.rsc",
-    "status": 200,
-    "to": "/.netlify/builders/___netlify-odb-handler",
-  },
   Object {
     "force": false,
     "from": "/broken-image",
@@ -1521,18 +1485,6 @@ Array [
     "status": 200,
     "to": "/.netlify/builders/___netlify-odb-handler",
   },
-  Object {
-    "force": false,
-    "from": "/es/blog/:author/:slug/index.rsc",
-    "status": 200,
-    "to": "/.netlify/builders/___netlify-odb-handler",
-  },
-  Object {
-    "force": false,
-    "from": "/es/blog/:author/index.rsc",
-    "status": 200,
-    "to": "/.netlify/builders/___netlify-odb-handler",
-  },
   Object {
     "force": false,
     "from": "/es/broken-image",
@@ -1761,18 +1713,6 @@ Array [
     "status": 200,
     "to": "/.netlify/builders/___netlify-odb-handler",
   },
-  Object {
-    "force": false,
-    "from": "/fr/blog/:author/:slug/index.rsc",
-    "status": 200,
-    "to": "/.netlify/builders/___netlify-odb-handler",
-  },
-  Object {
-    "force": false,
-    "from": "/fr/blog/:author/index.rsc",
-    "status": 200,
-    "to": "/.netlify/builders/___netlify-odb-handler",
-  },
   Object {
     "force": false,
     "from": "/fr/broken-image",