create-nextblock 0.16.4 → 0.17.1

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/ucp/v1/carts/[id]/cancel/route.ts

@@ -1,38 +1,38 @@
-import { NextResponse } from 'next/server';
-import {
-  buildProtocolError,
-  cancelUcpCart,
-  ensureEcommerceOnline,
-} from '../../../../../lib/ucp/server';
-
-export const dynamic = 'force-dynamic';
-export const runtime = 'nodejs';
-
-interface CartCancelRouteContext {
-  params: Promise<{ id: string }>;
-}
-
-export async function POST(request: Request, context: CartCancelRouteContext) {
-  try {
-    const isOnline = await ensureEcommerceOnline();
-    if (!isOnline) {
-      return NextResponse.json(
-        buildProtocolError(
-          'ecommerce_unavailable',
-          'Ecommerce module license is inactive.'
-        ),
-        { status: 403 }
-      );
-    }
-
-    const { id } = await context.params;
-    const result = await cancelUcpCart(id, request);
-    return NextResponse.json(result.body, { status: result.status });
-  } catch (error) {
-    console.error('UCP cancel cart error:', error);
-    return NextResponse.json(
-      buildProtocolError('internal_server_error', 'Cart cancellation failed.'),
-      { status: 500 }
-    );
-  }
-}
+import { NextResponse } from 'next/server';
+import {
+  buildProtocolError,
+  cancelUcpCart,
+  ensureEcommerceOnline,
+} from '../../../../../lib/ucp/server';
+
+export const dynamic = 'force-dynamic';
+export const runtime = 'nodejs';
+
+interface CartCancelRouteContext {
+  params: Promise<{ id: string }>;
+}
+
+export async function POST(request: Request, context: CartCancelRouteContext) {
+  try {
+    const isOnline = await ensureEcommerceOnline();
+    if (!isOnline) {
+      return NextResponse.json(
+        buildProtocolError(
+          'ecommerce_unavailable',
+          'Ecommerce module license is inactive.'
+        ),
+        { status: 403 }
+      );
+    }
+
+    const { id } = await context.params;
+    const result = await cancelUcpCart(id, request);
+    return NextResponse.json(result.body, { status: result.status });
+  } catch (error) {
+    console.error('UCP cancel cart error:', error);
+    return NextResponse.json(
+      buildProtocolError('internal_server_error', 'Cart cancellation failed.'),
+      { status: 500 }
+    );
+  }
+}

package/templates/nextblock-template/app/ucp/v1/carts/[id]/route.ts

@@ -1,68 +1,68 @@
-import { NextResponse } from 'next/server';
-import {
-  buildProtocolError,
-  ensureEcommerceOnline,
-  getUcpCart,
-  parseJsonBody,
-  updateUcpCart,
-} from '../../../../lib/ucp/server';
-
-export const dynamic = 'force-dynamic';
-export const runtime = 'nodejs';
-
-interface CartRouteContext {
-  params: Promise<{ id: string }>;
-}
-
-export async function GET(request: Request, context: CartRouteContext) {
-  try {
-    const isOnline = await ensureEcommerceOnline();
-    if (!isOnline) {
-      return NextResponse.json(
-        buildProtocolError(
-          'ecommerce_unavailable',
-          'Ecommerce module license is inactive.'
-        ),
-        { status: 403 }
-      );
-    }
-
-    const { id } = await context.params;
-    const result = await getUcpCart(id, request);
-    return NextResponse.json(result.body, { status: result.status });
-  } catch (error) {
-    console.error('UCP get cart error:', error);
-    return NextResponse.json(
-      buildProtocolError('internal_server_error', 'Cart retrieval failed.'),
-      { status: 500 }
-    );
-  }
-}
-
-export async function PUT(request: Request, context: CartRouteContext) {
-  try {
-    const isOnline = await ensureEcommerceOnline();
-    if (!isOnline) {
-      return NextResponse.json(
-        buildProtocolError(
-          'ecommerce_unavailable',
-          'Ecommerce module license is inactive.'
-        ),
-        { status: 403 }
-      );
-    }
-
-    const { id } = await context.params;
-    const body = await parseJsonBody(request);
-    const result = await updateUcpCart(id, body, request);
-    return NextResponse.json(result.body, { status: result.status });
-  } catch (error) {
-    console.error('UCP update cart error:', error);
-    return NextResponse.json(
-      buildProtocolError('internal_server_error', 'Cart update failed.'),
-      { status: 500 }
-    );
-  }
-}
-
-export const PATCH = PUT;
+import { NextResponse } from 'next/server';
+import {
+  buildProtocolError,
+  ensureEcommerceOnline,
+  getUcpCart,
+  parseJsonBody,
+  updateUcpCart,
+} from '../../../../lib/ucp/server';
+
+export const dynamic = 'force-dynamic';
+export const runtime = 'nodejs';
+
+interface CartRouteContext {
+  params: Promise<{ id: string }>;
+}
+
+export async function GET(request: Request, context: CartRouteContext) {
+  try {
+    const isOnline = await ensureEcommerceOnline();
+    if (!isOnline) {
+      return NextResponse.json(
+        buildProtocolError(
+          'ecommerce_unavailable',
+          'Ecommerce module license is inactive.'
+        ),
+        { status: 403 }
+      );
+    }
+
+    const { id } = await context.params;
+    const result = await getUcpCart(id, request);
+    return NextResponse.json(result.body, { status: result.status });
+  } catch (error) {
+    console.error('UCP get cart error:', error);
+    return NextResponse.json(
+      buildProtocolError('internal_server_error', 'Cart retrieval failed.'),
+      { status: 500 }
+    );
+  }
+}
+
+export async function PUT(request: Request, context: CartRouteContext) {
+  try {
+    const isOnline = await ensureEcommerceOnline();
+    if (!isOnline) {
+      return NextResponse.json(
+        buildProtocolError(
+          'ecommerce_unavailable',
+          'Ecommerce module license is inactive.'
+        ),
+        { status: 403 }
+      );
+    }
+
+    const { id } = await context.params;
+    const body = await parseJsonBody(request);
+    const result = await updateUcpCart(id, body, request);
+    return NextResponse.json(result.body, { status: result.status });
+  } catch (error) {
+    console.error('UCP update cart error:', error);
+    return NextResponse.json(
+      buildProtocolError('internal_server_error', 'Cart update failed.'),
+      { status: 500 }
+    );
+  }
+}
+
+export const PATCH = PUT;

package/templates/nextblock-template/app/ucp/v1/carts/route.ts

@@ -1,35 +1,35 @@
-import { NextResponse } from 'next/server';
-import {
-  buildProtocolError,
-  createUcpCart,
-  ensureEcommerceOnline,
-  parseJsonBody,
-} from '../../../lib/ucp/server';
-
-export const dynamic = 'force-dynamic';
-export const runtime = 'nodejs';
-
-export async function POST(request: Request) {
-  try {
-    const isOnline = await ensureEcommerceOnline();
-    if (!isOnline) {
-      return NextResponse.json(
-        buildProtocolError(
-          'ecommerce_unavailable',
-          'Ecommerce module license is inactive.'
-        ),
-        { status: 403 }
-      );
-    }
-
-    const body = await parseJsonBody(request);
-    const result = await createUcpCart(body, request);
-    return NextResponse.json(result.body, { status: result.status });
-  } catch (error) {
-    console.error('UCP create cart error:', error);
-    return NextResponse.json(
-      buildProtocolError('internal_server_error', 'Cart creation failed.'),
-      { status: 500 }
-    );
-  }
-}
+import { NextResponse } from 'next/server';
+import {
+  buildProtocolError,
+  createUcpCart,
+  ensureEcommerceOnline,
+  parseJsonBody,
+} from '../../../lib/ucp/server';
+
+export const dynamic = 'force-dynamic';
+export const runtime = 'nodejs';
+
+export async function POST(request: Request) {
+  try {
+    const isOnline = await ensureEcommerceOnline();
+    if (!isOnline) {
+      return NextResponse.json(
+        buildProtocolError(
+          'ecommerce_unavailable',
+          'Ecommerce module license is inactive.'
+        ),
+        { status: 403 }
+      );
+    }
+
+    const body = await parseJsonBody(request);
+    const result = await createUcpCart(body, request);
+    return NextResponse.json(result.body, { status: result.status });
+  } catch (error) {
+    console.error('UCP create cart error:', error);
+    return NextResponse.json(
+      buildProtocolError('internal_server_error', 'Cart creation failed.'),
+      { status: 500 }
+    );
+  }
+}

package/templates/nextblock-template/app/ucp/v1/catalog/lookup/route.ts

@@ -1,35 +1,35 @@
-import { NextResponse } from 'next/server';
-import {
-  buildProtocolError,
-  ensureEcommerceOnline,
-  lookupCatalogProducts,
-  parseJsonBody,
-} from '../../../../lib/ucp/server';
-
-export const dynamic = 'force-dynamic';
-export const runtime = 'nodejs';
-
-export async function POST(request: Request) {
-  try {
-    const isOnline = await ensureEcommerceOnline();
-    if (!isOnline) {
-      return NextResponse.json(
-        buildProtocolError(
-          'ecommerce_unavailable',
-          'Ecommerce module license is inactive.'
-        ),
-        { status: 403 }
-      );
-    }
-
-    const body = await parseJsonBody(request);
-    const result = await lookupCatalogProducts(body, request);
-    return NextResponse.json(result.body, { status: result.status });
-  } catch (error) {
-    console.error('UCP catalog lookup error:', error);
-    return NextResponse.json(
-      buildProtocolError('internal_server_error', 'Catalog lookup failed.'),
-      { status: 500 }
-    );
-  }
-}
+import { NextResponse } from 'next/server';
+import {
+  buildProtocolError,
+  ensureEcommerceOnline,
+  lookupCatalogProducts,
+  parseJsonBody,
+} from '../../../../lib/ucp/server';
+
+export const dynamic = 'force-dynamic';
+export const runtime = 'nodejs';
+
+export async function POST(request: Request) {
+  try {
+    const isOnline = await ensureEcommerceOnline();
+    if (!isOnline) {
+      return NextResponse.json(
+        buildProtocolError(
+          'ecommerce_unavailable',
+          'Ecommerce module license is inactive.'
+        ),
+        { status: 403 }
+      );
+    }
+
+    const body = await parseJsonBody(request);
+    const result = await lookupCatalogProducts(body, request);
+    return NextResponse.json(result.body, { status: result.status });
+  } catch (error) {
+    console.error('UCP catalog lookup error:', error);
+    return NextResponse.json(
+      buildProtocolError('internal_server_error', 'Catalog lookup failed.'),
+      { status: 500 }
+    );
+  }
+}