fix: correctly handle prerendered dynamic RSC routes

Author: ascorbic

packages/runtime/src/helpers/edge.ts

@@ -5,14 +5,14 @@ import type { NetlifyConfig, NetlifyPluginConstants } from '@netlify/build'
 import { greenBright } from 'chalk'
 import destr from 'destr'
 import { copy, copyFile, emptyDir, ensureDir, readJSON, readJson, writeJSON, writeJson } from 'fs-extra'
-import type { PrerenderManifest, SsgRoute } from 'next/dist/build'
+import type { PrerenderManifest } from 'next/dist/build'
 import type { MiddlewareManifest } from 'next/dist/build/webpack/plugins/middleware-plugin'
 import type { RouteHas } from 'next/dist/lib/load-custom-routes'
 import { outdent } from 'outdent'
 
 import { getRequiredServerFiles, NextConfig } from './config'
 import { makeLocaleOptional, stripLookahead } from './matchers'
-import { DynamicRoute, RoutesManifest } from './types'
+import { RoutesManifest } from './types'
 
 // This is the format as of next@12.2
 interface EdgeFunctionDefinitionV1 {
@@ -70,14 +70,8 @@ const maybeLoadJson = <T>(path: string): Promise<T> | null => {
     return readJson(path)
   }
 }
-
-export const isStaticAppDirRoute = ({ srcRoute }: SsgRoute, manifest: Record<string, string> | null): boolean =>
-  Boolean(manifest) && Object.values(manifest).includes(srcRoute)
-
-export const isDynamicAppDirRoute = (
-  { page }: Pick<DynamicRoute, 'page'>,
-  manifest: Record<string, string> | null,
-): boolean => Boolean(manifest) && Object.values(manifest).includes(page)
+export const isAppDirRoute = (route: string, appPathRoutesManifest: Record<string, string> | null): boolean =>
+  Boolean(appPathRoutesManifest) && Object.values(appPathRoutesManifest).includes(route)
 
 export const loadMiddlewareManifest = (netlifyConfig: NetlifyConfig): Promise<MiddlewareManifest | null> =>
   maybeLoadJson(resolve(netlifyConfig.build.publish, 'server', 'middleware-manifest.json'))
@@ -320,23 +314,38 @@ export const writeRscDataEdgeFunction = async ({
   }
   const staticAppdirRoutes: Array<string> = []
   for (const [path, route] of Object.entries(prerenderManifest.routes)) {
-    if (isStaticAppDirRoute(route, appPathRoutesManifest)) {
+    if (isAppDirRoute(route.srcRoute, appPathRoutesManifest)) {
       staticAppdirRoutes.push(path, route.dataRoute)
     }
   }
-  if (staticAppdirRoutes.length === 0) {
+  const dynamicAppDirRoutes: Array<string> = []
+
+  for (const [path, route] of Object.entries(prerenderManifest.dynamicRoutes)) {
+    if (isAppDirRoute(path, appPathRoutesManifest)) {
+      dynamicAppDirRoutes.push(route.routeRegex, route.dataRouteRegex)
+    }
+  }
+
+  if (staticAppdirRoutes.length === 0 && dynamicAppDirRoutes.length === 0) {
     return []
   }
 
   const edgeFunctionDir = resolve('.netlify', 'edge-functions', 'rsc-data')
   await ensureDir(edgeFunctionDir)
   await copyEdgeSourceFile({ edgeFunctionDir, file: 'rsc-data.ts' })
 
-  return staticAppdirRoutes.map((path) => ({
-    function: 'rsc-data',
-    name: 'RSC data routing',
-    path,
-  }))
+  return [
+    ...staticAppdirRoutes.map((path) => ({
+      function: 'rsc-data',
+      name: 'RSC data routing',
+      path,
+    })),
+    ...dynamicAppDirRoutes.map((pattern) => ({
+      function: 'rsc-data',
+      name: 'RSC data routing',
+      pattern,
+    })),
+  ]
 }
 
 /**

packages/runtime/src/helpers/redirects.ts

@@ -8,7 +8,7 @@ import { join } from 'pathe'
 
 import { HANDLER_FUNCTION_PATH, HIDDEN_PATHS, ODB_FUNCTION_PATH } from '../constants'
 
-import { isDynamicAppDirRoute, isStaticAppDirRoute, loadAppPathRoutesManifest } from './edge'
+import { isAppDirRoute, loadAppPathRoutesManifest } from './edge'
 import { getMiddleware } from './files'
 import { ApiRouteConfig } from './functions'
 import { RoutesManifest } from './types'
@@ -135,8 +135,7 @@ const generateStaticIsrRewrites = ({
   const staticIsrRoutesThatMatchMiddleware: Array<string> = []
   const staticRoutePaths = new Set<string>()
   const staticIsrRewrites: NetlifyConfig['redirects'] = []
-  staticRouteEntries.forEach(([route, ssgRoute]) => {
-    const { initialRevalidateSeconds, dataRoute } = ssgRoute
+  staticRouteEntries.forEach(([route, { initialRevalidateSeconds, dataRoute, srcRoute }]) => {
     if (isApiRoute(route) || is404Route(route, i18n)) {
       return
     }
@@ -147,7 +146,7 @@ const generateStaticIsrRewrites = ({
       return
     }
     // appDir routes are a different format, so we need to handle them differently
-    const isAppDir = isStaticAppDirRoute(ssgRoute, appPathRoutes)
+    const isAppDir = isAppDirRoute(srcRoute, appPathRoutes)
     // The default locale is served from the root, not the localised path
     if (i18n?.defaultLocale && route.startsWith(`/${i18n.defaultLocale}/`)) {
       route = route.slice(i18n.defaultLocale.length + 1)
@@ -227,7 +226,7 @@ const generateDynamicRewrites = ({
     if (route.page in prerenderedDynamicRoutes) {
       if (matchesMiddleware(middleware, route.page)) {
         dynamicRoutesThatMatchMiddleware.push(route.page)
-      } else if (isDynamicAppDirRoute(route, appPathRoutes)) {
+      } else if (isAppDirRoute(route.page, appPathRoutes)) {
         dynamicRewrites.push(
           ...redirectsForNextRoute({
             route: route.page,