create-nextblock 0.13.10 → 0.13.12

package/templates/nextblock-template/app/setup/layout.tsx

@@ -1,13 +1,13 @@
-// Minimal layout for the first-boot wizard. Deliberately does NO Supabase work so it
-// renders even on a completely unconfigured instance. (It is still nested inside the
-// root layout, which short-circuits its own data loading when unconfigured.)
-import type { ReactNode } from 'react';
-
-export const metadata = {
-  title: 'Set up NextBlock',
-  robots: { index: false, follow: false },
-};
-
-export default function SetupLayout({ children }: { children: ReactNode }) {
-  return <div className="mx-auto w-full max-w-3xl px-4 py-10 sm:py-16">{children}</div>;
-}
+// Minimal layout for the first-boot wizard. Deliberately does NO Supabase work so it
+// renders even on a completely unconfigured instance. (It is still nested inside the
+// root layout, which short-circuits its own data loading when unconfigured.)
+import type { ReactNode } from 'react';
+
+export const metadata = {
+  title: 'Set up NextBlock',
+  robots: { index: false, follow: false },
+};
+
+export default function SetupLayout({ children }: { children: ReactNode }) {
+  return <div className="mx-auto w-full max-w-3xl px-4 py-10 sm:py-16">{children}</div>;
+}

package/templates/nextblock-template/app/setup/page.tsx

@@ -1,111 +1,111 @@
-import { redirect } from 'next/navigation';
-import { createClient } from '@nextblock-cms/db/server';
-import {
-  detectChannel,
-  isLocalWritableEnv,
-  isSupabaseConfigured,
-  type DeployChannel,
-} from '../../lib/setup/env-status';
-import { getProvisioningStatus } from '../../lib/setup/provisioning';
-import SetupWizard, { type StoragePrefill } from './SetupWizard';
-
-// Always evaluate live: the wizard's whole job is to react to the current env state.
-export const dynamic = 'force-dynamic';
-
-function buildStoragePrefill(channel: DeployChannel, supabaseUrl: string): StoragePrefill {
-  if (channel === 'docker') {
-    // The Docker stack ships MinIO as the S3 backend; docker-setup wrote these already.
-    return {
-      kind: 'minio',
-      readOnly: true,
-      accountId: process.env.R2_ACCOUNT_ID ?? 'minio',
-      bucket: process.env.STORAGE_BUCKET ?? process.env.R2_BUCKET_NAME ?? 'media',
-      endpoint: process.env.R2_S3_ENDPOINT ?? 'http://minio:9000',
-      publicUrl: process.env.NEXT_PUBLIC_R2_PUBLIC_URL ?? 'http://localhost:9000',
-      baseUrl: process.env.NEXT_PUBLIC_R2_BASE_URL ?? '',
-      accessKeyId: '',
-      secretAccessKey: '',
-    };
-  }
-
-  if (channel === 'vercel') {
-    // One-click Vercel deploys connect to Supabase Storage's S3-compatible endpoint.
-    const base = supabaseUrl.replace(/\/$/, '');
-    return {
-      kind: 'supabase',
-      readOnly: false,
-      accountId: 'supabase',
-      bucket: 'media',
-      endpoint: base ? `${base}/storage/v1/s3` : '',
-      publicUrl: base ? `${base}/storage/v1/object/public` : '',
-      baseUrl: '',
-      accessKeyId: process.env.R2_ACCESS_KEY_ID ?? '',
-      secretAccessKey: '',
-    };
-  }
-
-  // Local: the user brings their own Cloudflare R2 (higher free-tier storage).
-  return {
-    kind: 'r2',
-    readOnly: false,
-    accountId: process.env.R2_ACCOUNT_ID ?? '',
-    bucket: process.env.R2_BUCKET_NAME ?? '',
-    endpoint: '',
-    publicUrl: process.env.NEXT_PUBLIC_R2_PUBLIC_URL ?? '',
-    baseUrl: process.env.NEXT_PUBLIC_R2_BASE_URL ?? '',
-    accessKeyId: process.env.R2_ACCESS_KEY_ID ?? '',
-    secretAccessKey: '',
-  };
-}
-
-export default async function SetupPage() {
-  const status = await getProvisioningStatus();
-
-  // Already finished — there's a first admin. Get out of the wizard.
-  if (status.hasAdmin) {
-    redirect('/cms/dashboard');
-  }
-
-  // A signed-in user never needs the wizard. This also closes the brief window right
-  // after completion where is_admin_created may still be read-stale: the just-created
-  // admin has a session, so send them straight to the CMS. (Only checked when
-  // configured — an unconfigured instance has no real auth.)
-  if (status.configured) {
-    const supabase = createClient();
-    const {
-      data: { user },
-    } = await supabase.auth.getUser();
-    if (user) {
-      redirect('/cms/dashboard');
-    }
-  }
-
-  const channel = detectChannel();
-  const supabaseUrl =
-    process.env.NEXT_PUBLIC_SUPABASE_URL || process.env.SUPABASE_URL || '';
-
-  return (
-    <SetupWizard
-      channel={channel}
-      configured={isSupabaseConfigured()}
-      writable={isLocalWritableEnv()}
-      siteUrl={process.env.NEXT_PUBLIC_URL ?? ''}
-      storagePrefill={buildStoragePrefill(channel, supabaseUrl)}
-      supabaseEnvDetected={{
-        NEXT_PUBLIC_SUPABASE_URL: Boolean(process.env.NEXT_PUBLIC_SUPABASE_URL),
-        SUPABASE_URL: Boolean(process.env.SUPABASE_URL),
-        NEXT_PUBLIC_SUPABASE_ANON_KEY: Boolean(
-          process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY ||
-            process.env.NEXT_PUBLIC_SUPABASE_PUBLISHABLE_KEY,
-        ),
-        SUPABASE_ANON_KEY: Boolean(
-          process.env.SUPABASE_ANON_KEY || process.env.SUPABASE_PUBLISHABLE_KEY,
-        ),
-        SUPABASE_SERVICE_ROLE_KEY: Boolean(
-          process.env.SUPABASE_SERVICE_ROLE_KEY || process.env.SUPABASE_SECRET_KEY,
-        ),
-        POSTGRES_URL: Boolean(process.env.POSTGRES_URL),
-      }}
-    />
-  );
-}
+import { redirect } from 'next/navigation';
+import { createClient } from '@nextblock-cms/db/server';
+import {
+  detectChannel,
+  isLocalWritableEnv,
+  isSupabaseConfigured,
+  type DeployChannel,
+} from '../../lib/setup/env-status';
+import { getProvisioningStatus } from '../../lib/setup/provisioning';
+import SetupWizard, { type StoragePrefill } from './SetupWizard';
+
+// Always evaluate live: the wizard's whole job is to react to the current env state.
+export const dynamic = 'force-dynamic';
+
+function buildStoragePrefill(channel: DeployChannel, supabaseUrl: string): StoragePrefill {
+  if (channel === 'docker') {
+    // The Docker stack ships MinIO as the S3 backend; docker-setup wrote these already.
+    return {
+      kind: 'minio',
+      readOnly: true,
+      accountId: process.env.R2_ACCOUNT_ID ?? 'minio',
+      bucket: process.env.STORAGE_BUCKET ?? process.env.R2_BUCKET_NAME ?? 'media',
+      endpoint: process.env.R2_S3_ENDPOINT ?? 'http://minio:9000',
+      publicUrl: process.env.NEXT_PUBLIC_R2_PUBLIC_URL ?? 'http://localhost:9000',
+      baseUrl: process.env.NEXT_PUBLIC_R2_BASE_URL ?? '',
+      accessKeyId: '',
+      secretAccessKey: '',
+    };
+  }
+
+  if (channel === 'vercel') {
+    // One-click Vercel deploys connect to Supabase Storage's S3-compatible endpoint.
+    const base = supabaseUrl.replace(/\/$/, '');
+    return {
+      kind: 'supabase',
+      readOnly: false,
+      accountId: 'supabase',
+      bucket: 'media',
+      endpoint: base ? `${base}/storage/v1/s3` : '',
+      publicUrl: base ? `${base}/storage/v1/object/public` : '',
+      baseUrl: '',
+      accessKeyId: process.env.R2_ACCESS_KEY_ID ?? '',
+      secretAccessKey: '',
+    };
+  }
+
+  // Local: the user brings their own Cloudflare R2 (higher free-tier storage).
+  return {
+    kind: 'r2',
+    readOnly: false,
+    accountId: process.env.R2_ACCOUNT_ID ?? '',
+    bucket: process.env.R2_BUCKET_NAME ?? '',
+    endpoint: '',
+    publicUrl: process.env.NEXT_PUBLIC_R2_PUBLIC_URL ?? '',
+    baseUrl: process.env.NEXT_PUBLIC_R2_BASE_URL ?? '',
+    accessKeyId: process.env.R2_ACCESS_KEY_ID ?? '',
+    secretAccessKey: '',
+  };
+}
+
+export default async function SetupPage() {
+  const status = await getProvisioningStatus();
+
+  // Already finished — there's a first admin. Get out of the wizard.
+  if (status.hasAdmin) {
+    redirect('/cms/dashboard');
+  }
+
+  // A signed-in user never needs the wizard. This also closes the brief window right
+  // after completion where is_admin_created may still be read-stale: the just-created
+  // admin has a session, so send them straight to the CMS. (Only checked when
+  // configured — an unconfigured instance has no real auth.)
+  if (status.configured) {
+    const supabase = createClient();
+    const {
+      data: { user },
+    } = await supabase.auth.getUser();
+    if (user) {
+      redirect('/cms/dashboard');
+    }
+  }
+
+  const channel = detectChannel();
+  const supabaseUrl =
+    process.env.NEXT_PUBLIC_SUPABASE_URL || process.env.SUPABASE_URL || '';
+
+  return (
+    <SetupWizard
+      channel={channel}
+      configured={isSupabaseConfigured()}
+      writable={isLocalWritableEnv()}
+      siteUrl={process.env.NEXT_PUBLIC_URL ?? ''}
+      storagePrefill={buildStoragePrefill(channel, supabaseUrl)}
+      supabaseEnvDetected={{
+        NEXT_PUBLIC_SUPABASE_URL: Boolean(process.env.NEXT_PUBLIC_SUPABASE_URL),
+        SUPABASE_URL: Boolean(process.env.SUPABASE_URL),
+        NEXT_PUBLIC_SUPABASE_ANON_KEY: Boolean(
+          process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY ||
+            process.env.NEXT_PUBLIC_SUPABASE_PUBLISHABLE_KEY,
+        ),
+        SUPABASE_ANON_KEY: Boolean(
+          process.env.SUPABASE_ANON_KEY || process.env.SUPABASE_PUBLISHABLE_KEY,
+        ),
+        SUPABASE_SERVICE_ROLE_KEY: Boolean(
+          process.env.SUPABASE_SERVICE_ROLE_KEY || process.env.SUPABASE_SECRET_KEY,
+        ),
+        POSTGRES_URL: Boolean(process.env.POSTGRES_URL),
+      }}
+    />
+  );
+}

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

@@ -1,130 +1,130 @@
-import type { MetadataRoute } from 'next';
-import { verifyPackageOnline } from '@nextblock-cms/db/server';
-import {
-  fetchAllActiveProducts,
-  fetchAllPublishedPages,
-  fetchAllPublishedPosts,
-  type SitemapEntry,
-} from './lib/sitemap-utils';
-import { resolveSiteUrl, hasResolvedSiteUrl } from '../lib/site-url';
-
-/**
- * Cache the generated sitemap and rebuild it at most once an hour. Crawlers get
- * a fast, statically-served file while newly published pages/posts/products
- * still appear without a redeploy.
- *
- * NextBlock does not enable Next.js Cache Components, so the route-segment
- * `revalidate` config is the idiomatic caching control here (it matches the
- * rest of the app's ISR cadence). If `cacheComponents` were turned on, the
- * equivalent would be a `'use cache'` body paired with `cacheLife('hours')`
- * instead of this export.
- */
-export const revalidate = 3600;
-
-type SitemapItem = MetadataRoute.Sitemap[number];
-type ChangeFrequency = NonNullable<SitemapItem['changeFrequency']>;
-
-// Explicit NEXT_PUBLIC_URL → Vercel production URL → local-dev fallback.
-const BASE_URL = resolveSiteUrl();
-
-function toAbsolute(path: string): string {
-  return `${BASE_URL}${path.startsWith('/') ? path : `/${path}`}`;
-}
-
-/** Maps a language-aware {@link SitemapEntry} onto a Next.js sitemap item. */
-function toSitemapItem(
-  entry: SitemapEntry,
-  changeFrequency: ChangeFrequency,
-  priority: number,
-): SitemapItem {
-  const item: SitemapItem = {
-    url: toAbsolute(entry.path),
-    lastModified: entry.lastModified,
-    changeFrequency,
-    priority,
-  };
-
-  if (entry.alternates) {
-    item.alternates = {
-      // Next.js renders this map as <xhtml:link rel="alternate" hreflang=.. href=.. />.
-      languages: Object.fromEntries(
-        Object.entries(entry.alternates).map(([code, path]) => [code, toAbsolute(path)]),
-      ),
-    };
-  }
-
-  return item;
-}
-
-async function safe(
-  label: string,
-  load: () => Promise<SitemapEntry[]>,
-): Promise<SitemapEntry[]> {
-  try {
-    return await load();
-  } catch (error) {
-    console.error(`Sitemap: failed to load ${label}.`, error);
-    return [];
-  }
-}
-
-export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
-  // Disposable sandbox deployments should not advertise an indexable sitemap
-  // (mirrors the legacy app/sitemap.xml route and app/robots.txt).
-  if (process.env.NEXT_PUBLIC_IS_SANDBOX === 'true') {
-    return [];
-  }
-
-  if (!hasResolvedSiteUrl()) {
-    console.warn(
-      'Warning: no site URL is set for the sitemap (NEXT_PUBLIC_URL / Vercel production URL). Defaulting to http://localhost:3000 — set NEXT_PUBLIC_URL in production.',
-    );
-  }
-
-  // Products live behind the premium ecommerce package; their routes 404 when
-  // it is inactive (see app/product/[slug]/page.tsx), so only advertise them
-  // when the package verifies as active.
-  let ecommerceActive = false;
-  try {
-    ecommerceActive = await verifyPackageOnline('ecommerce');
-  } catch (error) {
-    console.error('Sitemap: failed to verify the ecommerce package; omitting products.', error);
-  }
-
-  const [pages, posts, products] = await Promise.all([
-    safe('pages', fetchAllPublishedPages),
-    safe('posts', fetchAllPublishedPosts),
-    ecommerceActive
-      ? safe('products', fetchAllActiveProducts)
-      : Promise.resolve<SitemapEntry[]>([]),
-  ]);
-
-  // Code-defined route with no row in the content tables. The homepage is served
-  // at "/" (its `home`/`accueil` page rows are excluded from the pages query to
-  // avoid duplicate URLs).
-  const homepage: SitemapItem = {
-    url: toAbsolute('/'),
-    lastModified: new Date().toISOString(),
-    changeFrequency: 'daily',
-    priority: 1,
-  };
-
-  const items: SitemapItem[] = [
-    homepage,
-    ...pages.map((entry) => toSitemapItem(entry, 'weekly', 0.8)),
-    ...posts.map((entry) => toSitemapItem(entry, 'weekly', 0.6)),
-    ...products.map((entry) => toSitemapItem(entry, 'daily', 0.7)),
-  ];
-
-  // Translations can share a slug (NextBlock has no locale path prefix), so the
-  // same URL may surface more than once. Collapse duplicates, keeping the first
-  // (highest-priority) occurrence.
-  const seen = new Set<string>();
-  return items.filter((item) => {
-    if (seen.has(item.url)) {
-      return false;
-    }
-    seen.add(item.url);
-    return true;
-  });
-}
+import type { MetadataRoute } from 'next';
+import { verifyPackageOnline } from '@nextblock-cms/db/server';
+import {
+  fetchAllActiveProducts,
+  fetchAllPublishedPages,
+  fetchAllPublishedPosts,
+  type SitemapEntry,
+} from './lib/sitemap-utils';
+import { resolveSiteUrl, hasResolvedSiteUrl } from '../lib/site-url';
+
+/**
+ * Cache the generated sitemap and rebuild it at most once an hour. Crawlers get
+ * a fast, statically-served file while newly published pages/posts/products
+ * still appear without a redeploy.
+ *
+ * NextBlock does not enable Next.js Cache Components, so the route-segment
+ * `revalidate` config is the idiomatic caching control here (it matches the
+ * rest of the app's ISR cadence). If `cacheComponents` were turned on, the
+ * equivalent would be a `'use cache'` body paired with `cacheLife('hours')`
+ * instead of this export.
+ */
+export const revalidate = 3600;
+
+type SitemapItem = MetadataRoute.Sitemap[number];
+type ChangeFrequency = NonNullable<SitemapItem['changeFrequency']>;
+
+// Explicit NEXT_PUBLIC_URL → Vercel production URL → local-dev fallback.
+const BASE_URL = resolveSiteUrl();
+
+function toAbsolute(path: string): string {
+  return `${BASE_URL}${path.startsWith('/') ? path : `/${path}`}`;
+}
+
+/** Maps a language-aware {@link SitemapEntry} onto a Next.js sitemap item. */
+function toSitemapItem(
+  entry: SitemapEntry,
+  changeFrequency: ChangeFrequency,
+  priority: number,
+): SitemapItem {
+  const item: SitemapItem = {
+    url: toAbsolute(entry.path),
+    lastModified: entry.lastModified,
+    changeFrequency,
+    priority,
+  };
+
+  if (entry.alternates) {
+    item.alternates = {
+      // Next.js renders this map as <xhtml:link rel="alternate" hreflang=.. href=.. />.
+      languages: Object.fromEntries(
+        Object.entries(entry.alternates).map(([code, path]) => [code, toAbsolute(path)]),
+      ),
+    };
+  }
+
+  return item;
+}
+
+async function safe(
+  label: string,
+  load: () => Promise<SitemapEntry[]>,
+): Promise<SitemapEntry[]> {
+  try {
+    return await load();
+  } catch (error) {
+    console.error(`Sitemap: failed to load ${label}.`, error);
+    return [];
+  }
+}
+
+export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
+  // Disposable sandbox deployments should not advertise an indexable sitemap
+  // (mirrors the legacy app/sitemap.xml route and app/robots.txt).
+  if (process.env.NEXT_PUBLIC_IS_SANDBOX === 'true') {
+    return [];
+  }
+
+  if (!hasResolvedSiteUrl()) {
+    console.warn(
+      'Warning: no site URL is set for the sitemap (NEXT_PUBLIC_URL / Vercel production URL). Defaulting to http://localhost:3000 — set NEXT_PUBLIC_URL in production.',
+    );
+  }
+
+  // Products live behind the premium ecommerce package; their routes 404 when
+  // it is inactive (see app/product/[slug]/page.tsx), so only advertise them
+  // when the package verifies as active.
+  let ecommerceActive = false;
+  try {
+    ecommerceActive = await verifyPackageOnline('ecommerce');
+  } catch (error) {
+    console.error('Sitemap: failed to verify the ecommerce package; omitting products.', error);
+  }
+
+  const [pages, posts, products] = await Promise.all([
+    safe('pages', fetchAllPublishedPages),
+    safe('posts', fetchAllPublishedPosts),
+    ecommerceActive
+      ? safe('products', fetchAllActiveProducts)
+      : Promise.resolve<SitemapEntry[]>([]),
+  ]);
+
+  // Code-defined route with no row in the content tables. The homepage is served
+  // at "/" (its `home`/`accueil` page rows are excluded from the pages query to
+  // avoid duplicate URLs).
+  const homepage: SitemapItem = {
+    url: toAbsolute('/'),
+    lastModified: new Date().toISOString(),
+    changeFrequency: 'daily',
+    priority: 1,
+  };
+
+  const items: SitemapItem[] = [
+    homepage,
+    ...pages.map((entry) => toSitemapItem(entry, 'weekly', 0.8)),
+    ...posts.map((entry) => toSitemapItem(entry, 'weekly', 0.6)),
+    ...products.map((entry) => toSitemapItem(entry, 'daily', 0.7)),
+  ];
+
+  // Translations can share a slug (NextBlock has no locale path prefix), so the
+  // same URL may surface more than once. Collapse duplicates, keeping the first
+  // (highest-priority) occurrence.
+  const seen = new Set<string>();
+  return items.filter((item) => {
+    if (seen.has(item.url)) {
+      return false;
+    }
+    seen.add(item.url);
+    return true;
+  });
+}

package/templates/nextblock-template/components/BlockRenderer.tsx

@@ -188,6 +188,10 @@ async function renderLoadedBlock({
       parentBlockIndex={blockIndex}
       botProtectionPublic={botProtectionPublic}
       scriptNonce={scriptNonce}
+      // The first top-level block is above the fold, so its media is the LCP
+      // candidate. Renderers that own an image (video_embed's poster frame)
+      // use this to preload instead of lazy-loading it.
+      priority={blockIndex === 0}
     />
   );
 }

package/templates/nextblock-template/components/CartDrawerLoader.tsx

@@ -1,7 +1,7 @@
-'use client';
-
-import { CartDrawer } from '@nextblock-cms/ecommerce/components/CartDrawer';
-
-export function CartDrawerLoader() {
-  return <CartDrawer />;
-}
+'use client';
+
+import { CartDrawer } from '@nextblock-cms/ecommerce/components/CartDrawer';
+
+export function CartDrawerLoader() {
+  return <CartDrawer />;
+}

package/templates/nextblock-template/components/DeferredCartDrawer.tsx

@@ -1,23 +1,23 @@
-'use client';
-
-import dynamic from 'next/dynamic';
-import { useEffect, useState } from 'react';
-import { useCartStore } from '@nextblock-cms/ecommerce/cart-store';
-
-const CartDrawer = dynamic(
-  () => import('./CartDrawerLoader').then((module) => module.CartDrawerLoader),
-  { ssr: false }
-);
-
-export function DeferredCartDrawer() {
-  const isOpen = useCartStore((state) => state.isOpen);
-  const [shouldLoadDrawer, setShouldLoadDrawer] = useState(false);
-
-  useEffect(() => {
-    if (isOpen) {
-      setShouldLoadDrawer(true);
-    }
-  }, [isOpen]);
-
-  return shouldLoadDrawer ? <CartDrawer /> : null;
-}
+'use client';
+
+import dynamic from 'next/dynamic';
+import { useEffect, useState } from 'react';
+import { useCartStore } from '@nextblock-cms/ecommerce/cart-store';
+
+const CartDrawer = dynamic(
+  () => import('./CartDrawerLoader').then((module) => module.CartDrawerLoader),
+  { ssr: false }
+);
+
+export function DeferredCartDrawer() {
+  const isOpen = useCartStore((state) => state.isOpen);
+  const [shouldLoadDrawer, setShouldLoadDrawer] = useState(false);
+
+  useEffect(() => {
+    if (isOpen) {
+      setShouldLoadDrawer(true);
+    }
+  }, [isOpen]);
+
+  return shouldLoadDrawer ? <CartDrawer /> : null;
+}