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

samcx · 2024-04-19T19:01:19Z

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)

CleanShot.2024-04-20.at.12.05.19.mp4

(After)

CleanShot.2024-04-20.at.11.59.28.mp4

Closes NEXT-3173

ijjk · 2024-04-19T19:08:35Z

Stats from current PR

Default Build (Increase detected ⚠️)

General Overall increase ⚠️

	vercel/next.js canary	samcx/next.js sam/fetch-cache/fix-check	Change
buildDuration	14.4s	14.6s	⚠️ +144ms
buildDurationCached	7.8s	6.6s	N/A
nodeModulesSize	238 MB	238 MB	⚠️ +480 kB
nextStartRea..uration (ms)	384ms	385ms	N/A

Client Bundles (main, webpack)

	vercel/next.js canary	samcx/next.js sam/fetch-cache/fix-check	Change
2453-HASH.js gzip	31.5 kB	31.5 kB	N/A
3304.HASH.js gzip	169 B	169 B	✓
3f784ff6-HASH.js gzip	53.7 kB	53.7 kB	N/A
8299-HASH.js gzip	5.09 kB	5.1 kB	N/A
framework-HASH.js gzip	45.2 kB	45.2 kB	✓
main-app-HASH.js gzip	228 B	228 B	✓
main-HASH.js gzip	29.6 kB	29.6 kB	N/A
webpack-HASH.js gzip	1.64 kB	1.65 kB	N/A
Overall change	45.6 kB	45.6 kB	✓

Legacy Client Bundles (polyfills)

	vercel/next.js canary	samcx/next.js sam/fetch-cache/fix-check	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/fetch-cache/fix-check	Change
_app-HASH.js gzip	193 B	194 B	N/A
_error-HASH.js gzip	193 B	191 B	N/A
amp-HASH.js gzip	510 B	510 B	✓
css-HASH.js gzip	342 B	343 B	N/A
dynamic-HASH.js gzip	2.51 kB	2.52 kB	N/A
edge-ssr-HASH.js gzip	265 B	265 B	✓
head-HASH.js gzip	365 B	364 B	N/A
hooks-HASH.js gzip	389 B	391 B	N/A
image-HASH.js gzip	4.28 kB	4.28 kB	N/A
index-HASH.js gzip	269 B	268 B	N/A
link-HASH.js gzip	2.68 kB	2.69 kB	N/A
routerDirect..HASH.js gzip	328 B	326 B	N/A
script-HASH.js gzip	395 B	397 B	N/A
withRouter-HASH.js gzip	323 B	323 B	✓
1afbb74e6ecf..834.css gzip	106 B	106 B	✓
Overall change	1.2 kB	1.2 kB	✓

Client Build Manifests

	vercel/next.js canary	samcx/next.js sam/fetch-cache/fix-check	Change
_buildManifest.js gzip	482 B	484 B	N/A
Overall change	0 B	0 B	✓

Rendered Page Sizes

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

Edge SSR bundle Size Overall increase ⚠️

	vercel/next.js canary	samcx/next.js sam/fetch-cache/fix-check	Change
edge-ssr.js gzip	94.5 kB	108 kB	⚠️ +13.6 kB
page.js gzip	3.05 kB	3.04 kB	N/A
Overall change	94.5 kB	108 kB	⚠️ +13.6 kB

Middleware size

	vercel/next.js canary	samcx/next.js sam/fetch-cache/fix-check	Change
middleware-b..fest.js gzip	623 B	625 B	N/A
middleware-r..fest.js gzip	155 B	156 B	N/A
middleware.js gzip	25.6 kB	25.6 kB	N/A
edge-runtime..pack.js gzip	839 B	839 B	✓
Overall change	839 B	839 B	✓

Next Runtimes Overall increase ⚠️

	vercel/next.js canary	samcx/next.js sam/fetch-cache/fix-check	Change
app-page-exp...dev.js gzip	171 kB	171 kB	✓
app-page-exp..prod.js gzip	97.6 kB	97.6 kB	✓
app-page-tur..prod.js gzip	99.4 kB	99.4 kB	✓
app-page-tur..prod.js gzip	93.6 kB	93.6 kB	✓
app-page.run...dev.js gzip	145 kB	145 kB	✓
app-page.run..prod.js gzip	92.1 kB	92.1 kB	✓
app-route-ex...dev.js gzip	21.5 kB	21.5 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.2 kB	21.2 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	21.4 kB	21.4 kB	✓
pages.runtim...dev.js gzip	22.1 kB	22.1 kB	✓
pages.runtim..prod.js gzip	21.4 kB	21.4 kB	✓
server.runti..prod.js gzip	51.6 kB	65.3 kB	⚠️ +13.7 kB
Overall change	946 kB	960 kB	⚠️ +13.7 kB

build cache

	vercel/next.js canary	samcx/next.js sam/fetch-cache/fix-check	Change
0.pack gzip	1.6 MB	1.6 MB	N/A
index.pack gzip	107 kB	107 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 image-HASH.js

@@ -1,7 +1,7 @@
 (self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
   [8358],
   {
-    /***/ 1552: /***/ (
+    /***/ 4070: /***/ (
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/image",
         function () {
-          return __webpack_require__(5237);
+          return __webpack_require__(396);
         },
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 2016: /***/ (module, exports, __webpack_require__) => {
+    /***/ 8490: /***/ (module, exports, __webpack_require__) => {
       "use strict";
       /* __next_internal_client_entry_do_not_use__  cjs */
       Object.defineProperty(exports, "__esModule", {
@@ -40,15 +40,15 @@
         __webpack_require__(422)
       );
       const _head = /*#__PURE__*/ _interop_require_default._(
-        __webpack_require__(6074)
+        __webpack_require__(2457)
       );
-      const _getimgprops = __webpack_require__(9571);
-      const _imageconfig = __webpack_require__(6567);
-      const _imageconfigcontextsharedruntime = __webpack_require__(419);
-      const _warnonce = __webpack_require__(4486);
-      const _routercontextsharedruntime = __webpack_require__(162);
+      const _getimgprops = __webpack_require__(7932);
+      const _imageconfig = __webpack_require__(5706);
+      const _imageconfigcontextsharedruntime = __webpack_require__(9483);
+      const _warnonce = __webpack_require__(9035);
+      const _routercontextsharedruntime = __webpack_require__(4829);
       const _imageloader = /*#__PURE__*/ _interop_require_default._(
-        __webpack_require__(6996)
+        __webpack_require__(7240)
       );
       // This is replaced by webpack define plugin
       const configEnv = {
@@ -379,7 +379,7 @@
       /***/
     },
 
-    /***/ 9571: /***/ (
+    /***/ 7932: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -395,9 +395,9 @@
           return getImgProps;
         },
       });
-      const _warnonce = __webpack_require__(4486);
-      const _imageblursvg = __webpack_require__(133);
-      const _imageconfig = __webpack_require__(6567);
+      const _warnonce = __webpack_require__(9035);
+      const _imageblursvg = __webpack_require__(2642);
+      const _imageconfig = __webpack_require__(5706);
       const VALID_LOADING_VALUES =
         /* unused pure expression or super */ null && [
           "lazy",
@@ -772,7 +772,7 @@
       /***/
     },
 
-    /***/ 133: /***/ (__unused_webpack_module, exports) => {
+    /***/ 2642: /***/ (__unused_webpack_module, exports) => {
       "use strict";
       /**
        * A shared function, used on both client and server, to generate a SVG blur placeholder.
@@ -827,7 +827,7 @@
       /***/
     },
 
-    /***/ 4085: /***/ (
+    /***/ 503: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -854,10 +854,10 @@
         },
       });
       const _interop_require_default = __webpack_require__(7456);
-      const _getimgprops = __webpack_require__(9571);
-      const _imagecomponent = __webpack_require__(2016);
+      const _getimgprops = __webpack_require__(7932);
+      const _imagecomponent = __webpack_require__(8490);
       const _imageloader = /*#__PURE__*/ _interop_require_default._(
-        __webpack_require__(6996)
+        __webpack_require__(7240)
       );
       function getImageProps(imgProps) {
         const { props } = (0, _getimgprops.getImgProps)(imgProps, {
@@ -889,7 +889,7 @@
       /***/
     },
 
-    /***/ 6996: /***/ (__unused_webpack_module, exports) => {
+    /***/ 7240: /***/ (__unused_webpack_module, exports) => {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -924,7 +924,7 @@
       /***/
     },
 
-    /***/ 5237: /***/ (
+    /***/ 396: /***/ (
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -941,8 +941,8 @@
 
       // EXTERNAL MODULE: ./node_modules/.pnpm/react@18.2.0/node_modules/react/jsx-runtime.js
       var jsx_runtime = __webpack_require__(1527);
-      // EXTERNAL MODULE: ./node_modules/.pnpm/file+..+main-repo+packages+next+next-packed.tgz_react-dom@18.2.0_react@18.2.0/node_modules/next/image.js
-      var next_image = __webpack_require__(1577);
+      // EXTERNAL MODULE: ./node_modules/.pnpm/file+..+diff-repo+packages+next+next-packed.tgz_react-dom@18.2.0_react@18.2.0/node_modules/next/image.js
+      var next_image = __webpack_require__(73);
       var image_default = /*#__PURE__*/ __webpack_require__.n(next_image); // CONCATENATED MODULE: ./pages/nextjs.png
       /* harmony default export */ const nextjs = {
         src: "/_next/static/media/nextjs.cae0b805.png",
@@ -972,12 +972,8 @@
       /***/
     },
 
-    /***/ 1577: /***/ (
-      module,
-      __unused_webpack_exports,
-      __webpack_require__
-    ) => {
-      module.exports = __webpack_require__(4085);
+    /***/ 73: /***/ (module, __unused_webpack_exports, __webpack_require__) => {
+      module.exports = __webpack_require__(503);
 
       /***/
     },
@@ -987,7 +983,7 @@
     /******/ var __webpack_exec__ = (moduleId) =>
       __webpack_require__((__webpack_require__.s = moduleId));
     /******/ __webpack_require__.O(0, [2888, 9774, 179], () =>
-      __webpack_exec__(1552)
+      __webpack_exec__(4070)
     );
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;

Diff for 2453-HASH.js

Diff too large to display

Diff for main-HASH.js

Diff too large to display

Diff for server.runtime.prod.js

Diff too large to display

Commit: 67dc59c

ijjk · 2024-04-19T19:09:32Z

Failing test suites

Commit: 67dc59c

__NEXT_EXPERIMENTAL_PPR=true pnpm test-start test/e2e/app-dir/actions-allowed-origins/app-action-allowed-origins.test.ts (PPR)

app-dir action allowed origins > should pass if localhost is set as a safe origin

Expand output

● app-dir action allowed origins › should pass if localhost is set as a safe origin

thrown: "Exceeded timeout of 120000 ms for a hook.
Add a timeout value to this test to increase the timeout, if this is a long-running test. See https://jestjs.io/docs/api#testname-fn-timeout."

  252 |   let next: NextInstance
  253 |   if (!skipped) {
> 254 |     beforeAll(async () => {
      |     ^
  255 |       next = await createNext(options)
  256 |     })
  257 |     afterAll(async () => {

  at beforeAll (lib/e2e-utils.ts:254:5)
  at nextTestSetup (lib/e2e-utils.ts:322:21)
  at describe (lib/e2e-utils.ts:321:3)
  at Object.<anonymous> (e2e/app-dir/actions-allowed-origins/app-action-allowed-origins.test.ts:5:19)

● Test suite failed to run

thrown: "Exceeded timeout of 120000 ms for a hook.
Add a timeout value to this test to increase the timeout, if this is a long-running test. See https://jestjs.io/docs/api#testname-fn-timeout."

  131 |
  132 | if (typeof afterAll === 'function') {
> 133 |   afterAll(async () => {
      |   ^
  134 |     if (nextInstance) {
  135 |       await nextInstance.destroy()
  136 |       throw new Error(

  at Object.afterAll (lib/e2e-utils.ts:133:3)
  at Object.<anonymous> (e2e/app-dir/actions-allowed-origins/app-action-allowed-origins.test.ts:5:19)

Read more about building and testing Next.js in contributing.md.

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

laugharn · 2024-04-22T23:42:54Z

@samcx 🙇

…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): update logic for checking memory cache

d5f8efd

samcx self-assigned this Apr 19, 2024

samcx requested review from timneutkens, ijjk, shuding, huozhi, feedthejim, ztanner and wyattjoh as code owners April 19, 2024 19:01

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

samcx marked this pull request as draft April 19, 2024 19:21

fix(fetch-cache): fix typo

0a380b8

samcx changed the title ~~fix(fetch-cache): update logic for checking memory cache~~ fix(fetch-cache): fix additional typo Apr 20, 2024

samcx marked this pull request as ready for review April 20, 2024 16:06

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

50b64d7

ijjk approved these changes Apr 20, 2024

View reviewed changes

ijjk reviewed Apr 22, 2024

View reviewed changes

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

samcx changed the title ~~fix(fetch-cache): fix additional typo~~ fix(fetch-cache): fix additional typo and typing Apr 22, 2024

samcx added 2 commits April 22, 2024 14:35

fix(fetch-cache): add type to json response

53244ce

fix(fetch-cache): add zod validation

cc9e714

samcx changed the title ~~fix(fetch-cache): fix additional typo and typing~~ fix(fetch-cache): fix additional typo, add type & data validation Apr 22, 2024

samcx requested a review from ijjk April 22, 2024 19:46

wyattjoh reviewed Apr 22, 2024

View reviewed changes

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

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

fix(fetch-cache): remove unecessary !cached check

a5831b1

ijjk approved these changes Apr 22, 2024

View reviewed changes

fix(fetch-cache): add suggestions

8f72817

wyattjoh approved these changes Apr 22, 2024

View reviewed changes

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

67dc59c

samcx enabled auto-merge (squash) April 22, 2024 22:07

samcx merged commit 3d1f3cc into vercel:canary Apr 22, 2024
74 checks passed

samcx deleted the sam/fetch-cache/fix-check branch April 22, 2024 23:10

huozhi mentioned this pull request Apr 26, 2024

chore(fetch-cache): remove zod from fetch cache #65079

Merged

github-actions bot added the locked label May 7, 2024

github-actions bot locked as resolved and limited conversation to collaborators May 7, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

samcx commented Apr 19, 2024 •

edited

Loading

ijjk commented Apr 19, 2024 •

edited

Loading

ijjk commented Apr 19, 2024 •

edited

Loading

laugharn commented Apr 22, 2024

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

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

Conversation

samcx commented Apr 19, 2024 • edited Loading

Why?

ijjk commented Apr 19, 2024 • edited Loading

Stats from current PR

ijjk commented Apr 19, 2024 • edited Loading

Failing test suites

laugharn commented Apr 22, 2024

samcx commented Apr 19, 2024 •

edited

Loading

ijjk commented Apr 19, 2024 •

edited

Loading

ijjk commented Apr 19, 2024 •

edited

Loading