Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix SPR always revalidating in production #9091

Merged
merged 3 commits into from
Oct 16, 2019
Merged

Fix SPR always revalidating in production #9091

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9308d71
Add failing tests for SPR
ijjk Oct 15, 2019
30ade9b
Fix SPR always revalidating in production
ijjk Oct 16, 2019
5ac925f
Remove extra changes
ijjk Oct 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/next/next-server/server/spr-cache.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
23 changes: 21 additions & 2 deletions test/integration/prerender/test/index.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,17 +259,33 @@ const runTests = (dev = false) => {
expect(new Set(vals).size).toBe(1)
})

it('should not revalidate when set to false', async () => {
const route = '/something'
const initialHtml = await renderViaHTTP(appPort, route)
let newHtml = await renderViaHTTP(appPort, route)
expect(initialHtml).toBe(newHtml)

newHtml = await renderViaHTTP(appPort, route)
expect(initialHtml).toBe(newHtml)

newHtml = await renderViaHTTP(appPort, route)
expect(initialHtml).toBe(newHtml)
})

it('should handle revalidating HTML correctly', async () => {
const route = '/blog/post-1/comment-1'
const initialHtml = await renderViaHTTP(appPort, route)
expect(initialHtml).toMatch(/Post:.*?post-1/)
expect(initialHtml).toMatch(/Comment:.*?comment-1/)

let newHtml = await renderViaHTTP(appPort, route)
expect(newHtml).toBe(initialHtml)

await waitFor(2 * 1000)
await renderViaHTTP(appPort, route)

await waitFor(2 * 1000)
const newHtml = await renderViaHTTP(appPort, route)
newHtml = await renderViaHTTP(appPort, route)
expect(newHtml === initialHtml).toBe(false)
expect(newHtml).toMatch(/Post:.*?post-1/)
expect(newHtml).toMatch(/Comment:.*?comment-1/)
Expand All @@ -281,11 +297,14 @@ const runTests = (dev = false) => {
expect(initialJson).toMatch(/post-2/)
expect(initialJson).toMatch(/comment-3/)

let newJson = await renderViaHTTP(appPort, route)
expect(newJson).toBe(initialJson)

await waitFor(2 * 1000)
await renderViaHTTP(appPort, route)

await waitFor(2 * 1000)
const newJson = await renderViaHTTP(appPort, route)
newJson = await renderViaHTTP(appPort, route)
expect(newJson === initialJson).toBe(false)
expect(newJson).toMatch(/post-2/)
expect(newJson).toMatch(/comment-3/)
Expand Down