Ensure cache-control is correct for notFound: true with revalidate

[ijjk]

This ensures we have the correct cache-control header when revalidate is used with notFound: true on getStaticProps or getServerSideProps pages.

Bug

• Related issues linked using fixes #number
• Integration tests added
• Errors have helpful link attached, see contributing.md

Fixes: https://app.clubhouse.io/vercel/story/23445

[ijjk]

Stats from current PR

Default Build (Increase detected ⚠️)

General Overall increase ⚠️

	vercel/next.js canary	ijjk/next.js fix/gssp-404	Change
buildDuration	12s	11.9s	-64ms
buildDurationCached	3.1s	3.2s	⚠️ +148ms
nodeModulesSize	47 MB	47 MB	⚠️ +226 B

Page Load Tests Overall increase ✓

	vercel/next.js canary	ijjk/next.js fix/gssp-404	Change
/ failed reqs	0	0	✓
/ total time (seconds)	2.306	2.281	-0.02
/ avg req/sec	1084.34	1095.78	+11.44
/error-in-render failed reqs	0	0	✓
/error-in-render total time (seconds)	1.27	1.228	-0.04
/error-in-render avg req/sec	1967.97	2036.04	+68.07

Client Bundles (main, webpack, commons)

	vercel/next.js canary	ijjk/next.js fix/gssp-404	Change
745.HASH.js gzip	179 B	179 B	✓
framework-HASH.js gzip	42.2 kB	42.2 kB	✓
main-HASH.js gzip	26.6 kB	26.6 kB	✓
webpack-HASH.js gzip	1.45 kB	1.45 kB	✓
Overall change	70.4 kB	70.4 kB	✓

Legacy Client Bundles (polyfills)

	vercel/next.js canary	ijjk/next.js fix/gssp-404	Change
polyfills-a4..dd70.js gzip	31 kB	31 kB	✓
Overall change	31 kB	31 kB	✓

Client Pages

	vercel/next.js canary	ijjk/next.js fix/gssp-404	Change
_app-HASH.js gzip	979 B	979 B	✓
_error-HASH.js gzip	194 B	194 B	✓
amp-HASH.js gzip	312 B	312 B	✓
css-HASH.js gzip	329 B	329 B	✓
dynamic-HASH.js gzip	2.67 kB	2.67 kB	✓
head-HASH.js gzip	351 B	351 B	✓
hooks-HASH.js gzip	918 B	918 B	✓
image-HASH.js gzip	4.14 kB	4.14 kB	✓
index-HASH.js gzip	261 B	261 B	✓
link-HASH.js gzip	1.66 kB	1.66 kB	✓
routerDirect..HASH.js gzip	318 B	318 B	✓
script-HASH.js gzip	387 B	387 B	✓
withRouter-HASH.js gzip	320 B	320 B	✓
bb14e60e810b..30f.css gzip	125 B	125 B	✓
Overall change	13 kB	13 kB	✓

Client Build Manifests

	vercel/next.js canary	ijjk/next.js fix/gssp-404	Change
_buildManifest.js gzip	492 B	492 B	✓
Overall change	492 B	492 B	✓

Rendered Page Sizes

	vercel/next.js canary	ijjk/next.js fix/gssp-404	Change
index.html gzip	541 B	541 B	✓
link.html gzip	553 B	553 B	✓
withRouter.html gzip	534 B	534 B	✓
Overall change	1.63 kB	1.63 kB	✓

---

Webpack 4 Mode (Decrease detected ✓)

General Overall increase ⚠️

	vercel/next.js canary	ijjk/next.js fix/gssp-404	Change
buildDuration	10.7s	9.7s	-1s
buildDurationCached	4.2s	4.1s	-129ms
nodeModulesSize	47 MB	47 MB	⚠️ +226 B

Page Load Tests Overall decrease ⚠️

	vercel/next.js canary	ijjk/next.js fix/gssp-404	Change
/ failed reqs	0	0	✓
/ total time (seconds)	2.366	2.529	⚠️ +0.16
/ avg req/sec	1056.76	988.4	⚠️ -68.36
/error-in-render failed reqs	0	0	✓
/error-in-render total time (seconds)	1.375	1.359	-0.02
/error-in-render avg req/sec	1818.52	1839.21	+20.69

Client Bundles (main, webpack, commons)

	vercel/next.js canary	ijjk/next.js fix/gssp-404	Change
16.HASH.js gzip	186 B	186 B	✓
677f882d2ed8..HASH.js gzip	14.1 kB	14.1 kB	✓
framework.HASH.js gzip	41.9 kB	41.9 kB	✓
main-HASH.js gzip	13.8 kB	13.8 kB	✓
webpack-HASH.js gzip	1.19 kB	1.19 kB	✓
Overall change	71.2 kB	71.2 kB	✓

Legacy Client Bundles (polyfills)

	vercel/next.js canary	ijjk/next.js fix/gssp-404	Change
polyfills-a4..dd70.js gzip	31 kB	31 kB	✓
Overall change	31 kB	31 kB	✓

Client Pages

	vercel/next.js canary	ijjk/next.js fix/gssp-404	Change
_app-HASH.js gzip	964 B	964 B	✓
_error-HASH.js gzip	3.8 kB	3.8 kB	✓
amp-HASH.js gzip	552 B	552 B	✓
css-HASH.js gzip	333 B	333 B	✓
dynamic-HASH.js gzip	2.87 kB	2.87 kB	✓
head-HASH.js gzip	3.06 kB	3.06 kB	✓
hooks-HASH.js gzip	924 B	924 B	✓
index-HASH.js gzip	231 B	231 B	✓
link-HASH.js gzip	1.64 kB	1.64 kB	✓
routerDirect..HASH.js gzip	298 B	298 B	✓
script-HASH.js gzip	3.03 kB	3.03 kB	✓
withRouter-HASH.js gzip	295 B	295 B	✓
30809af5c834..565.css gzip	125 B	125 B	✓
Overall change	18.1 kB	18.1 kB	✓

Client Build Manifests

	vercel/next.js canary	ijjk/next.js fix/gssp-404	Change
_buildManifest.js gzip	500 B	500 B	✓
Overall change	500 B	500 B	✓

Rendered Page Sizes

	vercel/next.js canary	ijjk/next.js fix/gssp-404	Change
index.html gzip	585 B	585 B	✓
link.html gzip	596 B	596 B	✓
withRouter.html gzip	579 B	579 B	✓
Overall change	1.76 kB	1.76 kB	✓

Commit: 05bf6eb