Merge branch 'main' into delete-e2e-deploys

Author: LekoArts

.github/workflows/test.yml

@@ -7,6 +7,10 @@ on:
   schedule:
     - cron: '0 0 * * *'
 
+concurrency:
+  group: ${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   build:
     name: Unit tests

.release-please-manifest.json

@@ -1,4 +1,4 @@
 {
-  "packages/runtime": "4.32.2",
+  "packages/runtime": "4.33.0",
   "packages/next": "1.4.4"
 }

cypress/integration/default/appdir.spec.ts

@@ -29,6 +29,27 @@ describe('appDir', () => {
     })
   })
 
+  it('returns a vary header for RSC data requests to ISR pages', () => {
+    cy.request({
+      url: '/blog/erica/',
+      followRedirect: false,
+      headers: {
+        RSC: '1',
+      },
+    }).then((response) => {
+      expect(response.headers).to.have.property('vary').contains('RSC')
+    })
+  })
+
+  it('returns a vary header for non-RSC data requests to ISR pages', () => {
+    cy.request({
+      url: '/blog/erica/',
+      followRedirect: false,
+    }).then((response) => {
+      expect(response.headers).to.have.property('vary').contains('RSC')
+    })
+  })
+
   it('returns RSC data for RSC requests to static pages', () => {
     cy.request({
       url: '/blog/erica/first-post/',

cypress/integration/default/revalidate.spec.ts

@@ -0,0 +1,69 @@
+describe('On-demand revalidation', () => {
+  it('revalidates static ISR route with default locale', () => {
+    cy.request({ url: '/api/revalidate/?select=0' }).then((res) => {
+      expect(res.status).to.eq(200)
+      expect(res.body).to.have.property('message', 'success')
+    })
+  })
+  it('revalidates static ISR route with non-default locale', () => {
+    cy.request({ url: '/api/revalidate/?select=1' }).then((res) => {
+      expect(res.status).to.eq(200)
+      expect(res.body).to.have.property('message', 'success')
+    })
+  })
+  it('revalidates root static ISR route with default locale', () => {
+    cy.request({ url: '/api/revalidate/?select=2' }).then((res) => {
+      expect(res.status).to.eq(200)
+      expect(res.body).to.have.property('message', 'success')
+    })
+  })
+  it('revalidates root static ISR route with non-default locale', () => {
+    cy.request({ url: '/api/revalidate/?select=3' }).then((res) => {
+      expect(res.status).to.eq(200)
+      expect(res.body).to.have.property('message', 'success')
+    })
+  })
+  it('revalidates dynamic prerendered ISR route with default locale', () => {
+    cy.request({ url: '/api/revalidate/?select=4' }).then((res) => {
+      expect(res.status).to.eq(200)
+      expect(res.body).to.have.property('message', 'success')
+    })
+  })
+  it('fails to revalidate dynamic non-prerendered ISR route with fallback false', () => {
+    cy.request({ url: '/api/revalidate/?select=5', failOnStatusCode: false }).then((res) => {
+      expect(res.status).to.eq(500)
+      expect(res.body).to.have.property('message')
+      expect(res.body.message).to.include('Invalid response 404')
+    })
+  })
+  it('revalidates dynamic non-prerendered ISR route with fallback blocking', () => {
+    cy.request({ url: '/api/revalidate/?select=6' }).then((res) => {
+      expect(res.status).to.eq(200)
+      expect(res.body).to.have.property('message', 'success')
+    })
+  })
+  it('revalidates dynamic non-prerendered ISR route with fallback blocking and non-default locale', () => {
+    cy.request({ url: '/api/revalidate/?select=7' }).then((res) => {
+      expect(res.status).to.eq(200)
+      expect(res.body).to.have.property('message', 'success')
+    })
+  })
+  it('revalidates dynamic prerendered appDir route', () => {
+    cy.request({ url: '/api/revalidate/?select=8' }).then((res) => {
+      expect(res.status).to.eq(200)
+      expect(res.body).to.have.property('message', 'success')
+    })
+  })
+  it('fails to revalidate dynamic non-prerendered appDir route', () => {
+    cy.request({ url: '/api/revalidate/?select=9' }).then((res) => {
+      expect(res.status).to.eq(200)
+      expect(res.body).to.have.property('message', 'success')
+    })
+  })
+  it('revalidates dynamic prerendered appDir route with catch-all params', () => {
+    cy.request({ url: '/api/revalidate/?select=10' }).then((res) => {
+      expect(res.status).to.eq(200)
+      expect(res.body).to.have.property('message', 'success')
+    })
+  })
+})

cypress/integration/middleware/enhanced.spec.ts

@@ -1,7 +1,7 @@
 describe('Enhanced middleware', () => {
   it('rewrites the response body', () => {
     cy.visit('/static')
-    cy.get('#message').contains('This was static but has been transformed in')
+    cy.get('#message').contains('This was static (& escaping test &) but has been transformed in')
     cy.contains("This is an ad that isn't shown by default")
   })
 
@@ -10,7 +10,7 @@ describe('Enhanced middleware', () => {
       expect(response.body).to.have.nested.property('pageProps.showAd', true)
       expect(response.body)
         .to.have.nested.property('pageProps.message')
-        .that.includes('This was static but has been transformed in')
+        .that.includes('This was static (& escaping test &) but has been transformed in')
     })
   })
 
@@ -27,13 +27,13 @@ describe('Enhanced middleware', () => {
 
   it('handles uppercase i18n redirects properly ', () => {
     cy.visit('/de-DE/static')
-    cy.get('#message').contains('This was static but has been transformed in')
+    cy.get('#message').contains('This was static (& escaping test &) but has been transformed in')
     cy.contains("This is an ad that isn't shown by default")
   })
 
   it('handles lowercase i18n redirects properly ', () => {
     cy.visit('/de-de/static')
-    cy.get('#message').contains('This was static but has been transformed in')
+    cy.get('#message').contains('This was static (& escaping test &) but has been transformed in')
     cy.contains("This is an ad that isn't shown by default")
   })
 })

demos/canary/package-lock.json

@@ -0,0 +1,26 @@
+export default async function handler(req, res) {
+  const query = req.query
+  const select = Number(query.select) || 0
+
+  // these paths are used for e2e testing res.revalidate()
+  const paths = [
+    '/getStaticProps/with-revalidate/', // valid path
+    '/fr/getStaticProps/with-revalidate/', // valid path (with locale)
+    '/', // valid path (index)
+    '/fr/', // valid path (index with locale)
+    '/getStaticProps/withRevalidate/2/', // valid path (with dynamic route)
+    '/getStaticProps/withRevalidate/3/', // invalid path (fallback false with dynamic route)
+    '/getStaticProps/withRevalidate/withFallbackBlocking/3/', // valid path (fallback blocking with dynamic route)
+    '/fr/getStaticProps/withRevalidate/withFallbackBlocking/3/', // valid path (fallback blocking with dynamic route and locale)
+    '/blog/nick/', // valid path (with prerendered appDir dynamic route)
+    '/blog/greg/', // invalid path (with non-prerendered appDir dynamic route)
+    '/blog/rob/hello/', // valid path (with appDir dynamic route catch-all)
+  ]
+
+  try {
+    await res.revalidate(paths[select])
+    return res.json({ code: 200, message: 'success' })
+  } catch (err) {
+    return res.status(500).send({ code: 500, message: err.message })
+  }
+}

demos/default/pages/api/revalidate.js

@@ -1,8 +1,8 @@
 import Link from 'next/link'
 
-const Show = ({ show }) => (
+const Show = ({ show, time }) => (
   <div>
-    <p>This page uses getStaticProps() to pre-fetch a TV show.</p>
+    <p>This page uses getStaticProps() to pre-fetch a TV show at {time}</p>
 
     <hr />
 
@@ -22,6 +22,7 @@ export async function getStaticProps(context) {
   return {
     props: {
       show: data,
+      time: new Date().toISOString(),
     },
     // ODB handler will use the minimum TTL=60s
     revalidate: 1,

demos/default/pages/getStaticProps/with-revalidate.js

@@ -24,7 +24,7 @@ export async function middleware(req: NextRequest) {
   if (pathname.startsWith('/static')) {
     // Unlike NextResponse.next(), this actually sends the request to the origin
     const res = await request.next()
-    const message = `This was static but has been transformed in ${req.geo?.city}`
+    const message = `This was static (& escaping test &) but has been transformed in ${req.geo?.city}`
 
     // Transform the response HTML and props
     res.replaceText('p[id=message]', message)