Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
N
next.js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Alex
next.js
Commits
b5d8767f
Unverified
Commit
b5d8767f
authored
Oct 23, 2019
by
Joe Haddad
Committed by
GitHub
Oct 23, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cache No-Revalidate Pages (#9170)
* Cache No-Revalidate Pages * Specifically check for `false`
parent
c0a1c0f9
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
34 additions
and
12 deletions
+34
-12
next-server.ts
packages/next/next-server/server/next-server.ts
+15
-9
index.test.js
test/integration/prerender/test/index.test.js
+19
-3
No files found.
packages/next/next-server/server/next-server.ts
View file @
b5d8767f
...
@@ -4,6 +4,7 @@ import { IncomingMessage, ServerResponse } from 'http'
...
@@ -4,6 +4,7 @@ import { IncomingMessage, ServerResponse } from 'http'
import
{
join
,
resolve
,
sep
}
from
'path'
import
{
join
,
resolve
,
sep
}
from
'path'
import
{
parse
as
parseQs
,
ParsedUrlQuery
}
from
'querystring'
import
{
parse
as
parseQs
,
ParsedUrlQuery
}
from
'querystring'
import
{
parse
as
parseUrl
,
UrlWithParsedQuery
}
from
'url'
import
{
parse
as
parseUrl
,
UrlWithParsedQuery
}
from
'url'
import
{
withCoalescedInvoke
}
from
'../../lib/coalesced-function'
import
{
withCoalescedInvoke
}
from
'../../lib/coalesced-function'
import
{
import
{
BUILD_ID_FILE
,
BUILD_ID_FILE
,
...
@@ -22,7 +23,7 @@ import {
...
@@ -22,7 +23,7 @@ import {
isDynamicRoute
,
isDynamicRoute
,
}
from
'../lib/router/utils'
}
from
'../lib/router/utils'
import
*
as
envConfig
from
'../lib/runtime-config'
import
*
as
envConfig
from
'../lib/runtime-config'
import
{
NextApiRequest
,
NextApiResponse
,
isResSent
}
from
'../lib/utils'
import
{
isResSent
,
NextApiRequest
,
NextApiResponse
}
from
'../lib/utils'
import
{
apiResolver
}
from
'./api-utils'
import
{
apiResolver
}
from
'./api-utils'
import
loadConfig
,
{
isTargetLikeServerless
}
from
'./config'
import
loadConfig
,
{
isTargetLikeServerless
}
from
'./config'
import
{
recursiveReadDirSync
}
from
'./lib/recursive-readdir-sync'
import
{
recursiveReadDirSync
}
from
'./lib/recursive-readdir-sync'
...
@@ -32,9 +33,8 @@ import { getPagePath } from './require'
...
@@ -32,9 +33,8 @@ import { getPagePath } from './require'
import
Router
,
{
Params
,
route
,
Route
,
RouteMatch
}
from
'./router'
import
Router
,
{
Params
,
route
,
Route
,
RouteMatch
}
from
'./router'
import
{
sendHTML
}
from
'./send-html'
import
{
sendHTML
}
from
'./send-html'
import
{
serveStatic
}
from
'./serve-static'
import
{
serveStatic
}
from
'./serve-static'
import
{
getSprCache
,
initializeSprCache
,
setSprCache
}
from
'./spr-cache'
import
{
isBlockedPage
,
isInternalUrl
}
from
'./utils'
import
{
isBlockedPage
,
isInternalUrl
}
from
'./utils'
import
{
findPagesDir
}
from
'../../lib/find-pages-dir'
import
{
initializeSprCache
,
getSprCache
,
setSprCache
}
from
'./spr-cache'
type
NextConfig
=
any
type
NextConfig
=
any
...
@@ -542,12 +542,18 @@ export default class Server {
...
@@ -542,12 +542,18 @@ export default class Server {
// TODO: ETag? Cache-Control headers? Next-specific headers?
// TODO: ETag? Cache-Control headers? Next-specific headers?
res
.
setHeader
(
'Content-Type'
,
type
)
res
.
setHeader
(
'Content-Type'
,
type
)
res
.
setHeader
(
'Content-Length'
,
Buffer
.
byteLength
(
payload
))
res
.
setHeader
(
'Content-Length'
,
Buffer
.
byteLength
(
payload
))
if
(
!
this
.
renderOpts
.
dev
)
{
if
(
revalidate
)
{
if
(
revalidate
)
{
res
.
setHeader
(
res
.
setHeader
(
'Cache-Control'
,
'Cache-Control'
,
`s-maxage=
${
revalidate
}
, stale-while-revalidate`
`s-maxage=
${
revalidate
}
, stale-while-revalidate`
)
)
}
else
if
(
revalidate
===
false
)
{
res
.
setHeader
(
'Cache-Control'
,
`s-maxage=31536000, stale-while-revalidate`
)
}
}
}
res
.
end
(
payload
)
res
.
end
(
payload
)
}
}
...
...
test/integration/prerender/test/index.test.js
View file @
b5d8767f
...
@@ -5,6 +5,7 @@ import { join } from 'path'
...
@@ -5,6 +5,7 @@ import { join } from 'path'
import
webdriver
from
'next-webdriver'
import
webdriver
from
'next-webdriver'
import
{
import
{
renderViaHTTP
,
renderViaHTTP
,
fetchViaHTTP
,
findPort
,
findPort
,
launchApp
,
launchApp
,
killApp
,
killApp
,
...
@@ -202,14 +203,20 @@ const runTests = (dev = false) => {
...
@@ -202,14 +203,20 @@ const runTests = (dev = false) => {
if
(
dev
)
{
if
(
dev
)
{
it
(
'should always call getStaticProps without caching in dev'
,
async
()
=>
{
it
(
'should always call getStaticProps without caching in dev'
,
async
()
=>
{
const
initialHtml
=
await
renderViaHTTP
(
appPort
,
'/something'
)
const
initialRes
=
await
fetchViaHTTP
(
appPort
,
'/something'
)
expect
(
initialRes
.
headers
.
get
(
'cache-control'
)).
toBeFalsy
()
const
initialHtml
=
await
initialRes
.
text
()
expect
(
initialHtml
).
toMatch
(
/hello.*
?
world/
)
expect
(
initialHtml
).
toMatch
(
/hello.*
?
world/
)
const
newHtml
=
await
renderViaHTTP
(
appPort
,
'/something'
)
const
newRes
=
await
fetchViaHTTP
(
appPort
,
'/something'
)
expect
(
newRes
.
headers
.
get
(
'cache-control'
)).
toBeFalsy
()
const
newHtml
=
await
newRes
.
text
()
expect
(
newHtml
).
toMatch
(
/hello.*
?
world/
)
expect
(
newHtml
).
toMatch
(
/hello.*
?
world/
)
expect
(
initialHtml
!==
newHtml
).
toBe
(
true
)
expect
(
initialHtml
!==
newHtml
).
toBe
(
true
)
const
newerHtml
=
await
renderViaHTTP
(
appPort
,
'/something'
)
const
newerRes
=
await
fetchViaHTTP
(
appPort
,
'/something'
)
expect
(
newerRes
.
headers
.
get
(
'cache-control'
)).
toBeFalsy
()
const
newerHtml
=
await
newerRes
.
text
()
expect
(
newerHtml
).
toMatch
(
/hello.*
?
world/
)
expect
(
newerHtml
).
toMatch
(
/hello.*
?
world/
)
expect
(
newHtml
!==
newerHtml
).
toBe
(
true
)
expect
(
newHtml
!==
newerHtml
).
toBe
(
true
)
})
})
...
@@ -230,6 +237,15 @@ const runTests = (dev = false) => {
...
@@ -230,6 +237,15 @@ const runTests = (dev = false) => {
}
}
})
})
}
else
{
}
else
{
it
(
'should should use correct caching headers for a no-revalidate page'
,
async
()
=>
{
const
initialRes
=
await
fetchViaHTTP
(
appPort
,
'/something'
)
expect
(
initialRes
.
headers
.
get
(
'cache-control'
)).
toBe
(
's-maxage=31536000, stale-while-revalidate'
)
const
initialHtml
=
await
initialRes
.
text
()
expect
(
initialHtml
).
toMatch
(
/hello.*
?
world/
)
})
it
(
'outputs a prerender-manifest correctly'
,
async
()
=>
{
it
(
'outputs a prerender-manifest correctly'
,
async
()
=>
{
const
manifest
=
JSON
.
parse
(
const
manifest
=
JSON
.
parse
(
await
fs
.
readFile
(
join
(
appDir
,
'.next/prerender-manifest.json'
),
'utf8'
)
await
fs
.
readFile
(
join
(
appDir
,
'.next/prerender-manifest.json'
),
'utf8'
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment