npm - create-nextblock - Versions diffs - 0.14.1 → 0.14.4 - Mend

create-nextblock 0.14.1 → 0.14.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (263) hide show

package/templates/nextblock-template/app/layout.tsx CHANGED Viewed

@@ -13,6 +13,12 @@ import { ConsentGatedAnalytics } from '../components/privacy/ConsentGatedAnalyti
 import { ConsentBanner } from '../components/privacy/ConsentBanner';
 import { getPrivacySettings } from '../lib/privacy/settings';
 import { DEFAULT_PRIVACY_SETTINGS } from '../lib/privacy/types';
+import {
+  activeThemeSlugs,
+  buildThemeCss,
+  defaultThemeSlug,
+  type SiteTheme,
+} from '../lib/themes/buildThemeCss';
 import { DeferredSpeedInsights } from '../components/DeferredSpeedInsights';
 import { DeferredVisualEditing } from '../components/visual-editing/DeferredVisualEditing';
 import {
@@ -169,6 +175,25 @@ const getCachedGlobalCss = unstable_cache(
   { revalidate: PUBLIC_LAYOUT_REVALIDATE_SECONDS }
 );
+const getCachedSiteThemes = unstable_cache(
+  async (): Promise<SiteTheme[]> => {
+    const supabase = createStaticSupabaseClient();
+    const { data, error } = await supabase
+      .from('site_themes')
+      .select('id, slug, name, description, icon, color_scheme, tokens, extra_css, is_system, is_default, is_active, sort_order')
+      .order('sort_order');
+    if (error || !data) {
+      // A missing table (pre-migration install) must not take the site down —
+      // libs/ui/src/styles/theme.css still ships a working fallback palette.
+      return [];
+    }
+    return data as unknown as SiteTheme[];
+  },
+  ['public-layout-site-themes'],
+  { revalidate: PUBLIC_LAYOUT_REVALIDATE_SECONDS, tags: ['public-layout-site-themes'] }
+);
 const getCachedTranslations = unstable_cache(
   async () => {
     const supabase = createStaticSupabaseClient();
@@ -298,6 +323,7 @@ async function loadLayoutData() {
       siteTitle: 'NextBlock',
       isEcommerceActive: false,
       globalCss: '',
+      siteThemes: [] as SiteTheme[],
       privacySettings: DEFAULT_PRIVACY_SETTINGS,
       footerAttributionEnabled: true,
       rememberVisitorChoice: DEFAULT_LANGUAGE_DETECTION_SETTINGS.rememberVisitorChoice,
@@ -324,6 +350,7 @@ async function loadLayoutData() {
     currenciesResult,
     copyrightSettingsResult,
     globalCssResult,
+    siteThemesResult,
     translationsResult,
     isEcommerceActive,
     privacySettings,
@@ -336,6 +363,7 @@ async function loadLayoutData() {
       en: '(c) {year} Nextblock CMS. All rights reserved.',
     })),
     getCachedGlobalCss().catch(() => ''),
+    getCachedSiteThemes().catch(() => [] as SiteTheme[]),
     getCachedTranslations().catch(() => []),
     verifyPackageOnline('ecommerce').catch(() => false),
     getPrivacySettings().catch(() => DEFAULT_PRIVACY_SETTINGS),
@@ -369,6 +397,7 @@ async function loadLayoutData() {
   const copyrightText = templateForLocale.replace('{year}', new Date().getFullYear().toString());
   const globalCss = typeof globalCssResult === 'string' ? globalCssResult : '';
+  const siteThemes = Array.isArray(siteThemesResult) ? siteThemesResult : [];
   const translations = Array.isArray(translationsResult) ? translationsResult : [];
   const hasSupabaseEnv = isSupabaseConfigured();
@@ -404,6 +433,7 @@ async function loadLayoutData() {
     siteTitle,
     isEcommerceActive,
     globalCss,
+    siteThemes,
     privacySettings,
     footerAttributionEnabled,
     rememberVisitorChoice: languageDetectionSettings.rememberVisitorChoice,
@@ -486,10 +516,25 @@ export default async function RootLayout({
     siteTitle,
     isEcommerceActive,
     globalCss,
+    siteThemes,
     privacySettings,
     footerAttributionEnabled,
     rememberVisitorChoice,
   } = await loadLayoutData();
+  // Themes are rendered server-side into <head> so the palette is correct on the
+  // very first paint, before next-themes' blocking script adds the html class.
+  const themeCss = buildThemeCss(siteThemes);
+  const themeSlugs = activeThemeSlugs(siteThemes);
+  const initialTheme = defaultThemeSlug(siteThemes);
+  const themeCatalog = siteThemes
+    .filter((theme) => theme.is_active)
+    .sort((a, b) => a.sort_order - b.sort_order)
+    .map((theme) => ({
+      slug: theme.slug,
+      name: theme.name,
+      icon: theme.icon,
+      colorScheme: theme.color_scheme,
+    }));
   const draft = await draftMode();
   // GTM container id comes solely from the privacy settings row (site_settings).
   // There is intentionally no NEXT_PUBLIC_GTM_ID env fallback — analytics is
@@ -517,6 +562,7 @@ export default async function RootLayout({
     <html lang={serverDeterminedLocale} suppressHydrationWarning>
       <head>
         <meta name="viewport" content="width=device-width, initial-scale=1" />
+        {themeCss && <style id="nb-theme-tokens" dangerouslySetInnerHTML={{ __html: themeCss }} />}
         {globalCss && <style dangerouslySetInnerHTML={{ __html: globalCss }} />}
       </head>
       <body className="min-h-screen">
@@ -545,6 +591,9 @@ export default async function RootLayout({
           rememberVisitorChoice={rememberVisitorChoice}
           translations={translations}
           nonce={nonce}
+          themeSlugs={themeSlugs}
+          initialTheme={initialTheme}
+          themeCatalog={themeCatalog}
         >
           <ToasterProvider />
           <AppShell

package/templates/nextblock-template/app/lib/site-settings.ts CHANGED Viewed

@@ -1,105 +1,105 @@
-import 'server-only';
-import { unstable_cache } from 'next/cache';
-import { createClient as createSupabaseJsClient } from '@supabase/supabase-js';
-import type { Database } from '@nextblock-cms/db';
-import {
-  resolveSupabaseAnonKey,
-  resolveSupabaseServiceKey,
-  resolveSupabaseUrl,
-} from '../../lib/setup/env-status';
-import {
-  DEFAULT_SITE_TITLE,
-  DEFAULT_SITE_DESCRIPTION,
-  DEFAULT_SITE_KEYWORDS,
-} from './seo';
-export const SITE_SETTINGS_CACHE_TAG = 'public-site-settings';
-const SITE_SETTINGS_REVALIDATE_SECONDS = 60;
-export interface SiteSettings {
-  siteTitle: string;
-  siteDescription: string;
-  siteKeywords: string;
-}
-/**
- * Service-role (or anon) Supabase client used for cached, request-agnostic
- * reads of public layout/SEO data. Shared by the root layout and the public
- * route `generateMetadata` functions.
- */
-export function createStaticSupabaseClient() {
-  // Fall back to a dummy host when unconfigured (fresh clone, pre-/setup) so the
-  // root layout can still render rather than crashing the whole app on boot. Callers
-  // (getSiteSettings + the getCached* helpers) already swallow failures and use
-  // fallbacks, and loadLayoutData short-circuits before reaching here when there is
-  // no Supabase env at all.
-  const supabaseUrl = resolveSupabaseUrl() || 'https://dummy.supabase.co';
-  const supabaseKey =
-    resolveSupabaseServiceKey() || resolveSupabaseAnonKey() || 'dummy-anon-key';
-  return createSupabaseJsClient<Database>(supabaseUrl, supabaseKey, {
-    auth: {
-      persistSession: false,
-      autoRefreshToken: false,
-      detectSessionInUrl: false,
-    },
-  });
-}
-/**
- * Cached read of the site-wide SEO identity (title / description / keywords)
- * from the `site_settings` key-value store. This is the single source of truth
- * used for both `<title>`/OpenGraph metadata and the header brand.
- */
-export const getSiteSettings = unstable_cache(
-  async (): Promise<SiteSettings> => {
-    const fallback: SiteSettings = {
-      siteTitle: DEFAULT_SITE_TITLE,
-      siteDescription: DEFAULT_SITE_DESCRIPTION,
-      siteKeywords: DEFAULT_SITE_KEYWORDS,
-    };
-    // Unconfigured instance (pre-/setup): the static client would point at the dummy
-    // host, so the fetch fails with a noisy DNS error before falling back. Skip it and
-    // return SEO defaults directly. (generateMetadata calls this even on /setup.)
-    if (!process.env.NEXT_PUBLIC_SUPABASE_URL) {
-      return fallback;
-    }
-    try {
-      const supabase = createStaticSupabaseClient();
-      const { data, error } = await supabase
-        .from('site_settings')
-        .select('key, value')
-        .in('key', ['site_title', 'site_description', 'site_keywords']);
-      if (error || !data) {
-        // PGRST205 = table not found: the schema isn't migrated yet (e.g. mid-setup,
-        // right after the connection is saved but before `npm run db:migrate`). That's an
-        // expected transient state — don't shout about it. Real errors still log.
-        if (error && error.code !== 'PGRST205') {
-          console.error('Error fetching cached site settings:', error);
-        }
-        return fallback;
-      }
-      const settings: Record<string, string> = {};
-      data.forEach((item) => {
-        if (typeof item.value === 'string') {
-          settings[item.key] = item.value;
-        }
-      });
-      return {
-        siteTitle: settings.site_title?.trim() || fallback.siteTitle,
-        siteDescription: settings.site_description?.trim() || fallback.siteDescription,
-        siteKeywords: settings.site_keywords?.trim() || fallback.siteKeywords,
-      };
-    } catch (caught) {
-      console.error('Unexpected error fetching site settings:', caught);
-      return fallback;
-    }
-  },
-  ['public-site-settings'],
-  { revalidate: SITE_SETTINGS_REVALIDATE_SECONDS, tags: [SITE_SETTINGS_CACHE_TAG] }
-);
+import 'server-only';
+import { unstable_cache } from 'next/cache';
+import { createClient as createSupabaseJsClient } from '@supabase/supabase-js';
+import type { Database } from '@nextblock-cms/db';
+import {
+  resolveSupabaseAnonKey,
+  resolveSupabaseServiceKey,
+  resolveSupabaseUrl,
+} from '../../lib/setup/env-status';
+import {
+  DEFAULT_SITE_TITLE,
+  DEFAULT_SITE_DESCRIPTION,
+  DEFAULT_SITE_KEYWORDS,
+} from './seo';
+export const SITE_SETTINGS_CACHE_TAG = 'public-site-settings';
+const SITE_SETTINGS_REVALIDATE_SECONDS = 60;
+export interface SiteSettings {
+  siteTitle: string;
+  siteDescription: string;
+  siteKeywords: string;
+}
+/**
+ * Service-role (or anon) Supabase client used for cached, request-agnostic
+ * reads of public layout/SEO data. Shared by the root layout and the public
+ * route `generateMetadata` functions.
+ */
+export function createStaticSupabaseClient() {
+  // Fall back to a dummy host when unconfigured (fresh clone, pre-/setup) so the
+  // root layout can still render rather than crashing the whole app on boot. Callers
+  // (getSiteSettings + the getCached* helpers) already swallow failures and use
+  // fallbacks, and loadLayoutData short-circuits before reaching here when there is
+  // no Supabase env at all.
+  const supabaseUrl = resolveSupabaseUrl() || 'https://dummy.supabase.co';
+  const supabaseKey =
+    resolveSupabaseServiceKey() || resolveSupabaseAnonKey() || 'dummy-anon-key';
+  return createSupabaseJsClient<Database>(supabaseUrl, supabaseKey, {
+    auth: {
+      persistSession: false,
+      autoRefreshToken: false,
+      detectSessionInUrl: false,
+    },
+  });
+}
+/**
+ * Cached read of the site-wide SEO identity (title / description / keywords)
+ * from the `site_settings` key-value store. This is the single source of truth
+ * used for both `<title>`/OpenGraph metadata and the header brand.
+ */
+export const getSiteSettings = unstable_cache(
+  async (): Promise<SiteSettings> => {
+    const fallback: SiteSettings = {
+      siteTitle: DEFAULT_SITE_TITLE,
+      siteDescription: DEFAULT_SITE_DESCRIPTION,
+      siteKeywords: DEFAULT_SITE_KEYWORDS,
+    };
+    // Unconfigured instance (pre-/setup): the static client would point at the dummy
+    // host, so the fetch fails with a noisy DNS error before falling back. Skip it and
+    // return SEO defaults directly. (generateMetadata calls this even on /setup.)
+    if (!process.env.NEXT_PUBLIC_SUPABASE_URL) {
+      return fallback;
+    }
+    try {
+      const supabase = createStaticSupabaseClient();
+      const { data, error } = await supabase
+        .from('site_settings')
+        .select('key, value')
+        .in('key', ['site_title', 'site_description', 'site_keywords']);
+      if (error || !data) {
+        // PGRST205 = table not found: the schema isn't migrated yet (e.g. mid-setup,
+        // right after the connection is saved but before `npm run db:migrate`). That's an
+        // expected transient state — don't shout about it. Real errors still log.
+        if (error && error.code !== 'PGRST205') {
+          console.error('Error fetching cached site settings:', error);
+        }
+        return fallback;
+      }
+      const settings: Record<string, string> = {};
+      data.forEach((item) => {
+        if (typeof item.value === 'string') {
+          settings[item.key] = item.value;
+        }
+      });
+      return {
+        siteTitle: settings.site_title?.trim() || fallback.siteTitle,
+        siteDescription: settings.site_description?.trim() || fallback.siteDescription,
+        siteKeywords: settings.site_keywords?.trim() || fallback.siteKeywords,
+      };
+    } catch (caught) {
+      console.error('Unexpected error fetching site settings:', caught);
+      return fallback;
+    }
+  },
+  ['public-site-settings'],
+  { revalidate: SITE_SETTINGS_REVALIDATE_SECONDS, tags: [SITE_SETTINGS_CACHE_TAG] }
+);

package/templates/nextblock-template/app/profile/ProfilePageHeader.tsx CHANGED Viewed

@@ -1,16 +1,16 @@
-'use client';
-import { useTranslations } from '@nextblock-cms/utils';
-export function ProfilePageHeader() {
-  const { t } = useTranslations();
-  return (
-    <div className="mb-8">
-      <h1 className="text-3xl font-bold tracking-tight">{t('profile_settings_title')}</h1>
-      <p className="text-muted-foreground mt-2">
-        {t('profile_settings_description')}
-      </p>
-    </div>
-  );
-}
+'use client';
+import { useTranslations } from '@nextblock-cms/utils';
+export function ProfilePageHeader() {
+  const { t } = useTranslations();
+  return (
+    <div className="mb-8">
+      <h1 className="text-3xl font-bold tracking-tight">{t('profile_settings_title')}</h1>
+      <p className="text-muted-foreground mt-2">
+        {t('profile_settings_description')}
+      </p>
+    </div>
+  );
+}

package/templates/nextblock-template/app/profile/ProfilePageMissingState.tsx CHANGED Viewed

@@ -1,9 +1,9 @@
-'use client';
-import { useTranslations } from '@nextblock-cms/utils';
-export function ProfilePageMissingState() {
-  const { t } = useTranslations();
-  return <div>{t('profile_not_found')}</div>;
-}
+'use client';
+import { useTranslations } from '@nextblock-cms/utils';
+export function ProfilePageMissingState() {
+  const { t } = useTranslations();
+  return <div>{t('profile_not_found')}</div>;
+}

package/templates/nextblock-template/app/profile/account-links.ts CHANGED Viewed

@@ -1,22 +1,22 @@
-import type { AccountNavigationLink } from '@nextblock-cms/ecommerce';
-const isSandbox = process.env.NEXT_PUBLIC_IS_SANDBOX === 'true';
-export const profileAccountLinks: AccountNavigationLink[] = [
-  {
-    href: '/profile/orders',
-    labelKey: 'account_orders',
-    fallbackLabel: 'Orders',
-    icon: 'orders',
-  },
-  ...(!isSandbox
-    ? [
-        {
-          href: '/profile/password',
-          labelKey: 'change_my_password',
-          fallbackLabel: 'Change my password',
-          icon: 'password' as const,
-        },
-      ]
-    : []),
-];
+import type { AccountNavigationLink } from '@nextblock-cms/ecommerce';
+const isSandbox = process.env.NEXT_PUBLIC_IS_SANDBOX === 'true';
+export const profileAccountLinks: AccountNavigationLink[] = [
+  {
+    href: '/profile/orders',
+    labelKey: 'account_orders',
+    fallbackLabel: 'Orders',
+    icon: 'orders',
+  },
+  ...(!isSandbox
+    ? [
+        {
+          href: '/profile/password',
+          labelKey: 'change_my_password',
+          fallbackLabel: 'Change my password',
+          icon: 'password' as const,
+        },
+      ]
+    : []),
+];