@decocms/tanstack 7.11.2 → 7.12.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decocms/tanstack",
-  "version": "7.11.2",
+  "version": "7.12.1",
   "type": "module",
   "description": "Deco framework binding for TanStack Start + Cloudflare Workers",
   "repository": {
@@ -24,9 +24,9 @@
     "lint:unused": "knip"
   },
   "dependencies": {
-    "@decocms/blocks": "7.11.2",
-    "@decocms/blocks-admin": "7.11.2",
-    "@decocms/blocks-cli": "7.11.2",
+    "@decocms/blocks": "7.12.1",
+    "@decocms/blocks-admin": "7.12.1",
+    "@decocms/blocks-cli": "7.12.1",
     "@deco-cx/warp-node": "^0.3.16",
     "fast-json-patch": "^3.1.0",
     "ws": "^8.18.0"

package/src/routes/cmsRoute.ts

@@ -205,11 +205,19 @@ export const loadCmsPage = createServerFn({ method: "GET" })
     // Use the full path (including query string) as the dedup key.
     // Using basePath only caused /s?q=a and /s?q=b to share one promise,
     // returning wrong/empty results for search and filtered PLPs.
-    const existing = pageInflight.get(fullPath);
+    //
+    // Client-nav resolves all sections eagerly (#277). An in-flight SSR response
+    // for the same path may carry deferredSections; sharing that promise with a
+    // concurrent SPA transition would smuggle those deferred sections in, causing
+    // loadDeferredSection to run without the per-request commerce app context.
+    // Use separate dedup buckets for SSR vs client-nav.
+    const clientNav = isClientNavigation(fullPath, getRequestUrl());
+    const inflightKey = clientNav ? `__nav:${fullPath}` : fullPath;
+    const existing = pageInflight.get(inflightKey);
     if (existing) return existing;
 
-    const promise = loadCmsPageInternal(fullPath).finally(() => pageInflight.delete(fullPath));
-    pageInflight.set(fullPath, promise);
+    const promise = loadCmsPageInternal(fullPath).finally(() => pageInflight.delete(inflightKey));
+    pageInflight.set(inflightKey, promise);
     return promise;
   });