@cimplify/cli 0.5.2 → 0.5.3

package/templates/storefront-services/app/sitemap.ts

@@ -1,8 +1,6 @@
 import type { MetadataRoute } from "next";
 import { getServerClient, type Product } from "@cimplify/sdk/server";
-
-const SITE_URL =
-  process.env.NEXT_PUBLIC_SITE_URL?.trim() || "https://example.com";
+import { getSiteUrl } from "@/lib/site-url";
 
 const STATIC_ROUTES: { path: string; priority: number; changeFrequency: "daily" | "weekly" | "monthly" }[] = [
   { path: "/", priority: 1.0, changeFrequency: "daily" },
@@ -15,6 +13,7 @@ const STATIC_ROUTES: { path: string; priority: number; changeFrequency: "daily"
 
 export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
   const now = new Date();
+  const siteUrl = await getSiteUrl();
   const client = getServerClient();
 
   const [productsRes, categoriesRes, collectionsRes] = await Promise.all([
@@ -28,7 +27,7 @@ export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
   const collections = collectionsRes.ok ? collectionsRes.value : [];
 
   const staticEntries: MetadataRoute.Sitemap = STATIC_ROUTES.map((r) => ({
-    url: `${SITE_URL}${r.path}`,
+    url: `${siteUrl}${r.path}`,
     lastModified: now,
     changeFrequency: r.changeFrequency,
     priority: r.priority,
@@ -38,21 +37,21 @@ export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
   // shop pages). Emit those as deep-linkable URLs so search engines and LLMs
   // can index each product canonically.
   const productEntries: MetadataRoute.Sitemap = products.map((p: Product) => ({
-    url: `${SITE_URL}/shop?product=${encodeURIComponent(p.slug ?? p.id)}`,
+    url: `${siteUrl}/shop?product=${encodeURIComponent(p.slug ?? p.id)}`,
     lastModified: p.updated_at ? new Date(p.updated_at) : now,
     changeFrequency: "weekly",
     priority: 0.7,
   }));
 
   const categoryEntries: MetadataRoute.Sitemap = categories.map((c) => ({
-    url: `${SITE_URL}/categories/${c.slug}`,
+    url: `${siteUrl}/categories/${c.slug}`,
     lastModified: now,
     changeFrequency: "weekly",
     priority: 0.6,
   }));
 
   const collectionEntries: MetadataRoute.Sitemap = collections.map((c) => ({
-    url: `${SITE_URL}/collections/${c.slug}`,
+    url: `${siteUrl}/collections/${c.slug}`,
     lastModified: now,
     changeFrequency: "weekly",
     priority: 0.6,

package/templates/storefront-services/lib/site-url.ts

@@ -0,0 +1,29 @@
+import { headers } from "next/headers";
+
+/**
+ * Canonical absolute URL for this storefront, derived at request time.
+ *
+ * Resolution order:
+ *   1. `NEXT_PUBLIC_SITE_URL` — set when you need a fixed canonical
+ *      (multiple domains, www-vs-apex preference, etc.).
+ *   2. The request `Host` header — works automatically on every deploy,
+ *      including preview URLs and custom domains.
+ *   3. `https://example.com` — only ever returned during prerender of
+ *      a page that has no live request (rare in App Router).
+ */
+export async function getSiteUrl(): Promise<string> {
+  const explicit = process.env.NEXT_PUBLIC_SITE_URL?.trim();
+  if (explicit) return explicit;
+
+  try {
+    const h = await headers();
+    const host = h.get("host");
+    if (host) {
+      const isLocal = host.startsWith("localhost") || host.startsWith("127.");
+      return `${isLocal ? "http" : "https"}://${host}`;
+    }
+  } catch {
+    // `headers()` is unavailable in some build contexts — fall through.
+  }
+  return "https://example.com";
+}