create-nextblock 0.12.9 → 0.12.11

package/templates/nextblock-template/app/lib/sitemap-utils.ts

@@ -1,253 +1,253 @@
-import { getSsgSupabaseClient } from '@nextblock-cms/db/server';
-
-/**
- * A single, language-aware entry destined for the XML sitemap.
- *
- * Paths are kept site-root-relative (e.g. "/about", "/article/my-post"); the
- * `app/sitemap.ts` route prefixes the absolute origin so the base URL lives in
- * exactly one place.
- */
-export interface SitemapEntry {
-  /** Root-relative path for this row, e.g. "/about" or "/article/hello". */
-  path: string;
-  /** ISO-8601 timestamp mapped from the row's `updated_at`. */
-  lastModified: string;
-  /**
-   * hreflang map of `languageCode -> root-relative path` covering every
-   * published translation that shares this row's `translation_group_id`, plus
-   * an `x-default` key pointing at the default-language version. Left
-   * `undefined` for content that only exists in a single language.
-   *
-   * NextBlock's i18n model gives each language its own slug (there is no
-   * `/en` `/fr` path prefix), so alternates are resolved by grouping sibling
-   * rows on `translation_group_id` rather than by swapping a locale segment.
-   */
-  alternates?: Record<string, string>;
-}
-
-/**
- * Page slugs that are rendered by their own canonical route and must not be
- * re-advertised under the generic `/{slug}` catch-all:
- *  - `product-template` backs the product layout (app/product/[slug]); it is
- *    not a public page.
- *  - `home` / `accueil` back the locale-resolved homepage served at "/"
- *    (see getHomepageSlugForLocale in app/page.tsx); listing them as `/home`
- *    and `/accueil` would duplicate the canonical "/" entry.
- */
-const EXCLUDED_PAGE_SLUGS = new Set(['product-template', 'home', 'accueil']);
-
-type SupabaseLikeClient = ReturnType<typeof getSsgSupabaseClient>;
-
-/** Minimal shape every content table exposes for sitemap purposes. */
-interface ContentRow {
-  slug: string | null;
-  updated_at: string | null;
-  created_at?: string | null;
-  language_id: number | null;
-  translation_group_id: string | null;
-}
-
-function toIsoDate(value: string | null | undefined): string {
-  if (value) {
-    const parsed = new Date(value);
-    if (!Number.isNaN(parsed.getTime())) {
-      return parsed.toISOString();
-    }
-  }
-  return new Date().toISOString();
-}
-
-/**
- * Loads the language set once so callers can resolve a row's `language_id` to
- * its BCP-47 `code` and identify the default language used for `x-default`.
- */
-async function fetchLanguageMap(
-  supabase: SupabaseLikeClient,
-): Promise<{ codeById: Map<number, string>; defaultCode: string | null }> {
-  const codeById = new Map<number, string>();
-  let defaultCode: string | null = null;
-
-  const { data, error } = await supabase
-    .from('languages')
-    .select('id, code, is_default');
-
-  if (error) {
-    console.error('Error fetching languages for sitemap alternates:', error);
-    return { codeById, defaultCode };
-  }
-
-  for (const lang of data ?? []) {
-    if (lang.code) {
-      codeById.set(lang.id, lang.code);
-      if (lang.is_default) {
-        defaultCode = lang.code;
-      }
-    }
-  }
-
-  return { codeById, defaultCode };
-}
-
-/**
- * Turns raw content rows into language-aware sitemap entries. Rows that share a
- * `translation_group_id` are emitted as sibling URLs that cross-link to one
- * another via `alternates`.
- */
-function rowsToEntries(
-  rows: ContentRow[],
-  pathForSlug: (slug: string) => string,
-  codeById: Map<number, string>,
-  defaultCode: string | null,
-): SitemapEntry[] {
-  // Bucket rows by their translation group so each URL can advertise its siblings.
-  const groups = new Map<string, ContentRow[]>();
-  for (const row of rows) {
-    if (!row.slug) continue;
-    const key = row.translation_group_id ?? `solo:${row.slug}`;
-    const bucket = groups.get(key);
-    if (bucket) {
-      bucket.push(row);
-    } else {
-      groups.set(key, [row]);
-    }
-  }
-
-  const entries: SitemapEntry[] = [];
-  for (const group of groups.values()) {
-    // languageCode -> path for every translated sibling in this group.
-    const byCode: Record<string, string> = {};
-    let defaultPath: string | undefined;
-    for (const sibling of group) {
-      if (!sibling.slug || sibling.language_id == null) continue;
-      const code = codeById.get(sibling.language_id);
-      if (!code) continue;
-      const path = pathForSlug(sibling.slug);
-      byCode[code] = path;
-      if (code === defaultCode) {
-        defaultPath = path;
-      }
-    }
-
-    // hreflang is only meaningful when 2+ *distinct* URLs exist. NextBlock has no
-    // locale path prefix, so two translations can share a slug (e.g. `/articles`
-    // is the slug in both en and fr); that collapses to a single URL with nothing
-    // to cross-link, so no alternates are emitted.
-    const hasAlternates = new Set(Object.values(byCode)).size > 1;
-    const alternates = hasAlternates
-      ? { ...byCode, 'x-default': defaultPath ?? Object.values(byCode)[0] }
-      : undefined;
-
-    for (const row of group) {
-      if (!row.slug) continue;
-      entries.push({
-        path: pathForSlug(row.slug),
-        lastModified: toIsoDate(row.updated_at ?? row.created_at),
-        alternates,
-      });
-    }
-  }
-
-  return entries;
-}
-
-/**
- * Fetches all published pages from Supabase and formats them, with language
- * alternates, for the sitemap.
- */
-export async function fetchAllPublishedPages(): Promise<SitemapEntry[]> {
-  const supabase = getSsgSupabaseClient();
-  try {
-    const [{ data: pages, error }, languageMap] = await Promise.all([
-      supabase
-        .from('pages')
-        .select('slug, updated_at, language_id, translation_group_id')
-        .eq('status', 'published'),
-      fetchLanguageMap(supabase),
-    ]);
-
-    if (error) {
-      console.error('Error fetching published pages:', error);
-      return [];
-    }
-
-    const rows = (pages ?? []).filter(
-      (page) => page.slug && !EXCLUDED_PAGE_SLUGS.has(page.slug),
-    );
-
-    return rowsToEntries(
-      rows,
-      (slug) => `/${slug}`,
-      languageMap.codeById,
-      languageMap.defaultCode,
-    );
-  } catch (err) {
-    console.error('An unexpected error occurred while fetching pages:', err);
-    return [];
-  }
-}
-
-/**
- * Fetches all published posts (respecting scheduled `published_at`) from
- * Supabase and formats them, with language alternates, for the sitemap.
- */
-export async function fetchAllPublishedPosts(): Promise<SitemapEntry[]> {
-  const supabase = getSsgSupabaseClient();
-  try {
-    const nowIso = new Date().toISOString();
-    const [{ data: posts, error }, languageMap] = await Promise.all([
-      supabase
-        .from('posts')
-        .select('slug, updated_at, language_id, translation_group_id')
-        .eq('status', 'published')
-        .or(`published_at.is.null,published_at.lte.${nowIso}`),
-      fetchLanguageMap(supabase),
-    ]);
-
-    if (error) {
-      console.error('Error fetching published posts:', error);
-      return [];
-    }
-
-    return rowsToEntries(
-      posts ?? [],
-      (slug) => `/article/${slug}`,
-      languageMap.codeById,
-      languageMap.defaultCode,
-    );
-  } catch (err) {
-    console.error('An unexpected error occurred while fetching posts:', err);
-    return [];
-  }
-}
-
-/**
- * Fetches all active storefront products from Supabase and formats them, with
- * language alternates, for the sitemap.
- */
-export async function fetchAllActiveProducts(): Promise<SitemapEntry[]> {
-  const supabase = getSsgSupabaseClient();
-  try {
-    const [{ data: products, error }, languageMap] = await Promise.all([
-      supabase
-        .from('products')
-        .select('slug, updated_at, created_at, language_id, translation_group_id')
-        .eq('status', 'active'),
-      fetchLanguageMap(supabase),
-    ]);
-
-    if (error) {
-      console.error('Error fetching active products:', error);
-      return [];
-    }
-
-    return rowsToEntries(
-      products ?? [],
-      (slug) => `/product/${slug}`,
-      languageMap.codeById,
-      languageMap.defaultCode,
-    );
-  } catch (err) {
-    console.error('An unexpected error occurred while fetching products:', err);
-    return [];
-  }
-}
+import { getSsgSupabaseClient } from '@nextblock-cms/db/server';
+
+/**
+ * A single, language-aware entry destined for the XML sitemap.
+ *
+ * Paths are kept site-root-relative (e.g. "/about", "/article/my-post"); the
+ * `app/sitemap.ts` route prefixes the absolute origin so the base URL lives in
+ * exactly one place.
+ */
+export interface SitemapEntry {
+  /** Root-relative path for this row, e.g. "/about" or "/article/hello". */
+  path: string;
+  /** ISO-8601 timestamp mapped from the row's `updated_at`. */
+  lastModified: string;
+  /**
+   * hreflang map of `languageCode -> root-relative path` covering every
+   * published translation that shares this row's `translation_group_id`, plus
+   * an `x-default` key pointing at the default-language version. Left
+   * `undefined` for content that only exists in a single language.
+   *
+   * NextBlock's i18n model gives each language its own slug (there is no
+   * `/en` `/fr` path prefix), so alternates are resolved by grouping sibling
+   * rows on `translation_group_id` rather than by swapping a locale segment.
+   */
+  alternates?: Record<string, string>;
+}
+
+/**
+ * Page slugs that are rendered by their own canonical route and must not be
+ * re-advertised under the generic `/{slug}` catch-all:
+ *  - `product-template` backs the product layout (app/product/[slug]); it is
+ *    not a public page.
+ *  - `home` / `accueil` back the locale-resolved homepage served at "/"
+ *    (see getHomepageSlugForLocale in app/page.tsx); listing them as `/home`
+ *    and `/accueil` would duplicate the canonical "/" entry.
+ */
+const EXCLUDED_PAGE_SLUGS = new Set(['product-template', 'home', 'accueil']);
+
+type SupabaseLikeClient = ReturnType<typeof getSsgSupabaseClient>;
+
+/** Minimal shape every content table exposes for sitemap purposes. */
+interface ContentRow {
+  slug: string | null;
+  updated_at: string | null;
+  created_at?: string | null;
+  language_id: number | null;
+  translation_group_id: string | null;
+}
+
+function toIsoDate(value: string | null | undefined): string {
+  if (value) {
+    const parsed = new Date(value);
+    if (!Number.isNaN(parsed.getTime())) {
+      return parsed.toISOString();
+    }
+  }
+  return new Date().toISOString();
+}
+
+/**
+ * Loads the language set once so callers can resolve a row's `language_id` to
+ * its BCP-47 `code` and identify the default language used for `x-default`.
+ */
+async function fetchLanguageMap(
+  supabase: SupabaseLikeClient,
+): Promise<{ codeById: Map<number, string>; defaultCode: string | null }> {
+  const codeById = new Map<number, string>();
+  let defaultCode: string | null = null;
+
+  const { data, error } = await supabase
+    .from('languages')
+    .select('id, code, is_default');
+
+  if (error) {
+    console.error('Error fetching languages for sitemap alternates:', error);
+    return { codeById, defaultCode };
+  }
+
+  for (const lang of data ?? []) {
+    if (lang.code) {
+      codeById.set(lang.id, lang.code);
+      if (lang.is_default) {
+        defaultCode = lang.code;
+      }
+    }
+  }
+
+  return { codeById, defaultCode };
+}
+
+/**
+ * Turns raw content rows into language-aware sitemap entries. Rows that share a
+ * `translation_group_id` are emitted as sibling URLs that cross-link to one
+ * another via `alternates`.
+ */
+function rowsToEntries(
+  rows: ContentRow[],
+  pathForSlug: (slug: string) => string,
+  codeById: Map<number, string>,
+  defaultCode: string | null,
+): SitemapEntry[] {
+  // Bucket rows by their translation group so each URL can advertise its siblings.
+  const groups = new Map<string, ContentRow[]>();
+  for (const row of rows) {
+    if (!row.slug) continue;
+    const key = row.translation_group_id ?? `solo:${row.slug}`;
+    const bucket = groups.get(key);
+    if (bucket) {
+      bucket.push(row);
+    } else {
+      groups.set(key, [row]);
+    }
+  }
+
+  const entries: SitemapEntry[] = [];
+  for (const group of groups.values()) {
+    // languageCode -> path for every translated sibling in this group.
+    const byCode: Record<string, string> = {};
+    let defaultPath: string | undefined;
+    for (const sibling of group) {
+      if (!sibling.slug || sibling.language_id == null) continue;
+      const code = codeById.get(sibling.language_id);
+      if (!code) continue;
+      const path = pathForSlug(sibling.slug);
+      byCode[code] = path;
+      if (code === defaultCode) {
+        defaultPath = path;
+      }
+    }
+
+    // hreflang is only meaningful when 2+ *distinct* URLs exist. NextBlock has no
+    // locale path prefix, so two translations can share a slug (e.g. `/articles`
+    // is the slug in both en and fr); that collapses to a single URL with nothing
+    // to cross-link, so no alternates are emitted.
+    const hasAlternates = new Set(Object.values(byCode)).size > 1;
+    const alternates = hasAlternates
+      ? { ...byCode, 'x-default': defaultPath ?? Object.values(byCode)[0] }
+      : undefined;
+
+    for (const row of group) {
+      if (!row.slug) continue;
+      entries.push({
+        path: pathForSlug(row.slug),
+        lastModified: toIsoDate(row.updated_at ?? row.created_at),
+        alternates,
+      });
+    }
+  }
+
+  return entries;
+}
+
+/**
+ * Fetches all published pages from Supabase and formats them, with language
+ * alternates, for the sitemap.
+ */
+export async function fetchAllPublishedPages(): Promise<SitemapEntry[]> {
+  const supabase = getSsgSupabaseClient();
+  try {
+    const [{ data: pages, error }, languageMap] = await Promise.all([
+      supabase
+        .from('pages')
+        .select('slug, updated_at, language_id, translation_group_id')
+        .eq('status', 'published'),
+      fetchLanguageMap(supabase),
+    ]);
+
+    if (error) {
+      console.error('Error fetching published pages:', error);
+      return [];
+    }
+
+    const rows = (pages ?? []).filter(
+      (page) => page.slug && !EXCLUDED_PAGE_SLUGS.has(page.slug),
+    );
+
+    return rowsToEntries(
+      rows,
+      (slug) => `/${slug}`,
+      languageMap.codeById,
+      languageMap.defaultCode,
+    );
+  } catch (err) {
+    console.error('An unexpected error occurred while fetching pages:', err);
+    return [];
+  }
+}
+
+/**
+ * Fetches all published posts (respecting scheduled `published_at`) from
+ * Supabase and formats them, with language alternates, for the sitemap.
+ */
+export async function fetchAllPublishedPosts(): Promise<SitemapEntry[]> {
+  const supabase = getSsgSupabaseClient();
+  try {
+    const nowIso = new Date().toISOString();
+    const [{ data: posts, error }, languageMap] = await Promise.all([
+      supabase
+        .from('posts')
+        .select('slug, updated_at, language_id, translation_group_id')
+        .eq('status', 'published')
+        .or(`published_at.is.null,published_at.lte.${nowIso}`),
+      fetchLanguageMap(supabase),
+    ]);
+
+    if (error) {
+      console.error('Error fetching published posts:', error);
+      return [];
+    }
+
+    return rowsToEntries(
+      posts ?? [],
+      (slug) => `/article/${slug}`,
+      languageMap.codeById,
+      languageMap.defaultCode,
+    );
+  } catch (err) {
+    console.error('An unexpected error occurred while fetching posts:', err);
+    return [];
+  }
+}
+
+/**
+ * Fetches all active storefront products from Supabase and formats them, with
+ * language alternates, for the sitemap.
+ */
+export async function fetchAllActiveProducts(): Promise<SitemapEntry[]> {
+  const supabase = getSsgSupabaseClient();
+  try {
+    const [{ data: products, error }, languageMap] = await Promise.all([
+      supabase
+        .from('products')
+        .select('slug, updated_at, created_at, language_id, translation_group_id')
+        .eq('status', 'active'),
+      fetchLanguageMap(supabase),
+    ]);
+
+    if (error) {
+      console.error('Error fetching active products:', error);
+      return [];
+    }
+
+    return rowsToEntries(
+      products ?? [],
+      (slug) => `/product/${slug}`,
+      languageMap.codeById,
+      languageMap.defaultCode,
+    );
+  } catch (err) {
+    console.error('An unexpected error occurred while fetching products:', err);
+    return [];
+  }
+}

package/templates/nextblock-template/app/profile/ProfileAccountSidebar.tsx

@@ -1,73 +1,73 @@
-'use client';
-
-import { AccountNavigationMenu } from '@nextblock-cms/ecommerce';
-import { useTranslations } from '@nextblock-cms/utils';
-import {
-  Avatar,
-  AvatarFallback,
-  AvatarImage,
-  Card,
-  CardContent,
-  CardHeader,
-  CardTitle,
-} from '@nextblock-cms/ui';
-import { User as UserIcon } from 'lucide-react';
-
-import type { ProfileAccountSummary, ProfileAccountUser } from './account-types';
-import { profileAccountLinks } from './account-links';
-
-interface ProfileAccountSidebarProps {
-  profile: ProfileAccountSummary;
-  user: ProfileAccountUser;
-}
-
-export function ProfileAccountSidebar({
-  profile,
-  user,
-}: ProfileAccountSidebarProps) {
-  const { t } = useTranslations();
-  const displayName =
-    profile.full_name || profile.github_username || user.email || 'User';
-
-  return (
-    <Card className="h-fit">
-      <CardHeader>
-        <CardTitle className="text-xl">
-          {t('public_profile') === 'public_profile'
-            ? 'Public Profile'
-            : t('public_profile')}
-        </CardTitle>
-      </CardHeader>
-
-      <CardContent className="flex flex-col items-center space-y-4 text-center">
-        <Avatar className="h-28 w-28 border-4 border-muted">
-          <AvatarImage
-            src={profile.avatar_url || undefined}
-            alt={displayName}
-            className="object-cover"
-          />
-          <AvatarFallback className="bg-secondary text-3xl">
-            {displayName?.charAt(0)?.toUpperCase() || (
-              <UserIcon className="h-10 w-10" />
-            )}
-          </AvatarFallback>
-        </Avatar>
-
-        <div className="w-full space-y-1 text-left">
-          <div className="text-sm font-medium uppercase tracking-wider text-muted-foreground">
-            {t('identity') === 'identity' ? 'Identity' : t('identity')}
-          </div>
-          <p className="text-lg font-semibold">{displayName}</p>
-          {user.email ? (
-            <p className="text-sm text-muted-foreground">{user.email}</p>
-          ) : null}
-        </div>
-
-        <AccountNavigationMenu
-          links={profileAccountLinks}
-          className="text-left"
-        />
-      </CardContent>
-    </Card>
-  );
-}
+'use client';
+
+import { AccountNavigationMenu } from '@nextblock-cms/ecommerce';
+import { useTranslations } from '@nextblock-cms/utils';
+import {
+  Avatar,
+  AvatarFallback,
+  AvatarImage,
+  Card,
+  CardContent,
+  CardHeader,
+  CardTitle,
+} from '@nextblock-cms/ui';
+import { User as UserIcon } from 'lucide-react';
+
+import type { ProfileAccountSummary, ProfileAccountUser } from './account-types';
+import { profileAccountLinks } from './account-links';
+
+interface ProfileAccountSidebarProps {
+  profile: ProfileAccountSummary;
+  user: ProfileAccountUser;
+}
+
+export function ProfileAccountSidebar({
+  profile,
+  user,
+}: ProfileAccountSidebarProps) {
+  const { t } = useTranslations();
+  const displayName =
+    profile.full_name || profile.github_username || user.email || 'User';
+
+  return (
+    <Card className="h-fit">
+      <CardHeader>
+        <CardTitle className="text-xl">
+          {t('public_profile') === 'public_profile'
+            ? 'Public Profile'
+            : t('public_profile')}
+        </CardTitle>
+      </CardHeader>
+
+      <CardContent className="flex flex-col items-center space-y-4 text-center">
+        <Avatar className="h-28 w-28 border-4 border-muted">
+          <AvatarImage
+            src={profile.avatar_url || undefined}
+            alt={displayName}
+            className="object-cover"
+          />
+          <AvatarFallback className="bg-secondary text-3xl">
+            {displayName?.charAt(0)?.toUpperCase() || (
+              <UserIcon className="h-10 w-10" />
+            )}
+          </AvatarFallback>
+        </Avatar>
+
+        <div className="w-full space-y-1 text-left">
+          <div className="text-sm font-medium uppercase tracking-wider text-muted-foreground">
+            {t('identity') === 'identity' ? 'Identity' : t('identity')}
+          </div>
+          <p className="text-lg font-semibold">{displayName}</p>
+          {user.email ? (
+            <p className="text-sm text-muted-foreground">{user.email}</p>
+          ) : null}
+        </div>
+
+        <AccountNavigationMenu
+          links={profileAccountLinks}
+          className="text-left"
+        />
+      </CardContent>
+    </Card>
+  );
+}