bsmnt 0.3.3 → 0.4.1

package/src/helpers/integrate/sanity/files/lib/integrations/sanity/queries.ts

@@ -64,3 +64,45 @@ export const ARTICLE_BY_ID_QUERY = defineQuery(`
     _updatedAt
   }
 `);
+
+export const PAGE_QUERY = defineQuery(`
+  *[_type == "example" && slug.current == $slug][0] {
+    _id,
+    title,
+    slug,
+    hero,
+    ${richTextWithLinks},
+    features,
+    tags,
+    metadata,
+    publishedAt,
+    _updatedAt
+  }
+`);
+
+export const SITEMAP_ARTICLES_QUERY = defineQuery(`
+  *[_type == "article" && defined(slug.current)] {
+    title,
+    slug,
+    _updatedAt,
+    "noIndex": metadata.noIndex
+  }
+`);
+
+export const SITEMAP_PAGES_QUERY = defineQuery(`
+  *[_type == "example" && defined(slug.current)] {
+    title,
+    slug,
+    _updatedAt,
+    "noIndex": metadata.noIndex
+  }
+`);
+
+export const ALL_PAGES_QUERY = defineQuery(`
+  *[_type == "example" && defined(slug.current)] | order(publishedAt desc) {
+    slug,
+    _updatedAt,
+    "noIndex": metadata.noIndex
+  }
+`);
+

package/src/helpers/integrate/sanity/files/lib/integrations/sanity/sitemap.ts

@@ -0,0 +1,90 @@
+import { client } from "./client";
+import { SITEMAP_ARTICLES_QUERY, SITEMAP_PAGES_QUERY } from "./queries";
+
+export interface SitemapEntry {
+	loc: string;
+	lastmod: string;
+	changefreq: string;
+	priority: number;
+}
+
+interface SitemapDocument {
+	slug?: {
+		current?: string | null;
+	} | null;
+	_updatedAt: string;
+	noIndex?: boolean | null;
+}
+
+/**
+ * Fetch all published articles as sitemap entries.
+ * Excludes articles with metadata.noIndex set to true.
+ */
+async function getArticleEntries(baseUrl: string): Promise<SitemapEntry[]> {
+	if (!client) return [];
+
+	try {
+		const articles =
+			(await client.fetch(SITEMAP_ARTICLES_QUERY)) as SitemapDocument[] | null;
+
+		if (!articles) return [];
+
+		return articles
+			.filter((article) => article.slug?.current && !article.noIndex)
+			.map((article) => ({
+				loc: `${baseUrl}/blog/${article.slug!.current!}`,
+				lastmod: new Date(article._updatedAt).toISOString(),
+				changefreq: "weekly",
+				priority: 0.7,
+			}));
+	} catch (error) {
+		console.error("Error fetching article sitemap entries:", error);
+		return [];
+	}
+}
+
+/**
+ * Fetch all published CMS pages as sitemap entries.
+ * Supports nested slugs and excludes metadata.noIndex pages.
+ */
+async function getPageEntries(baseUrl: string): Promise<SitemapEntry[]> {
+	if (!client) return [];
+
+	try {
+		const pages =
+			(await client.fetch(SITEMAP_PAGES_QUERY)) as SitemapDocument[] | null;
+
+		if (!pages) return [];
+
+		return pages
+			.filter((page) => page.slug?.current && !page.noIndex)
+			.map((page) => ({
+				loc: `${baseUrl}/${page.slug!.current!}`,
+				lastmod: new Date(page._updatedAt).toISOString(),
+				changefreq: "monthly",
+				priority: 0.8,
+			}));
+	} catch (error) {
+		console.error("Error fetching page sitemap entries:", error);
+		return [];
+	}
+}
+
+/**
+ * Fetch all CMS-managed sitemap entries across all collections.
+ *
+ * To add a new collection, create a getter function (e.g. getPageEntries)
+ * and include it in the Promise.all below.
+ */
+export async function getCMSSitemapEntries(
+	baseUrl: string,
+): Promise<SitemapEntry[]> {
+	const entries = await Promise.all([
+		getArticleEntries(baseUrl),
+		getPageEntries(baseUrl),
+		// Add more collections here as needed:
+		// getProjectEntries(baseUrl),
+	]);
+
+	return entries.flat();
+}

package/src/helpers/integrate/sanity/files/lib/utils/metadata.ts

@@ -1,4 +1,5 @@
 import type { Metadata } from "next";
+import { getBaseUrl } from "@/lib/utils/url";
 
 /**
  * Metadata Generation Utilities
@@ -26,8 +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/helpers/integrate/sanity/files/lib/utils/url.ts

@@ -0,0 +1,23 @@
+/**
+ * Resolves the application base URL from environment variables.
+ *
+ * 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)
+ * 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)
+		return `https://${process.env.VERCEL_PROJECT_PRODUCTION_URL}`;
+	if (process.env.VERCEL_URL) return `https://${process.env.VERCEL_URL}`;
+	return "http://localhost:3000";
+}
+
+export function getPageUrl(baseUrl: string, slug: string | null): string {
+	if (!slug) return baseUrl;
+	const path = slug.startsWith("/") ? slug : `/${slug}`;
+	return `${baseUrl.replace(/\/$/, "")}${path}`;
+}

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

@@ -13,9 +13,9 @@
 # CORE (Recommended)
 # ============================================
 
-# Base URL for your site (used for SEO, canonical URLs, etc.)
-# Development: http://localhost:3000
-# Production: https://your-domain.com
+# Base URL (sitemaps, OG tags, canonical URLs)
+# On Vercel: auto-detected if unset. Set explicitly for custom domains.
+# Local: http://localhost:3000
 NEXT_PUBLIC_BASE_URL="http://localhost:3000"
 
 # Draft mode secret for preview functionality

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

@@ -5,6 +5,7 @@ import { Link } from "@/components/ui/link";
 import AppData from "@/package.json";
 import "@/lib/styles/global.css";
 import { cn } from "@/lib/styles/cn";
+import { getBaseUrl } from "@/lib/utils/url";
 import {
   JsonLd,
   generateWebSiteJsonLd,
@@ -15,8 +16,7 @@ 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,7 +1,7 @@
 import type { MetadataRoute } from "next";
+import { getBaseUrl } from "@/lib/utils/url";
 
-const APP_BASE_URL =
-  process.env.NEXT_PUBLIC_BASE_URL ?? "http://localhost:3000";
+const APP_BASE_URL = getBaseUrl();
 
 export default function robots(): MetadataRoute.Robots {
   return {

package/src/templates/next-default/app/sitemap.xml/route.ts

@@ -0,0 +1,51 @@
+import { getBaseUrl } from "@/lib/utils/url";
+
+const BASE_URL = getBaseUrl();
+
+export const dynamic = "force-dynamic";
+
+interface SitemapEntry {
+	loc: string;
+	lastmod: string;
+	changefreq: string;
+	priority: number;
+}
+
+function toXml(entries: SitemapEntry[]): string {
+	const urls = entries
+		.map(
+			(entry) => `
+  <url>
+    <loc>${entry.loc}</loc>
+    <lastmod>${entry.lastmod}</lastmod>
+    <changefreq>${entry.changefreq}</changefreq>
+    <priority>${entry.priority}</priority>
+  </url>`,
+		)
+		.join("");
+
+	return `<?xml version="1.0" encoding="UTF-8"?>
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">${urls}
+</urlset>`;
+}
+
+function getStaticEntries(): SitemapEntry[] {
+	return [
+		{
+			loc: BASE_URL,
+			lastmod: new Date().toISOString(),
+			changefreq: "daily",
+			priority: 1,
+		},
+	];
+}
+
+export async function GET() {
+	const entries: SitemapEntry[] = getStaticEntries();
+
+	return new Response(toXml(entries), {
+		headers: {
+			"Content-Type": "application/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,8 +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

@@ -0,0 +1,16 @@
+/**
+ * Resolves the application base URL from environment variables.
+ *
+ * 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)
+ * 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)
+    return `https://${process.env.VERCEL_PROJECT_PRODUCTION_URL}`;
+  if (process.env.VERCEL_URL) return `https://${process.env.VERCEL_URL}`;
+  return "http://localhost:3000";
+}

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

@@ -13,9 +13,9 @@
 # CORE (Recommended)
 # ============================================
 
-# Base URL for your site (used for SEO, canonical URLs, etc.)
-# Development: http://localhost:3000
-# Production: https://your-domain.com
+# Base URL (sitemaps, OG tags, canonical URLs)
+# On Vercel: auto-detected if unset. Set explicitly for custom domains.
+# Local: http://localhost:3000
 NEXT_PUBLIC_BASE_URL="http://localhost:3000"
 
 # Draft mode secret for preview functionality

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

@@ -5,6 +5,7 @@ import { Link } from "@/components/ui/link";
 import AppData from "@/package.json";
 import "@/lib/styles/global.css";
 import { cn } from "@/lib/styles/cn";
+import { getBaseUrl } from "@/lib/utils/url";
 import {
   JsonLd,
   generateWebSiteJsonLd,
@@ -15,8 +16,7 @@ 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,8 +1,5 @@
 import type { MetadataRoute } from "next";
 
-const APP_BASE_URL =
-  process.env.NEXT_PUBLIC_BASE_URL ?? "http://localhost:3000";
-
 export default function robots(): MetadataRoute.Robots {
   return {
     rules: {
@@ -10,6 +7,5 @@ export default function robots(): MetadataRoute.Robots {
       allow: "/",
       disallow: [],
     },
-    sitemap: `${APP_BASE_URL}/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,8 +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

@@ -0,0 +1,16 @@
+/**
+ * Resolves the application base URL from environment variables.
+ *
+ * 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)
+ * 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)
+    return `https://${process.env.VERCEL_PROJECT_PRODUCTION_URL}`;
+  if (process.env.VERCEL_URL) return `https://${process.env.VERCEL_URL}`;
+  return "http://localhost:3000";
+}

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

@@ -1,6 +1,6 @@
 import { notFound } from "next/navigation"
 import { client } from "@/lib/integrations/sanity/client"
-import { sanityFetch } from "@/lib/integrations/sanity/live"
+import { fetchSanity } from "@/lib/integrations/sanity/live"
 import {
   ALL_PAGE_SLUGS_QUERY,
   PAGE_QUERY,
@@ -9,12 +9,12 @@ import type {
   ALL_PAGE_SLUGS_QUERY_RESULT,
   PAGE_QUERY_RESULT,
 } from "@/lib/integrations/sanity/sanity.types"
+import { PageDocument } from "@/components/page-document"
 import { generateSanityMetadata } from "@/lib/utils/metadata"
 import { getSlugTag } from "@/lib/utils/slug-tag"
-import { PageDocument } from "@/components/page-document"
 
 const getPageDocument = async (slug: string | null, stega = true) =>
-  sanityFetch({
+  fetchSanity<PAGE_QUERY_RESULT>({
     query: PAGE_QUERY,
     params: { slug },
     tags: [getSlugTag(slug)],
@@ -32,15 +32,19 @@ const getResolvedPage = async (
   return (page as NonNullable<PAGE_QUERY_RESULT> | null) ?? null
 }
 
+type SearchParams = Promise<{ [key: string]: string | string[] | undefined }>
+
 export const generateStaticParams = async () => {
-  if (!client) return []
+  if (!client) return [{ slug: [] }]
 
   const slugs =
     await client.fetch<ALL_PAGE_SLUGS_QUERY_RESULT>(ALL_PAGE_SLUGS_QUERY)
 
+  if (!slugs?.length) return [{ slug: [] }]
+
   return (slugs ?? []).flatMap((page) => {
     if (!page.slug) return []
-    return { slug: page.slug.split("/") }
+    return page.slug === "/" ? { slug: [] } : { slug: page.slug.split("/") }
   })
 }
 
@@ -56,13 +60,18 @@ export const generateMetadata = async ({ params }: Props) => {
     : {}
 }
 
-export default async function CatchAllPage({ params }: Props) {
+export default async function CatchAllPage({
+  params,
+  searchParams,
+}: Props & {
+  searchParams: SearchParams
+}) {
   const { slug } = await params
 
   const path = toPath(slug)
   const page = await getResolvedPage(path)
 
-  if (!page) return notFound()
+  if (!page) notFound()
 
-  return <PageDocument page={page} path={path} />
+  return <PageDocument page={page} path={path} searchParams={searchParams} />
 }

package/src/templates/next-pagebuilder/app/(content)/layout.tsx

@@ -1,13 +1,25 @@
 import { JsonLd } from "@/components/layout/json-ld"
 import { Wrapper } from "@/components/layout/wrapper"
 import { SanityVisualEditing } from "@/components/sanity/visual-editing"
+import { getSiteLayoutData } from "@/lib/integrations/sanity/fetchers/layout"
 
-const Layout = async ({ children }: { children: React.ReactNode }) => (
-  <>
-    <JsonLd />
-    <Wrapper>{children}</Wrapper>
-    <SanityVisualEditing />
-  </>
-)
+
+const Layout = async ({ children }: { children: React.ReactNode }) => {
+  const layoutData = await getSiteLayoutData()
+
+  return (
+    <>
+      <JsonLd navbar={layoutData.navbar} companyData={layoutData.companyData} />
+      <Wrapper
+        navbar={layoutData.navbar}
+        footer={layoutData.footer}
+        companyData={layoutData.companyData}
+      >
+        {children}
+      </Wrapper>
+      <SanityVisualEditing />
+    </>
+  )
+}
 
 export default Layout

package/src/templates/next-pagebuilder/app/actions/refresh.ts

@@ -0,0 +1,5 @@
+"use client"
+
+export async function refreshAction(): Promise<"refresh"> {
+  return "refresh"
+}

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

@@ -3,30 +3,19 @@ import { SanityImage } from "@/components/ui/sanity-image"
 import {
   type CompanyData,
   type FooterData,
-  getCompanyData,
-  getFooter,
 } from "@/lib/integrations/sanity/fetchers/layout"
 
 type FooterLinkGroup = NonNullable<FooterData["links"]>[number]
 type FooterLinkItem = NonNullable<FooterLinkGroup["items"]>[number]
 type SocialLink = NonNullable<CompanyData["socialLinks"]>[number]
 
-export const Footer = async () => {
-  const [footer, companyData] = await Promise.all([
-    getFooter(),
-    getCompanyData(),
-  ])
-
-  const year = new Date().getFullYear()
-
-  if (!(footer || companyData)) {
-    return (
-      <footer className="border-black/10 border-t px-6 py-3">
-        <p>&copy; {year} Basement</p>
-      </footer>
-    )
-  }
-
+export const Footer = ({
+  footer,
+  companyData,
+}: {
+  footer: FooterData | null
+  companyData: CompanyData | null
+}) => {
   const links = footer?.links ?? []
 
   return (
@@ -58,7 +47,9 @@ export const Footer = async () => {
         )}
 
         <div className="flex flex-row items-center justify-between gap-3 border-black/10 border-t pt-4">
-          <p className="w-fit">&copy; {year} Basement</p>
+          <p className="w-fit">
+            &copy; <CurrentYear /> Basement
+          </p>
 
           {companyData?.socialLinks && companyData.socialLinks.length > 0 ? (
             <div className="flex w-fit flex-wrap items-center gap-x-4 gap-y-2">
@@ -93,3 +84,8 @@ export const Footer = async () => {
     </footer>
   )
 }
+
+
+const CurrentYear = () => {
+  return <span>{new Date().getFullYear()}</span>
+}

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

@@ -1,8 +1,6 @@
-import { getNavbar } from "@/lib/integrations/sanity/fetchers/layout"
-
 import { HeaderClient } from "./header-client"
+import type { NavbarData } from "@/lib/integrations/sanity/fetchers/layout"
 
-export const Header = async () => {
-  const navbar = await getNavbar()
-  return <HeaderClient data={navbar} />
+export const Header = ({ data }: { data: NavbarData | null }) => {
+  return <HeaderClient data={data} />
 }

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

@@ -1,7 +1,7 @@
 import { stegaClean } from "next-sanity"
-import {
-  getCompanyData,
-  getNavbar,
+import type {
+  CompanyData,
+  NavbarData,
 } from "@/lib/integrations/sanity/fetchers/layout"
 import {
   generateOrganizationJsonLd,
@@ -12,17 +12,18 @@ import {
 const APP_DESCRIPTION =
   "Basement is the AI-native platform for audit and advisory firms. Automate engagement workflows using AI agents trusted by 50% of top 100 firms."
 
-export const JsonLd = async () => {
-  const [navbarData, companyData] = await Promise.all([
-    getNavbar(),
-    getCompanyData(),
-  ])
-
+export const JsonLd = ({
+  navbar,
+  companyData,
+}: {
+  navbar: NavbarData | null
+  companyData: CompanyData | null
+}) => {
   const sameAs = companyData?.socialLinks
     ?.map((link) => stegaClean(link.url))
     .filter((url): url is string => Boolean(url))
 
-  const logoUrl = navbarData?.logo?.asset?.url
+  const logoUrl = navbar?.logo?.asset?.url
 
   return (
     <>

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

@@ -1,9 +1,12 @@
 import Link from "next/link"
 import { Footer } from "@/components/layout/footer"
 import { Header } from "@/components/layout/header"
+import type { SiteLayoutData } from "@/lib/integrations/sanity/fetchers/layout"
 import { cn } from "@/lib/styles/cn"
 
-interface WrapperProps extends React.HTMLAttributes<HTMLDivElement> {}
+interface WrapperProps
+  extends React.HTMLAttributes<HTMLDivElement>,
+    SiteLayoutData {}
 
 const SkipToMainContent = () => (
   <Link
@@ -14,10 +17,17 @@ const SkipToMainContent = () => (
   </Link>
 )
 
-export const Wrapper = ({ children, className, ...props }: WrapperProps) => (
+export const Wrapper = ({
+  children,
+  className,
+  navbar,
+  footer,
+  companyData,
+  ...props
+}: WrapperProps) => (
   <>
     <SkipToMainContent />
-    <Header />
+    <Header data={navbar} />
     <main
       id="main-content"
       className={cn("relative flex grow flex-col", className)}
@@ -25,6 +35,6 @@ export const Wrapper = ({ children, className, ...props }: WrapperProps) => (
     >
       {children}
     </main>
-    <Footer />
+    <Footer footer={footer} companyData={companyData} />
   </>
 )

package/src/templates/next-pagebuilder/components/page-builder/components/{post-collection → content-collection}/content-card.tsx

@@ -1,10 +1,10 @@
 import { Link } from "@/components/ui/link"
 import { SanityImage } from "@/components/ui/sanity-image"
 import { formatDate } from "@/lib/utils/format-date"
-import type { BlogArticleCard } from "./types"
+import type { ContentItemCard } from "./types"
 
 type ContentCardProps = {
-  article: BlogArticleCard
+  article: ContentItemCard
   className?: string | undefined
 }
 
@@ -46,9 +46,7 @@ export const ContentCard = ({ article, className }: ContentCardProps) => {
             </div>
           ) : null}
 
-          <h3 className="text-balance font-medium text-lg leading-snug">
-            {title}
-          </h3>
+          <h3 className="text-balance font-medium text-lg leading-snug">{title}</h3>
 
           {authorName || formattedDate ? (
             <div className="flex items-center gap-2 text-current/60 text-sm">