create-nextblock 0.14.1 → 0.14.2

package/templates/nextblock-template/app/cms/import-export/actions.ts

@@ -1,226 +1,226 @@
-"use server";
-
-import {
-  applyBundleImport,
-  applyCsvImport,
-  buildCsvTemplate,
-  dryRunBundleImport,
-  dryRunCsvImport,
-  exportBackupBundle,
-  exportCsv,
-} from "../../../lib/cms-transfer/server";
-import type {
-  CmsContentType,
-  CmsImportApplyMode,
-  CmsImportConflictMode,
-  CmsTransferActionResult,
-} from "../../../lib/cms-transfer/types";
-
-function dateStamp() {
-  return new Date().toISOString().slice(0, 10);
-}
-
-function contentLabel(contentType: CmsContentType) {
-  return contentType === "pages" ? "pages" : contentType === "posts" ? "posts" : "products";
-}
-
-export async function getCmsCsvTemplateAction(
-  contentType: CmsContentType
-): Promise<CmsTransferActionResult> {
-  try {
-    return {
-      success: true,
-      fileName: `nextblock-${contentLabel(contentType)}-import-template.csv`,
-      mimeType: "text/csv",
-      content: buildCsvTemplate(contentType),
-    };
-  } catch (error) {
-    return {
-      success: false,
-      error: error instanceof Error ? error.message : "Failed to build template.",
-    };
-  }
-}
-
-export async function exportCmsCsvAction(params: {
-  contentType: CmsContentType;
-  languageId?: number;
-}): Promise<CmsTransferActionResult> {
-  try {
-    return {
-      success: true,
-      fileName: `nextblock-${contentLabel(params.contentType)}-${dateStamp()}.csv`,
-      mimeType: "text/csv",
-      content: await exportCsv(params),
-    };
-  } catch (error) {
-    return {
-      success: false,
-      error: error instanceof Error ? error.message : "Failed to export CSV.",
-    };
-  }
-}
-
-export async function dryRunCmsCsvImportAction(params: {
-  contentType: CmsContentType;
-  csv: string;
-  conflictMode: CmsImportConflictMode;
-  applyMode: CmsImportApplyMode;
-  ignoreBlankFields?: boolean;
-}) {
-  try {
-    return await dryRunCsvImport({
-      contentType: params.contentType,
-      csv: params.csv,
-      options: {
-        conflictMode: params.conflictMode,
-        applyMode: params.applyMode,
-        ignoreBlankFields: params.ignoreBlankFields,
-      },
-    });
-  } catch (error) {
-    return {
-      success: false,
-      totalRows: 0,
-      created: 0,
-      updated: 0,
-      skipped: 0,
-      preview: [],
-      warnings: [],
-      errors: [
-        {
-          row: 0,
-          type: "error" as const,
-          message: error instanceof Error ? error.message : "Failed to dry-run import.",
-        },
-      ],
-    };
-  }
-}
-
-export async function applyCmsCsvImportAction(params: {
-  contentType: CmsContentType;
-  csv: string;
-  conflictMode: CmsImportConflictMode;
-  applyMode: CmsImportApplyMode;
-  ignoreBlankFields?: boolean;
-}) {
-  try {
-    return await applyCsvImport({
-      contentType: params.contentType,
-      csv: params.csv,
-      options: {
-        conflictMode: params.conflictMode,
-        applyMode: params.applyMode,
-        ignoreBlankFields: params.ignoreBlankFields,
-      },
-    });
-  } catch (error) {
-    return {
-      success: false,
-      totalRows: 0,
-      created: 0,
-      updated: 0,
-      skipped: 0,
-      preview: [],
-      warnings: [],
-      errors: [
-        {
-          row: 0,
-          type: "error" as const,
-          message: error instanceof Error ? error.message : "Failed to apply import.",
-        },
-      ],
-    };
-  }
-}
-
-export async function exportCmsBackupBundleAction(): Promise<CmsTransferActionResult> {
-  try {
-    return {
-      success: true,
-      fileName: `nextblock-content-backup-${dateStamp()}.json`,
-      mimeType: "application/json",
-      content: await exportBackupBundle(),
-    };
-  } catch (error) {
-    return {
-      success: false,
-      error: error instanceof Error ? error.message : "Failed to export backup bundle.",
-    };
-  }
-}
-
-export async function dryRunCmsBackupBundleImportAction(params: {
-  bundleJson: string;
-  contentTypes: CmsContentType[];
-  conflictMode: CmsImportConflictMode;
-  applyMode: CmsImportApplyMode;
-  includeBlocks?: boolean;
-}) {
-  try {
-    return await dryRunBundleImport({
-      bundleJson: params.bundleJson,
-      contentTypes: params.contentTypes,
-      includeBlocks: params.includeBlocks,
-      options: {
-        conflictMode: params.conflictMode,
-        applyMode: params.applyMode,
-      },
-    });
-  } catch (error) {
-    return {
-      success: false,
-      totalRows: 0,
-      created: 0,
-      updated: 0,
-      skipped: 0,
-      preview: [],
-      warnings: [],
-      errors: [
-        {
-          row: 0,
-          type: "error" as const,
-          message: error instanceof Error ? error.message : "Failed to dry-run backup import.",
-        },
-      ],
-    };
-  }
-}
-
-export async function applyCmsBackupBundleImportAction(params: {
-  bundleJson: string;
-  contentTypes: CmsContentType[];
-  conflictMode: CmsImportConflictMode;
-  applyMode: CmsImportApplyMode;
-  includeBlocks?: boolean;
-}) {
-  try {
-    return await applyBundleImport({
-      bundleJson: params.bundleJson,
-      contentTypes: params.contentTypes,
-      includeBlocks: params.includeBlocks,
-      options: {
-        conflictMode: params.conflictMode,
-        applyMode: params.applyMode,
-      },
-    });
-  } catch (error) {
-    return {
-      success: false,
-      totalRows: 0,
-      created: 0,
-      updated: 0,
-      skipped: 0,
-      preview: [],
-      warnings: [],
-      errors: [
-        {
-          row: 0,
-          type: "error" as const,
-          message: error instanceof Error ? error.message : "Failed to apply backup import.",
-        },
-      ],
-    };
-  }
-}
+"use server";
+
+import {
+  applyBundleImport,
+  applyCsvImport,
+  buildCsvTemplate,
+  dryRunBundleImport,
+  dryRunCsvImport,
+  exportBackupBundle,
+  exportCsv,
+} from "../../../lib/cms-transfer/server";
+import type {
+  CmsContentType,
+  CmsImportApplyMode,
+  CmsImportConflictMode,
+  CmsTransferActionResult,
+} from "../../../lib/cms-transfer/types";
+
+function dateStamp() {
+  return new Date().toISOString().slice(0, 10);
+}
+
+function contentLabel(contentType: CmsContentType) {
+  return contentType === "pages" ? "pages" : contentType === "posts" ? "posts" : "products";
+}
+
+export async function getCmsCsvTemplateAction(
+  contentType: CmsContentType
+): Promise<CmsTransferActionResult> {
+  try {
+    return {
+      success: true,
+      fileName: `nextblock-${contentLabel(contentType)}-import-template.csv`,
+      mimeType: "text/csv",
+      content: buildCsvTemplate(contentType),
+    };
+  } catch (error) {
+    return {
+      success: false,
+      error: error instanceof Error ? error.message : "Failed to build template.",
+    };
+  }
+}
+
+export async function exportCmsCsvAction(params: {
+  contentType: CmsContentType;
+  languageId?: number;
+}): Promise<CmsTransferActionResult> {
+  try {
+    return {
+      success: true,
+      fileName: `nextblock-${contentLabel(params.contentType)}-${dateStamp()}.csv`,
+      mimeType: "text/csv",
+      content: await exportCsv(params),
+    };
+  } catch (error) {
+    return {
+      success: false,
+      error: error instanceof Error ? error.message : "Failed to export CSV.",
+    };
+  }
+}
+
+export async function dryRunCmsCsvImportAction(params: {
+  contentType: CmsContentType;
+  csv: string;
+  conflictMode: CmsImportConflictMode;
+  applyMode: CmsImportApplyMode;
+  ignoreBlankFields?: boolean;
+}) {
+  try {
+    return await dryRunCsvImport({
+      contentType: params.contentType,
+      csv: params.csv,
+      options: {
+        conflictMode: params.conflictMode,
+        applyMode: params.applyMode,
+        ignoreBlankFields: params.ignoreBlankFields,
+      },
+    });
+  } catch (error) {
+    return {
+      success: false,
+      totalRows: 0,
+      created: 0,
+      updated: 0,
+      skipped: 0,
+      preview: [],
+      warnings: [],
+      errors: [
+        {
+          row: 0,
+          type: "error" as const,
+          message: error instanceof Error ? error.message : "Failed to dry-run import.",
+        },
+      ],
+    };
+  }
+}
+
+export async function applyCmsCsvImportAction(params: {
+  contentType: CmsContentType;
+  csv: string;
+  conflictMode: CmsImportConflictMode;
+  applyMode: CmsImportApplyMode;
+  ignoreBlankFields?: boolean;
+}) {
+  try {
+    return await applyCsvImport({
+      contentType: params.contentType,
+      csv: params.csv,
+      options: {
+        conflictMode: params.conflictMode,
+        applyMode: params.applyMode,
+        ignoreBlankFields: params.ignoreBlankFields,
+      },
+    });
+  } catch (error) {
+    return {
+      success: false,
+      totalRows: 0,
+      created: 0,
+      updated: 0,
+      skipped: 0,
+      preview: [],
+      warnings: [],
+      errors: [
+        {
+          row: 0,
+          type: "error" as const,
+          message: error instanceof Error ? error.message : "Failed to apply import.",
+        },
+      ],
+    };
+  }
+}
+
+export async function exportCmsBackupBundleAction(): Promise<CmsTransferActionResult> {
+  try {
+    return {
+      success: true,
+      fileName: `nextblock-content-backup-${dateStamp()}.json`,
+      mimeType: "application/json",
+      content: await exportBackupBundle(),
+    };
+  } catch (error) {
+    return {
+      success: false,
+      error: error instanceof Error ? error.message : "Failed to export backup bundle.",
+    };
+  }
+}
+
+export async function dryRunCmsBackupBundleImportAction(params: {
+  bundleJson: string;
+  contentTypes: CmsContentType[];
+  conflictMode: CmsImportConflictMode;
+  applyMode: CmsImportApplyMode;
+  includeBlocks?: boolean;
+}) {
+  try {
+    return await dryRunBundleImport({
+      bundleJson: params.bundleJson,
+      contentTypes: params.contentTypes,
+      includeBlocks: params.includeBlocks,
+      options: {
+        conflictMode: params.conflictMode,
+        applyMode: params.applyMode,
+      },
+    });
+  } catch (error) {
+    return {
+      success: false,
+      totalRows: 0,
+      created: 0,
+      updated: 0,
+      skipped: 0,
+      preview: [],
+      warnings: [],
+      errors: [
+        {
+          row: 0,
+          type: "error" as const,
+          message: error instanceof Error ? error.message : "Failed to dry-run backup import.",
+        },
+      ],
+    };
+  }
+}
+
+export async function applyCmsBackupBundleImportAction(params: {
+  bundleJson: string;
+  contentTypes: CmsContentType[];
+  conflictMode: CmsImportConflictMode;
+  applyMode: CmsImportApplyMode;
+  includeBlocks?: boolean;
+}) {
+  try {
+    return await applyBundleImport({
+      bundleJson: params.bundleJson,
+      contentTypes: params.contentTypes,
+      includeBlocks: params.includeBlocks,
+      options: {
+        conflictMode: params.conflictMode,
+        applyMode: params.applyMode,
+      },
+    });
+  } catch (error) {
+    return {
+      success: false,
+      totalRows: 0,
+      created: 0,
+      updated: 0,
+      skipped: 0,
+      preview: [],
+      warnings: [],
+      errors: [
+        {
+          row: 0,
+          type: "error" as const,
+          message: error instanceof Error ? error.message : "Failed to apply backup import.",
+        },
+      ],
+    };
+  }
+}

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

@@ -1,73 +1,73 @@
-import 'katex/dist/katex.min.css';
-import { redirect } from 'next/navigation';
-import { after } from 'next/server';
-import CmsClientLayout from "./CmsClientLayout";
-import { verifyPackageOnline, createClient } from '@nextblock-cms/db/server';
-import { evaluateTwoFactor, getStaffTwoFactorReminder } from '../../lib/auth/twoFactor';
-import { maybeRefreshUpstreamStatus } from '../../lib/updates/check-upstream';
-import type { SystemAlertItem } from './components/SystemAlertsBanner';
-
-/**
- * Unresolved system alerts for the dashboard banner. Runs as the signed-in user, so the
- * system_alerts SELECT RLS policy returns rows only for ADMINs (WRITERs get an empty
- * list). Best-effort: any failure (e.g. the table not yet migrated) yields no banner.
- */
-async function getUnresolvedSystemAlerts(): Promise<SystemAlertItem[]> {
-  try {
-    const supabase = createClient();
-    const { data, error } = await supabase
-      .from('system_alerts')
-      .select('id, alert_type, title, message, metadata')
-      .eq('is_resolved', false)
-      .in('alert_type', ['merge_conflict', 'runtime_update_available'])
-      .order('created_at', { ascending: false })
-      .limit(20);
-    if (error || !data) return [];
-    return data.map((a) => ({
-      id: a.id,
-      alert_type: a.alert_type,
-      title: a.title,
-      message: a.message,
-      metadata: (a.metadata ?? null) as Record<string, unknown> | null,
-    }));
-  } catch {
-    return [];
-  }
-}
-
-export default async function CmsLayout({
-  children,
-}: {
-  children: React.ReactNode;
-}) {
-  // Enforce any outstanding second factor before rendering the CMS. This guards
-  // direct navigation to /cms/* with an aal1 (password-only) session.
-  const twoFactor = await evaluateTwoFactor();
-  if (twoFactor.status === 'totp_required' || twoFactor.status === 'email_required') {
-    redirect('/two-factor?redirect_to=/cms/dashboard');
-  }
-
-  const [isEcommerceActive, isCortexAiActive, showTwoFactorReminder, systemAlerts] =
-    await Promise.all([
-      verifyPackageOnline('ecommerce'),
-      verifyPackageOnline('cortex-ai'),
-      getStaffTwoFactorReminder(),
-      getUnresolvedSystemAlerts(),
-    ]);
-
-  // After the response, refresh upstream update/conflict status in the background
-  // (throttled to ~6h, see maybeRefreshUpstreamStatus). This keeps the banner current
-  // without a cron — so it works on Vercel Hobby (limited crons) and self-hosted alike.
-  after(() => maybeRefreshUpstreamStatus());
-
-  return (
-    <CmsClientLayout
-      isCortexAiActive={isCortexAiActive}
-      isEcommerceActive={isEcommerceActive}
-      showTwoFactorReminder={showTwoFactorReminder}
-      systemAlerts={systemAlerts}
-    >
-      {children}
-    </CmsClientLayout>
-  );
-}
+import 'katex/dist/katex.min.css';
+import { redirect } from 'next/navigation';
+import { after } from 'next/server';
+import CmsClientLayout from "./CmsClientLayout";
+import { verifyPackageOnline, createClient } from '@nextblock-cms/db/server';
+import { evaluateTwoFactor, getStaffTwoFactorReminder } from '../../lib/auth/twoFactor';
+import { maybeRefreshUpstreamStatus } from '../../lib/updates/check-upstream';
+import type { SystemAlertItem } from './components/SystemAlertsBanner';
+
+/**
+ * Unresolved system alerts for the dashboard banner. Runs as the signed-in user, so the
+ * system_alerts SELECT RLS policy returns rows only for ADMINs (WRITERs get an empty
+ * list). Best-effort: any failure (e.g. the table not yet migrated) yields no banner.
+ */
+async function getUnresolvedSystemAlerts(): Promise<SystemAlertItem[]> {
+  try {
+    const supabase = createClient();
+    const { data, error } = await supabase
+      .from('system_alerts')
+      .select('id, alert_type, title, message, metadata')
+      .eq('is_resolved', false)
+      .in('alert_type', ['merge_conflict', 'runtime_update_available'])
+      .order('created_at', { ascending: false })
+      .limit(20);
+    if (error || !data) return [];
+    return data.map((a) => ({
+      id: a.id,
+      alert_type: a.alert_type,
+      title: a.title,
+      message: a.message,
+      metadata: (a.metadata ?? null) as Record<string, unknown> | null,
+    }));
+  } catch {
+    return [];
+  }
+}
+
+export default async function CmsLayout({
+  children,
+}: {
+  children: React.ReactNode;
+}) {
+  // Enforce any outstanding second factor before rendering the CMS. This guards
+  // direct navigation to /cms/* with an aal1 (password-only) session.
+  const twoFactor = await evaluateTwoFactor();
+  if (twoFactor.status === 'totp_required' || twoFactor.status === 'email_required') {
+    redirect('/two-factor?redirect_to=/cms/dashboard');
+  }
+
+  const [isEcommerceActive, isCortexAiActive, showTwoFactorReminder, systemAlerts] =
+    await Promise.all([
+      verifyPackageOnline('ecommerce'),
+      verifyPackageOnline('cortex-ai'),
+      getStaffTwoFactorReminder(),
+      getUnresolvedSystemAlerts(),
+    ]);
+
+  // After the response, refresh upstream update/conflict status in the background
+  // (throttled to ~6h, see maybeRefreshUpstreamStatus). This keeps the banner current
+  // without a cron — so it works on Vercel Hobby (limited crons) and self-hosted alike.
+  after(() => maybeRefreshUpstreamStatus());
+
+  return (
+    <CmsClientLayout
+      isCortexAiActive={isCortexAiActive}
+      isEcommerceActive={isEcommerceActive}
+      showTwoFactorReminder={showTwoFactorReminder}
+      systemAlerts={systemAlerts}
+    >
+      {children}
+    </CmsClientLayout>
+  );
+}