Fix SPR always revalidating in production

vercel · Oct 16, 2019 · 30ade9b · 30ade9b
1 parent 9308d71
commit 30ade9b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/packages/next/next-server/server/next-server.ts b/packages/next/next-server/server/next-server.ts
@@ -594,6 +594,7 @@ export default class Server {
 
     // Complete the response with cached data if its present
     const cachedData = await getSprCache(sprCacheKey)
+
     if (cachedData) {
       const data = isSprData
         ? JSON.stringify(cachedData.pageData)

diff --git a/packages/next/next-server/server/spr-cache.ts b/packages/next/next-server/server/spr-cache.ts
@@ -35,7 +35,7 @@ export const calculateRevalidate = (pathname: string): number | false => {
   // in development we don't have a prerender-manifest
   // and default to always revalidating to allow easier debugging
   const curTime = new Date().getTime()
-  if (!sprOptions.dev) return curTime
+  if (sprOptions.dev) return curTime
 
   const { initialRevalidateSeconds } = prerenderManifest.routes[pathname] || {
     initialRevalidateSeconds: 1,
@@ -157,9 +157,11 @@ export async function setSprCache(
   }
 
   pathname = normalizePagePath(pathname)
+  const revalidateAfter = calculateRevalidate(pathname)
+
   cache.set(pathname, {
     ...data,
-    revalidateAfter: calculateRevalidate(pathname),
+    revalidateAfter,
   })
 
   // TODO: This option needs to cease to exist unless it stops mutating the