Add default cache handlers and update tags manifest handling

[ijjk]

This breaks the default cache handler out from the use-cache-wrapper and starts wiring up the config so we can provide custom handlers. This does not make custom ones able to be leveraged yet that will come in a follow-up and inject them.

[socket-security]

Removed dependencies detected. Learn more about Socket for GitHub ↗︎

🚮 Removed packages: npm/@types/lru-cache@5.1.0

View full report↗︎

[ijjk]

Stats from current PR

Default Build (Increase detected ⚠️)

General

	vercel/next.js canary	vercel/next.js ijjk/experimental-cache-handlers	Change
buildDuration	17.7s	16.1s	N/A
buildDurationCached	15.4s	13s	N/A
nodeModulesSize	372 MB	372 MB	N/A
nextStartRea..uration (ms)	429ms	428ms	N/A

Client Bundles (main, webpack)

	vercel/next.js canary	vercel/next.js ijjk/experimental-cache-handlers	Change
1193.HASH.js gzip	168 B	168 B	✓
1495-HASH.js gzip	5.27 kB	5.27 kB	N/A
9073-HASH.js gzip	44.2 kB	44.2 kB	N/A
d4c1d954-HASH.js gzip	52.6 kB	52.6 kB	N/A
framework-HASH.js gzip	57.4 kB	57.4 kB	N/A
main-app-HASH.js gzip	237 B	236 B	N/A
main-HASH.js gzip	32.8 kB	32.8 kB	N/A
webpack-HASH.js gzip	1.71 kB	1.71 kB	N/A
Overall change	168 B	168 B	✓

Legacy Client Bundles (polyfills)

	vercel/next.js canary	vercel/next.js ijjk/experimental-cache-handlers	Change
polyfills-HASH.js gzip	39.4 kB	39.4 kB	✓
Overall change	39.4 kB	39.4 kB	✓

Client Pages

	vercel/next.js canary	vercel/next.js ijjk/experimental-cache-handlers	Change
_app-HASH.js gzip	192 B	193 B	N/A
_error-HASH.js gzip	192 B	192 B	✓
amp-HASH.js gzip	511 B	510 B	N/A
css-HASH.js gzip	341 B	343 B	N/A
dynamic-HASH.js gzip	1.84 kB	1.84 kB	N/A
edge-ssr-HASH.js gzip	266 B	266 B	✓
head-HASH.js gzip	364 B	364 B	✓
hooks-HASH.js gzip	391 B	391 B	✓
image-HASH.js gzip	4.41 kB	4.4 kB	N/A
index-HASH.js gzip	269 B	268 B	N/A
link-HASH.js gzip	2.78 kB	2.78 kB	N/A
routerDirect..HASH.js gzip	328 B	327 B	N/A
script-HASH.js gzip	397 B	395 B	N/A
withRouter-HASH.js gzip	324 B	322 B	N/A
1afbb74e6ecf..834.css gzip	106 B	106 B	✓
Overall change	1.32 kB	1.32 kB	✓

Client Build Manifests

	vercel/next.js canary	vercel/next.js ijjk/experimental-cache-handlers	Change
_buildManifest.js gzip	746 B	749 B	N/A
Overall change	0 B	0 B	✓

Rendered Page Sizes

	vercel/next.js canary	vercel/next.js ijjk/experimental-cache-handlers	Change
index.html gzip	522 B	523 B	N/A
link.html gzip	535 B	536 B	N/A
withRouter.html gzip	518 B	519 B	N/A
Overall change	0 B	0 B	✓

Edge SSR bundle Size

	vercel/next.js canary	vercel/next.js ijjk/experimental-cache-handlers	Change
edge-ssr.js gzip	130 kB	128 kB	N/A
page.js gzip	189 kB	187 kB	N/A
Overall change	0 B	0 B	✓

Middleware size

	vercel/next.js canary	vercel/next.js ijjk/experimental-cache-handlers	Change
middleware-b..fest.js gzip	665 B	671 B	N/A
middleware-r..fest.js gzip	156 B	156 B	✓
middleware.js gzip	31 kB	31 kB	N/A
edge-runtime..pack.js gzip	844 B	844 B	✓
Overall change	1 kB	1 kB	✓

Next Runtimes

	vercel/next.js canary	vercel/next.js ijjk/experimental-cache-handlers	Change
973-experime...dev.js gzip	322 B	322 B	✓
973.runtime.dev.js gzip	314 B	314 B	✓
app-page-exp...dev.js gzip	314 kB	314 kB	✓
app-page-exp..prod.js gzip	121 kB	121 kB	✓
app-page-tur..prod.js gzip	134 kB	134 kB	✓
app-page-tur..prod.js gzip	129 kB	129 kB	✓
app-page.run...dev.js gzip	304 kB	304 kB	✓
app-page.run..prod.js gzip	116 kB	116 kB	✓
app-route-ex...dev.js gzip	35.9 kB	35.9 kB	✓
app-route-ex..prod.js gzip	24.4 kB	24.4 kB	✓
app-route-tu..prod.js gzip	24.4 kB	24.4 kB	✓
app-route-tu..prod.js gzip	24.2 kB	24.2 kB	✓
app-route.ru...dev.js gzip	37.5 kB	37.5 kB	✓
app-route.ru..prod.js gzip	24.2 kB	24.2 kB	✓
pages-api-tu..prod.js gzip	9.61 kB	9.61 kB	✓
pages-api.ru...dev.js gzip	11.4 kB	11.4 kB	✓
pages-api.ru..prod.js gzip	9.61 kB	9.61 kB	✓
pages-turbo...prod.js gzip	20.9 kB	20.9 kB	✓
pages.runtim...dev.js gzip	26.5 kB	26.5 kB	✓
pages.runtim..prod.js gzip	20.9 kB	20.9 kB	✓
server.runti..prod.js gzip	60.4 kB	58.1 kB	N/A
Overall change	1.39 MB	1.39 MB	✓

build cache Overall increase ⚠️

	vercel/next.js canary	vercel/next.js ijjk/experimental-cache-handlers	Change
0.pack gzip	1.84 MB	1.84 MB	⚠️ +3.94 kB
index.pack gzip	142 kB	144 kB	⚠️ +1.79 kB
Overall change	1.98 MB	1.99 MB	⚠️ +5.73 kB

Diff details

Diff for page.js

Diff too large to display

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],
   {
-    /***/ 771: /***/ (
+    /***/ 2258: /***/ (
       __unused_webpack_module,
       __unused_webpack_exports,
       __webpack_require__
@@ -9,7 +9,7 @@
       (window.__NEXT_P = window.__NEXT_P || []).push([
         "/image",
         function () {
-          return __webpack_require__(5653);
+          return __webpack_require__(142);
         },
       ]);
       if (false) {
@@ -18,7 +18,7 @@
       /***/
     },
 
-    /***/ 5267: /***/ (module, exports, __webpack_require__) => {
+    /***/ 9936: /***/ (module, exports, __webpack_require__) => {
       "use strict";
       /* __next_internal_client_entry_do_not_use__  cjs */
       Object.defineProperty(exports, "__esModule", {
@@ -40,17 +40,17 @@
         __webpack_require__(755)
       );
       const _head = /*#__PURE__*/ _interop_require_default._(
-        __webpack_require__(3489)
+        __webpack_require__(2183)
       );
-      const _getimgprops = __webpack_require__(5537);
-      const _imageconfig = __webpack_require__(8868);
-      const _imageconfigcontextsharedruntime = __webpack_require__(7610);
-      const _warnonce = __webpack_require__(2332);
-      const _routercontextsharedruntime = __webpack_require__(3445);
+      const _getimgprops = __webpack_require__(6561);
+      const _imageconfig = __webpack_require__(9706);
+      const _imageconfigcontextsharedruntime = __webpack_require__(3188);
+      const _warnonce = __webpack_require__(5157);
+      const _routercontextsharedruntime = __webpack_require__(1511);
       const _imageloader = /*#__PURE__*/ _interop_require_default._(
-        __webpack_require__(6376)
+        __webpack_require__(320)
       );
-      const _usemergedref = __webpack_require__(3768);
+      const _usemergedref = __webpack_require__(8118);
       // This is replaced by webpack define plugin
       const configEnv = {
         deviceSizes: [640, 750, 828, 1080, 1200, 1920, 2048, 3840],
@@ -371,7 +371,7 @@
       /***/
     },
 
-    /***/ 3768: /***/ (module, exports, __webpack_require__) => {
+    /***/ 8118: /***/ (module, exports, __webpack_require__) => {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -432,7 +432,7 @@
       /***/
     },
 
-    /***/ 5537: /***/ (
+    /***/ 6561: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -448,9 +448,9 @@
           return getImgProps;
         },
       });
-      const _warnonce = __webpack_require__(2332);
-      const _imageblursvg = __webpack_require__(7988);
-      const _imageconfig = __webpack_require__(8868);
+      const _warnonce = __webpack_require__(5157);
+      const _imageblursvg = __webpack_require__(9002);
+      const _imageconfig = __webpack_require__(9706);
       const VALID_LOADING_VALUES =
         /* unused pure expression or super */ null && [
           "lazy",
@@ -824,7 +824,7 @@
       /***/
     },
 
-    /***/ 7988: /***/ (__unused_webpack_module, exports) => {
+    /***/ 9002: /***/ (__unused_webpack_module, exports) => {
       "use strict";
       /**
        * A shared function, used on both client and server, to generate a SVG blur placeholder.
@@ -879,7 +879,7 @@
       /***/
     },
 
-    /***/ 8208: /***/ (
+    /***/ 6821: /***/ (
       __unused_webpack_module,
       exports,
       __webpack_require__
@@ -906,10 +906,10 @@
         },
       });
       const _interop_require_default = __webpack_require__(9608);
-      const _getimgprops = __webpack_require__(5537);
-      const _imagecomponent = __webpack_require__(5267);
+      const _getimgprops = __webpack_require__(6561);
+      const _imagecomponent = __webpack_require__(9936);
       const _imageloader = /*#__PURE__*/ _interop_require_default._(
-        __webpack_require__(6376)
+        __webpack_require__(320)
       );
       function getImageProps(imgProps) {
         const { props } = (0, _getimgprops.getImgProps)(imgProps, {
@@ -941,7 +941,7 @@
       /***/
     },
 
-    /***/ 6376: /***/ (__unused_webpack_module, exports) => {
+    /***/ 320: /***/ (__unused_webpack_module, exports) => {
       "use strict";
 
       Object.defineProperty(exports, "__esModule", {
@@ -976,7 +976,7 @@
       /***/
     },
 
-    /***/ 5653: /***/ (
+    /***/ 142: /***/ (
       __unused_webpack_module,
       __webpack_exports__,
       __webpack_require__
@@ -993,8 +993,8 @@
 
       // EXTERNAL MODULE: ./node_modules/.pnpm/react@19.0.0-rc-bf7e210c-20241017/node_modules/react/jsx-runtime.js
       var jsx_runtime = __webpack_require__(9166);
-      // EXTERNAL MODULE: ./node_modules/.pnpm/next@file+..+main-repo+packages+next+next-packed.tgz_react-dom@19.0.0-rc-bf7e210c-20241017_re_s3utpgylidq4iuqtuhvaikn7r4/node_modules/next/image.js
-      var next_image = __webpack_require__(6812);
+      // EXTERNAL MODULE: ./node_modules/.pnpm/next@file+..+diff-repo+packages+next+next-packed.tgz_react-dom@19.0.0-rc-bf7e210c-20241017_re_z36suzq4wvowgbcnr6zytfoqpy/node_modules/next/image.js
+      var next_image = __webpack_require__(9101);
       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",
@@ -1024,12 +1024,12 @@
       /***/
     },
 
-    /***/ 6812: /***/ (
+    /***/ 9101: /***/ (
       module,
       __unused_webpack_exports,
       __webpack_require__
     ) => {
-      module.exports = __webpack_require__(8208);
+      module.exports = __webpack_require__(6821);
 
       /***/
     },
@@ -1039,7 +1039,7 @@
     /******/ var __webpack_exec__ = (moduleId) =>
       __webpack_require__((__webpack_require__.s = moduleId));
     /******/ __webpack_require__.O(0, [2888, 9774, 179], () =>
-      __webpack_exec__(771)
+      __webpack_exec__(2258)
     );
     /******/ var __webpack_exports__ = __webpack_require__.O();
     /******/ _N_E = __webpack_exports__;

Diff for server.runtime.prod.js

Diff too large to display

Commit: f1b7c12

[sebmarkbage]

Let's use a singleton instead of classes. No need to instantiate new ones all the time.

[sebmarkbage]

this is called stale now since that's what the config option is called on cacheLife.

https://github.com/vercel/next.js/blob/canary/packages/next/src/server/use-cache/use-cache-wrapper.ts#L41-L53

[sebmarkbage]

rm this whole file?

[ijjk]

This is the old vendor'ed one we can just use the minimal one which handles our specific LRU uses

[sebmarkbage]

If we extend the cache entries we end up with different hidden classes in the code when more than one cache handler is active which would cause that code to deopt, thrash the JIT and eventually stable out in a sub-optimal polymorphic state.

It's better that we compose them instead. (Also just composition > inheritance in general.)

For example:

type DefaultCacheEntry = {
  entry: CacheEntry,
  isErrored: boolean
  errorRetryCount: number
  size?: number
}

This also makes it clearer which are internals of this and never could possibly leak outside the implementation of the cache handler into the implementation of use-cache-wrapper.

[vercel]

Notifying the following users due to files changed in this PR based on this repo's notify modifiers:

@timneutkens, @shuding, @huozhi:

packages/next/src/server/config.ts