chore: handle dynamic isr routes

Author: ascorbic

packages/runtime/src/helpers/redirects.ts

@@ -233,9 +233,10 @@ const generateDynamicRewrites = ({
             route: route.page,
             buildId,
             basePath,
-            to: HANDLER_FUNCTION_PATH,
+            to: ODB_FUNCTION_PATH,
             i18n,
-            withData: false,
+            dataRoute: prerenderedDynamicRoutes[route.page].dataRoute,
+            withData: true,
           }),
         )
       } else if (prerenderedDynamicRoutes[route.page].fallback === false && !is404Isr) {

packages/runtime/src/helpers/utils.ts

@@ -52,6 +52,13 @@ 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

@@ -1,40 +1,74 @@
 import type { EdgeFunction } from 'https://edge.netlify.com'
 
-interface PrerenderedRoute {
+export declare type SsgRoute = {
   initialRevalidateSeconds: number | false
   srcRoute: string | null
-  dataRoute: string | null
+  dataRoute: string
+}
+export declare type DynamicSsgRoute = {
+  routeRegex: string
+  fallback: string | null | false
+  dataRoute: string
+  dataRouteRegex: string
+}
+export declare type PrerenderManifest = {
+  version: 3
+  routes: {
+    [route: string]: SsgRoute
+  }
+  dynamicRoutes: {
+    [route: string]: DynamicSsgRoute
+  }
+  notFoundRoutes: string[]
 }
 
-export const getRscDataRouter = (prerenderedRoutes: Record<string, PrerenderedRoute>): EdgeFunction => {
-  const routeEntries: Array<[string, PrerenderedRoute]> = Object.entries(prerenderedRoutes)
-  const routes = new Map(routeEntries)
+const noop = () => {}
 
-  const rscDataRoutes = new Set(
-    routeEntries.map(([, { dataRoute }]) => dataRoute).filter((dataRoute) => dataRoute?.endsWith('.rsc')),
+// 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 + '.rsc'
+}
+
+export const getRscDataRouter = ({ routes: staticRoutes, dynamicRoutes }: PrerenderManifest): EdgeFunction => {
+  const staticRouteSet = new Set(
+    Object.entries(staticRoutes)
+      .filter(([, { dataRoute }]) => dataRoute.endsWith('.rsc'))
+      .map(([route]) => route),
   )
 
+  const dynamicRouteMatcher = Object.values(dynamicRoutes)
+    .filter(({ dataRoute }) => dataRoute.endsWith('.rsc'))
+    .map(({ dataRouteRegex }) => new RegExp(dataRouteRegex))
+
+  const matchesDynamicRscDataRoute = (pathname: string) => {
+    return dynamicRouteMatcher.some((matcher) => matcher.test(pathname))
+  }
+
+  const matchesStaticRscDataRoute = (pathname: string) => {
+    const key = pathname.endsWith('/') ? pathname.slice(0, -1) : pathname
+    return staticRouteSet.has(key)
+  }
+
+  const matchesRscRoute = (pathname: string) => {
+    return matchesStaticRscDataRoute(pathname) || matchesDynamicRscDataRoute(pathname)
+  }
+
   return (request, context) => {
     const debug = request.headers.has('x-next-debug-logging')
-    const log = (...args: unknown[]) => {
-      if (debug) {
-        console.log(...args)
-      }
-    }
+    const log = debug ? (...args: unknown[]) => console.log(...args) : noop
     const url = new URL(request.url)
-    // Manifest always has the route without a trailing slash
-    const pathname = url.pathname.endsWith('/') ? url.pathname.slice(0, -1) : url.pathname
     // If this is a static RSC request, rewrite to the data route
     if (request.headers.get('rsc') === '1') {
       log('Is rsc request')
-      const route = routes.get(pathname)
-      if (route?.dataRoute) {
+      if (matchesRscRoute(url.pathname)) {
         request.headers.set('x-rsc-route', url.pathname)
-        return context.rewrite(new URL(route.dataRoute, request.url))
+        const target = rscifyPath(url.pathname)
+        log('Rewriting to', target)
+        return context.rewrite(target)
       }
-    } else if (rscDataRoutes.has(pathname)) {
-      log('Is rsc data request. Adding rsc header')
-      request.headers.set('rsc', '1')
     }
   }
 }

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

@@ -1,5 +1,5 @@
 import prerenderManifest from '../edge-shared/prerender-manifest.json' assert { type: 'json' }
-import { getRscDataRouter } from '../edge-shared/rsc-data.ts'
+import { getRscDataRouter, PrerenderManifest } from '../edge-shared/rsc-data.ts'
 
-const handler = getRscDataRouter(prerenderManifest.routes)
+const handler = getRscDataRouter(prerenderManifest as PrerenderManifest)
 export default handler