bsmnt 0.14.0 → 0.15.0

package/src/templates/next-default/app/layout.tsx

@@ -11,12 +11,13 @@ import {
   generateWebSiteJsonLd,
   JsonLd,
 } from "@/lib/utils/json-ld"
+import { getBaseUrl } from "@/lib/utils/url"
 
 const APP_NAME = AppData.name
 const APP_DEFAULT_TITLE = "Basement Starter"
 const APP_TITLE_TEMPLATE = "%s - Basement Starter"
 const APP_DESCRIPTION = AppData.description
-const APP_BASE_URL = process.env.NEXT_PUBLIC_BASE_URL ?? "http://localhost:3000"
+const APP_BASE_URL = getBaseUrl()
 
 const geist = Geist({
   subsets: ["latin"],

package/src/templates/next-default/app/robots.ts

@@ -1,12 +1,18 @@
 import type { MetadataRoute } from "next"
-import { getBaseUrl } from "@/lib/utils/url"
+import { headers } from "next/headers"
+import { getBaseUrl, isIndexableHost } from "@/lib/utils/url"
+
+export default async function robots(): Promise<MetadataRoute.Robots> {
+  const host = (await headers()).get("host")
+  if (!isIndexableHost(host)) {
+    return { rules: { userAgent: "*", disallow: "/" } }
+  }
 
-export default function robots(): MetadataRoute.Robots {
   return {
     rules: {
       userAgent: "*",
       allow: "/",
-      disallow: [],
+      disallow: ["/api/", "/studio"],
     },
     sitemap: `${getBaseUrl()}/sitemap.xml`,
   }

package/src/templates/next-default/lib/utils/metadata.ts

@@ -1,4 +1,5 @@
 import type { Metadata } from "next"
+import { getBaseUrl } from "@/lib/utils/url"
 
 /**
  * Metadata Generation Utilities
@@ -26,7 +27,7 @@ interface GenerateMetadataOptions {
   authors?: string[]
 }
 
-const APP_BASE_URL = process.env.NEXT_PUBLIC_BASE_URL ?? "http://localhost:3000"
+const APP_BASE_URL = getBaseUrl()
 
 /**
  * Generate complete metadata object for pages

package/src/templates/next-default/lib/utils/url.ts

@@ -3,17 +3,34 @@
  *
  * Priority:
  * 1. NEXT_PUBLIC_BASE_URL  - explicit override (custom domains)
- * 2. VERCEL_PROJECT_PRODUCTION_URL - auto-set by Vercel (production domain)
- * 3. VERCEL_URL - auto-set by Vercel (preview/branch deploys)
+ * 2. VERCEL_PROJECT_PRODUCTION_URL - auto-set by Vercel, on production deployments only
+ * 3. VERCEL_URL - the deployment's own URL, so previews never emit production URLs
  * 4. localhost fallback
  */
 export function getBaseUrl(): string {
   if (process.env.NEXT_PUBLIC_BASE_URL) {
     return process.env.NEXT_PUBLIC_BASE_URL
   }
-  if (process.env.VERCEL_PROJECT_PRODUCTION_URL) {
+  if (
+    process.env.VERCEL_ENV === "production" &&
+    process.env.VERCEL_PROJECT_PRODUCTION_URL
+  ) {
     return `https://${process.env.VERCEL_PROJECT_PRODUCTION_URL}`
   }
   if (process.env.VERCEL_URL) return `https://${process.env.VERCEL_URL}`
   return "http://localhost:3000"
 }
+
+// The production build also answers on *.vercel.app; only the launch domain is indexed.
+export function getIndexableHost(): string | null {
+  const baseUrl = process.env.NEXT_PUBLIC_BASE_URL
+  // Off Vercel VERCEL_ENV is unset, and the configured host is the launch domain.
+  const vercelEnv = process.env.VERCEL_ENV
+  if (!baseUrl || (vercelEnv && vercelEnv !== "production")) return null
+  return URL.canParse(baseUrl) ? new URL(baseUrl).host : null
+}
+
+export function isIndexableHost(host: string | null | undefined): boolean {
+  const indexable = getIndexableHost()
+  return indexable !== null && host?.toLowerCase() === indexable
+}

package/src/templates/next-default/next.config.ts

@@ -1,5 +1,9 @@
 import withBundleAnalyzer from "@next/bundle-analyzer"
 import type { NextConfig } from "next"
+import { getIndexableHost } from "./lib/utils/url"
+
+// Only the launch domain is indexed; every other host is sent noindex.
+const indexableHost = getIndexableHost()
 
 const nextConfig: NextConfig = {
   reactStrictMode: true,
@@ -92,6 +96,18 @@ const nextConfig: NextConfig = {
     imageSizes: [16, 32, 48, 64, 96, 128, 256, 384],
   },
   headers: async () => [
+    {
+      source: "/:path*",
+      ...(indexableHost && {
+        missing: [
+          {
+            type: "host" as const,
+            value: indexableHost.replaceAll(".", "\\."),
+          },
+        ],
+      }),
+      headers: [{ key: "X-Robots-Tag", value: "noindex" }],
+    },
     {
       // Excludes /studio* — must stay mutually exclusive with the rule below.
       source: "/((?!studio(?:/|$)).*)",

package/src/templates/next-experiments/.env.example

@@ -33,7 +33,9 @@
 # Development: http://localhost:3000
 # Production: https://your-domain.com
 # Inlined at build time — scope this to the Production environment only in
-# Vercel so Preview deployments fall through to VERCEL_PROJECT_PRODUCTION_URL.
+# Vercel so Preview deployments fall through to their own VERCEL_URL. On a
+# production deployment it is also the only host that gets indexed: every other
+# host is sent `X-Robots-Tag: noindex` and a disallow-all robots.txt.
 NEXT_PUBLIC_BASE_URL=""
 
 # Draft mode secret for preview functionality

package/src/templates/next-experiments/app/layout.tsx

@@ -11,12 +11,13 @@ import {
   generateWebSiteJsonLd,
   JsonLd,
 } from "@/lib/utils/json-ld"
+import { getBaseUrl } from "@/lib/utils/url"
 
 const APP_NAME = AppData.name
 const APP_DEFAULT_TITLE = "Basement Starter"
 const APP_TITLE_TEMPLATE = "%s - Basement Starter"
 const APP_DESCRIPTION = AppData.description
-const APP_BASE_URL = process.env.NEXT_PUBLIC_BASE_URL ?? "http://localhost:3000"
+const APP_BASE_URL = getBaseUrl()
 
 const geist = Geist({
   subsets: ["latin"],

package/src/templates/next-experiments/app/robots.ts

@@ -1,12 +1,18 @@
 import type { MetadataRoute } from "next"
-import { getBaseUrl } from "@/lib/utils/url"
+import { headers } from "next/headers"
+import { getBaseUrl, isIndexableHost } from "@/lib/utils/url"
+
+export default async function robots(): Promise<MetadataRoute.Robots> {
+  const host = (await headers()).get("host")
+  if (!isIndexableHost(host)) {
+    return { rules: { userAgent: "*", disallow: "/" } }
+  }
 
-export default function robots(): MetadataRoute.Robots {
   return {
     rules: {
       userAgent: "*",
       allow: "/",
-      disallow: [],
+      disallow: ["/api/", "/studio"],
     },
     sitemap: `${getBaseUrl()}/sitemap.xml`,
   }

package/src/templates/next-experiments/lib/utils/metadata.ts

@@ -1,4 +1,5 @@
 import type { Metadata } from "next"
+import { getBaseUrl } from "@/lib/utils/url"
 
 /**
  * Metadata Generation Utilities
@@ -26,7 +27,7 @@ interface GenerateMetadataOptions {
   authors?: string[]
 }
 
-const APP_BASE_URL = process.env.NEXT_PUBLIC_BASE_URL ?? "http://localhost:3000"
+const APP_BASE_URL = getBaseUrl()
 
 /**
  * Generate complete metadata object for pages

package/src/templates/next-experiments/lib/utils/url.ts

@@ -3,17 +3,34 @@
  *
  * Priority:
  * 1. NEXT_PUBLIC_BASE_URL  - explicit override (custom domains)
- * 2. VERCEL_PROJECT_PRODUCTION_URL - auto-set by Vercel (production domain)
- * 3. VERCEL_URL - auto-set by Vercel (preview/branch deploys)
+ * 2. VERCEL_PROJECT_PRODUCTION_URL - auto-set by Vercel, on production deployments only
+ * 3. VERCEL_URL - the deployment's own URL, so previews never emit production URLs
  * 4. localhost fallback
  */
 export function getBaseUrl(): string {
   if (process.env.NEXT_PUBLIC_BASE_URL) {
     return process.env.NEXT_PUBLIC_BASE_URL
   }
-  if (process.env.VERCEL_PROJECT_PRODUCTION_URL) {
+  if (
+    process.env.VERCEL_ENV === "production" &&
+    process.env.VERCEL_PROJECT_PRODUCTION_URL
+  ) {
     return `https://${process.env.VERCEL_PROJECT_PRODUCTION_URL}`
   }
   if (process.env.VERCEL_URL) return `https://${process.env.VERCEL_URL}`
   return "http://localhost:3000"
 }
+
+// The production build also answers on *.vercel.app; only the launch domain is indexed.
+export function getIndexableHost(): string | null {
+  const baseUrl = process.env.NEXT_PUBLIC_BASE_URL
+  // Off Vercel VERCEL_ENV is unset, and the configured host is the launch domain.
+  const vercelEnv = process.env.VERCEL_ENV
+  if (!baseUrl || (vercelEnv && vercelEnv !== "production")) return null
+  return URL.canParse(baseUrl) ? new URL(baseUrl).host : null
+}
+
+export function isIndexableHost(host: string | null | undefined): boolean {
+  const indexable = getIndexableHost()
+  return indexable !== null && host?.toLowerCase() === indexable
+}

package/src/templates/next-experiments/next.config.ts

@@ -1,5 +1,9 @@
 import withBundleAnalyzer from "@next/bundle-analyzer"
 import type { NextConfig } from "next"
+import { getIndexableHost } from "./lib/utils/url"
+
+// Only the launch domain is indexed; every other host is sent noindex.
+const indexableHost = getIndexableHost()
 
 const nextConfig: NextConfig = {
   reactStrictMode: true,
@@ -92,6 +96,18 @@ const nextConfig: NextConfig = {
     imageSizes: [16, 32, 48, 64, 96, 128, 256, 384],
   },
   headers: async () => [
+    {
+      source: "/:path*",
+      ...(indexableHost && {
+        missing: [
+          {
+            type: "host" as const,
+            value: indexableHost.replaceAll(".", "\\."),
+          },
+        ],
+      }),
+      headers: [{ key: "X-Robots-Tag", value: "noindex" }],
+    },
     {
       // Excludes /studio* — must stay mutually exclusive with the rule below.
       source: "/((?!studio(?:/|$)).*)",

package/src/templates/next-pagebuilder/.env.example

@@ -26,7 +26,9 @@
 
 # Base URL
 # Inlined at build time — scope this to the Production environment only in
-# Vercel so Preview deployments fall through to VERCEL_PROJECT_PRODUCTION_URL.
+# Vercel so Preview deployments fall through to their own VERCEL_URL. On a
+# production deployment it is also the only host that gets indexed: every other
+# host is sent `X-Robots-Tag: noindex` and a disallow-all robots.txt.
 NEXT_PUBLIC_BASE_URL=
 
 # Draft Mode

package/src/templates/next-pagebuilder/.github/workflows/ci.yml

@@ -8,6 +8,13 @@ on:
     branches:
       - main
 
+permissions:
+  contents: read
+
+concurrency:
+  group: ci-${{ github.ref }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+
 jobs:
   ci:
     runs-on: ubuntu-latest
@@ -43,17 +50,33 @@ jobs:
       - name: Type check
         run: bun run typecheck
 
-      - name: Lint
+      - name: Lint and format
         run: bun run lint
 
+      # Runs your tests if any exist; a fresh project with none passes cleanly.
+      - name: Test
+        run: |
+          if git ls-files '*.test.*' '*.spec.*' '*_test.*' '*_spec.*' | grep -q .; then
+            bun test
+          else
+            echo "No test files found — skipping bun test."
+          fi
+
       # bsmnt:if dotenvx
       # dotenvx needs the private key to decrypt secrets at build time. It's
       # pulled from 1Password via an org-wide service-account token + the op-ref
       # committed in .env. Optional: builds pass without it (only plaintext /
       # NEXT_PUBLIC_* is read), and a per-repo DOTENV_PRIVATE_KEY secret still
       # works as a fallback.
+      # The `secrets` context isn't available in step `if:`, so the check runs as its own step.
+      - name: Detect 1Password token
+        id: op
+        env:
+          OP_SERVICE_ACCOUNT_TOKEN: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN }}
+        run: '[ -n "$OP_SERVICE_ACCOUNT_TOKEN" ] && echo "enabled=true" >> "$GITHUB_OUTPUT" || true'
+
       - name: Install 1Password CLI
-        if: ${{ secrets.OP_SERVICE_ACCOUNT_TOKEN != '' }}
+        if: steps.op.outputs.enabled == 'true'
         uses: 1password/install-cli-action@v1
 
       - name: Build
@@ -92,13 +115,14 @@ jobs:
         run: bun run build
 
       # bsmnt:endif
-      # Runs your tests if any exist; a fresh project with none passes cleanly.
-      - name: Test
+      # `prebuild` regenerated these; any change (or untracked file) means they were committed stale.
+      - name: Generated Sanity files are committed
         run: |
-          if git ls-files '*.test.*' '*.spec.*' '*_test.*' '*_spec.*' | grep -q .; then
-            bun test
-          else
-            echo "No test files found — skipping bun test."
+          cd lib/integrations/sanity
+          if [ -n "$(git status --porcelain -- sanity.types.ts schema.json)" ]; then
+            git status --short -- sanity.types.ts schema.json
+            echo "::error::Run \`bun sanity:typegen\` and commit the result."
+            exit 1
           fi
 
       - name: Knip

package/src/templates/next-pagebuilder/AGENTS.md

@@ -139,3 +139,6 @@ the "Page-builder blocks" section of the README.
 
   (`bun run build`, not `bun build` — the bare form is Bun's bundler.) Say what
   you ran and what it printed; don't report success you haven't seen.
+- **Before a commit or PR, or when told to ship, check the `launch-ready`
+  skill's rules against the diff.** Run all of them when asked whether the site
+  is ready to launch.

package/src/templates/next-pagebuilder/app/(content)/[[...slug]]/page.tsx

@@ -1,6 +1,9 @@
+import { toPlainText } from "next-sanity"
 import { notFound } from "next/navigation"
-import { PageDocument } from "@/components/page-document"
+import { findBlogBlock, PageDocument } from "@/components/page-document"
 import { client } from "@/lib/integrations/sanity/client"
+import { getBreadcrumbPages } from "@/lib/integrations/sanity/fetchers/breadcrumbs"
+import { getLayoutData } from "@/lib/integrations/sanity/fetchers/layout"
 import { fetchSanity } from "@/lib/integrations/sanity/live"
 import {
   ALL_PAGE_SLUGS_QUERY,
@@ -60,17 +63,42 @@ export const generateStaticParams = async () => {
 
 type Props = { params: Promise<{ slug?: string[] }> }
 
+// Blog posts fall back to their body and thumbnail when the SEO fields are
+// empty, and are tagged as articles.
+const blogPostMetadata = (page: NonNullable<PAGE_QUERY_RESULT>) => {
+  const post = findBlogBlock(page)
+  if (!post) return {}
+
+  return {
+    fallbackDescription: post.body ? toPlainText(post.body) : undefined,
+    fallbackImage: post.thumbnail,
+    article: {
+      publishedTime: post.date,
+      modifiedTime: page._updatedAt,
+      authors: [post.author?.name],
+    },
+  }
+}
+
 export const generateMetadata = async ({ params }: Props) => {
   const { slug } = await params
   const path = toPath(slug)
 
   if (slug?.length && path === null) return {}
 
-  const page = await getResolvedPage(path, false)
+  const [page, { structuredData }] = await Promise.all([
+    getResolvedPage(path, false),
+    getLayoutData(),
+  ])
 
-  return page
-    ? generateSanityMetadata({ document: page, url: path ? `/${path}` : "/" })
-    : {}
+  if (!page) return {}
+
+  return generateSanityMetadata({
+    document: page,
+    url: path ? `/${path}` : "/",
+    site: structuredData,
+    ...blogPostMetadata(page),
+  })
 }
 
 export default async function CatchAllPage({
@@ -85,7 +113,10 @@ export default async function CatchAllPage({
 
   if (slug?.length && path === null) notFound()
 
-  const page = await getResolvedPage(path)
+  const [page, breadcrumbPages] = await Promise.all([
+    getResolvedPage(path),
+    getBreadcrumbPages(path),
+  ])
 
   if (!page) {
     // Fall back to a CMS redirect before 404ing.
@@ -93,5 +124,12 @@ export default async function CatchAllPage({
     notFound()
   }
 
-  return <PageDocument page={page} path={path} searchParams={searchParams} />
+  return (
+    <PageDocument
+      page={page}
+      path={path}
+      searchParams={searchParams}
+      breadcrumbPages={breadcrumbPages}
+    />
+  )
 }

package/src/templates/next-pagebuilder/app/layout.tsx

@@ -8,9 +8,6 @@ import { getBaseUrl } from "@/lib/utils/base-url"
 import AppData from "@/package.json"
 
 const APP_NAME = AppData.name
-const APP_DEFAULT_TITLE = "My Site"
-const APP_TITLE_TEMPLATE = "%s"
-const APP_DESCRIPTION = AppData.description
 const APP_BASE_URL = getBaseUrl()
 
 const geist = Geist({
@@ -19,55 +16,20 @@ const geist = Geist({
 })
 
 export const metadata: Metadata = {
-  alternates: {
-    canonical: "/",
-    languages: {
-      "en-US": "/en-US",
-    },
-  },
+  metadataBase: new URL(APP_BASE_URL),
+  applicationName: APP_NAME,
   appleWebApp: {
     capable: true,
     statusBarStyle: "default",
-    title: APP_DEFAULT_TITLE,
   },
-  applicationName: APP_NAME,
-  authors: [{ name: "basement.studio", url: "https://basement.studio" }],
-  description: APP_DESCRIPTION,
   formatDetection: { telephone: false },
-  metadataBase: new URL(APP_BASE_URL),
   openGraph: {
-    description: APP_DESCRIPTION,
-    images: [
-      {
-        alt: APP_DEFAULT_TITLE,
-        height: 630,
-        url: "/opengraph-image.jpg",
-        width: 1200,
-      },
-    ],
-    locale: "en_US",
     siteName: APP_NAME,
-    title: {
-      default: APP_DEFAULT_TITLE,
-      template: APP_TITLE_TEMPLATE,
-    },
+    locale: "en_US",
     type: "website",
-    url: APP_BASE_URL,
-  },
-  other: {
-    "fb:app_id": process.env.NEXT_PUBLIC_FACEBOOK_APP_ID || "",
-  },
-  title: {
-    default: APP_DEFAULT_TITLE,
-    template: APP_TITLE_TEMPLATE,
   },
   twitter: {
     card: "summary_large_image",
-    description: APP_DESCRIPTION,
-    title: {
-      default: APP_DEFAULT_TITLE,
-      template: APP_TITLE_TEMPLATE,
-    },
   },
 }
 

package/src/templates/next-pagebuilder/app/robots.ts

@@ -1,12 +1,18 @@
 import type { MetadataRoute } from "next"
-import { getBaseUrl } from "@/lib/utils/base-url"
+import { headers } from "next/headers"
+import { getBaseUrl, isIndexableHost } from "@/lib/utils/base-url"
+
+export default async function robots(): Promise<MetadataRoute.Robots> {
+  const host = (await headers()).get("host")
+  if (!isIndexableHost(host)) {
+    return { rules: { userAgent: "*", disallow: "/" } }
+  }
 
-export default function robots(): MetadataRoute.Robots {
   return {
     rules: {
       userAgent: "*",
       allow: "/",
-      disallow: [],
+      disallow: ["/api/", "/studio"],
     },
     sitemap: `${getBaseUrl()}/sitemap.xml`,
   }

package/src/templates/next-pagebuilder/biome.json

@@ -36,7 +36,8 @@
       "!**/*.mdx",
       "!**/tailwind.css",
       "!**/*.grit",
-      "!**/sanity.types.ts"
+      "!**/sanity.types.ts",
+      "!next-env.d.ts"
     ]
   },
   "formatter": {

package/src/templates/next-pagebuilder/components/layout/footer/index.tsx

@@ -23,7 +23,7 @@ export const Footer = async () => {
           <div className="grid grid-cols-5 gap-x-8 gap-y-6 md:grid-cols-3 lg:grid-cols-5">
             {links.map((linkGroup: FooterLinkGroup) => (
               <div key={linkGroup._key} className="flex flex-col gap-2">
-                <h3>{linkGroup.title}</h3>
+                <h2>{linkGroup.title}</h2>
                 {linkGroup.items && linkGroup.items.length > 0 ? (
                   <ul className="space-y-1">
                     {linkGroup.items

package/src/templates/next-pagebuilder/components/page-document/index.tsx

@@ -1,9 +1,13 @@
 import { stegaClean } from "@sanity/client/stega"
 import type { ContentCollectionSearchParams } from "@/components/page-builder/components/content-collection/types"
 import { Renderer } from "@/components/page-builder/renderer"
-import type { PAGE_QUERY_RESULT } from "@/lib/integrations/sanity/sanity.types"
+import type {
+  BREADCRUMB_PAGES_QUERY_RESULT,
+  PAGE_QUERY_RESULT,
+} from "@/lib/integrations/sanity/sanity.types"
 import { urlForImage } from "@/lib/integrations/sanity/utils/image"
 import { buildPageJsonLd } from "@/lib/integrations/sanity/utils/page-json-ld"
+import { buildBreadcrumbs } from "@/lib/utils/breadcrumbs"
 import {
   generateBreadcrumbJsonLd,
   generateSanityArticleJsonLd,
@@ -15,6 +19,7 @@ type PageDocumentProps = {
   page: NonNullable<PAGE_QUERY_RESULT>
   path: string | null
   searchParams: ContentCollectionSearchParams
+  breadcrumbPages: BREADCRUMB_PAGES_QUERY_RESULT
 }
 
 type PageBuilderBlock = NonNullable<
@@ -22,6 +27,13 @@ type PageBuilderBlock = NonNullable<
 >[number]
 type BlogContentBlock = Extract<PageBuilderBlock, { _type: "blogContent" }>
 
+// Blog posts are pages with a Blog Posts block; it carries the post's date,
+// author and thumbnail.
+export const findBlogBlock = (page: NonNullable<PAGE_QUERY_RESULT>) =>
+  page.pageBuilder?.find(
+    (block): block is BlogContentBlock => block?._type === "blogContent"
+  )
+
 export const getPageSections = (
   page: NonNullable<PAGE_QUERY_RESULT>,
   searchParams: ContentCollectionSearchParams
@@ -38,42 +50,20 @@ export const getPageSections = (
       ]
     : []
 
-const buildBreadcrumbs = (
-  slugPath: string | null,
-  pageTitle: string | null
-): Array<{ name: string; url: string }> => {
-  const items: Array<{ name: string; url: string }> = [
-    { name: "Home", url: "/" },
-  ]
-
-  if (!slugPath) return items
-
-  const segments = slugPath.split("/").filter(Boolean)
-  for (let i = 0; i < segments.length; i++) {
-    const isLast = i === segments.length - 1
-    const url = `/${segments.slice(0, i + 1).join("/")}`
-
-    //TODO: we might change this in the future if slug title and folder diverge too much :)
-
-    const name =
-      isLast && pageTitle
-        ? pageTitle
-        : (segments[i]
-            ?.replace(/-/g, " ")
-            .replace(/\b\w/g, (c) => c.toUpperCase()) ?? "")
-    items.push({ name, url })
-  }
-
-  return items
-}
-
 export const PageDocument = ({
   page,
   path,
   searchParams,
+  breadcrumbPages,
 }: PageDocumentProps) => {
   const title = stegaClean(page.title) || page.title
   const sections = getPageSections(page, searchParams)
+  // A Heading block renders the page's H1, so the title only stands in without
+  // one. Hidden blocks are already filtered out of the query, and an empty one
+  // renders nothing (see the registry's `isEmpty`).
+  const hasHeadingBlock = page.pageBuilder?.some(
+    (block) => block?._type === "hero" && Boolean(block.headline)
+  )
 
   const cleanTitle = stegaClean(page.title) || "Basement"
   const cleanDescription = stegaClean(
@@ -85,7 +75,11 @@ export const PageDocument = ({
     ? urlForImage(page.metadata.image).width(1200).height(630).url()
     : undefined
 
-  const breadcrumbs = buildBreadcrumbs(path, cleanTitle)
+  const breadcrumbs = buildBreadcrumbs({
+    path,
+    name: cleanTitle,
+    pages: breadcrumbPages,
+  })
   const hasBreadcrumbs = breadcrumbs.length > 1
 
   // Editor-selected page-level structured data (FAQ, Event, custom, etc.).
@@ -94,9 +88,7 @@ export const PageDocument = ({
   // Blog posts (pages with a Blog Posts block) emit Article JSON-LD with
   // fields derived from the post — no Custom block needed. Skipped when the
   // editor already supplied an Article (via a Custom block) to avoid duplicates.
-  const blogBlock = page.pageBuilder?.find(
-    (block): block is BlogContentBlock => block?._type === "blogContent"
-  )
+  const blogBlock = findBlogBlock(page)
   const hasManualArticle = pageJsonLd.some(
     ({ data }) => (data as { "@type"?: unknown })["@type"] === "Article"
   )
@@ -134,7 +126,7 @@ export const PageDocument = ({
         <JsonLd key={key} data={data} />
       ))}
       <article className="mx-auto flex w-full max-w-6xl flex-1 flex-col px-4 py-14 md:px-6 md:py-20">
-        <h1>{title}</h1>
+        {hasHeadingBlock ? null : <h1>{title}</h1>}
         {sections.length ? (
           sections
         ) : (

package/src/templates/next-pagebuilder/lefthook.yml

@@ -7,7 +7,7 @@ pre-commit:
   commands:
     biome:
       glob: '*.{js,mjs,ts,jsx,tsx,css,scss}'
-      run: bun biome check --max-diagnostics=200 --write --unsafe {staged_files}
+      run: bun biome check --max-diagnostics=200 --write {staged_files}
       stage_fixed: true
     typecheck:
       glob: '*.{ts,tsx}'