@decocms/start 0.25.0 → 0.25.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decocms/start",
-  "version": "0.25.0",
+  "version": "0.25.2",
   "type": "module",
   "description": "Deco framework for TanStack Start - CMS bridge, admin protocol, hooks, schema generation",
   "main": "./src/index.ts",

package/src/cms/index.ts

@@ -3,6 +3,7 @@ export {
   findPageByPath,
   getAllPages,
   getRevision,
+  getSiteSeo,
   loadBlocks,
   onChange,
   setBlocks,

package/src/cms/loader.ts

@@ -161,6 +161,31 @@ function matchPath(pattern: string, urlPath: string): Record<string, string> | n
   return params;
 }
 
+/**
+ * Extract the site-wide SEO config from the "Site" app block.
+ *
+ * In the original deco-cx/deco framework this is `ctx.seo` — the app-level
+ * SEO configuration that provides fallback title, description, and templates
+ * when page-level seo blocks don't supply them.
+ */
+export function getSiteSeo(): {
+  title?: string;
+  description?: string;
+  titleTemplate?: string;
+  descriptionTemplate?: string;
+  image?: string;
+  favicon?: string;
+  themeColor?: string;
+  noIndexing?: boolean;
+} {
+  const blocks = loadBlocks();
+  const site = blocks["Site"] as Record<string, unknown> | undefined;
+  if (!site) return {};
+  const seo = site.seo as Record<string, unknown> | undefined;
+  if (!seo) return {};
+  return seo as ReturnType<typeof getSiteSeo>;
+}
+
 export function findPageByPath(
   targetPath: string,
 ): { page: DecoPage; params: Record<string, string> } | null {

package/src/routes/cmsRoute.ts

@@ -37,6 +37,7 @@ import {
   resolveDecoPage,
   resolveDeferredSection,
 } from "../cms/resolve";
+import { getSiteSeo } from "../cms/loader";
 import { runSectionLoaders, runSingleSectionLoader } from "../cms/sectionLoaders";
 import {
   type CacheProfile,
@@ -269,7 +270,19 @@ async function buildPageSeo(
   // Secondary source: SEO sections embedded in the sections array
   const sectionSeo = extractSeoFromSections(enrichedSections);
 
-  if (!seoSection) return sectionSeo;
+  // Site-wide SEO config from the "Site" app block — mirrors ctx.seo in
+  // the original deco-cx/deco framework. Provides fallback title,
+  // description, and templates when page-level seo doesn't supply them.
+  const siteSeo = getSiteSeo();
+
+  if (!seoSection) {
+    // No page.seo block — use site-wide SEO as primary, section-contributed as secondary
+    const merged: PageSeo = { ...sectionSeo };
+    if (siteSeo.title && !merged.title) merged.title = siteSeo.title;
+    if (siteSeo.description && !merged.description) merged.description = siteSeo.description;
+    if (siteSeo.image && !merged.image) merged.image = siteSeo.image;
+    return merged;
+  }
 
   // Run the section loader on the seo section if one is registered
   // (e.g., SEOPDP loader transforms {jsonLD: ProductDetailsPage} → {title, description, ...})
@@ -283,16 +296,28 @@ async function buildPageSeo(
 
   const pageSeo = extractSeoFromProps(enrichedProps);
 
-  // Apply title/description templates from the SEO block config.
-  // SeoV2 blocks carry templates like "%s | CASA & VIDEO" that wrap
-  // the computed title. Template "%s" is a no-op.
+  // Replicate original SeoV2 loader logic: `_title ?? appTitle`
+  // When the page's seo block doesn't have a title/description,
+  // fall back to the Site app's seo config.
+  if (!pageSeo.title && siteSeo.title) pageSeo.title = siteSeo.title;
+  if (!pageSeo.description && siteSeo.description) pageSeo.description = siteSeo.description;
+  if (!pageSeo.image && siteSeo.image) pageSeo.image = siteSeo.image;
+
+  // Apply title/description templates.
+  // Priority: page-level template → site-level template → no-op.
+  // This mirrors the original: `(titleTemplate ?? "").trim().length === 0 ? "%s" : titleTemplate`
   const rawProps = seoSection.props;
-  const titleTemplate = rawProps.titleTemplate as string | undefined;
-  const descTemplate = rawProps.descriptionTemplate as string | undefined;
-  if (titleTemplate && titleTemplate !== "%s" && pageSeo.title) {
+  const titleTemplate =
+    effectiveTemplate(rawProps.titleTemplate as string | undefined) ??
+    effectiveTemplate(siteSeo.titleTemplate);
+  const descTemplate =
+    effectiveTemplate(rawProps.descriptionTemplate as string | undefined) ??
+    effectiveTemplate(siteSeo.descriptionTemplate);
+
+  if (titleTemplate && pageSeo.title) {
     pageSeo.title = titleTemplate.replace("%s", pageSeo.title);
   }
-  if (descTemplate && descTemplate !== "%s" && pageSeo.description) {
+  if (descTemplate && pageSeo.description) {
     pageSeo.description = descTemplate.replace("%s", pageSeo.description);
   }
 
@@ -301,6 +326,12 @@ async function buildPageSeo(
   return { ...sectionSeo, ...pageSeo };
 }
 
+/** Returns a non-trivial template string, or undefined for "%s" / empty / blank. */
+function effectiveTemplate(tmpl: string | undefined): string | undefined {
+  if (!tmpl || tmpl.trim() === "" || tmpl.trim() === "%s") return undefined;
+  return tmpl;
+}
+
 // ---------------------------------------------------------------------------
 // Head metadata builder
 // ---------------------------------------------------------------------------

package/src/sdk/workerEntry.ts

@@ -722,6 +722,20 @@ export function createDecoWorkerEntry(
               const v = (env[cacheVersionEnv] as string) || "";
               if (v) hit.headers.set("X-Cache-Version", v);
             }
+            // Restore client-facing Cache-Control (the stored version uses sMaxAge
+            // as max-age for Cache API TTL, which would leak to the CDN auto-cache
+            // and cause stale HTML after deploys — the CDN caches under the raw URL,
+            // bypassing BUILD_HASH versioned keys).
+            const hitProfile = getProfile(url);
+            const hitHeaders = cacheHeaders(hitProfile);
+            for (const [k, v] of Object.entries(hitHeaders)) {
+              hit.headers.set(k, v);
+            }
+            // Prevent CDN from auto-caching this response under the raw URL.
+            // The Worker manages edge caching via caches.default with versioned keys;
+            // CDN auto-caching would bypass that versioning and serve stale HTML
+            // after deploys (referencing old CSS/JS fingerprinted filenames).
+            hit.headers.set("CDN-Cache-Control", "no-store");
             return hit;
           }
         } catch {
@@ -785,12 +799,21 @@ export function createDecoWorkerEntry(
         if (v) toReturn.headers.set("X-Cache-Version", v);
       }
 
+      // Prevent CDN from auto-caching this response under the raw URL.
+      // Edge caching is managed by the Worker via caches.default with
+      // BUILD_HASH-versioned keys; CDN auto-caching would bypass versioning
+      // and serve stale HTML after deploys.
+      toReturn.headers.set("CDN-Cache-Control", "no-store");
+
       // For Cache API storage, use sMaxAge as max-age since the Cache API
       // ignores s-maxage and only respects max-age for TTL decisions.
       if (cache) {
         try {
           const toStore = toReturn.clone();
           toStore.headers.set("Cache-Control", `public, max-age=${profileConfig.sMaxAge}`);
+          // Remove CDN-Cache-Control from stored version — it's only needed
+          // on the response to the client to prevent CDN auto-caching.
+          toStore.headers.delete("CDN-Cache-Control");
           ctx.waitUntil(cache.put(cacheKey, toStore));
         } catch {
           // Cache API unavailable — skip storing