chore: standardise ODB terminology

README.md

@@ -62,6 +62,8 @@ If you are using Nx, then you will need to point `publish` to the folder inside
 The Next.js Runtime fully supports ISR on Netlify. For more details see
 [the ISR docs](https://github.com/netlify/next-runtime/blob/main/docs/isr.md).
 
+Note that Netlify has a minimum TTL of 60 seconds for revalidation.
+
 ## Use with `next export`
 
 If you are using `next export` to generate a static site, you do not need most of the functionality of this Next.js

cypress/integration/default/dynamic-routes.spec.ts

@@ -16,7 +16,7 @@ describe('Static Routing', () => {
   it('renders correct page via ODB on a static route', () => {
     cy.request('/getStaticProps/with-revalidate/').then((res) => {
       expect(res.status).to.eq(200)
-      expect(res.headers).to.have.property('x-render-mode', 'isr')
+      expect(res.headers).to.have.property('x-render-mode', 'odb ttl=60')
       expect(res.body).to.contain('Dancing with the Stars')
     })
   })
@@ -84,7 +84,7 @@ describe('Dynamic Routing', () => {
   it('renders correct page via ODB on a prerendered dynamic route with revalidate and fallback: false', () => {
     cy.request('/getStaticProps/withRevalidate/1/').then((res) => {
       expect(res.status).to.eq(200)
-      expect(res.headers).to.have.property('x-render-mode', 'isr')
+      expect(res.headers).to.have.property('x-render-mode', 'odb ttl=60')
       expect(res.body).to.contain('Under the Dome')
     })
   })
@@ -98,29 +98,29 @@ describe('Dynamic Routing', () => {
   it('renders correct page via ODB on a prerendered dynamic route with revalidate and fallback: true', () => {
     cy.request('/getStaticProps/withRevalidate/withFallback/1/').then((res) => {
       expect(res.status).to.eq(200)
-      expect(res.headers).to.have.property('x-render-mode', 'isr')
+      expect(res.headers).to.have.property('x-render-mode', 'odb ttl=60')
       expect(res.body).to.contain('Under the Dome')
     })
   })
   it('renders fallback page via ODB on a non-prerendered dynamic route with revalidate and fallback: true', () => {
     cy.request('/getStaticProps/withRevalidate/withFallback/3/').then((res) => {
       expect(res.status).to.eq(200)
-      expect(res.headers).to.have.property('x-render-mode', 'isr')
+      expect(res.headers).to.have.property('x-render-mode', 'odb ttl=60')
       // expect 'Bitten' until https://github.com/netlify/pillar-runtime/issues/438 is fixed
       expect(res.body).to.contain('Bitten')
     })
   })
   it('renders correct page via ODB on a prerendered dynamic route with revalidate and fallback: blocking', () => {
     cy.request('/getStaticProps/withRevalidate/withFallbackBlocking/1/').then((res) => {
       expect(res.status).to.eq(200)
-      expect(res.headers).to.have.property('x-render-mode', 'isr')
+      expect(res.headers).to.have.property('x-render-mode', 'odb ttl=60')
       expect(res.body).to.contain('Under the Dome')
     })
   })
   it('renders correct page via ODB on a non-prerendered dynamic route with revalidate and fallback: blocking', () => {
     cy.request('/getStaticProps/withRevalidate/withFallbackBlocking/3/').then((res) => {
       expect(res.status).to.eq(200)
-      expect(res.headers).to.have.property('x-render-mode', 'isr')
+      expect(res.headers).to.have.property('x-render-mode', 'odb ttl=60')
       expect(res.body).to.contain('Bitten')
     })
   })

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

@@ -25,7 +25,7 @@ export async function getStaticProps(context) {
     props: {
       show: data,
     },
-    revalidate: 1,
+    revalidate: 60,
   }
 }
 

packages/runtime/src/templates/getHandler.ts

@@ -129,15 +129,15 @@ const makeHandler = (conf: NextConfig, app, pageRoot, staticManifest: Array<[str
         // Long-expiry TTL is basically no TTL, so we'll skip it
         if (ttl > 0 && ttl < ONE_YEAR_IN_SECONDS) {
           result.ttl = ttl
-          requestMode = 'isr'
+          requestMode = `odb ttl=${ttl}`
         }
       }
       multiValueHeaders['cache-control'] = ['public, max-age=0, must-revalidate']
     }
-    multiValueHeaders['x-render-mode'] = [requestMode]
-    console.log(
-      `[${event.httpMethod}] ${event.path} (${requestMode?.toUpperCase()}${result.ttl > 0 ? ` ${result.ttl}s` : ''})`,
-    )
+    multiValueHeaders['x-nf-render-mode'] = [requestMode]
+
+    console.log(`[${event.httpMethod}] ${event.path} (${requestMode?.toUpperCase()})`)
+
     return {
       ...result,
       multiValueHeaders,