fix: set swr delta

packages/next/src/server/lib/revalidate.ts

@@ -13,8 +13,8 @@ export function formatRevalidate(revalidate: Revalidate): string {
   if (revalidate === 0) {
     return 'private, no-cache, no-store, max-age=0, must-revalidate'
   } else if (typeof revalidate === 'number') {
-    return `s-maxage=${revalidate}, stale-while-revalidate`
+    return `s-maxage=${revalidate}, stale-while-revalidate=${CACHE_ONE_YEAR}`
   }
 
-  return `s-maxage=${CACHE_ONE_YEAR}, stale-while-revalidate`
+  return `s-maxage=${CACHE_ONE_YEAR}, stale-while-revalidate=${CACHE_ONE_YEAR}`
 }

test/e2e/app-dir/app-prefetch/prefetching.test.ts

@@ -84,59 +84,45 @@ createNextDescribe(
       let requests: string[] = []
 
       browser.on('request', (req) => {
-        requests.push(new URL(req.url()).pathname)
+        const url = new URL(req.url())
+        if (url.toString().includes(`/static-page?${NEXT_RSC_UNION_QUERY}=`)) {
+          requests.push(`${url.pathname}${url.search}`)
+        }
       })
-      await browser.eval('location.href = "/"')
 
+      await browser.eval('location.href = "/"')
       await browser.eval(
         'window.nd.router.prefetch("/static-page", {kind: "auto"})'
       )
-
-      await check(() => {
-        return requests.some(
-          (req) =>
-            req.includes('static-page') && !req.includes(NEXT_RSC_UNION_QUERY)
-        )
-          ? 'success'
-          : JSON.stringify(requests)
-      }, 'success')
-
       await browser
         .elementByCss('#to-static-page')
         .click()
         .waitForElementByCss('#static-page')
 
-      expect(
-        requests.filter((request) => request === '/static-page').length
-      ).toBe(1)
+      await check(() => {
+        return requests.length === 2 ? 'success' : JSON.stringify(requests)
+      }, 'success')
     })
 
     it('should not fetch again when a static page was prefetched when navigating to it twice', async () => {
       const browser = await next.browser('/404', browserConfigWithFixedTime)
       let requests: string[] = []
 
       browser.on('request', (req) => {
-        requests.push(new URL(req.url()).pathname)
+        const url = new URL(req.url())
+        if (url.toString().includes(`/static-page?${NEXT_RSC_UNION_QUERY}=`)) {
+          requests.push(`${url.pathname}${url.search}`)
+        }
       })
-      await browser.eval('location.href = "/"')
 
+      await browser.eval('location.href = "/"')
       await browser.eval(
         `window.nd.router.prefetch("/static-page", {kind: "auto"})`
       )
-      await check(() => {
-        return requests.some(
-          (req) =>
-            req.includes('static-page') && !req.includes(NEXT_RSC_UNION_QUERY)
-        )
-          ? 'success'
-          : JSON.stringify(requests)
-      }, 'success')
-
       await browser
         .elementByCss('#to-static-page')
         .click()
         .waitForElementByCss('#static-page')
-
       await browser
         .elementByCss('#to-home')
         // Go back to home page
@@ -148,49 +134,9 @@ createNextDescribe(
         // Wait for the static page to load again
         .waitForElementByCss('#static-page')
 
-      expect(
-        requests.filter(
-          (request) =>
-            request === '/static-page' || request.includes(NEXT_RSC_UNION_QUERY)
-        ).length
-      ).toBe(1)
-    })
-
-    it('should calculate `_rsc` query based on `Next-Url`', async () => {
-      const browser = await next.browser('/404', browserConfigWithFixedTime)
-      let staticPageRequests: string[] = []
-
-      browser.on('request', (req) => {
-        const url = new URL(req.url())
-        if (url.toString().includes(`/static-page?${NEXT_RSC_UNION_QUERY}=`)) {
-          staticPageRequests.push(`${url.pathname}${url.search}`)
-        }
-      })
-      await browser.eval('location.href = "/"')
-      await browser.eval(
-        `window.nd.router.prefetch("/static-page", {kind: "auto"})`
-      )
-      await check(() => {
-        return staticPageRequests.length === 1
-          ? 'success'
-          : JSON.stringify(staticPageRequests)
-      }, 'success')
-
-      // Unable to clear router cache so mpa navigation
-      await browser.eval('location.href = "/dashboard"')
-      await browser.eval(
-        `window.nd.router.prefetch("/static-page", {kind: "auto"})`
-      )
       await check(() => {
-        return staticPageRequests.length === 2
-          ? 'success'
-          : JSON.stringify(staticPageRequests)
+        return requests.length === 2 ? 'success' : JSON.stringify(requests)
       }, 'success')
-
-      expect(staticPageRequests[0]).toMatch('/static-page?_rsc=')
-      expect(staticPageRequests[1]).toMatch('/static-page?_rsc=')
-      // `_rsc` does not match because it depends on the `Next-Url`
-      expect(staticPageRequests[0]).not.toBe(staticPageRequests[1])
     })
 
     it('should not prefetch for a bot user agent', async () => {

test/e2e/app-dir/ppr-full/ppr-full.test.ts

@@ -140,7 +140,9 @@ createNextDescribe(
               expect(cacheControl).toEqual('no-store, must-revalidate')
             } else if (dynamic === false || dynamic === 'force-static') {
               expect(cacheControl).toEqual(
-                `s-maxage=${revalidate || '31536000'}, stale-while-revalidate`
+                `s-maxage=${
+                  revalidate || '31536000'
+                }, stale-while-revalidate=31536000`
               )
             } else {
               expect(cacheControl).toEqual(
@@ -338,7 +340,9 @@ createNextDescribe(
               expect(cache).toEqual('public, max-age=0, must-revalidate')
             } else {
               expect(cache).toEqual(
-                `s-maxage=${revalidate || '31536000'}, stale-while-revalidate`
+                `s-maxage=${
+                  revalidate || '31536000'
+                }, stale-while-revalidate=31536000`
               )
             }
 

test/e2e/prerender.test.ts

@@ -599,7 +599,7 @@ describe('Prerender', () => {
         expect(initialRes.headers.get('cache-control')).toBe(
           isDeploy
             ? 'public, max-age=0, must-revalidate'
-            : 's-maxage=2, stale-while-revalidate'
+            : 's-maxage=2, stale-while-revalidate=31536000'
         )
       })
     }
@@ -1265,7 +1265,7 @@ describe('Prerender', () => {
         expect(initialRes.headers.get('cache-control')).toBe(
           isDeploy
             ? 'public, max-age=0, must-revalidate'
-            : 's-maxage=31536000, stale-while-revalidate'
+            : 's-maxage=31536000, stale-while-revalidate=31536000'
         )
         const initialHtml = await initialRes.text()
         expect(initialHtml).toMatch(/hello.*?world/)

test/integration/not-found-revalidate/test/index.test.js

@@ -101,7 +101,7 @@ const runTests = () => {
 
     const props = JSON.parse($('#props').text())
     expect(res.headers.get('cache-control')).toBe(
-      's-maxage=1, stale-while-revalidate'
+      's-maxage=1, stale-while-revalidate=31536000'
     )
     expect(res.status).toBe(200)
     expect(props.found).toBe(true)
@@ -114,7 +114,7 @@ const runTests = () => {
 
     const props2 = JSON.parse($('#props').text())
     expect(res.headers.get('cache-control')).toBe(
-      's-maxage=1, stale-while-revalidate'
+      's-maxage=1, stale-while-revalidate=31536000'
     )
     expect(res.status).toBe(200)
     expect(props2.found).toBe(true)
@@ -127,7 +127,7 @@ const runTests = () => {
 
     const props3 = JSON.parse($('#props').text())
     expect(res.headers.get('cache-control')).toBe(
-      's-maxage=1, stale-while-revalidate'
+      's-maxage=1, stale-while-revalidate=31536000'
     )
     expect(res.status).toBe(200)
     expect(props3.found).toBe(true)
@@ -157,7 +157,7 @@ const runTests = () => {
 
     const props = JSON.parse($('#props').text())
     expect(res.headers.get('cache-control')).toBe(
-      's-maxage=1, stale-while-revalidate'
+      's-maxage=1, stale-while-revalidate=31536000'
     )
     expect(res.status).toBe(200)
     expect(props.found).toBe(true)
@@ -170,7 +170,7 @@ const runTests = () => {
 
     const props2 = JSON.parse($('#props').text())
     expect(res.headers.get('cache-control')).toBe(
-      's-maxage=1, stale-while-revalidate'
+      's-maxage=1, stale-while-revalidate=31536000'
     )
     expect(res.status).toBe(200)
     expect(props2.found).toBe(true)
@@ -183,7 +183,7 @@ const runTests = () => {
 
     const props3 = JSON.parse($('#props').text())
     expect(res.headers.get('cache-control')).toBe(
-      's-maxage=1, stale-while-revalidate'
+      's-maxage=1, stale-while-revalidate=31536000'
     )
     expect(res.status).toBe(200)
     expect(props3.found).toBe(true)

test/production/standalone-mode/required-server-files/required-server-files-i18n.test.ts

@@ -172,7 +172,7 @@ describe('required server files i18n', () => {
     })
     expect(res.status).toBe(200)
     expect(res.headers.get('cache-control')).toBe(
-      's-maxage=1, stale-while-revalidate'
+      's-maxage=1, stale-while-revalidate=31536000'
     )
 
     await waitFor(2000)
@@ -183,7 +183,7 @@ describe('required server files i18n', () => {
     })
     expect(res2.status).toBe(404)
     expect(res2.headers.get('cache-control')).toBe(
-      's-maxage=1, stale-while-revalidate'
+      's-maxage=1, stale-while-revalidate=31536000'
     )
   })
 

test/production/standalone-mode/required-server-files/required-server-files.test.ts

@@ -193,13 +193,13 @@ describe('required server files', () => {
       case: 'redirect no revalidate',
       path: '/optional-ssg/redirect-1',
       dest: '/somewhere',
-      cacheControl: 's-maxage=31536000, stale-while-revalidate',
+      cacheControl: 's-maxage=31536000, stale-while-revalidate=31536000',
     },
     {
       case: 'redirect with revalidate',
       path: '/optional-ssg/redirect-2',
       dest: '/somewhere-else',
-      cacheControl: 's-maxage=5, stale-while-revalidate',
+      cacheControl: 's-maxage=5, stale-while-revalidate=31536000',
     },
   ])(
     `should have correct cache-control for $case`,
@@ -234,13 +234,13 @@ describe('required server files', () => {
       case: 'notFound no revalidate',
       path: '/optional-ssg/not-found-1',
       dest: '/somewhere',
-      cacheControl: 's-maxage=31536000, stale-while-revalidate',
+      cacheControl: 's-maxage=31536000, stale-while-revalidate=31536000',
     },
     {
       case: 'notFound with revalidate',
       path: '/optional-ssg/not-found-2',
       dest: '/somewhere-else',
-      cacheControl: 's-maxage=5, stale-while-revalidate',
+      cacheControl: 's-maxage=5, stale-while-revalidate=31536000',
     },
   ])(
     `should have correct cache-control for $case`,
@@ -267,7 +267,7 @@ describe('required server files', () => {
     const res = await fetchViaHTTP(appPort, '/optional-ssg/props-no-revalidate')
     expect(res.status).toBe(200)
     expect(res.headers.get('cache-control')).toBe(
-      's-maxage=31536000, stale-while-revalidate'
+      's-maxage=31536000, stale-while-revalidate=31536000'
     )
     const $ = cheerio.load(await res.text())
     expect(JSON.parse($('#props').text()).params).toEqual({
@@ -281,7 +281,7 @@ describe('required server files', () => {
     )
     expect(dataRes.status).toBe(200)
     expect(res.headers.get('cache-control')).toBe(
-      's-maxage=31536000, stale-while-revalidate'
+      's-maxage=31536000, stale-while-revalidate=31536000'
     )
     expect((await dataRes.json()).pageProps.params).toEqual({
       rest: ['props-no-revalidate'],
@@ -449,7 +449,7 @@ describe('required server files', () => {
     })
     expect(res.status).toBe(200)
     expect(res.headers.get('cache-control')).toBe(
-      's-maxage=1, stale-while-revalidate'
+      's-maxage=1, stale-while-revalidate=31536000'
     )
 
     await waitFor(2000)
@@ -460,7 +460,7 @@ describe('required server files', () => {
     })
     expect(res2.status).toBe(404)
     expect(res2.headers.get('cache-control')).toBe(
-      's-maxage=1, stale-while-revalidate'
+      's-maxage=1, stale-while-revalidate=31536000'
     )
   })