fix(fetch-cache): add check for updated tags when checking same cache key #63547

samcx · 2024-03-21T04:05:41Z

Why?

When we fetch the same cache key (URL) but add an additional tag, the revalidation does not re-fetch correctly (the bug just uses in-memory cache again) when deployed.

:repro: → https://github.com/lostip/nextjs-revalidation-demo/tree/main

… key

ijjk · 2024-03-21T04:11:57Z

Stats from current PR

Default Build (Increase detected ⚠️)

General Overall increase ⚠️

	vercel/next.js canary	samcx/next.js sam/fix-fetch-cache-tags	Change
buildDuration	14.1s	14s	N/A
buildDurationCached	7.6s	6.4s	N/A
nodeModulesSize	199 MB	199 MB	⚠️ +12.3 kB
nextStartRea..uration (ms)	402ms	403ms	N/A

Client Bundles (main, webpack)

	vercel/next.js canary	samcx/next.js sam/fix-fetch-cache-tags	Change
2453-HASH.js gzip	31.4 kB	31.4 kB	N/A
3304.HASH.js gzip	181 B	181 B	✓
3f784ff6-HASH.js gzip	53.7 kB	53.7 kB	✓
8299-HASH.js gzip	5.05 kB	5.05 kB	N/A
framework-HASH.js gzip	45.2 kB	45.2 kB	✓
main-app-HASH.js gzip	242 B	239 B	N/A
main-HASH.js gzip	32.2 kB	32.2 kB	N/A
webpack-HASH.js gzip	1.68 kB	1.68 kB	N/A
Overall change	99 kB	99 kB	✓

Legacy Client Bundles (polyfills)

	vercel/next.js canary	samcx/next.js sam/fix-fetch-cache-tags	Change
polyfills-HASH.js gzip	31 kB	31 kB	✓
Overall change	31 kB	31 kB	✓

Client Pages

	vercel/next.js canary	samcx/next.js sam/fix-fetch-cache-tags	Change
_app-HASH.js gzip	196 B	197 B	N/A
_error-HASH.js gzip	184 B	184 B	✓
amp-HASH.js gzip	505 B	505 B	✓
css-HASH.js gzip	324 B	325 B	N/A
dynamic-HASH.js gzip	2.5 kB	2.5 kB	N/A
edge-ssr-HASH.js gzip	258 B	258 B	✓
head-HASH.js gzip	352 B	352 B	✓
hooks-HASH.js gzip	370 B	371 B	N/A
image-HASH.js gzip	4.22 kB	4.22 kB	N/A
index-HASH.js gzip	259 B	259 B	✓
link-HASH.js gzip	2.67 kB	2.67 kB	N/A
routerDirect..HASH.js gzip	314 B	312 B	N/A
script-HASH.js gzip	386 B	386 B	✓
withRouter-HASH.js gzip	309 B	309 B	✓
1afbb74e6ecf..834.css gzip	106 B	106 B	✓
Overall change	2.36 kB	2.36 kB	✓

Client Build Manifests

	vercel/next.js canary	samcx/next.js sam/fix-fetch-cache-tags	Change
_buildManifest.js gzip	483 B	485 B	N/A
Overall change	0 B	0 B	✓

Rendered Page Sizes

	vercel/next.js canary	samcx/next.js sam/fix-fetch-cache-tags	Change
index.html gzip	529 B	529 B	✓
link.html gzip	542 B	541 B	N/A
withRouter.html gzip	524 B	523 B	N/A
Overall change	529 B	529 B	✓

Edge SSR bundle Size Overall increase ⚠️

	vercel/next.js canary	samcx/next.js sam/fix-fetch-cache-tags	Change
edge-ssr.js gzip	95.4 kB	95.5 kB	⚠️ +120 B
page.js gzip	3.06 kB	3.06 kB	N/A
Overall change	95.4 kB	95.5 kB	⚠️ +120 B

Middleware size

	vercel/next.js canary	samcx/next.js sam/fix-fetch-cache-tags	Change
middleware-b..fest.js gzip	623 B	625 B	N/A
middleware-r..fest.js gzip	151 B	151 B	✓
middleware.js gzip	25.5 kB	25.5 kB	N/A
edge-runtime..pack.js gzip	839 B	839 B	✓
Overall change	990 B	990 B	✓

Next Runtimes Overall increase ⚠️

	vercel/next.js canary	samcx/next.js sam/fix-fetch-cache-tags	Change
app-page-exp...dev.js gzip	170 kB	170 kB	✓
app-page-exp..prod.js gzip	97.3 kB	97.3 kB	✓
app-page-tur..prod.js gzip	99.1 kB	99.1 kB	✓
app-page-tur..prod.js gzip	93.3 kB	93.3 kB	✓
app-page.run...dev.js gzip	144 kB	144 kB	✓
app-page.run..prod.js gzip	91.8 kB	91.8 kB	✓
app-route-ex...dev.js gzip	21.4 kB	21.4 kB	✓
app-route-ex..prod.js gzip	15.1 kB	15.1 kB	✓
app-route-tu..prod.js gzip	15.1 kB	15.1 kB	✓
app-route-tu..prod.js gzip	14.9 kB	14.9 kB	✓
app-route.ru...dev.js gzip	21.1 kB	21.1 kB	✓
app-route.ru..prod.js gzip	14.9 kB	14.9 kB	✓
pages-api-tu..prod.js gzip	9.55 kB	9.55 kB	✓
pages-api.ru...dev.js gzip	9.82 kB	9.82 kB	✓
pages-api.ru..prod.js gzip	9.55 kB	9.55 kB	✓
pages-turbo...prod.js gzip	22.5 kB	22.5 kB	✓
pages.runtim...dev.js gzip	23.1 kB	23.1 kB	✓
pages.runtim..prod.js gzip	22.4 kB	22.4 kB	✓
server.runti..prod.js gzip	51.1 kB	51.3 kB	⚠️ +134 B
Overall change	947 kB	947 kB	⚠️ +134 B

build cache

	vercel/next.js canary	samcx/next.js sam/fix-fetch-cache-tags	Change
0.pack gzip	1.58 MB	1.58 MB	N/A
index.pack gzip	107 kB	106 kB	N/A
Overall change	0 B	0 B	✓

Diff details

Diff for middleware.js

Diff too large to display

Diff for edge-ssr.js

Diff too large to display

Diff for server.runtime.prod.js

Diff too large to display

Commit: dce5b09

packages/next/src/server/lib/incremental-cache/fetch-cache.ts

ijjk

Lets also add this specific fetch/tag case to https://github.com/vercel/next.js/blob/canary/test/e2e/app-dir/app-static/app-static.test.ts

Ethan-Arrowood

looking good. I only have some code style changes, but otherwise this LGTM

packages/next/src/server/lib/incremental-cache/fetch-cache.ts

Co-authored-by: Ethan Arrowood <ethan@arrowood.dev>

ijjk · 2024-03-26T23:04:15Z

Tests Passed

ijjk

Changs looks good just need test case before 🚢

test/e2e/app-dir/app-static/app/mismatch-tags/page.tsx

…4799) ## Why? This PR fixes the fetch cache, which currently is not using the fetch cache when it exists (the tags were not getting set properly), and tags have not updated. (Before) https://github.com/vercel/next.js/assets/28912696/74d8f592-0698-4ae4-be4b-30cffb1ffe11 (After) https://github.com/vercel/next.js/assets/28912696/af12b13a-46c6-41c3-9ac3-20e1ec44a865 - #64786 - #63547 Closes NEXT-3173

…4799) This PR fixes the fetch cache, which currently is not using the fetch cache when it exists (the tags were not getting set properly), and tags have not updated. (Before) https://github.com/vercel/next.js/assets/28912696/74d8f592-0698-4ae4-be4b-30cffb1ffe11 (After) https://github.com/vercel/next.js/assets/28912696/af12b13a-46c6-41c3-9ac3-20e1ec44a865 - #64786 - #63547 Closes NEXT-3173

fix(fetch-cache): add check for updated tags when checking same cache…

a9a3520

… key

samcx requested a review from ijjk March 21, 2024 04:05

samcx self-assigned this Mar 21, 2024

samcx requested review from timneutkens, shuding, huozhi, feedthejim, ztanner and wyattjoh as code owners March 21, 2024 04:05

ijjk added created-by: Next.js team PRs by the Next.js team type: next labels Mar 21, 2024

samcx added 2 commits March 20, 2024 21:22

fix(fetch-cache): removing unnecessary 'FETCH' check

98ff8fa

fix(fetch-cache): re-add 'FETCH' check

2cd7f6c

ijjk reviewed Mar 21, 2024

View reviewed changes

packages/next/src/server/lib/incremental-cache/fetch-cache.ts Outdated Show resolved Hide resolved

samcx added 2 commits March 21, 2024 14:51

fix(fetch-cache): add minor tweaks

53030bc

Merge branch 'canary' into sam/fix-fetch-cache-tags

858b4a0

ijjk reviewed Mar 22, 2024

View reviewed changes

packages/next/src/server/lib/incremental-cache/fetch-cache.ts Outdated Show resolved Hide resolved

ijjk reviewed Mar 22, 2024

View reviewed changes

packages/next/src/server/lib/incremental-cache/fetch-cache.ts Outdated Show resolved Hide resolved

ijjk reviewed Mar 22, 2024

View reviewed changes

Ethan-Arrowood approved these changes Mar 25, 2024

View reviewed changes

packages/next/src/server/lib/incremental-cache/fetch-cache.ts Outdated Show resolved Hide resolved

packages/next/src/server/lib/incremental-cache/fetch-cache.ts Outdated Show resolved Hide resolved

packages/next/src/server/lib/incremental-cache/fetch-cache.ts Outdated Show resolved Hide resolved

fix(fetch-cache): add suggested changes

1b804ef

Co-authored-by: Ethan Arrowood <ethan@arrowood.dev>

samcx added 2 commits March 26, 2024 17:13

fix(fetch-cache): add more suggested changes

d48182d

Merge branch 'canary' into sam/fix-fetch-cache-tags

0ca80ab

samcx requested review from Ethan-Arrowood and ijjk March 27, 2024 00:14

ijjk reviewed Mar 27, 2024

View reviewed changes

samcx added 2 commits April 5, 2024 12:30

Merge branch 'canary' into sam/fix-fetch-cache-tags

bd79373

Merge branch 'canary' into sam/fix-fetch-cache-tags

c85bd30

fix(fetch-cache): add test

b7a5a33

ijjk added the area: tests label Apr 5, 2024

samcx added 4 commits April 5, 2024 17:14

fix(fetch-cache): remove comments

c2f985a

test(fetch-cache): update test title

76e9425

test(fetch-cache): update test

c83128b

test(fetch-cache): add force-dynamic

4f5179e

samcx requested a review from ijjk April 5, 2024 21:50

test(fetch-cache): fix test

e83e602

ijjk reviewed Apr 5, 2024

View reviewed changes

test/e2e/app-dir/app-static/app/mismatch-tags/page.tsx Outdated Show resolved Hide resolved

samcx added 3 commits April 5, 2024 18:19

test(fetch-cache): switch to force-cache

f3f7bc6

Merge branch 'canary' into sam/fix-fetch-cache-tags

499568b

fix(fetch-cache): add suggested changes

c48ce41

Ethan-Arrowood approved these changes Apr 9, 2024

View reviewed changes

test(app-static): add another test that revalidatetag's as well

947fa92

samcx requested a review from ijjk April 9, 2024 16:18

ijjk approved these changes Apr 9, 2024

View reviewed changes

Merge branch 'canary' into sam/fix-fetch-cache-tags

dce5b09

samcx enabled auto-merge (squash) April 9, 2024 16:35

samcx merged commit 39a1c2a into vercel:canary Apr 9, 2024
73 checks passed

samcx deleted the sam/fix-fetch-cache-tags branch April 9, 2024 16:36

samcx mentioned this pull request Apr 19, 2024

fix(fetch-cache): fix additional typo, add type & data validation #64799

Merged

github-actions bot added the locked label Apr 24, 2024

github-actions bot locked as resolved and limited conversation to collaborators Apr 24, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(fetch-cache): add check for updated tags when checking same cache key #63547

fix(fetch-cache): add check for updated tags when checking same cache key #63547

samcx commented Mar 21, 2024 •

edited

ijjk commented Mar 21, 2024 •

edited

ijjk left a comment

Ethan-Arrowood left a comment

ijjk commented Mar 26, 2024 •

edited

ijjk left a comment

fix(fetch-cache): add check for updated tags when checking same cache key #63547

fix(fetch-cache): add check for updated tags when checking same cache key #63547

Conversation

samcx commented Mar 21, 2024 • edited

Why?

ijjk commented Mar 21, 2024 • edited

Stats from current PR

ijjk left a comment

Choose a reason for hiding this comment

Ethan-Arrowood left a comment

Choose a reason for hiding this comment

ijjk commented Mar 26, 2024 • edited

Tests Passed

ijjk left a comment

Choose a reason for hiding this comment

samcx commented Mar 21, 2024 •

edited

ijjk commented Mar 21, 2024 •

edited

ijjk commented Mar 26, 2024 •

edited