switchboard-router 0.9.21 → 0.9.26

package/app/node_modules/baseline-browser-mapping/package.json

@@ -1,7 +1,7 @@
 {
   "name": "baseline-browser-mapping",
   "main": "./dist/index.cjs",
-  "version": "2.10.42",
+  "version": "2.11.21",
   "description": "A library for obtaining browser versions with their maximum supported Baseline feature set and Widely Available status.",
   "exports": {
     ".": {
@@ -40,16 +40,16 @@
     "build": "rm -rf dist; npx prettier . --write; rollup -c; rm -rf ./dist/scripts/expose-data.d.ts ./dist/cli.d.ts",
     "refresh-downstream": "npx tsx scripts/refresh-downstream.ts",
     "refresh-static": "npx tsx scripts/refresh-static.ts",
-    "update-data-file": "npx tsx scripts/update-data-file.ts; npx prettier ./src/data/data.js --write",
+    "update-timeline": "npx tsx scripts/create-timeline.ts; npx prettier ./src/data/timeline.js --write",
     "update-data-dependencies": "npm i @mdn/browser-compat-data@latest web-features@latest -D",
-    "check-data-changes": "git diff --name-only | grep -q '^src/data/data.js$' && echo 'changes-available=TRUE' || echo 'changes-available=FALSE'"
+    "check-timeline-changes": "git diff --name-only | grep -q '^src/data/timeline.js$' && echo 'changes-available=TRUE' || echo 'changes-available=FALSE'"
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@mdn/browser-compat-data": "^8.0.5",
+    "@mdn/browser-compat-data": "^8.1.0",
     "@rollup/plugin-terser": "^1.0.0",
     "@rollup/plugin-typescript": "^12.1.3",
-    "@types/node": "^22.15.17",
+    "@types/node": "^22.19.21",
     "eslint-plugin-new-with-error": "^5.0.0",
     "jasmine": "^5.8.0",
     "jasmine-browser-runner": "^3.0.0",
@@ -59,7 +59,7 @@
     "tslib": "^2.8.1",
     "typescript": "^5.7.2",
     "typescript-eslint": "^8.35.0",
-    "web-features": "^3.32.0"
+    "web-features": "^3.37.0"
   },
   "repository": {
     "type": "git",

package/app/node_modules/next/dist/build/swc/index.js

@@ -139,7 +139,7 @@ var HmrTarget = /*#__PURE__*/ function(HmrTarget) {
     HmrTarget["Server"] = "server";
     return HmrTarget;
 }({});
-const nextVersion = "16.3.0";
+const nextVersion = "16.3.4";
 const ArchName = (0, _os.arch)();
 const PlatformName = (0, _os.platform)();
 function infoLog(...args) {

package/app/node_modules/next/dist/build/webpack-config.js

@@ -1770,7 +1770,7 @@ async function getBaseWebpackConfig(dir, { buildId, encryptionKey, config, compi
             isClient && new _copyfileplugin.CopyFilePlugin({
                 // file path to build output of `@next/polyfill-nomodule`
                 filePath: require.resolve('./polyfills/polyfill-nomodule'),
-                cacheKey: "16.3.0",
+                cacheKey: "16.3.4",
                 name: `static/chunks/polyfills${dev ? '' : '-[hash]'}.js`,
                 minimize: false,
                 info: {
@@ -1971,7 +1971,7 @@ async function getBaseWebpackConfig(dir, { buildId, encryptionKey, config, compi
         //  - Next.js location on disk (some loaders use absolute paths and some resolve options depend on absolute paths)
         //  - Next.js version
         //  - next.config.js keys that affect compilation
-        version: `${__dirname}|${"16.3.0"}|${configVars}`,
+        version: `${__dirname}|${"16.3.4"}|${configVars}`,
         cacheDirectory: _path.default.join(distDir, 'cache', 'webpack'),
         // For production builds, it's more efficient to compress all cache files together instead of compression each one individually.
         // So we disable compression here and allow the build runner to take care of compressing the cache as a whole.
@@ -2027,7 +2027,7 @@ async function getBaseWebpackConfig(dir, { buildId, encryptionKey, config, compi
                 type: 'filesystem',
                 directory: _path.default.join(distDir, 'cache', 'rspack', rspackCacheKey)
             },
-            version: `${__dirname}|${"16.3.0"}|${configVars}|${rspackCacheKey}`
+            version: `${__dirname}|${"16.3.4"}|${configVars}|${rspackCacheKey}`
         };
     }
     if (process.env.NEXT_WEBPACK_LOGGING) {

package/app/node_modules/next/dist/client/components/router-reducer/create-initial-router-state.js

@@ -42,7 +42,8 @@ function createInitialRouterState({ navigatedAt, initialRSCPayload, initialFligh
     // to be immediately expired. The next prefetch will re-fetch the tree with
     // correct hints from the /_tree response.
     const acc = {
-        metadataVaryPath: null
+        metadataVaryPath: null,
+        treeDivergedFromBase: false
     };
     const initialRouteTree = (0, _cache.convertRootFlightRouterStateToRouteTree)(initialTree, initialRenderedSearch, acc);
     const metadataVaryPath = acc.metadataVaryPath;
@@ -68,8 +69,8 @@ function createInitialRouterState({ navigatedAt, initialRSCPayload, initialFligh
                     const staticStageResponse = await (0, _fetchserverresponse.decodeStageUntilBoundary)(initialFlightStreamForCache, byteLength, undefined);
                     const now = Date.now();
                     const staleAt = await (0, _cache.resolveStaleAt)(now, staticStageResponse.s);
-                    (0, _cache.writePrerenderResponseIntoCache)(now, _types.FetchStrategy.PPR, staticStageResponse.f, undefined, staticStageResponse.h, staticStageResponse.r ?? null, staleAt, initialTree, initialRenderedSearch, true // isResponsePartial
-                    );
+                    (0, _cache.writePrerenderResponseIntoCache)(now, _types.FetchStrategy.PPR, staticStageResponse.f, undefined, staticStageResponse.h, staticStageResponse.r ?? null, staleAt, initialTree, initialRenderedSearch, true, _cache // hydration writes are bound to the shared map
+                    .segmentCacheMap);
                 }).catch(()=>{
                 // The static stage processing failed. Not fatal — the page
                 // rendered normally, we just won't write into the cache.
@@ -82,8 +83,8 @@ function createInitialRouterState({ navigatedAt, initialRSCPayload, initialFligh
                 // hydration and write it into the cache directly.
                 const now = Date.now();
                 (0, _cache.resolveStaleAt)(now, initialStaleTime).then((staleAt)=>{
-                    (0, _cache.writePrerenderResponseIntoCache)(now, _types.FetchStrategy.PPR, initialFlightData, undefined, initialHeadVaryParams, initialRootVaryParams ?? null, staleAt, initialTree, initialRenderedSearch, false // isResponsePartial
-                    );
+                    (0, _cache.writePrerenderResponseIntoCache)(now, _types.FetchStrategy.PPR, initialFlightData, undefined, initialHeadVaryParams, initialRootVaryParams ?? null, staleAt, initialTree, initialRenderedSearch, false, _cache // hydration writes are bound to the shared map
+                    .segmentCacheMap);
                 }).catch(()=>{
                 // The static stage processing failed. Not fatal — the page
                 // rendered normally, we just won't write into the cache.
@@ -102,7 +103,8 @@ function createInitialRouterState({ navigatedAt, initialRSCPayload, initialFligh
         if (initialRuntimePrefetchStream != null) {
             (0, _cache.processRuntimePrefetchStream)(Date.now(), initialRuntimePrefetchStream, initialTree, initialRenderedSearch).then((processed)=>{
                 if (processed !== null) {
-                    (0, _cache.writeDynamicRenderResponseIntoCache)(Date.now(), _types.FetchStrategy.PPRRuntime, processed.flightDatas, processed.buildId, processed.isResponsePartial, processed.headVaryParams, processed.rootVaryParamsIterable, processed.staleAt, processed.navigationSeed, null);
+                    (0, _cache.writeDynamicRenderResponseIntoCache)(Date.now(), _types.FetchStrategy.PPRRuntime, processed.flightDatas, processed.buildId, processed.isResponsePartial, processed.headVaryParams, processed.rootVaryParamsIterable, processed.staleAt, processed.navigationSeed, null, _cache // hydration writes are bound to the shared map
+                    .segmentCacheMap);
                 }
             }).catch(()=>{
             // Runtime prefetch cache write failed. Not fatal — the page rendered

package/app/node_modules/next/dist/client/components/router-reducer/ppr-navigations.js

@@ -79,10 +79,13 @@ function createInitialCacheNodeForHydration(navigatedAt, initialTree, seedData,
         scrollRef: null
     };
     const restrictToShell = false;
-    const task = createCacheNodeOnNavigation(navigatedAt, initialTree, null, 1, seedData, seedHead, seedDynamicStaleAt, false, accumulation, restrictToShell);
+    const task = createCacheNodeOnNavigation(navigatedAt, initialTree, null, 1, seedData, seedHead, seedDynamicStaleAt, false, accumulation, // Hydration is bound to the shared map.
+    _cache.segmentCacheMap, restrictToShell);
     return task;
 }
-function startPPRNavigation(navigatedAt, oldUrl, oldRenderedSearch, oldCacheNode, oldRouterState, newRouteTree, newMetadataVaryPath, freshness, seedData, seedHead, seedDynamicStaleAt, isSamePageNavigation, accumulation, // Instant Navigation Testing API only — restricts segment reads to shell
+function startPPRNavigation(navigatedAt, oldUrl, oldRenderedSearch, oldCacheNode, oldRouterState, newRouteTree, newMetadataVaryPath, freshness, seedData, seedHead, seedDynamicStaleAt, isSamePageNavigation, accumulation, // The segment cache map this navigation is bound to: a locked navigation's
+// driving-task map, or the shared map. See `segmentCacheMap` in cache.ts.
+map, // Instant Navigation Testing API only — restricts segment reads to shell
 // entries. Always false outside the testing API. See navigation-testing-lock.
 restrictToShell) {
     const parentNeedsDynamicRequest = false;
@@ -91,9 +94,9 @@ restrictToShell) {
         canonicalUrl: (0, _createhreffromurl.createHrefFromUrl)(oldUrl),
         renderedSearch: oldRenderedSearch
     };
-    return updateCacheNodeOnNavigation(navigatedAt, oldUrl, oldCacheNode !== null ? oldCacheNode : undefined, oldRouterState, newRouteTree, newMetadataVaryPath, freshness, seedData, seedHead, seedDynamicStaleAt, isSamePageNavigation, parentNeedsDynamicRequest, oldRootRefreshState, parentRefreshState, accumulation, restrictToShell);
+    return updateCacheNodeOnNavigation(navigatedAt, oldUrl, oldCacheNode !== null ? oldCacheNode : undefined, oldRouterState, newRouteTree, newMetadataVaryPath, freshness, seedData, seedHead, seedDynamicStaleAt, isSamePageNavigation, parentNeedsDynamicRequest, oldRootRefreshState, parentRefreshState, accumulation, map, restrictToShell);
 }
-function updateCacheNodeOnNavigation(navigatedAt, oldUrl, oldCacheNode, oldRouterState, newRouteTree, newMetadataVaryPath, freshness, seedData, seedHead, seedDynamicStaleAt, isSamePageNavigation, parentNeedsDynamicRequest, oldRootRefreshState, parentRefreshState, accumulation, // Instant Navigation Testing API only — restricts segment reads to shell
+function updateCacheNodeOnNavigation(navigatedAt, oldUrl, oldCacheNode, oldRouterState, newRouteTree, newMetadataVaryPath, freshness, seedData, seedHead, seedDynamicStaleAt, isSamePageNavigation, parentNeedsDynamicRequest, oldRootRefreshState, parentRefreshState, accumulation, map, // Instant Navigation Testing API only — restricts segment reads to shell
 // entries. Always false outside the testing API. See navigation-testing-lock.
 restrictToShell) {
     // Check if this segment matches the one in the previous route. A
@@ -119,7 +122,7 @@ restrictToShell) {
         newSegment === _segment.NOT_FOUND_SEGMENT_KEY) {
             return null;
         }
-        return createCacheNodeOnNavigation(navigatedAt, newRouteTree, newMetadataVaryPath, freshness, seedData, seedHead, seedDynamicStaleAt, parentNeedsDynamicRequest, accumulation, restrictToShell);
+        return createCacheNodeOnNavigation(navigatedAt, newRouteTree, newMetadataVaryPath, freshness, seedData, seedHead, seedDynamicStaleAt, parentNeedsDynamicRequest, accumulation, map, restrictToShell);
     }
     const newSlots = newRouteTree.slots;
     const oldRouterStateChildren = oldRouterState[1];
@@ -168,7 +171,7 @@ restrictToShell) {
         const result = createCacheNodeForSegment(navigatedAt, newRouteTree, seedRsc, newMetadataVaryPath, seedHead, freshness, seedDynamicStaleAt, // Carry forward the existing bfcacheId when there's a prior CacheNode:
         // even though the data is being refreshed, the state identity of the
         // route hasn't changed. Otherwise (no prior node) mint a fresh one.
-        oldCacheNode !== undefined ? oldCacheNode.bfcacheId : generateBFCacheId(freshness), restrictToShell);
+        oldCacheNode !== undefined ? oldCacheNode.bfcacheId : generateBFCacheId(freshness), map, restrictToShell);
         newCacheNode = result.cacheNode;
         needsDynamicRequest = result.needsDynamicRequest;
         // Scroll handling
@@ -256,7 +259,7 @@ restrictToShell) {
                 seedHeadChild = null;
             }
             const oldCacheNodeChild = oldCacheNodeSlots !== null ? oldCacheNodeSlots[parallelRouteKey] : undefined;
-            const taskChild = updateCacheNodeOnNavigation(navigatedAt, oldUrl, oldCacheNodeChild, oldRouterStateChild, newRouteTreeChild, newMetadataVaryPath, freshness, seedDataChild ?? null, seedHeadChild, seedDynamicStaleAt, isSamePageNavigation, parentNeedsDynamicRequest || needsDynamicRequest, oldRootRefreshState, refreshState, accumulation, restrictToShell);
+            const taskChild = updateCacheNodeOnNavigation(navigatedAt, oldUrl, oldCacheNodeChild, oldRouterStateChild, newRouteTreeChild, newMetadataVaryPath, freshness, seedDataChild ?? null, seedHeadChild, seedDynamicStaleAt, isSamePageNavigation, parentNeedsDynamicRequest || needsDynamicRequest, oldRootRefreshState, refreshState, accumulation, map, restrictToShell);
             if (taskChild === null) {
                 // One of the child tasks discovered a change to the root layout.
                 // Immediately unwind from this recursive traversal. This will trigger a
@@ -338,7 +341,7 @@ restrictToShell) {
             break;
     }
 }
-function createCacheNodeOnNavigation(navigatedAt, newRouteTree, newMetadataVaryPath, freshness, seedData, seedHead, seedDynamicStaleAt, parentNeedsDynamicRequest, accumulation, // Instant Navigation Testing API only — restricts segment reads to shell
+function createCacheNodeOnNavigation(navigatedAt, newRouteTree, newMetadataVaryPath, freshness, seedData, seedHead, seedDynamicStaleAt, parentNeedsDynamicRequest, accumulation, map, // Instant Navigation Testing API only — restricts segment reads to shell
 // entries. Always false outside the testing API. See navigation-testing-lock.
 restrictToShell) {
     // Same traversal as updateCacheNodeNavigation, but simpler. We switch to this
@@ -356,7 +359,7 @@ restrictToShell) {
     const seedRsc = seedData !== null ? seedData[0] : null;
     const result = createCacheNodeForSegment(navigatedAt, newRouteTree, seedRsc, newMetadataVaryPath, seedHead, freshness, seedDynamicStaleAt, // This segment was not part of the previous route, so mint a fresh
     // bfcacheId.
-    generateBFCacheId(freshness), restrictToShell);
+    generateBFCacheId(freshness), map, restrictToShell);
     const newCacheNode = result.cacheNode;
     const needsDynamicRequest = result.needsDynamicRequest;
     const isLeafSegment = newSlots === null;
@@ -373,7 +376,7 @@ restrictToShell) {
         taskChildren = new Map();
         for (const [parallelRouteKey, newRouteTreeChild] of newSlots){
             const seedDataChild = seedDataChildren !== null ? seedDataChildren[parallelRouteKey] : null;
-            const taskChild = createCacheNodeOnNavigation(navigatedAt, newRouteTreeChild, newMetadataVaryPath, freshness, seedDataChild ?? null, seedHead, seedDynamicStaleAt, parentNeedsDynamicRequest || needsDynamicRequest, accumulation, restrictToShell);
+            const taskChild = createCacheNodeOnNavigation(navigatedAt, newRouteTreeChild, newMetadataVaryPath, freshness, seedDataChild ?? null, seedHead, seedDynamicStaleAt, parentNeedsDynamicRequest || needsDynamicRequest, accumulation, map, restrictToShell);
             taskChildren.set(parallelRouteKey, taskChild);
             newCacheNodeSlots[parallelRouteKey] = taskChild.node;
             const taskChildRoute = taskChild.route;
@@ -514,7 +517,8 @@ function reuseActiveSegmentInDefaultSlot(parentRouteTree, parallelRouteKey, oldR
         reusedRenderedSearch = oldRootRefreshState.renderedSearch;
     }
     const acc = {
-        metadataVaryPath: null
+        metadataVaryPath: null,
+        treeDivergedFromBase: false
     };
     const reusedRouteTree = (0, _cache.convertReusedFlightRouterStateToRouteTree)(parentRouteTree, parallelRouteKey, oldRouterState, reusedRenderedSearch, acc);
     reusedRouteTree.refreshState = {
@@ -531,7 +535,7 @@ function reuseSharedCacheNode(dropPrefetchRsc, existingCacheNode) {
     // identity across navigations.
     return createCacheNode(existingCacheNode.rsc, dropPrefetchRsc ? null : existingCacheNode.prefetchRsc, existingCacheNode.head, dropPrefetchRsc ? null : existingCacheNode.prefetchHead, existingCacheNode.bfcacheId, existingCacheNode.scrollRef);
 }
-function createCacheNodeForSegment(now, tree, seedRsc, metadataVaryPath, seedHead, freshness, dynamicStaleAt, bfcacheId, // Instant Navigation Testing API only — restricts segment reads to shell
+function createCacheNodeForSegment(now, tree, seedRsc, metadataVaryPath, seedHead, freshness, dynamicStaleAt, bfcacheId, map, // Instant Navigation Testing API only — restricts segment reads to shell
 // entries. Always false outside the testing API. See navigation-testing-lock.
 restrictToShell) {
     // Construct a new CacheNode using data from the BFCache, the client's
@@ -637,7 +641,7 @@ restrictToShell) {
     }
     let cachedRsc = null;
     let isCachedRscPartial = true;
-    const segmentEntry = (0, _cache.readSegmentCacheEntryForNavigation)(now, tree.varyPath, restrictToShell);
+    const segmentEntry = (0, _cache.readSegmentCacheEntryForNavigation)(now, map, tree.varyPath, restrictToShell);
     if (segmentEntry !== null) {
         switch(segmentEntry.status){
             case _cache.EntryStatus.Fulfilled:
@@ -736,7 +740,7 @@ restrictToShell) {
         let cachedHead = null;
         let isCachedHeadPartial = true;
         if (metadataVaryPath !== null) {
-            const metadataEntry = (0, _cache.readSegmentCacheEntryForNavigation)(now, metadataVaryPath, restrictToShell);
+            const metadataEntry = (0, _cache.readSegmentCacheEntryForNavigation)(now, map, metadataVaryPath, restrictToShell);
             if (metadataEntry !== null) {
                 switch(metadataEntry.status){
                     case _cache.EntryStatus.Fulfilled:
@@ -865,7 +869,9 @@ function spawnDynamicRequests(task, primaryUrl, nextUrl, freshnessPolicy, accumu
 routeCacheEntry, // The original navigation's push/replace intent. Threaded through to the
 // server-patch retry logic so it can inherit the intent if the original
 // transition hasn't committed yet.
-navigateType, navigationLock, signal) {
+navigateType, navigationLock, // The segment cache map this navigation is bound to. See `segmentCacheMap`
+// in cache.ts.
+map, signal) {
     const dynamicRequestTree = task.dynamicRequestTree;
     if (dynamicRequestTree === null) {
         // This navigation was fully cached. There are no dynamic requests to spawn.
@@ -881,7 +887,7 @@ navigateType, navigationLock, signal) {
     // block the navigation, and collect the promises. The next function,
     // `finishNavigationTask`, can await the promises in any order without
     // accidentally introducing a network waterfall.
-    const primaryRequestPromise = fetchMissingDynamicData(task, dynamicRequestTree, primaryUrl, nextUrl, freshnessPolicy, routeCacheEntry, navigationLock, signal);
+    const primaryRequestPromise = fetchMissingDynamicData(task, dynamicRequestTree, primaryUrl, nextUrl, freshnessPolicy, routeCacheEntry, navigationLock, map, signal);
     const separateRefreshUrls = accumulation.separateRefreshUrls;
     let refreshRequestPromises = null;
     if (separateRefreshUrls !== null) {
@@ -916,7 +922,7 @@ navigateType, navigationLock, signal) {
                 // start tracking this alongside the refresh URL. In the meantime,
                 // if a refresh fails due to a mismatch, it will trigger a
                 // hard refresh.
-                nextUrl, freshnessPolicy, routeCacheEntry, navigationLock, signal));
+                nextUrl, freshnessPolicy, routeCacheEntry, navigationLock, map, signal));
             }
         }
     }
@@ -1100,7 +1106,7 @@ retryFreshnessPolicy) {
     };
     (0, _useactionqueue.dispatchAppRouterAction)(retryAction);
 }
-async function fetchMissingDynamicData(task, dynamicRequestTree, url, nextUrl, freshnessPolicy, routeCacheEntry, navigationLock, signal) {
+async function fetchMissingDynamicData(task, dynamicRequestTree, url, nextUrl, freshnessPolicy, routeCacheEntry, navigationLock, map, signal) {
     try {
         const result = await (0, _fetchserverresponse.fetchServerResponse)(url, {
             flightRouterState: dynamicRequestTree,
@@ -1134,7 +1140,7 @@ async function fetchMissingDynamicData(task, dynamicRequestTree, url, nextUrl, f
             const { response: staticStageResponse, isResponsePartial } = result.staticStageData;
             (0, _cache.resolveStaleAt)(now, staticStageResponse.s).then((staleAt)=>{
                 const buildId = result.responseHeaders.get(_constants.NEXT_NAV_DEPLOYMENT_ID_HEADER) ?? staticStageResponse.b;
-                (0, _cache.writePrerenderResponseIntoCache)(now, _types.FetchStrategy.PPR, staticStageResponse.f, buildId, staticStageResponse.h, staticStageResponse.r ?? null, staleAt, dynamicRequestTree, result.renderedSearch, isResponsePartial);
+                (0, _cache.writePrerenderResponseIntoCache)(now, _types.FetchStrategy.PPR, staticStageResponse.f, buildId, staticStageResponse.h, staticStageResponse.r ?? null, staleAt, dynamicRequestTree, result.renderedSearch, isResponsePartial, map);
             }).catch(()=>{
             // The static stage processing failed. Not fatal — the navigation
             // completed normally, we just won't write into the cache.
@@ -1143,7 +1149,7 @@ async function fetchMissingDynamicData(task, dynamicRequestTree, url, nextUrl, f
         if (routeCacheEntry !== null && result.runtimePrefetchStream !== null) {
             (0, _cache.processRuntimePrefetchStream)(now, result.runtimePrefetchStream, dynamicRequestTree, result.renderedSearch).then((processed)=>{
                 if (processed !== null) {
-                    (0, _cache.writeDynamicRenderResponseIntoCache)(now, _types.FetchStrategy.PPRRuntime, processed.flightDatas, processed.buildId, processed.isResponsePartial, processed.headVaryParams, processed.rootVaryParamsIterable, processed.staleAt, processed.navigationSeed, null);
+                    (0, _cache.writeDynamicRenderResponseIntoCache)(now, _types.FetchStrategy.PPRRuntime, processed.flightDatas, processed.buildId, processed.isResponsePartial, processed.headVaryParams, processed.rootVaryParamsIterable, processed.staleAt, processed.navigationSeed, null, map);
                 }
             }).catch(()=>{
             // The runtime prefetch cache write failed. Not fatal — the

package/app/node_modules/next/dist/client/components/router-reducer/reducers/refresh-reducer.js

@@ -73,7 +73,8 @@ function refreshDynamicData(state, freshnessPolicy, signal) {
     // takes over the push. If the navigation does commit first, HistoryUpdater
     // sees that the URL already matches and replaces instead.
     const navigateType = state.pushRef.pendingPush ? 'push' : 'replace';
-    return (0, _navigation.navigateToKnownRoute)(now, state, currentUrl, currentCanonicalUrl, refreshSeed, currentUrl, currentRenderedSearch, state.cache, currentFlightRouterState, freshnessPolicy, nextUrlForRefresh, scrollBehavior, navigateType, navigationLock, null, // Refresh navigations don't use route prediction, so there's no route
+    return (0, _navigation.navigateToKnownRoute)(now, state, currentUrl, currentCanonicalUrl, refreshSeed, currentUrl, currentRenderedSearch, state.cache, currentFlightRouterState, freshnessPolicy, nextUrlForRefresh, scrollBehavior, navigateType, navigationLock, // A refresh is bound to the shared map.
+    _cache.segmentCacheMap, null, // Refresh navigations don't use route prediction, so there's no route
     // cache entry to mark as having a dynamic rewrite on mismatch. If a
     // mismatch occurs, the retry handler will traverse the known route tree
     // to find and mark the entry.

package/app/node_modules/next/dist/client/components/router-reducer/reducers/restore-reducer.js

@@ -11,6 +11,7 @@ Object.defineProperty(exports, "restoreReducer", {
 const _computechangedpath = require("../compute-changed-path");
 const _pprnavigations = require("../ppr-navigations");
 const _navigation = require("../../segment-cache/navigation");
+const _cache = require("../../segment-cache/cache");
 const _bfcache = require("../../segment-cache/bfcache");
 function restoreReducer(state, action) {
     // This action is used to restore the router state from the history state.
@@ -40,7 +41,8 @@ function restoreReducer(state, action) {
         scrollRef: null
     };
     const restoreSeed = (0, _navigation.convertServerPatchToFullTree)(now, treeToRestore, null, renderedSearch, _bfcache.UnknownDynamicStaleTime);
-    const task = (0, _pprnavigations.startPPRNavigation)(now, currentUrl, state.renderedSearch, state.cache, state.tree, restoreSeed.routeTree, restoreSeed.metadataVaryPath, _pprnavigations.FreshnessPolicy.HistoryTraversal, null, null, restoreSeed.dynamicStaleAt, false, accumulation, // A history-traversal restore never restricts to the shell.
+    const task = (0, _pprnavigations.startPPRNavigation)(now, currentUrl, state.renderedSearch, state.cache, state.tree, restoreSeed.routeTree, restoreSeed.metadataVaryPath, _pprnavigations.FreshnessPolicy.HistoryTraversal, null, null, restoreSeed.dynamicStaleAt, false, accumulation, // A history-traversal restore is bound to the shared map.
+    _cache.segmentCacheMap, // A history-traversal restore never restricts to the shell.
     false);
     if (task === null) {
         return (0, _navigation.completeHardNavigation)(state, restoredUrl, 'replace');
@@ -53,7 +55,8 @@ function restoreReducer(state, action) {
     'replace', // Instant Navigation Testing API: a traversal is not a capture. Spawn its
     // dynamic requests ungated (null lock) so they render from cache or fetch
     // normally rather than being withheld behind the lock.
-    null, // Not an HMR refresh, so there's no request generation to cancel.
+    null, // A history-traversal restore is bound to the shared map.
+    _cache.segmentCacheMap, // Not an HMR refresh, so there's no request generation to cancel.
     undefined);
     // Instant Navigation Testing API: a traversal resets the lock to a fresh
     // pending scope — releasing any data withheld by prior forward navigations and

package/app/node_modules/next/dist/client/components/router-reducer/reducers/server-action-reducer.js

@@ -317,7 +317,8 @@ function serverActionReducer(state, action) {
                 );
             }
             const navigationLock = (0, _pprnavigations.getCurrentNavigationLock)();
-            return (0, _navigation.navigateToKnownRoute)(now, state, redirectUrl, redirectCanonicalUrl, redirectSeed, currentUrl, currentRenderedSearch, state.cache, currentFlightRouterState, freshnessPolicy, nextUrl, scrollBehavior, navigateType, navigationLock, null, // Server action redirects don't use route prediction - we already
+            return (0, _navigation.navigateToKnownRoute)(now, state, redirectUrl, redirectCanonicalUrl, redirectSeed, currentUrl, currentRenderedSearch, state.cache, currentFlightRouterState, freshnessPolicy, nextUrl, scrollBehavior, navigateType, navigationLock, // A server-action redirect navigation is bound to the shared map.
+            _cache.segmentCacheMap, null, // Server action redirects don't use route prediction - we already
             // have the route tree from the server response. If a mismatch occurs
             // during dynamic data fetch, the retry handler will traverse the
             // known route tree to mark the entry as having a dynamic rewrite.

package/app/node_modules/next/dist/client/components/router-reducer/reducers/server-patch-reducer.js

@@ -11,6 +11,7 @@ Object.defineProperty(exports, "serverPatchReducer", {
 const _createhreffromurl = require("../create-href-from-url");
 const _routerreducertypes = require("../router-reducer-types");
 const _navigation = require("../../segment-cache/navigation");
+const _cache = require("../../segment-cache/cache");
 const _refreshreducer = require("./refresh-reducer");
 const _pprnavigations = require("../ppr-navigations");
 function serverPatchReducer(state, action) {
@@ -49,7 +50,8 @@ function serverPatchReducer(state, action) {
     const scrollBehavior = _routerreducertypes.ScrollBehavior.Default;
     const navigationLock = (0, _pprnavigations.getCurrentNavigationLock)();
     const now = Date.now();
-    return (0, _navigation.navigateToKnownRoute)(now, state, retryUrl, retryCanonicalUrl, retrySeed, currentUrl, currentRenderedSearch, state.cache, state.tree, action.freshnessPolicy, retryNextUrl, scrollBehavior, navigateType, navigationLock, null, // Server patch (retry) navigations don't use route prediction. This is
+    return (0, _navigation.navigateToKnownRoute)(now, state, retryUrl, retryCanonicalUrl, retrySeed, currentUrl, currentRenderedSearch, state.cache, state.tree, action.freshnessPolicy, retryNextUrl, scrollBehavior, navigateType, navigationLock, // A server-patch retry navigation is bound to the shared map.
+    _cache.segmentCacheMap, null, // Server patch (retry) navigations don't use route prediction. This is
     // typically a retry after a previous mismatch, so the route was already
     // marked as having a dynamic rewrite when the mismatch was detected.
     null, // Not an HMR refresh, so there's no request generation to cancel.