Unify RequestStore, PrerenderStore and CacheStore #70819
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Failing test suitesCommit: 18d85c3
Expand output● app-dir-hmr › filesystem changes › should update server components pages when env files is changed (node) Read more about building and testing Next.js in contributing.md.
Expand output● Prerender › should always show fallback for page not in getStaticPaths ● Prerender › should not contain headers already sent error Read more about building and testing Next.js in contributing.md. |
Stats from current PRDefault Build (Increase detected
|
| vercel/next.js canary | sebmarkbage/next.js unifyworkunit | Change | |
|---|---|---|---|
| buildDuration | 23.1s | 20.6s | N/A |
| buildDurationCached | 19.8s | 16.6s | N/A |
| nodeModulesSize | 370 MB | 369 MB | N/A |
| nextStartRea..uration (ms) | 502ms | 501ms | N/A |
Client Bundles (main, webpack)
| vercel/next.js canary | sebmarkbage/next.js unifyworkunit | Change | |
|---|---|---|---|
| 1526.HASH.js gzip | 170 B | 169 B | N/A |
| 1698-HASH.js gzip | 5.27 kB | 5.27 kB | N/A |
| 3463-HASH.js gzip | 43.5 kB | 43.5 kB | N/A |
| d1e65033-HASH.js gzip | 52.8 kB | 52.8 kB | N/A |
| framework-HASH.js gzip | 57.5 kB | 57.5 kB | N/A |
| main-app-HASH.js gzip | 233 B | 233 B | ✓ |
| main-HASH.js gzip | 32.7 kB | 32.7 kB | N/A |
| webpack-HASH.js gzip | 1.71 kB | 1.71 kB | ✓ |
| Overall change | 1.94 kB | 1.94 kB | ✓ |
Legacy Client Bundles (polyfills)
| vercel/next.js canary | sebmarkbage/next.js unifyworkunit | 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 | sebmarkbage/next.js unifyworkunit | Change | |
|---|---|---|---|
| _app-HASH.js gzip | 193 B | 193 B | ✓ |
| _error-HASH.js gzip | 192 B | 192 B | ✓ |
| amp-HASH.js gzip | 511 B | 512 B | N/A |
| css-HASH.js gzip | 343 B | 341 B | N/A |
| dynamic-HASH.js gzip | 1.84 kB | 1.85 kB | N/A |
| edge-ssr-HASH.js gzip | 266 B | 266 B | ✓ |
| head-HASH.js gzip | 364 B | 363 B | N/A |
| hooks-HASH.js gzip | 392 B | 389 B | N/A |
| image-HASH.js gzip | 4.41 kB | 4.41 kB | N/A |
| index-HASH.js gzip | 268 B | 268 B | ✓ |
| link-HASH.js gzip | 2.78 kB | 2.78 kB | N/A |
| routerDirect..HASH.js gzip | 329 B | 328 B | N/A |
| script-HASH.js gzip | 396 B | 396 B | ✓ |
| withRouter-HASH.js gzip | 325 B | 324 B | N/A |
| 1afbb74e6ecf..834.css gzip | 106 B | 106 B | ✓ |
| Overall change | 1.42 kB | 1.42 kB | ✓ |
Client Build Manifests
| vercel/next.js canary | sebmarkbage/next.js unifyworkunit | Change | |
|---|---|---|---|
| _buildManifest.js gzip | 747 B | 750 B | N/A |
| Overall change | 0 B | 0 B | ✓ |
Rendered Page Sizes
| vercel/next.js canary | sebmarkbage/next.js unifyworkunit | Change | |
|---|---|---|---|
| index.html gzip | 524 B | 525 B | N/A |
| link.html gzip | 540 B | 539 B | N/A |
| withRouter.html gzip | 520 B | 521 B | N/A |
| Overall change | 0 B | 0 B | ✓ |
Edge SSR bundle Size
| vercel/next.js canary | sebmarkbage/next.js unifyworkunit | Change | |
|---|---|---|---|
| edge-ssr.js gzip | 129 kB | 129 kB | N/A |
| page.js gzip | 187 kB | 187 kB | N/A |
| Overall change | 0 B | 0 B | ✓ |
Middleware size
| vercel/next.js canary | sebmarkbage/next.js unifyworkunit | Change | |
|---|---|---|---|
| middleware-b..fest.js gzip | 668 B | 668 B | ✓ |
| middleware-r..fest.js gzip | 155 B | 156 B | N/A |
| middleware.js gzip | 30.4 kB | 30.3 kB | N/A |
| edge-runtime..pack.js gzip | 844 B | 844 B | ✓ |
| Overall change | 1.51 kB | 1.51 kB | ✓ |
Next Runtimes
| vercel/next.js canary | sebmarkbage/next.js unifyworkunit | 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 | 310 kB | 310 kB | N/A |
| app-page-exp..prod.js gzip | 119 kB | 119 kB | N/A |
| app-page-tur..prod.js gzip | 133 kB | 133 kB | N/A |
| app-page-tur..prod.js gzip | 128 kB | 128 kB | N/A |
| app-page.run...dev.js gzip | 300 kB | 300 kB | N/A |
| app-page.run..prod.js gzip | 115 kB | 115 kB | N/A |
| app-route-ex...dev.js gzip | 34.2 kB | 34.2 kB | N/A |
| app-route-ex..prod.js gzip | 23.2 kB | 23.2 kB | N/A |
| app-route-tu..prod.js gzip | 23.2 kB | 23.2 kB | N/A |
| app-route-tu..prod.js gzip | 23 kB | 23 kB | N/A |
| app-route.ru...dev.js gzip | 35.9 kB | 35.9 kB | N/A |
| app-route.ru..prod.js gzip | 23 kB | 23 kB | N/A |
| pages-api-tu..prod.js gzip | 9.6 kB | 9.6 kB | ✓ |
| pages-api.ru...dev.js gzip | 11.4 kB | 11.4 kB | ✓ |
| pages-api.ru..prod.js gzip | 9.6 kB | 9.6 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 | 57.5 kB | 57.5 kB | N/A |
| Overall change | 99.5 kB | 99.5 kB | ✓ |
build cache Overall increase ⚠️
| vercel/next.js canary | sebmarkbage/next.js unifyworkunit | Change | |
|---|---|---|---|
| 0.pack gzip | 1.84 MB | 1.84 MB | |
| index.pack gzip | 143 kB | 143 kB | N/A |
| Overall change | 1.84 MB | 1.84 MB |
Diff details
Diff for page.js
@@ -15,7 +15,7 @@
/***/
},
- /***/ 2457: /***/ (
+ /***/ 5228: /***/ (
__unused_webpack_module,
__webpack_exports__,
__webpack_require__
@@ -30,7 +30,7 @@
default: () => /* binding */ nHandler,
});
- // NAMESPACE OBJECT: ./node_modules/.pnpm/next@file+..+main-repo+packages+next+next-packed.tgz_react-dom@19.0.0-rc-2d16326d-20240930_re_aw34735d3a4s5ybwraoeym2z3m/node_modules/next/dist/build/webpack/loaders/next-app-loader/index.js?name=app%2Fapp-edge-ssr%2Fpage&page=%2Fapp-edge-ssr%2Fpage&pagePath=private-next-app-dir%2Fapp-edge-ssr%2Fpage.js&appDir=%2Ftmp%2Fnext-statstuMVya%2Fstats-app%2Fapp&appPaths=%2Fapp-edge-ssr%2Fpage&pageExtensions=tsx&pageExtensions=ts&pageExtensions=jsx&pageExtensions=js&basePath=&assetPrefix=&nextConfigOutput=&flyingShuttle=false&preferredRegion=&middlewareConfig=e30%3D!./app/app-edge-ssr/page.js?__next_edge_ssr_entry__
+ // NAMESPACE OBJECT: ./node_modules/.pnpm/next@file+..+diff-repo+packages+next+next-packed.tgz_react-dom@19.0.0-rc-2d16326d-20240930_re_twsodcu6u2xc4vttzu7xhu5gra/node_modules/next/dist/build/webpack/loaders/next-app-loader/index.js?name=app%2Fapp-edge-ssr%2Fpage&page=%2Fapp-edge-ssr%2Fpage&pagePath=private-next-app-dir%2Fapp-edge-ssr%2Fpage.js&appDir=%2Ftmp%2Fnext-statstuMVya%2Fstats-app%2Fapp&appPaths=%2Fapp-edge-ssr%2Fpage&pageExtensions=tsx&pageExtensions=ts&pageExtensions=jsx&pageExtensions=js&basePath=&assetPrefix=&nextConfigOutput=&flyingShuttle=false&preferredRegion=&middlewareConfig=e30%3D!./app/app-edge-ssr/page.js?__next_edge_ssr_entry__
var page_next_edge_ssr_entry_namespaceObject = {};
__webpack_require__.r(page_next_edge_ssr_entry_namespaceObject);
__webpack_require__.d(page_next_edge_ssr_entry_namespaceObject, {
@@ -72,43 +72,43 @@
prerender: () => entry_base /* prerender */.V4,
renderToReadableStream: () =>
entry_base /* renderToReadableStream */.aW,
- requestAsyncStorage: () => entry_base /* requestAsyncStorage */.Fg,
routeModule: () => routeModule,
serverHooks: () => entry_base /* serverHooks */.GP,
taintObjectReference: () => entry_base /* taintObjectReference */.nr,
tree: () => tree,
workAsyncStorage: () => entry_base /* workAsyncStorage */.eP,
+ workUnitAsyncStorage: () => entry_base /* workUnitAsyncStorage */.Sz,
});
- // EXTERNAL MODULE: ./node_modules/.pnpm/next@file+..+main-repo+packages+next+next-packed.tgz_react-dom@19.0.0-rc-2d16326d-20240930_re_aw34735d3a4s5ybwraoeym2z3m/node_modules/next/dist/esm/server/web/globals.js
- var globals = __webpack_require__(786);
- // EXTERNAL MODULE: ./node_modules/.pnpm/next@file+..+main-repo+packages+next+next-packed.tgz_react-dom@19.0.0-rc-2d16326d-20240930_re_aw34735d3a4s5ybwraoeym2z3m/node_modules/next/dist/esm/server/web/adapter.js + 3 modules
- var adapter = __webpack_require__(6671);
- // EXTERNAL MODULE: ./node_modules/.pnpm/next@file+..+main-repo+packages+next+next-packed.tgz_react-dom@19.0.0-rc-2d16326d-20240930_re_aw34735d3a4s5ybwraoeym2z3m/node_modules/next/dist/esm/build/webpack/loaders/next-edge-ssr-loader/render.js + 88 modules
- var render = __webpack_require__(3276);
- // EXTERNAL MODULE: ./node_modules/.pnpm/next@file+..+main-repo+packages+next+next-packed.tgz_react-dom@19.0.0-rc-2d16326d-20240930_re_aw34735d3a4s5ybwraoeym2z3m/node_modules/next/dist/esm/server/lib/incremental-cache/index.js + 3 modules
- var incremental_cache = __webpack_require__(3048);
- // EXTERNAL MODULE: ./node_modules/.pnpm/next@file+..+main-repo+packages+next+next-packed.tgz_react-dom@19.0.0-rc-2d16326d-20240930_re_aw34735d3a4s5ybwraoeym2z3m/node_modules/next/dist/esm/server/app-render/app-render.js + 60 modules
- var app_render = __webpack_require__(6827);
- // EXTERNAL MODULE: ./node_modules/.pnpm/next@file+..+main-repo+packages+next+next-packed.tgz_react-dom@19.0.0-rc-2d16326d-20240930_re_aw34735d3a4s5ybwraoeym2z3m/node_modules/next/dist/esm/server/route-modules/app-page/module.compiled.js
- var module_compiled = __webpack_require__(8320);
- // EXTERNAL MODULE: ./node_modules/.pnpm/next@file+..+main-repo+packages+next+next-packed.tgz_react-dom@19.0.0-rc-2d16326d-20240930_re_aw34735d3a4s5ybwraoeym2z3m/node_modules/next/dist/esm/server/route-kind.js
- var route_kind = __webpack_require__(6965);
- // EXTERNAL MODULE: ./node_modules/.pnpm/next@file+..+main-repo+packages+next+next-packed.tgz_react-dom@19.0.0-rc-2d16326d-20240930_re_aw34735d3a4s5ybwraoeym2z3m/node_modules/next/dist/esm/client/components/error-boundary.js
- var error_boundary = __webpack_require__(3226);
- // EXTERNAL MODULE: ./node_modules/.pnpm/next@file+..+main-repo+packages+next+next-packed.tgz_react-dom@19.0.0-rc-2d16326d-20240930_re_aw34735d3a4s5ybwraoeym2z3m/node_modules/next/dist/esm/server/app-render/entry-base.js + 29 modules
- var entry_base = __webpack_require__(6950); // CONCATENATED MODULE: ./node_modules/.pnpm/next@file+..+main-repo+packages+next+next-packed.tgz_react-dom@19.0.0-rc-2d16326d-20240930_re_aw34735d3a4s5ybwraoeym2z3m/node_modules/next/dist/build/webpack/loaders/next-app-loader/index.js?name=app%2Fapp-edge-ssr%2Fpage&page=%2Fapp-edge-ssr%2Fpage&pagePath=private-next-app-dir%2Fapp-edge-ssr%2Fpage.js&appDir=%2Ftmp%2Fnext-statstuMVya%2Fstats-app%2Fapp&appPaths=%2Fapp-edge-ssr%2Fpage&pageExtensions=tsx&pageExtensions=ts&pageExtensions=jsx&pageExtensions=js&basePath=&assetPrefix=&nextConfigOutput=&flyingShuttle=false&preferredRegion=&middlewareConfig=e30%3D!./app/app-edge-ssr/page.js?__next_edge_ssr_entry__
+ // EXTERNAL MODULE: ./node_modules/.pnpm/next@file+..+diff-repo+packages+next+next-packed.tgz_react-dom@19.0.0-rc-2d16326d-20240930_re_twsodcu6u2xc4vttzu7xhu5gra/node_modules/next/dist/esm/server/web/globals.js
+ var globals = __webpack_require__(7371);
+ // EXTERNAL MODULE: ./node_modules/.pnpm/next@file+..+diff-repo+packages+next+next-packed.tgz_react-dom@19.0.0-rc-2d16326d-20240930_re_twsodcu6u2xc4vttzu7xhu5gra/node_modules/next/dist/esm/server/web/adapter.js + 3 modules
+ var adapter = __webpack_require__(4654);
+ // EXTERNAL MODULE: ./node_modules/.pnpm/next@file+..+diff-repo+packages+next+next-packed.tgz_react-dom@19.0.0-rc-2d16326d-20240930_re_twsodcu6u2xc4vttzu7xhu5gra/node_modules/next/dist/esm/build/webpack/loaders/next-edge-ssr-loader/render.js + 88 modules
+ var render = __webpack_require__(3880);
+ // EXTERNAL MODULE: ./node_modules/.pnpm/next@file+..+diff-repo+packages+next+next-packed.tgz_react-dom@19.0.0-rc-2d16326d-20240930_re_twsodcu6u2xc4vttzu7xhu5gra/node_modules/next/dist/esm/server/lib/incremental-cache/index.js + 3 modules
+ var incremental_cache = __webpack_require__(1622);
+ // EXTERNAL MODULE: ./node_modules/.pnpm/next@file+..+diff-repo+packages+next+next-packed.tgz_react-dom@19.0.0-rc-2d16326d-20240930_re_twsodcu6u2xc4vttzu7xhu5gra/node_modules/next/dist/esm/server/app-render/app-render.js + 60 modules
+ var app_render = __webpack_require__(400);
+ // EXTERNAL MODULE: ./node_modules/.pnpm/next@file+..+diff-repo+packages+next+next-packed.tgz_react-dom@19.0.0-rc-2d16326d-20240930_re_twsodcu6u2xc4vttzu7xhu5gra/node_modules/next/dist/esm/server/route-modules/app-page/module.compiled.js
+ var module_compiled = __webpack_require__(4672);
+ // EXTERNAL MODULE: ./node_modules/.pnpm/next@file+..+diff-repo+packages+next+next-packed.tgz_react-dom@19.0.0-rc-2d16326d-20240930_re_twsodcu6u2xc4vttzu7xhu5gra/node_modules/next/dist/esm/server/route-kind.js
+ var route_kind = __webpack_require__(764);
+ // EXTERNAL MODULE: ./node_modules/.pnpm/next@file+..+diff-repo+packages+next+next-packed.tgz_react-dom@19.0.0-rc-2d16326d-20240930_re_twsodcu6u2xc4vttzu7xhu5gra/node_modules/next/dist/esm/client/components/error-boundary.js
+ var error_boundary = __webpack_require__(5978);
+ // EXTERNAL MODULE: ./node_modules/.pnpm/next@file+..+diff-repo+packages+next+next-packed.tgz_react-dom@19.0.0-rc-2d16326d-20240930_re_twsodcu6u2xc4vttzu7xhu5gra/node_modules/next/dist/esm/server/app-render/entry-base.js + 29 modules
+ var entry_base = __webpack_require__(1388); // CONCATENATED MODULE: ./node_modules/.pnpm/next@file+..+diff-repo+packages+next+next-packed.tgz_react-dom@19.0.0-rc-2d16326d-20240930_re_twsodcu6u2xc4vttzu7xhu5gra/node_modules/next/dist/build/webpack/loaders/next-app-loader/index.js?name=app%2Fapp-edge-ssr%2Fpage&page=%2Fapp-edge-ssr%2Fpage&pagePath=private-next-app-dir%2Fapp-edge-ssr%2Fpage.js&appDir=%2Ftmp%2Fnext-statstuMVya%2Fstats-app%2Fapp&appPaths=%2Fapp-edge-ssr%2Fpage&pageExtensions=tsx&pageExtensions=ts&pageExtensions=jsx&pageExtensions=js&basePath=&assetPrefix=&nextConfigOutput=&flyingShuttle=false&preferredRegion=&middlewareConfig=e30%3D!./app/app-edge-ssr/page.js?__next_edge_ssr_entry__
const module0 = () =>
Promise.resolve(/* import() eager */).then(
- __webpack_require__.bind(__webpack_require__, 4836)
+ __webpack_require__.bind(__webpack_require__, 6603)
);
const module1 = () =>
Promise.resolve(/* import() eager */).then(
- __webpack_require__.bind(__webpack_require__, 2881)
+ __webpack_require__.bind(__webpack_require__, 8334)
);
const page2 = () =>
Promise.resolve(/* import() eager */).then(
- __webpack_require__.bind(__webpack_require__, 2596)
+ __webpack_require__.bind(__webpack_require__, 6258)
);
// We inject the tree and pages here so that we can use them in the route
@@ -171,12 +171,12 @@
});
//# sourceMappingURL=app-page.js.map
- // EXTERNAL MODULE: ./node_modules/.pnpm/next@file+..+main-repo+packages+next+next-packed.tgz_react-dom@19.0.0-rc-2d16326d-20240930_re_aw34735d3a4s5ybwraoeym2z3m/node_modules/next/dist/esm/lib/page-types.js
- var page_types = __webpack_require__(9641);
- // EXTERNAL MODULE: ./node_modules/.pnpm/next@file+..+main-repo+packages+next+next-packed.tgz_react-dom@19.0.0-rc-2d16326d-20240930_re_aw34735d3a4s5ybwraoeym2z3m/node_modules/next/dist/esm/server/app-render/encryption-utils.js
- var encryption_utils = __webpack_require__(2663);
- // EXTERNAL MODULE: ./node_modules/.pnpm/next@file+..+main-repo+packages+next+next-packed.tgz_react-dom@19.0.0-rc-2d16326d-20240930_re_aw34735d3a4s5ybwraoeym2z3m/node_modules/next/dist/esm/server/app-render/action-utils.js
- var action_utils = __webpack_require__(497); // CONCATENATED MODULE: ./node_modules/.pnpm/next@file+..+main-repo+packages+next+next-packed.tgz_react-dom@19.0.0-rc-2d16326d-20240930_re_aw34735d3a4s5ybwraoeym2z3m/node_modules/next/dist/build/webpack/loaders/next-edge-ssr-loader/index.js?{"absolute500Path":"","absoluteAppPath":"next/dist/pages/_app","absoluteDocumentPath":"next/dist/pages/_document","absoluteErrorPath":"next/dist/pages/_error","absolutePagePath":"private-next-app-dir/app-edge-ssr/page.js","dev":false,"isServerComponent":true,"page":"/app-edge-ssr/page","stringifiedConfig":"eyJlbnYiOnt9LCJlc2xpbnQiOnsiaWdub3JlRHVyaW5nQnVpbGRzIjpmYWxzZX0sInR5cGVzY3JpcHQiOnsiaWdub3JlQnVpbGRFcnJvcnMiOmZhbHNlLCJ0c2NvbmZpZ1BhdGgiOiJ0c2NvbmZpZy5qc29uIn0sImRpc3REaXIiOiIubmV4dCIsImNsZWFuRGlzdERpciI6dHJ1ZSwiYXNzZXRQcmVmaXgiOiIiLCJjYWNoZU1heE1lbW9yeVNpemUiOjUyNDI4ODAwLCJjb25maWdPcmlnaW4iOiJuZXh0LmNvbmZpZy5qcyIsInVzZUZpbGVTeXN0ZW1QdWJsaWNSb3V0ZXMiOnRydWUsImdlbmVyYXRlRXRhZ3MiOnRydWUsInBhZ2VFeHRlbnNpb25zIjpbInRzeCIsInRzIiwianN4IiwianMiXSwicG93ZXJlZEJ5SGVhZGVyIjp0cnVlLCJjb21wcmVzcyI6dHJ1ZSwiaW1hZ2VzIjp7ImRldmljZVNpemVzIjpbNjQwLDc1MCw4MjgsMTA4MCwxMjAwLDE5MjAsMjA0OCwzODQwXSwiaW1hZ2VTaXplcyI6WzE2LDMyLDQ4LDY0LDk2LDEyOCwyNTYsMzg0XSwicGF0aCI6Ii9fbmV4dC9pbWFnZSIsImxvYWRlciI6ImRlZmF1bHQiLCJsb2FkZXJGaWxlIjoiIiwiZG9tYWlucyI6W10sImRpc2FibGVTdGF0aWNJbWFnZXMiOmZhbHNlLCJtaW5pbXVtQ2FjaGVUVEwiOjYwLCJmb3JtYXRzIjpbImltYWdlL3dlYnAiXSwiZGFuZ2Vyb3VzbHlBbGxvd1NWRyI6ZmFsc2UsImNvbnRlbnRTZWN1cml0eVBvbGljeSI6InNjcmlwdC1zcmMgJ25vbmUnOyBmcmFtZS1zcmMgJ25vbmUnOyBzYW5kYm94OyIsImNvbnRlbnREaXNwb3NpdGlvblR5cGUiOiJhdHRhY2htZW50IiwicmVtb3RlUGF0dGVybnMiOltdLCJ1bm9wdGltaXplZCI6ZmFsc2V9LCJkZXZJbmRpY2F0b3JzIjp7ImFwcElzclN0YXR1cyI6dHJ1ZSwiYnVpbGRBY3Rpdml0eSI6dHJ1ZSwiYnVpbGRBY3Rpdml0eVBvc2l0aW9uIjoiYm90dG9tLXJpZ2h0In0sIm9uRGVtYW5kRW50cmllcyI6eyJtYXhJbmFjdGl2ZUFnZSI6NjAwMDAsInBhZ2VzQnVmZmVyTGVuZ3RoIjo1fSwiYW1wIjp7ImNhbm9uaWNhbEJhc2UiOiIifSwiYmFzZVBhdGgiOiIiLCJzYXNzT3B0aW9ucyI6e30sInRyYWlsaW5nU2xhc2giOmZhbHNlLCJpMThuIjpudWxsLCJwcm9kdWN0aW9uQnJvd3NlclNvdXJjZU1hcHMiOmZhbHNlLCJleGNsdWRlRGVmYXVsdE1vbWVudExvY2FsZXMiOnRydWUsInNlcnZlclJ1bnRpbWVDb25maWciOnt9LCJwdWJsaWNSdW50aW1lQ29uZmlnIjp7fSwicmVhY3RQcm9kdWN0aW9uUHJvZmlsaW5nIjpmYWxzZSwicmVhY3RTdHJpY3RNb2RlIjpudWxsLCJyZWFjdE1heEhlYWRlcnNMZW5ndGgiOjYwMDAsImh0dHBBZ2VudE9wdGlvbnMiOnsia2VlcEFsaXZlIjp0cnVlfSwibG9nZ2luZyI6e30sInN3ckRlbHRhIjozMTUzNjAwMCwic3RhdGljUGFnZUdlbmVyYXRpb25UaW1lb3V0Ijo2MCwibW9kdWxhcml6ZUltcG9ydHMiOnsiQG11aS9pY29ucy1tYXRlcmlhbCI6eyJ0cmFuc2Zvcm0iOiJAbXVpL2ljb25zLW1hdGVyaWFsL3t7bWVtYmVyfX0ifSwibG9kYXNoIjp7InRyYW5zZm9ybSI6ImxvZGFzaC97e21lbWJlcn19In19LCJvdXRwdXRGaWxlVHJhY2luZ1Jvb3QiOiIvdG1wL25leHQtc3RhdHN0dU1WeWEvc3RhdHMtYXBwIiwiZXhwZXJpbWVudGFsIjp7Im11bHRpWm9uZURyYWZ0TW9kZSI6ZmFsc2UsImFwcE5hdkZhaWxIYW5kbGluZyI6ZmFsc2UsInByZXJlbmRlckVhcmx5RXhpdCI6dHJ1ZSwic2VydmVyTWluaWZpY2F0aW9uIjp0cnVlLCJzZXJ2ZXJTb3VyY2VNYXBzIjpmYWxzZSwibGlua05vVG91Y2hTdGFydCI6ZmFsc2UsImNhc2VTZW5zaXRpdmVSb3V0ZXMiOmZhbHNlLCJwcmVsb2FkRW50cmllc09uU3RhcnQiOnRydWUsImNsaWVudFJvdXRlckZpbHRlciI6dHJ1ZSwiY2xpZW50Um91dGVyRmlsdGVyUmVkaXJlY3RzIjpmYWxzZSwiZmV0Y2hDYWNoZUtleVByZWZpeCI6IiIsIm1pZGRsZXdhcmVQcmVmZXRjaCI6ImZsZXhpYmxlIiwib3B0aW1pc3RpY0NsaWVudENhY2hlIjp0cnVlLCJtYW51YWxDbGllbnRCYXNlUGF0aCI6ZmFsc2UsImNwdXMiOjE5LCJtZW1vcnlCYXNlZFdvcmtlcnNDb3VudCI6ZmFsc2UsImlzckZsdXNoVG9EaXNrIjp0cnVlLCJ3b3JrZXJUaHJlYWRzIjpmYWxzZSwib3B0aW1pemVDc3MiOmZhbHNlLCJuZXh0U2NyaXB0V29ya2VycyI6ZmFsc2UsInNjcm9sbFJlc3RvcmF0aW9uIjpmYWxzZSwiZXh0ZXJuYWxEaXIiOmZhbHNlLCJkaXNhYmxlT3B0aW1pemVkTG9hZGluZyI6ZmFsc2UsImd6aXBTaXplIjp0cnVlLCJjcmFDb21wYXQiOmZhbHNlLCJlc21FeHRlcm5hbHMiOnRydWUsImZ1bGx5U3BlY2lmaWVkIjpmYWxzZSwic3djVHJhY2VQcm9maWxpbmciOmZhbHNlLCJmb3JjZVN3Y1RyYW5zZm9ybXMiOmZhbHNlLCJsYXJnZVBhZ2VEYXRhQnl0ZXMiOjEyODAwMCwidHVyYm8iOnsicm9vdCI6Ii90bXAvbmV4dC1zdGF0c3R1TVZ5YS9zdGF0cy1hcHAifSwidHlwZWRSb3V0ZXMiOmZhbHNlLCJ0eXBlZEVudiI6ZmFsc2UsInBhcmFsbGVsU2VydmVyQ29tcGlsZXMiOmZhbHNlLCJwYXJhbGxlbFNlcnZlckJ1aWxkVHJhY2VzIjpmYWxzZSwicHByIjpmYWxzZSwicHByRmFsbGJhY2tzIjpmYWxzZSwid2VicGFja01lbW9yeU9wdGltaXphdGlvbnMiOmZhbHNlLCJvcHRpbWl6ZVNlcnZlclJlYWN0Ijp0cnVlLCJ1c2VFYXJseUltcG9ydCI6ZmFsc2UsInN0YWxlVGltZXMiOnsiZHluYW1pYyI6MCwic3RhdGljIjozMDB9LCJhZnRlciI6ZmFsc2UsInNlcnZlckNvbXBvbmVudHNIbXJDYWNoZSI6dHJ1ZSwic3RhdGljR2VuZXJhdGlvbk1heENvbmN1cnJlbmN5Ijo4LCJzdGF0aWNHZW5lcmF0aW9uTWluUGFnZXNQZXJXb3JrZXIiOjI1LCJkeW5hbWljSU8iOmZhbHNlLCJvcHRpbWl6ZVBhY2thZ2VJbXBvcnRzIjpbImx1Y2lkZS1yZWFjdCIsImRhdGUtZm5zIiwibG9kYXNoLWVzIiwicmFtZGEiLCJhbnRkIiwicmVhY3QtYm9vdHN0cmFwIiwiYWhvb2tzIiwiQGFudC1kZXNpZ24vaWNvbnMiLCJAaGVhZGxlc3N1aS9yZWFjdCIsIkBoZWFkbGVzc3VpLWZsb2F0L3JlYWN0IiwiQGhlcm9pY29ucy9yZWFjdC8yMC9zb2xpZCIsIkBoZXJvaWNvbnMvcmVhY3QvMjQvc29saWQiLCJAaGVyb2ljb25zL3JlYWN0LzI0L291dGxpbmUiLCJAdmlzeC92aXN4IiwiQHRyZW1vci9yZWFjdCIsInJ4anMiLCJAbXVpL21hdGVyaWFsIiwiQG11aS9pY29ucy1tYXRlcmlhbCIsInJlY2hhcnRzIiwicmVhY3QtdXNlIiwiZWZmZWN0IiwiQGVmZmVjdC9zY2hlbWEiLCJAZWZmZWN0L3BsYXRmb3JtIiwiQGVmZmVjdC9wbGF0Zm9ybS1ub2RlIiwiQGVmZmVjdC9wbGF0Zm9ybS1icm93c2VyIiwiQGVmZmVjdC9wbGF0Zm9ybS1idW4iLCJAZWZmZWN0L3NxbCIsIkBlZmZlY3Qvc3FsLW1zc3FsIiwiQGVmZmVjdC9zcWwtbXlzcWwyIiwiQGVmZmVjdC9zcWwtcGciLCJAZWZmZWN0L3NxbC1zcXVsaXRlLW5vZGUiLCJAZWZmZWN0L3NxbC1zcXVsaXRlLWJ1biIsIkBlZmZlY3Qvc3FsLXNxdWxpdGUtd2FzbSIsIkBlZmZlY3Qvc3FsLXNxdWxpdGUtcmVhY3QtbmF0aXZlIiwiQGVmZmVjdC9ycGMiLCJAZWZmZWN0L3JwYy1odHRwIiwiQGVmZmVjdC90eXBlY2xhc3MiLCJAZWZmZWN0L2V4cGVyaW1lbnRhbCIsIkBlZmZlY3Qvb3BlbnRlbGVtZXRyeSIsIkBtYXRlcmlhbC11aS9jb3JlIiwiQG1hdGVyaWFsLXVpL2ljb25zIiwiQHRhYmxlci9pY29ucy1yZWFjdCIsIm11aS1jb3JlIiwicmVhY3QtaWNvbnMvYWkiLCJyZWFjdC1pY29ucy9iaSIsInJlYWN0LWljb25zL2JzIiwicmVhY3QtaWNvbnMvY2ciLCJyZWFjdC1pY29ucy9jaSIsInJlYWN0LWljb25zL2RpIiwicmVhY3QtaWNvbnMvZmEiLCJyZWFjdC1pY29ucy9mYTYiLCJyZWFjdC1pY29ucy9mYyIsInJlYWN0LWljb25zL2ZpIiwicmVhY3QtaWNvbnMvZ2kiLCJyZWFjdC1pY29ucy9nbyIsInJlYWN0LWljb25zL2dyIiwicmVhY3QtaWNvbnMvaGkiLCJyZWFjdC1pY29ucy9oaTIiLCJyZWFjdC1pY29ucy9pbSIsInJlYWN0LWljb25zL2lvIiwicmVhY3QtaWNvbnMvaW81IiwicmVhY3QtaWNvbnMvbGlhIiwicmVhY3QtaWNvbnMvbGliIiwicmVhY3QtaWNvbnMvbHUiLCJyZWFjdC1pY29ucy9tZCIsInJlYWN0LWljb25zL3BpIiwicmVhY3QtaWNvbnMvcmkiLCJyZWFjdC1pY29ucy9yeCIsInJlYWN0LWljb25zL3NpIiwicmVhY3QtaWNvbnMvc2wiLCJyZWFjdC1pY29ucy90YiIsInJlYWN0LWljb25zL3RmaSIsInJlYWN0LWljb25zL3RpIiwicmVhY3QtaWNvbnMvdnNjIiwicmVhY3QtaWNvbnMvd2kiXX0sImJ1bmRsZVBhZ2VzUm91dGVyRGVwZW5kZW5jaWVzIjpmYWxzZSwiY29uZmlnRmlsZSI6Ii90bXAvbmV4dC1zdGF0c3R1TVZ5YS9zdGF0cy1hcHAvbmV4dC5jb25maWcuanMiLCJjb25maWdGaWxlTmFtZSI6Im5leHQuY29uZmlnLmpzIn0=","pagesType":"app","appDirLoader":"bmV4dC1hcHAtbG9hZGVyP25hbWU9YXBwJTJGYXBwLWVkZ2Utc3NyJTJGcGFnZSZwYWdlPSUyRmFwcC1lZGdlLXNzciUyRnBhZ2UmcGFnZVBhdGg9cHJpdmF0ZS1uZXh0LWFwcC1kaXIlMkZhcHAtZWRnZS1zc3IlMkZwYWdlLmpzJmFwcERpcj0lMkZ0bXAlMkZuZXh0LXN0YXRzdHVNVnlhJTJGc3RhdHMtYXBwJTJGYXBwJmFwcFBhdGhzPSUyRmFwcC1lZGdlLXNzciUyRnBhZ2UmcGFnZUV4dGVuc2lvbnM9dHN4JnBhZ2VFeHRlbnNpb25zPXRzJnBhZ2VFeHRlbnNpb25zPWpzeCZwYWdlRXh0ZW5zaW9ucz1qcyZiYXNlUGF0aD0mYXNzZXRQcmVmaXg9Jm5leHRDb25maWdPdXRwdXQ9JmZseWluZ1NodXR0bGU9ZmFsc2UmcHJlZmVycmVkUmVnaW9uPSZtaWRkbGV3YXJlQ29uZmlnPWUzMCUzRCE=","sriEnabled":false,"middlewareConfig":"e30="}!
+ // EXTERNAL MODULE: ./node_modules/.pnpm/next@file+..+diff-repo+packages+next+next-packed.tgz_react-dom@19.0.0-rc-2d16326d-20240930_re_twsodcu6u2xc4vttzu7xhu5gra/node_modules/next/dist/esm/lib/page-types.js
+ var page_types = __webpack_require__(9544);
+ // EXTERNAL MODULE: ./node_modules/.pnpm/next@file+..+diff-repo+packages+next+next-packed.tgz_react-dom@19.0.0-rc-2d16326d-20240930_re_twsodcu6u2xc4vttzu7xhu5gra/node_modules/next/dist/esm/server/app-render/encryption-utils.js
+ var encryption_utils = __webpack_require__(1028);
+ // EXTERNAL MODULE: ./node_modules/.pnpm/next@file+..+diff-repo+packages+next+next-packed.tgz_react-dom@19.0.0-rc-2d16326d-20240930_re_twsodcu6u2xc4vttzu7xhu5gra/node_modules/next/dist/esm/server/app-render/action-utils.js
+ var action_utils = __webpack_require__(6273); // CONCATENATED MODULE: ./node_modules/.pnpm/next@file+..+diff-repo+packages+next+next-packed.tgz_react-dom@19.0.0-rc-2d16326d-20240930_re_twsodcu6u2xc4vttzu7xhu5gra/node_modules/next/dist/build/webpack/loaders/next-edge-ssr-loader/index.js?{"absolute500Path":"","absoluteAppPath":"next/dist/pages/_app","absoluteDocumentPath":"next/dist/pages/_document","absoluteErrorPath":"next/dist/pages/_error","absolutePagePath":"private-next-app-dir/app-edge-ssr/page.js","dev":false,"isServerComponent":true,"page":"/app-edge-ssr/page","stringifiedConfig":"eyJlbnYiOnt9LCJlc2xpbnQiOnsiaWdub3JlRHVyaW5nQnVpbGRzIjpmYWxzZX0sInR5cGVzY3JpcHQiOnsiaWdub3JlQnVpbGRFcnJvcnMiOmZhbHNlLCJ0c2NvbmZpZ1BhdGgiOiJ0c2NvbmZpZy5qc29uIn0sImRpc3REaXIiOiIubmV4dCIsImNsZWFuRGlzdERpciI6dHJ1ZSwiYXNzZXRQcmVmaXgiOiIiLCJjYWNoZU1heE1lbW9yeVNpemUiOjUyNDI4ODAwLCJjb25maWdPcmlnaW4iOiJuZXh0LmNvbmZpZy5qcyIsInVzZUZpbGVTeXN0ZW1QdWJsaWNSb3V0ZXMiOnRydWUsImdlbmVyYXRlRXRhZ3MiOnRydWUsInBhZ2VFeHRlbnNpb25zIjpbInRzeCIsInRzIiwianN4IiwianMiXSwicG93ZXJlZEJ5SGVhZGVyIjp0cnVlLCJjb21wcmVzcyI6dHJ1ZSwiaW1hZ2VzIjp7ImRldmljZVNpemVzIjpbNjQwLDc1MCw4MjgsMTA4MCwxMjAwLDE5MjAsMjA0OCwzODQwXSwiaW1hZ2VTaXplcyI6WzE2LDMyLDQ4LDY0LDk2LDEyOCwyNTYsMzg0XSwicGF0aCI6Ii9fbmV4dC9pbWFnZSIsImxvYWRlciI6ImRlZmF1bHQiLCJsb2FkZXJGaWxlIjoiIiwiZG9tYWlucyI6W10sImRpc2FibGVTdGF0aWNJbWFnZXMiOmZhbHNlLCJtaW5pbXVtQ2FjaGVUVEwiOjYwLCJmb3JtYXRzIjpbImltYWdlL3dlYnAiXSwiZGFuZ2Vyb3VzbHlBbGxvd1NWRyI6ZmFsc2UsImNvbnRlbnRTZWN1cml0eVBvbGljeSI6InNjcmlwdC1zcmMgJ25vbmUnOyBmcmFtZS1zcmMgJ25vbmUnOyBzYW5kYm94OyIsImNvbnRlbnREaXNwb3NpdGlvblR5cGUiOiJhdHRhY2htZW50IiwicmVtb3RlUGF0dGVybnMiOltdLCJ1bm9wdGltaXplZCI6ZmFsc2V9LCJkZXZJbmRpY2F0b3JzIjp7ImFwcElzclN0YXR1cyI6dHJ1ZSwiYnVpbGRBY3Rpdml0eSI6dHJ1ZSwiYnVpbGRBY3Rpdml0eVBvc2l0aW9uIjoiYm90dG9tLXJpZ2h0In0sIm9uRGVtYW5kRW50cmllcyI6eyJtYXhJbmFjdGl2ZUFnZSI6NjAwMDAsInBhZ2VzQnVmZmVyTGVuZ3RoIjo1fSwiYW1wIjp7ImNhbm9uaWNhbEJhc2UiOiIifSwiYmFzZVBhdGgiOiIiLCJzYXNzT3B0aW9ucyI6e30sInRyYWlsaW5nU2xhc2giOmZhbHNlLCJpMThuIjpudWxsLCJwcm9kdWN0aW9uQnJvd3NlclNvdXJjZU1hcHMiOmZhbHNlLCJleGNsdWRlRGVmYXVsdE1vbWVudExvY2FsZXMiOnRydWUsInNlcnZlclJ1bnRpbWVDb25maWciOnt9LCJwdWJsaWNSdW50aW1lQ29uZmlnIjp7fSwicmVhY3RQcm9kdWN0aW9uUHJvZmlsaW5nIjpmYWxzZSwicmVhY3RTdHJpY3RNb2RlIjpudWxsLCJyZWFjdE1heEhlYWRlcnNMZW5ndGgiOjYwMDAsImh0dHBBZ2VudE9wdGlvbnMiOnsia2VlcEFsaXZlIjp0cnVlfSwibG9nZ2luZyI6e30sInN3ckRlbHRhIjozMTUzNjAwMCwic3RhdGljUGFnZUdlbmVyYXRpb25UaW1lb3V0Ijo2MCwibW9kdWxhcml6ZUltcG9ydHMiOnsiQG11aS9pY29ucy1tYXRlcmlhbCI6eyJ0cmFuc2Zvcm0iOiJAbXVpL2ljb25zLW1hdGVyaWFsL3t7bWVtYmVyfX0ifSwibG9kYXNoIjp7InRyYW5zZm9ybSI6ImxvZGFzaC97e21lbWJlcn19In19LCJvdXRwdXRGaWxlVHJhY2luZ1Jvb3QiOiIvdG1wL25leHQtc3RhdHN0dU1WeWEvc3RhdHMtYXBwIiwiZXhwZXJpbWVudGFsIjp7Im11bHRpWm9uZURyYWZ0TW9kZSI6ZmFsc2UsImFwcE5hdkZhaWxIYW5kbGluZyI6ZmFsc2UsInByZXJlbmRlckVhcmx5RXhpdCI6dHJ1ZSwic2VydmVyTWluaWZpY2F0aW9uIjp0cnVlLCJzZXJ2ZXJTb3VyY2VNYXBzIjpmYWxzZSwibGlua05vVG91Y2hTdGFydCI6ZmFsc2UsImNhc2VTZW5zaXRpdmVSb3V0ZXMiOmZhbHNlLCJwcmVsb2FkRW50cmllc09uU3RhcnQiOnRydWUsImNsaWVudFJvdXRlckZpbHRlciI6dHJ1ZSwiY2xpZW50Um91dGVyRmlsdGVyUmVkaXJlY3RzIjpmYWxzZSwiZmV0Y2hDYWNoZUtleVByZWZpeCI6IiIsIm1pZGRsZXdhcmVQcmVmZXRjaCI6ImZsZXhpYmxlIiwib3B0aW1pc3RpY0NsaWVudENhY2hlIjp0cnVlLCJtYW51YWxDbGllbnRCYXNlUGF0aCI6ZmFsc2UsImNwdXMiOjE5LCJtZW1vcnlCYXNlZFdvcmtlcnNDb3VudCI6ZmFsc2UsImlzckZsdXNoVG9EaXNrIjp0cnVlLCJ3b3JrZXJUaHJlYWRzIjpmYWxzZSwib3B0aW1pemVDc3MiOmZhbHNlLCJuZXh0U2NyaXB0V29ya2VycyI6ZmFsc2UsInNjcm9sbFJlc3RvcmF0aW9uIjpmYWxzZSwiZXh0ZXJuYWxEaXIiOmZhbHNlLCJkaXNhYmxlT3B0aW1pemVkTG9hZGluZyI6ZmFsc2UsImd6aXBTaXplIjp0cnVlLCJjcmFDb21wYXQiOmZhbHNlLCJlc21FeHRlcm5hbHMiOnRydWUsImZ1bGx5U3BlY2lmaWVkIjpmYWxzZSwic3djVHJhY2VQcm9maWxpbmciOmZhbHNlLCJmb3JjZVN3Y1RyYW5zZm9ybXMiOmZhbHNlLCJsYXJnZVBhZ2VEYXRhQnl0ZXMiOjEyODAwMCwidHVyYm8iOnsicm9vdCI6Ii90bXAvbmV4dC1zdGF0c3R1TVZ5YS9zdGF0cy1hcHAifSwidHlwZWRSb3V0ZXMiOmZhbHNlLCJ0eXBlZEVudiI6ZmFsc2UsInBhcmFsbGVsU2VydmVyQ29tcGlsZXMiOmZhbHNlLCJwYXJhbGxlbFNlcnZlckJ1aWxkVHJhY2VzIjpmYWxzZSwicHByIjpmYWxzZSwicHByRmFsbGJhY2tzIjpmYWxzZSwid2VicGFja01lbW9yeU9wdGltaXphdGlvbnMiOmZhbHNlLCJvcHRpbWl6ZVNlcnZlclJlYWN0Ijp0cnVlLCJ1c2VFYXJseUltcG9ydCI6ZmFsc2UsInN0YWxlVGltZXMiOnsiZHluYW1pYyI6MCwic3RhdGljIjozMDB9LCJhZnRlciI6ZmFsc2UsInNlcnZlckNvbXBvbmVudHNIbXJDYWNoZSI6dHJ1ZSwic3RhdGljR2VuZXJhdGlvbk1heENvbmN1cnJlbmN5Ijo4LCJzdGF0aWNHZW5lcmF0aW9uTWluUGFnZXNQZXJXb3JrZXIiOjI1LCJkeW5hbWljSU8iOmZhbHNlLCJvcHRpbWl6ZVBhY2thZ2VJbXBvcnRzIjpbImx1Y2lkZS1yZWFjdCIsImRhdGUtZm5zIiwibG9kYXNoLWVzIiwicmFtZGEiLCJhbnRkIiwicmVhY3QtYm9vdHN0cmFwIiwiYWhvb2tzIiwiQGFudC1kZXNpZ24vaWNvbnMiLCJAaGVhZGxlc3N1aS9yZWFjdCIsIkBoZWFkbGVzc3VpLWZsb2F0L3JlYWN0IiwiQGhlcm9pY29ucy9yZWFjdC8yMC9zb2xpZCIsIkBoZXJvaWNvbnMvcmVhY3QvMjQvc29saWQiLCJAaGVyb2ljb25zL3JlYWN0LzI0L291dGxpbmUiLCJAdmlzeC92aXN4IiwiQHRyZW1vci9yZWFjdCIsInJ4anMiLCJAbXVpL21hdGVyaWFsIiwiQG11aS9pY29ucy1tYXRlcmlhbCIsInJlY2hhcnRzIiwicmVhY3QtdXNlIiwiZWZmZWN0IiwiQGVmZmVjdC9zY2hlbWEiLCJAZWZmZWN0L3BsYXRmb3JtIiwiQGVmZmVjdC9wbGF0Zm9ybS1ub2RlIiwiQGVmZmVjdC9wbGF0Zm9ybS1icm93c2VyIiwiQGVmZmVjdC9wbGF0Zm9ybS1idW4iLCJAZWZmZWN0L3NxbCIsIkBlZmZlY3Qvc3FsLW1zc3FsIiwiQGVmZmVjdC9zcWwtbXlzcWwyIiwiQGVmZmVjdC9zcWwtcGciLCJAZWZmZWN0L3NxbC1zcXVsaXRlLW5vZGUiLCJAZWZmZWN0L3NxbC1zcXVsaXRlLWJ1biIsIkBlZmZlY3Qvc3FsLXNxdWxpdGUtd2FzbSIsIkBlZmZlY3Qvc3FsLXNxdWxpdGUtcmVhY3QtbmF0aXZlIiwiQGVmZmVjdC9ycGMiLCJAZWZmZWN0L3JwYy1odHRwIiwiQGVmZmVjdC90eXBlY2xhc3MiLCJAZWZmZWN0L2V4cGVyaW1lbnRhbCIsIkBlZmZlY3Qvb3BlbnRlbGVtZXRyeSIsIkBtYXRlcmlhbC11aS9jb3JlIiwiQG1hdGVyaWFsLXVpL2ljb25zIiwiQHRhYmxlci9pY29ucy1yZWFjdCIsIm11aS1jb3JlIiwicmVhY3QtaWNvbnMvYWkiLCJyZWFjdC1pY29ucy9iaSIsInJlYWN0LWljb25zL2JzIiwicmVhY3QtaWNvbnMvY2ciLCJyZWFjdC1pY29ucy9jaSIsInJlYWN0LWljb25zL2RpIiwicmVhY3QtaWNvbnMvZmEiLCJyZWFjdC1pY29ucy9mYTYiLCJyZWFjdC1pY29ucy9mYyIsInJlYWN0LWljb25zL2ZpIiwicmVhY3QtaWNvbnMvZ2kiLCJyZWFjdC1pY29ucy9nbyIsInJlYWN0LWljb25zL2dyIiwicmVhY3QtaWNvbnMvaGkiLCJyZWFjdC1pY29ucy9oaTIiLCJyZWFjdC1pY29ucy9pbSIsInJlYWN0LWljb25zL2lvIiwicmVhY3QtaWNvbnMvaW81IiwicmVhY3QtaWNvbnMvbGlhIiwicmVhY3QtaWNvbnMvbGliIiwicmVhY3QtaWNvbnMvbHUiLCJyZWFjdC1pY29ucy9tZCIsInJlYWN0LWljb25zL3BpIiwicmVhY3QtaWNvbnMvcmkiLCJyZWFjdC1pY29ucy9yeCIsInJlYWN0LWljb25zL3NpIiwicmVhY3QtaWNvbnMvc2wiLCJyZWFjdC1pY29ucy90YiIsInJlYWN0LWljb25zL3RmaSIsInJlYWN0LWljb25zL3RpIiwicmVhY3QtaWNvbnMvdnNjIiwicmVhY3QtaWNvbnMvd2kiXX0sImJ1bmRsZVBhZ2VzUm91dGVyRGVwZW5kZW5jaWVzIjpmYWxzZSwiY29uZmlnRmlsZSI6Ii90bXAvbmV4dC1zdGF0c3R1TVZ5YS9zdGF0cy1hcHAvbmV4dC5jb25maWcuanMiLCJjb25maWdGaWxlTmFtZSI6Im5leHQuY29uZmlnLmpzIn0=","pagesType":"app","appDirLoader":"bmV4dC1hcHAtbG9hZGVyP25hbWU9YXBwJTJGYXBwLWVkZ2Utc3NyJTJGcGFnZSZwYWdlPSUyRmFwcC1lZGdlLXNzciUyRnBhZ2UmcGFnZVBhdGg9cHJpdmF0ZS1uZXh0LWFwcC1kaXIlMkZhcHAtZWRnZS1zc3IlMkZwYWdlLmpzJmFwcERpcj0lMkZ0bXAlMkZuZXh0LXN0YXRzdHVNVnlhJTJGc3RhdHMtYXBwJTJGYXBwJmFwcFBhdGhzPSUyRmFwcC1lZGdlLXNzciUyRnBhZ2UmcGFnZUV4dGVuc2lvbnM9dHN4JnBhZ2VFeHRlbnNpb25zPXRzJnBhZ2VFeHRlbnNpb25zPWpzeCZwYWdlRXh0ZW5zaW9ucz1qcyZiYXNlUGF0aD0mYXNzZXRQcmVmaXg9Jm5leHRDb25maWdPdXRwdXQ9JmZseWluZ1NodXR0bGU9ZmFsc2UmcHJlZmVycmVkUmVnaW9uPSZtaWRkbGV3YXJlQ29uZmlnPWUzMCUzRCE=","sriEnabled":false,"middlewareConfig":"e30="}!
var _self___RSC_MANIFEST;
const incrementalCacheHandler = null;
@@ -441,56 +441,56 @@
/***/
},
- /***/ 981: /***/ (
+ /***/ 8791: /***/ (
__unused_webpack_module,
__unused_webpack_exports,
__webpack_require__
) => {
Promise.resolve(/* import() eager */).then(
- __webpack_require__.bind(__webpack_require__, 7478)
+ __webpack_require__.bind(__webpack_require__, 203)
);
Promise.resolve(/* import() eager */).then(
- __webpack_require__.bind(__webpack_require__, 3102)
+ __webpack_require__.bind(__webpack_require__, 2954)
);
Promise.resolve(/* import() eager */).then(
- __webpack_require__.bind(__webpack_require__, 3908)
+ __webpack_require__.bind(__webpack_require__, 9995)
);
Promise.resolve(/* import() eager */).then(
- __webpack_require__.bind(__webpack_require__, 2131)
+ __webpack_require__.bind(__webpack_require__, 865)
);
Promise.resolve(/* import() eager */).then(
- __webpack_require__.bind(__webpack_require__, 8591)
+ __webpack_require__.bind(__webpack_require__, 1014)
);
Promise.resolve(/* import() eager */).then(
- __webpack_require__.bind(__webpack_require__, 7981)
+ __webpack_require__.bind(__webpack_require__, 1059)
);
Promise.resolve(/* import() eager */).then(
- __webpack_require__.bind(__webpack_require__, 6570)
+ __webpack_require__.bind(__webpack_require__, 6265)
);
Promise.resolve(/* import() eager */).then(
- __webpack_require__.bind(__webpack_require__, 2300)
+ __webpack_require__.bind(__webpack_require__, 6317)
);
Promise.resolve(/* import() eager */).then(
- __webpack_require__.bind(__webpack_require__, 1952)
+ __webpack_require__.bind(__webpack_require__, 4152)
);
Promise.resolve(/* import() eager */).then(
- __webpack_require__.bind(__webpack_require__, 7139)
+ __webpack_require__.bind(__webpack_require__, 2571)
);
Promise.resolve(/* import() eager */).then(
- __webpack_require__.bind(__webpack_require__, 1548)
+ __webpack_require__.bind(__webpack_require__, 4480)
);
Promise.resolve(/* import() eager */).then(
- __webpack_require__.bind(__webpack_require__, 5936)
+ __webpack_require__.bind(__webpack_require__, 187)
);
/***/
},
- /***/ 6913: /***/ () => {
+ /***/ 232: /***/ () => {
/***/
},
- /***/ 2596: /***/ (
+ /***/ 6258: /***/ (
__unused_webpack_module,
__webpack_exports__,
__webpack_require__
@@ -510,7 +510,7 @@
/***/
},
- /***/ 4836: /***/ (
+ /***/ 6603: /***/ (
__unused_webpack_module,
__webpack_exports__,
__webpack_require__
@@ -522,7 +522,7 @@
/* harmony export */
});
/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__ =
- __webpack_require__(547);
+ __webpack_require__(648);
function RootLayout({ children }) {
return /*#__PURE__*/ (0,
@@ -541,7 +541,7 @@
// webpackRuntimeModules
/******/ var __webpack_exec__ = (moduleId) =>
__webpack_require__((__webpack_require__.s = moduleId));
- /******/ __webpack_require__.O(0, [720, 707], () => __webpack_exec__(2457));
+ /******/ __webpack_require__.O(0, [842, 582], () => __webpack_exec__(5228));
/******/ var __webpack_exports__ = __webpack_require__.O();
/******/ (_ENTRIES = typeof _ENTRIES === "undefined" ? {} : _ENTRIES)[
"middleware_app/app-edge-ssr/page"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],
{
- /***/ 4519: /***/ (
+ /***/ 766: /***/ (
__unused_webpack_module,
__unused_webpack_exports,
__webpack_require__
@@ -9,7 +9,7 @@
(window.__NEXT_P = window.__NEXT_P || []).push([
"/image",
function () {
- return __webpack_require__(6366);
+ return __webpack_require__(8898);
},
]);
if (false) {
@@ -18,7 +18,7 @@
/***/
},
- /***/ 7847: /***/ (module, exports, __webpack_require__) => {
+ /***/ 8501: /***/ (module, exports, __webpack_require__) => {
"use strict";
/* __next_internal_client_entry_do_not_use__ cjs */
Object.defineProperty(exports, "__esModule", {
@@ -40,17 +40,17 @@
__webpack_require__(133)
);
const _head = /*#__PURE__*/ _interop_require_default._(
- __webpack_require__(6142)
+ __webpack_require__(294)
);
- const _getimgprops = __webpack_require__(2989);
- const _imageconfig = __webpack_require__(2948);
- const _imageconfigcontextsharedruntime = __webpack_require__(3394);
- const _warnonce = __webpack_require__(6308);
- const _routercontextsharedruntime = __webpack_require__(932);
+ const _getimgprops = __webpack_require__(2367);
+ const _imageconfig = __webpack_require__(9037);
+ const _imageconfigcontextsharedruntime = __webpack_require__(6876);
+ const _warnonce = __webpack_require__(5603);
+ const _routercontextsharedruntime = __webpack_require__(6967);
const _imageloader = /*#__PURE__*/ _interop_require_default._(
- __webpack_require__(4394)
+ __webpack_require__(5093)
);
- const _usemergedref = __webpack_require__(9673);
+ const _usemergedref = __webpack_require__(9386);
// This is replaced by webpack define plugin
const configEnv = {
deviceSizes: [640, 750, 828, 1080, 1200, 1920, 2048, 3840],
@@ -371,7 +371,7 @@
/***/
},
- /***/ 9673: /***/ (module, exports, __webpack_require__) => {
+ /***/ 9386: /***/ (module, exports, __webpack_require__) => {
"use strict";
Object.defineProperty(exports, "__esModule", {
@@ -432,7 +432,7 @@
/***/
},
- /***/ 2989: /***/ (
+ /***/ 2367: /***/ (
__unused_webpack_module,
exports,
__webpack_require__
@@ -448,9 +448,9 @@
return getImgProps;
},
});
- const _warnonce = __webpack_require__(6308);
- const _imageblursvg = __webpack_require__(9492);
- const _imageconfig = __webpack_require__(2948);
+ const _warnonce = __webpack_require__(5603);
+ const _imageblursvg = __webpack_require__(2052);
+ const _imageconfig = __webpack_require__(9037);
const VALID_LOADING_VALUES =
/* unused pure expression or super */ null && [
"lazy",
@@ -823,7 +823,7 @@
/***/
},
- /***/ 9492: /***/ (__unused_webpack_module, exports) => {
+ /***/ 2052: /***/ (__unused_webpack_module, exports) => {
"use strict";
/**
* A shared function, used on both client and server, to generate a SVG blur placeholder.
@@ -878,7 +878,7 @@
/***/
},
- /***/ 9256: /***/ (
+ /***/ 3038: /***/ (
__unused_webpack_module,
exports,
__webpack_require__
@@ -905,10 +905,10 @@
},
});
const _interop_require_default = __webpack_require__(9608);
- const _getimgprops = __webpack_require__(2989);
- const _imagecomponent = __webpack_require__(7847);
+ const _getimgprops = __webpack_require__(2367);
+ const _imagecomponent = __webpack_require__(8501);
const _imageloader = /*#__PURE__*/ _interop_require_default._(
- __webpack_require__(4394)
+ __webpack_require__(5093)
);
function getImageProps(imgProps) {
const { props } = (0, _getimgprops.getImgProps)(imgProps, {
@@ -940,7 +940,7 @@
/***/
},
- /***/ 4394: /***/ (__unused_webpack_module, exports) => {
+ /***/ 5093: /***/ (__unused_webpack_module, exports) => {
"use strict";
Object.defineProperty(exports, "__esModule", {
@@ -975,7 +975,7 @@
/***/
},
- /***/ 6366: /***/ (
+ /***/ 8898: /***/ (
__unused_webpack_module,
__webpack_exports__,
__webpack_require__
@@ -992,8 +992,8 @@
// EXTERNAL MODULE: ./node_modules/.pnpm/react@19.0.0-rc-2d16326d-20240930/node_modules/react/jsx-runtime.js
var jsx_runtime = __webpack_require__(9837);
- // EXTERNAL MODULE: ./node_modules/.pnpm/next@file+..+main-repo+packages+next+next-packed.tgz_react-dom@19.0.0-rc-2d16326d-20240930_re_aw34735d3a4s5ybwraoeym2z3m/node_modules/next/image.js
- var next_image = __webpack_require__(6020);
+ // EXTERNAL MODULE: ./node_modules/.pnpm/next@file+..+diff-repo+packages+next+next-packed.tgz_react-dom@19.0.0-rc-2d16326d-20240930_re_twsodcu6u2xc4vttzu7xhu5gra/node_modules/next/image.js
+ var next_image = __webpack_require__(3843);
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",
@@ -1023,12 +1023,12 @@
/***/
},
- /***/ 6020: /***/ (
+ /***/ 3843: /***/ (
module,
__unused_webpack_exports,
__webpack_require__
) => {
- module.exports = __webpack_require__(9256);
+ module.exports = __webpack_require__(3038);
/***/
},
@@ -1038,7 +1038,7 @@
/******/ var __webpack_exec__ = (moduleId) =>
__webpack_require__((__webpack_require__.s = moduleId));
/******/ __webpack_require__.O(0, [2888, 9774, 179], () =>
- __webpack_exec__(4519)
+ __webpack_exec__(766)
);
/******/ var __webpack_exports__ = __webpack_require__.O();
/******/ _N_E = __webpack_exports__;Diff for 1698-HASH.js
@@ -1,8 +1,8 @@
"use strict";
(self["webpackChunk_N_E"] = self["webpackChunk_N_E"] || []).push([
- [1698],
+ [2859],
{
- /***/ 1698: /***/ (module, exports, __webpack_require__) => {
+ /***/ 2859: /***/ (module, exports, __webpack_require__) => {
/* __next_internal_client_entry_do_not_use__ cjs */
Object.defineProperty(exports, "__esModule", {
value: true,
@@ -13,27 +13,27 @@
return Image;
},
});
- const _interop_require_default = __webpack_require__(3280);
- const _interop_require_wildcard = __webpack_require__(8464);
- const _jsxruntime = __webpack_require__(673);
+ const _interop_require_default = __webpack_require__(9218);
+ const _interop_require_wildcard = __webpack_require__(8553);
+ const _jsxruntime = __webpack_require__(9348);
const _react = /*#__PURE__*/ _interop_require_wildcard._(
- __webpack_require__(254)
+ __webpack_require__(8196)
);
const _reactdom = /*#__PURE__*/ _interop_require_default._(
- __webpack_require__(177)
+ __webpack_require__(8174)
);
const _head = /*#__PURE__*/ _interop_require_default._(
- __webpack_require__(4591)
+ __webpack_require__(3039)
);
- const _getimgprops = __webpack_require__(6509);
- const _imageconfig = __webpack_require__(1545);
- const _imageconfigcontextsharedruntime = __webpack_require__(9041);
- const _warnonce = __webpack_require__(7147);
- const _routercontextsharedruntime = __webpack_require__(7112);
+ const _getimgprops = __webpack_require__(4645);
+ const _imageconfig = __webpack_require__(8661);
+ const _imageconfigcontextsharedruntime = __webpack_require__(5611);
+ const _warnonce = __webpack_require__(3975);
+ const _routercontextsharedruntime = __webpack_require__(4332);
const _imageloader = /*#__PURE__*/ _interop_require_default._(
- __webpack_require__(4980)
+ __webpack_require__(9206)
);
- const _usemergedref = __webpack_require__(3096);
+ const _usemergedref = __webpack_require__(900);
// This is replaced by webpack define plugin
const configEnv = {
deviceSizes: [640, 750, 828, 1080, 1200, 1920, 2048, 3840],
@@ -355,7 +355,7 @@
/***/
},
- /***/ 3096: /***/ (module, exports, __webpack_require__) => {
+ /***/ 900: /***/ (module, exports, __webpack_require__) => {
Object.defineProperty(exports, "__esModule", {
value: true,
});
@@ -365,7 +365,7 @@
return useMergedRef;
},
});
- const _react = __webpack_require__(254);
+ const _react = __webpack_require__(8196);
function useMergedRef(refA, refB) {
const cleanupA = (0, _react.useRef)(() => {});
const cleanupB = (0, _react.useRef)(() => {});
@@ -414,7 +414,7 @@
/***/
},
- /***/ 5225: /***/ (
+ /***/ 4551: /***/ (
__unused_webpack_module,
exports,
__webpack_require__
@@ -428,9 +428,9 @@
return AmpStateContext;
},
});
- const _interop_require_default = __webpack_require__(3280);
+ const _interop_require_default = __webpack_require__(9218);
const _react = /*#__PURE__*/ _interop_require_default._(
- __webpack_require__(254)
+ __webpack_require__(8196)
);
const AmpStateContext = _react.default.createContext({});
if (false) {
@@ -439,7 +439,7 @@
/***/
},
- /***/ 4457: /***/ (__unused_webpack_module, exports) => {
+ /***/ 7094: /***/ (__unused_webpack_module, exports) => {
Object.defineProperty(exports, "__esModule", {
value: true,
});
@@ -461,7 +461,7 @@
/***/
},
- /***/ 6509: /***/ (
+ /***/ 4645: /***/ (
__unused_webpack_module,
exports,
__webpack_require__
@@ -475,9 +475,9 @@
return getImgProps;
},
});
- const _warnonce = __webpack_require__(7147);
- const _imageblursvg = __webpack_require__(5901);
- const _imageconfig = __webpack_require__(1545);
+ const _warnonce = __webpack_require__(3975);
+ const _imageblursvg = __webpack_require__(3749);
+ const _imageconfig = __webpack_require__(8661);
const VALID_LOADING_VALUES =
/* unused pure expression or super */ null && [
"lazy",
@@ -850,8 +850,8 @@
/***/
},
- /***/ 4591: /***/ (module, exports, __webpack_require__) => {
- /* provided dependency */ var process = __webpack_require__(4784);
+ /***/ 3039: /***/ (module, exports, __webpack_require__) => {
+ /* provided dependency */ var process = __webpack_require__(1482);
/* __next_internal_client_entry_do_not_use__ cjs */
Object.defineProperty(exports, "__esModule", {
value: true,
@@ -872,19 +872,19 @@
return defaultHead;
},
});
- const _interop_require_default = __webpack_require__(3280);
- const _interop_require_wildcard = __webpack_require__(8464);
- const _jsxruntime = __webpack_require__(673);
+ const _interop_require_default = __webpack_require__(9218);
+ const _interop_require_wildcard = __webpack_require__(8553);
+ const _jsxruntime = __webpack_require__(9348);
const _react = /*#__PURE__*/ _interop_require_wildcard._(
- __webpack_require__(254)
+ __webpack_require__(8196)
);
const _sideeffect = /*#__PURE__*/ _interop_require_default._(
- __webpack_require__(31)
+ __webpack_require__(2968)
);
- const _ampcontextsharedruntime = __webpack_require__(5225);
- const _headmanagercontextsharedruntime = __webpack_require__(3382);
- const _ampmode = __webpack_require__(4457);
- const _warnonce = __webpack_require__(7147);
+ const _ampcontextsharedruntime = __webpack_require__(4551);
+ const _headmanagercontextsharedruntime = __webpack_require__(452);
+ const _ampmode = __webpack_require__(7094);
+ const _warnonce = __webpack_require__(3975);
function defaultHead(inAmpMode) {
if (inAmpMode === void 0) inAmpMode = false;
const head = [
@@ -1068,7 +1068,7 @@
/***/
},
- /***/ 5901: /***/ (__unused_webpack_module, exports) => {
+ /***/ 3749: /***/ (__unused_webpack_module, exports) => {
/**
* A shared function, used on both client and server, to generate a SVG blur placeholder.
*/
@@ -1122,7 +1122,7 @@
/***/
},
- /***/ 9041: /***/ (
+ /***/ 5611: /***/ (
__unused_webpack_module,
exports,
__webpack_require__
@@ -1136,11 +1136,11 @@
return ImageConfigContext;
},
});
- const _interop_require_default = __webpack_require__(3280);
+ const _interop_require_default = __webpack_require__(9218);
const _react = /*#__PURE__*/ _interop_require_default._(
- __webpack_require__(254)
+ __webpack_require__(8196)
);
- const _imageconfig = __webpack_require__(1545);
+ const _imageconfig = __webpack_require__(8661);
const ImageConfigContext = _react.default.createContext(
_imageconfig.imageConfigDefault
);
@@ -1150,7 +1150,7 @@
/***/
},
- /***/ 1545: /***/ (__unused_webpack_module, exports) => {
+ /***/ 8661: /***/ (__unused_webpack_module, exports) => {
Object.defineProperty(exports, "__esModule", {
value: true,
});
@@ -1198,7 +1198,7 @@
/***/
},
- /***/ 4980: /***/ (__unused_webpack_module, exports) => {
+ /***/ 9206: /***/ (__unused_webpack_module, exports) => {
Object.defineProperty(exports, "__esModule", {
value: true,
});
@@ -1231,7 +1231,7 @@
/***/
},
- /***/ 7112: /***/ (
+ /***/ 4332: /***/ (
__unused_webpack_module,
exports,
__webpack_require__
@@ -1245,9 +1245,9 @@
return RouterContext;
},
});
- const _interop_require_default = __webpack_require__(3280);
+ const _interop_require_default = __webpack_require__(9218);
const _react = /*#__PURE__*/ _interop_require_default._(
- __webpack_require__(254)
+ __webpack_require__(8196)
);
const RouterContext = _react.default.createContext(null);
if (false) {
@@ -1256,7 +1256,11 @@
/***/
},
- /***/ 31: /***/ (__unused_webpack_module, exports, __webpack_require__) => {
+ /***/ 2968: /***/ (
+ __unused_webpack_module,
+ exports,
+ __webpack_require__
+ ) => {
Object.defineProperty(exports, "__esModule", {
value: true,
});
@@ -1266,7 +1270,7 @@
return SideEffect;
},
});
- const _react = __webpack_require__(254);
+ const _react = __webpack_require__(8196);
const isServer = typeof window === "undefined";
const useClientOnlyLayoutEffect = isServer
? () => {}Diff for 3463-HASH.js
Diff too large to display
Diff for app-page-exp..ntime.dev.js
failed to diffDiff for app-page-exp..time.prod.js
Diff too large to display
Diff for app-page-tur..time.prod.js
Diff too large to display
Diff for app-page-tur..time.prod.js
Diff too large to display
Diff for app-page.runtime.dev.js
Diff too large to display
Diff for app-page.runtime.prod.js
Diff too large to display
Diff for app-route-ex..ntime.dev.js
Diff too large to display
Diff for app-route-ex..time.prod.js
Diff too large to display
Diff for app-route-tu..time.prod.js
Diff too large to display
Diff for app-route-tu..time.prod.js
Diff too large to display
Diff for app-route.runtime.dev.js
Diff too large to display
Diff for app-route.ru..time.prod.js
Diff too large to display
Diff for server.runtime.prod.js
Diff too large to display
gnoff
reviewed
Oct 6, 2024
Comment on lines
121
to
123
| } | ||
|
|
||
| // cookies is being called in a dynamic context |
There was a problem hiding this comment.
Why not check if workUnitStore here is request and get the cookies this way. You're close to removing the unecessary requestAsyncLocalStorage and we never need real cookies/headers in a prerender context so I think it's pretty straight forward to yank it out here now
There was a problem hiding this comment.
I'm trying to keep this PR to not change anything other than merging the stores. There's a lot more we can simplify and a lot of inconsistencies that this surfaces that can be fixed in other PRs.
There's a lot of implicit fall throughs here. Especially in Pages Router where there's is no workStore but there is a requestStore.
Another weird one is that sometimes we get the store when calling cookies() / headers() and sometimes in the actual set/get methods.
Comment on lines
175
to
189
| if ( | ||
| workUnitStore !== undefined && | ||
| workUnitStore.type === 'request' && | ||
| workUnitStore?.url.pathname && | ||
| !hasFallbackRouteParams | ||
| ) { | ||
| const tag = `${NEXT_CACHE_IMPLICIT_TAG_ID}${workUnitStore.url.pathname}` | ||
| if (!workStore.tags?.includes(tag)) { | ||
| workStore.tags?.push(tag) |
There was a problem hiding this comment.
Not sure if related to the revalidate tests failures but this doesn't seem semantically equivalent. previously we would still have a requestStore with a URL even during prerenders. Now we have that (though it should be removed) but we don't have access to that when adding implicit tags inside the patched fetch. It seems we may need to move this URL concept to workStore or add it to the prerender store.
There was a problem hiding this comment.
Yea I'm working on this. I think we have a bigger issue with implicit tags though if we want to support nested caches. Which this highlighted.
There was a problem hiding this comment.
Now rebased on #70889
Comment on lines
+128
to
+131
| const requestStore = | ||
| workUnitStore && workUnitStore.type === 'request' | ||
| ? workUnitStore | ||
| : undefined |
There was a problem hiding this comment.
Similar to the patch-fetch comment I think this might sometimes hide pathname from cache keys during prerender that used to be present
There was a problem hiding this comment.
Rebased on #70889.
sebmarkbage
force-pushed
the
unifyworkunit
branch
2 times, most recently
from
45a2cf4 to
651a4fc
Compare
sebmarkbage
added a commit
that referenced
this pull request
Oct 7, 2024
This lets us use this for implicit tags when a full Request is not available. Required for #70819. This should probably be more normalized but I only pass the path name instead of the full url to avoid leaking more dynamic information to the prerender. This does not yet solve the case where we have nested caches (which we don't in unstable_cache but in use cache). In that case it's more complex because for an outer hit we'd need to add it to the inner cache entries.
lubieowoce
reviewed
Oct 7, 2024
There was a problem hiding this comment.
There's a bunch of lingering references to requestStore here, like AppRenderContext.requestStore
Are we just keeping those around for now and clean up later?
Closed
lubieowoce
force-pushed
the
unifyworkunit
branch
from
651a4fc to
cdcefad
Compare
lubieowoce
force-pushed
the
unifyworkunit
branch
from
cdcefad to
1527777
Compare
lubieowoce
approved these changes
Oct 7, 2024
2 tasks
lubieowoce
added a commit
that referenced
this pull request
Oct 9, 2024
for unknown reasons, moving these files out of `next/src/client/components` (as done in #70819) makes them no longer be singletons in turbopack build + edge. they *need* to be singletons, because `myStorage.run(...)` and `myStorage.getStore()` need to refer to the same `myStorage`, so this is a problem. the problem only seems to occur in turbopack when building edge code (see failing tests in #70934). until we figure out what causes this, it's safest to move this back.
kdy1
pushed a commit
that referenced
this pull request
Oct 10, 2024
This lets us use this for implicit tags when a full Request is not available. Required for #70819. This should probably be more normalized but I only pass the path name instead of the full url to avoid leaking more dynamic information to the prerender. This does not yet solve the case where we have nested caches (which we don't in unstable_cache but in use cache). In that case it's more complex because for an outer hit we'd need to add it to the inner cache entries.
kdy1
pushed a commit
that referenced
this pull request
Oct 10, 2024
Stacked on #70889. This merges these three stores into a single AsyncLocalStorage context containing a disjoint union named WorkUnitStore. That way they're mutually exclusive. This prevents us from leaking RequestStore information in either PrerenderStore or CacheStore. --------- Co-authored-by: Janka Uryga <lolzatu2@gmail.com>
kdy1
pushed a commit
that referenced
this pull request
Oct 10, 2024
for unknown reasons, moving these files out of `next/src/client/components` (as done in #70819) makes them no longer be singletons in turbopack build + edge. they *need* to be singletons, because `myStorage.run(...)` and `myStorage.getStore()` need to refer to the same `myStorage`, so this is a problem. the problem only seems to occur in turbopack when building edge code (see failing tests in #70934). until we figure out what causes this, it's safest to move this back.
kdy1
pushed a commit
that referenced
this pull request
Oct 10, 2024
This lets us use this for implicit tags when a full Request is not available. Required for #70819. This should probably be more normalized but I only pass the path name instead of the full url to avoid leaking more dynamic information to the prerender. This does not yet solve the case where we have nested caches (which we don't in unstable_cache but in use cache). In that case it's more complex because for an outer hit we'd need to add it to the inner cache entries.
kdy1
pushed a commit
that referenced
this pull request
Oct 10, 2024
Stacked on #70889. This merges these three stores into a single AsyncLocalStorage context containing a disjoint union named WorkUnitStore. That way they're mutually exclusive. This prevents us from leaking RequestStore information in either PrerenderStore or CacheStore. --------- Co-authored-by: Janka Uryga <lolzatu2@gmail.com>
kdy1
pushed a commit
that referenced
this pull request
Oct 10, 2024
for unknown reasons, moving these files out of `next/src/client/components` (as done in #70819) makes them no longer be singletons in turbopack build + edge. they *need* to be singletons, because `myStorage.run(...)` and `myStorage.getStore()` need to refer to the same `myStorage`, so this is a problem. the problem only seems to occur in turbopack when building edge code (see failing tests in #70934). until we figure out what causes this, it's safest to move this back.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Stacked on #70889.
This merges these three stores into a single AsyncLocalStorage context containing a disjoint union named WorkUnitStore. That way they're mutually exclusive. This prevents us from leaking RequestStore information in either PrerenderStore or CacheStore.