fix: now data routes for dynamic routes filter even when null when creating the RSC data router (#2041)

* fix: now data routes for dynamic routes filter even when null when creating the RSC data router

* test: updated test descriptions

Author: nickytonline

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

@@ -44,7 +44,7 @@ export const getRscDataRouter = ({ routes: staticRoutes, dynamicRoutes }: Preren
   )
 
   const dynamicRouteMatcher = Object.values(dynamicRoutes)
-    .filter(({ dataRoute }) => dataRoute.endsWith('.rsc'))
+    .filter(({ dataRoute }) => dataRoute?.endsWith('.rsc'))
     .map(({ routeRegex }) => new RegExp(routeRegex))
 
   const matchesDynamicRscDataRoute = (pathname: string) => {

test/rsc-data.spec.ts

@@ -8,7 +8,7 @@ const basePrerenderManifest: PrerenderManifest = {
 }
 
 describe('getRscDataRouter', () => {
-  it('should create a RSC data router when data routes are not present for routes', () => {
+  it('should filter static routes when creating the RSC data router', () => {
     const manifest: PrerenderManifest = {
       ...basePrerenderManifest,
       routes: {
@@ -37,4 +37,36 @@ describe('getRscDataRouter', () => {
 
     expect(typeof rscDataRouter).toBe('function')
   })
+
+  it('should filter dynamic routes when creating the RSC data router', () => {
+    const manifest: PrerenderManifest = {
+      ...basePrerenderManifest,
+      dynamicRoutes: {
+        '/[slug]': {
+          routeRegex: '^\\/(?<slug>[^\\/]+?)(?:\\/)?$',
+          fallback: null,
+          dataRoute: null,
+          dataRouteRegex: '^\\/(?<slug>[^\\/]+?)(?:\\/)?$',
+        },
+        '/[slug]/[slug2]': {
+          routeRegex: '^\\/(?<slug>[^\\/]+?)(?:\\/)(?<slug2>[^\\/]+?)(?:\\/)?$',
+          fallback: null,
+          dataRoute: '/[slug]/[slug2].json.rsc',
+          dataRouteRegex: '^\\/(?<slug>[^\\/]+?)(?:\\/)(?<slug2>[^\\/]+?)(?:\\/)?$',
+        },
+      },
+    }
+
+    let rscDataRouter
+
+    // Normally type checking would pick this up, but because this file is copied when generating
+    // edge functions for the build, we need to make sure it's valid for builds.
+    //
+    // See https://github.com/netlify/next-runtime/issues/1940
+    expect(() => {
+      rscDataRouter = getRscDataRouter(manifest)
+    }).not.toThrow()
+
+    expect(typeof rscDataRouter).toBe('function')
+  })
 })