chore: wip

Author: ascorbic

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

@@ -6,10 +6,7 @@ interface PrerenderedRoute {
   dataRoute: string | null
 }
 
-export const getRscDataRouter = (
-  prerenderedRoutes: Record<string, PrerenderedRoute>,
-  trailingSlash: boolean,
-): EdgeFunction => {
+export const getRscDataRouter = (prerenderedRoutes: Record<string, PrerenderedRoute>): EdgeFunction => {
   const routeEntries: Array<[string, PrerenderedRoute]> = Object.entries(prerenderedRoutes)
   const routes = new Map(routeEntries)
 
@@ -32,9 +29,7 @@ export const getRscDataRouter = (
       log('Is rsc request')
       const route = routes.get(pathname)
       if (route?.dataRoute) {
-        log('Rewriting to data route', route.dataRoute)
-        // We need the correct slash here so we don't get a 308
-        request.headers.set('x-rsc-route', trailingSlash ? `${pathname}/` : pathname)
+        request.headers.set('x-rsc-route', url.pathname)
         return context.rewrite(new URL(route.dataRoute, request.url))
       }
     } else if (rscDataRoutes.has(pathname)) {

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

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

packages/runtime/src/templates/getHandler.ts

@@ -104,9 +104,6 @@ const makeHandler = (conf: NextConfig, app, pageRoot, staticManifest: Array<[str
     if (prefetchResponse) {
       return prefetchResponse
     }
-    if (event.headers['x-next-debug-logging']) {
-      console.log(event.path, event.headers)
-    }
 
     event.path = normalizePath(event)
 
@@ -133,7 +130,7 @@ const makeHandler = (conf: NextConfig, app, pageRoot, staticManifest: Array<[str
         headers: multiValueHeaders,
         statusCode: result.statusCode,
       }
-      console.log('Origin response:', JSON.stringify(response, null, 2))
+      console.log('Next server response:', JSON.stringify(response, null, 2))
     }
 
     if (multiValueHeaders['set-cookie']?.[0]?.includes('__prerender_bypass')) {