Merge branch 'main' into delete-e2e-deploys

Author: LekoArts

cypress/integration/default/appdir.spec.ts

@@ -29,7 +29,7 @@ describe('appDir', () => {
     })
   })
 
-  it('returns a vary header for RSC data requests to ISR pages', () => {
+  it.skip('returns a vary header for RSC data requests to ISR pages', () => {
     cy.request({
       url: '/blog/erica/',
       followRedirect: false,
@@ -41,7 +41,7 @@ describe('appDir', () => {
     })
   })
 
-  it('returns a vary header for non-RSC data requests to ISR pages', () => {
+  it.skip('returns a vary header for non-RSC data requests to ISR pages', () => {
     cy.request({
       url: '/blog/erica/',
       followRedirect: false,

cypress/integration/middleware/standard.spec.ts

@@ -37,6 +37,14 @@ describe('Standard middleware', () => {
       cy.getCookie('netlifyCookie').should('have.property', 'value', 'true')
     })
   })
+
+  // https://github.com/netlify/pillar-support/issues/350
+  it('MiddlewareResponse adds cookies', () => {
+    cy.request('/cookies/middleware').then((response) => {
+      cy.getCookie('middlewareCookie').should('have.property', 'value', 'true')
+      expect(response.headers).to.have.property('x-foo', 'bar')
+    })
+  })
 })
 
 describe('Middleware matchers', () => {

demos/middleware/middleware.ts

@@ -53,6 +53,13 @@ export async function middleware(req: NextRequest) {
     return request.rewrite('/api/hello')
   }
 
+  if (pathname.startsWith('/cookies/middleware')) {
+    const response = await new MiddlewareRequest(req).next()
+    response.cookies.set('middlewareCookie', 'true')
+    response.headers.set('x-foo', 'bar')
+    return response
+  }
+
   if (pathname.startsWith('/cookies')) {
     response = NextResponse.next()
     response.cookies.set('netlifyCookie', 'true')
@@ -129,8 +136,8 @@ export const config = {
   matcher: [
     '/api/:all*',
     '/headers',
+    '/cookies/:path*',
     { source: '/static' },
-    { source: '/cookies' },
     { source: '/matcher-cookie'},
     { source: '/shows/((?!99|88).*)' },
     {

demos/middleware/pages/cookies/middleware.js

@@ -0,0 +1,9 @@
+const Cookies = () => {
+  return (
+    <div>
+      <p>The cookie "middlewareCookie" should be set to true</p>
+    </div>
+  )
+}
+
+export default Cookies

packages/next/src/middleware/response.ts

@@ -11,7 +11,15 @@ export class MiddlewareResponse extends NextResponse {
   private readonly dataTransforms: NextDataTransform[]
   private readonly elementHandlers: Array<[selector: string, handlers: ElementHandlers]>
   constructor(public originResponse: Response) {
-    super()
+    // we need to propagate the set-cookie header, so response.cookies.get works correctly
+    const initHeaders = new Headers()
+    if (originResponse.headers.has('set-cookie')) {
+      initHeaders.set('set-cookie', originResponse.headers.get('set-cookie'))
+    }
+
+    super(undefined, {
+      headers: initHeaders,
+    })
 
     // These are private in Node when compiling, but we access them in Deno at runtime
     Object.defineProperty(this, 'dataTransforms', {

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

@@ -1,14 +1,18 @@
 import type { EdgeFunction } from 'https://edge.netlify.com'
 
+// These are copied from next/dist/build. This file gets copied as part of the next
+// runtime build and can't reference the next package directly.
+//
+// Latest types at https://github.com/vercel/next.js/blob/4a2df3c3752aeddc50fd5ab053440eccf71ae50b/packages/next/src/build/index.ts#L140
 export declare type SsgRoute = {
   initialRevalidateSeconds: number | false
   srcRoute: string | null
-  dataRoute: string
+  dataRoute: string | null
 }
 export declare type DynamicSsgRoute = {
   routeRegex: string
   fallback: string | null | false
-  dataRoute: string
+  dataRoute: string | null
   dataRouteRegex: string
 }
 export declare type PrerenderManifest = {
@@ -35,7 +39,7 @@ const rscifyPath = (route: string) => {
 export const getRscDataRouter = ({ routes: staticRoutes, dynamicRoutes }: PrerenderManifest): EdgeFunction => {
   const staticRouteSet = new Set(
     Object.entries(staticRoutes)
-      .filter(([, { dataRoute }]) => dataRoute.endsWith('.rsc'))
+      .filter(([, { dataRoute }]) => dataRoute?.endsWith('.rsc'))
       .map(([route]) => route),
   )
 

packages/runtime/src/templates/edge-shared/utils.ts

@@ -57,10 +57,15 @@ export const addMiddlewareHeaders = async (
   return response
 }
 
+interface ResponseCookies {
+  readonly _headers: Headers
+}
+
 interface MiddlewareResponse extends Response {
   originResponse: Response
   dataTransforms: NextDataTransform[]
   elementHandlers: Array<[selector: string, handlers: ElementHandlers]>
+  get cookies(): ResponseCookies
 }
 
 interface MiddlewareRequest {
@@ -184,6 +189,12 @@ export const buildResponse = async ({
     if (request.method === 'HEAD' || request.method === 'OPTIONS') {
       return response.originResponse
     }
+
+    // NextResponse doesn't set cookies onto the originResponse, so we need to copy them over
+    if (response.cookies._headers.has('set-cookie')) {
+      response.originResponse.headers.set('set-cookie', response.cookies._headers.get('set-cookie')!)
+    }
+
     // If it's JSON we don't need to use the rewriter, we can just parse it
     if (response.originResponse.headers.get('content-type')?.includes('application/json')) {
       const props = await response.originResponse.json()

test/rsc-data.spec.ts

@@ -0,0 +1,40 @@
+import { getRscDataRouter, PrerenderManifest } from '../packages/runtime/src/templates/edge-shared/rsc-data'
+
+const basePrerenderManifest: PrerenderManifest = {
+  version: 3,
+  routes: {},
+  dynamicRoutes: {},
+  notFoundRoutes: [],
+}
+
+describe('getRscDataRouter', () => {
+  it('should create a RSC data router when data routes are not present for routes', () => {
+    const manifest: PrerenderManifest = {
+      ...basePrerenderManifest,
+      routes: {
+        '/': {
+          initialRevalidateSeconds: 1,
+          srcRoute: null,
+          dataRoute: '/index.json.rsc',
+        },
+        '/api/hello': {
+          initialRevalidateSeconds: false,
+          srcRoute: '/api/hello',
+          dataRoute: null,
+        },
+      },
+    }
+
+    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')
+  })
+})