create-nextblock 0.16.4 → 0.17.1

package/templates/nextblock-template/lib/cms/payments-reminder.ts

@@ -1,105 +1,105 @@
-import 'server-only';
-
-import { createClient, verifyPackageOnline } from '@nextblock-cms/db/server';
-import { getStoreReadiness } from '@nextblock-cms/ecommerce/server';
-
-/**
- * A store that has commerce switched on but cannot actually take money. This is easy to
- * end up in — the products, prices and pages all look finished — and the only symptom
- * used to be a shopper hitting a payment error at checkout. The banner makes the gap
- * visible in the CMS instead of on the storefront.
- */
-export interface PaymentsReminder {
-  /** Providers that are not ready, with what each is missing. */
-  blocked: Array<{
-    provider: 'stripe' | 'freemius';
-    label: string;
-    missing: string[];
-  }>;
-  /** Published products that currently cannot be bought because of the above. */
-  affectedProducts: number;
-}
-
-/**
- * Best-effort reminder state for the CMS layout. Returns null (no banner) whenever
- * nagging would be wrong or the answer can't be determined — an unmigrated database,
- * an instance without commerce, or the sandbox.
- */
-export async function getPaymentsReminder(): Promise<PaymentsReminder | null> {
-  // The sandbox refuses to store live credentials at all (savePaymentCredentials throws),
-  // so a "finish setting up payments" nag there is noise the operator cannot act on.
-  if (process.env.NEXT_PUBLIC_IS_SANDBOX === 'true') return null;
-
-  try {
-    if (!(await verifyPackageOnline('ecommerce'))) return null;
-
-    const supabase = createClient();
-
-    // Only ADMINs can act on this (the /cms/payments route is admin-only), so don't do
-    // the work for anyone else.
-    const {
-      data: { user },
-    } = await supabase.auth.getUser();
-    if (!user) return null;
-    const { data: profile } = await supabase
-      .from('profiles')
-      .select('role')
-      .eq('id', user.id)
-      .maybeSingle();
-    if (profile?.role !== 'ADMIN') return null;
-
-    const readiness = await getStoreReadiness();
-    const unready = (['stripe', 'freemius'] as const)
-      .map((provider) => readiness[provider])
-      .filter((entry) => !entry.ready);
-
-    if (unready.length === 0) return null;
-
-    // A provider matters to this reminder only when the catalogue contains products
-    // of the type routed through it. Do not treat a stale/accidental provider toggle as
-    // usage: that produced a Stripe warning in digital-only stores with no Stripe keys.
-    // Count across ALL statuses so a shop building a draft catalogue is warned before
-    // it publishes rather than after.
-    const usage = await Promise.all(
-      unready.map(async (entry) => {
-        const productType =
-          entry.provider === 'stripe' ? 'physical' : 'digital';
-        const [{ count: totalCount }, { count: activeCount }] =
-          await Promise.all([
-            supabase
-              .from('products')
-              .select('id', { count: 'exact', head: true })
-              .eq('product_type', productType),
-            supabase
-              .from('products')
-              .select('id', { count: 'exact', head: true })
-              .eq('status', 'active')
-              .eq('product_type', productType),
-          ]);
-        return {
-          entry,
-          inUse: (totalCount ?? 0) > 0,
-          activeProducts: activeCount ?? 0,
-        };
-      }),
-    );
-
-    const relevant = usage.filter((item) => item.inUse);
-    if (relevant.length === 0) return null;
-
-    return {
-      blocked: relevant.map(({ entry }) => ({
-        provider: entry.provider,
-        label: entry.label,
-        missing: entry.missing,
-      })),
-      affectedProducts: relevant.reduce(
-        (total, item) => total + item.activeProducts,
-        0,
-      ),
-    };
-  } catch {
-    // Never let a reminder break the CMS shell.
-    return null;
-  }
-}
+import 'server-only';
+
+import { createClient, verifyPackageOnline } from '@nextblock-cms/db/server';
+import { getStoreReadiness } from '@nextblock-cms/ecommerce/server';
+
+/**
+ * A store that has commerce switched on but cannot actually take money. This is easy to
+ * end up in — the products, prices and pages all look finished — and the only symptom
+ * used to be a shopper hitting a payment error at checkout. The banner makes the gap
+ * visible in the CMS instead of on the storefront.
+ */
+export interface PaymentsReminder {
+  /** Providers that are not ready, with what each is missing. */
+  blocked: Array<{
+    provider: 'stripe' | 'freemius';
+    label: string;
+    missing: string[];
+  }>;
+  /** Published products that currently cannot be bought because of the above. */
+  affectedProducts: number;
+}
+
+/**
+ * Best-effort reminder state for the CMS layout. Returns null (no banner) whenever
+ * nagging would be wrong or the answer can't be determined — an unmigrated database,
+ * an instance without commerce, or the sandbox.
+ */
+export async function getPaymentsReminder(): Promise<PaymentsReminder | null> {
+  // The sandbox refuses to store live credentials at all (savePaymentCredentials throws),
+  // so a "finish setting up payments" nag there is noise the operator cannot act on.
+  if (process.env.NEXT_PUBLIC_IS_SANDBOX === 'true') return null;
+
+  try {
+    if (!(await verifyPackageOnline('ecommerce'))) return null;
+
+    const supabase = createClient();
+
+    // Only ADMINs can act on this (the /cms/payments route is admin-only), so don't do
+    // the work for anyone else.
+    const {
+      data: { user },
+    } = await supabase.auth.getUser();
+    if (!user) return null;
+    const { data: profile } = await supabase
+      .from('profiles')
+      .select('role')
+      .eq('id', user.id)
+      .maybeSingle();
+    if (profile?.role !== 'ADMIN') return null;
+
+    const readiness = await getStoreReadiness();
+    const unready = (['stripe', 'freemius'] as const)
+      .map((provider) => readiness[provider])
+      .filter((entry) => !entry.ready);
+
+    if (unready.length === 0) return null;
+
+    // A provider matters to this reminder only when the catalogue contains products
+    // of the type routed through it. Do not treat a stale/accidental provider toggle as
+    // usage: that produced a Stripe warning in digital-only stores with no Stripe keys.
+    // Count across ALL statuses so a shop building a draft catalogue is warned before
+    // it publishes rather than after.
+    const usage = await Promise.all(
+      unready.map(async (entry) => {
+        const productType =
+          entry.provider === 'stripe' ? 'physical' : 'digital';
+        const [{ count: totalCount }, { count: activeCount }] =
+          await Promise.all([
+            supabase
+              .from('products')
+              .select('id', { count: 'exact', head: true })
+              .eq('product_type', productType),
+            supabase
+              .from('products')
+              .select('id', { count: 'exact', head: true })
+              .eq('status', 'active')
+              .eq('product_type', productType),
+          ]);
+        return {
+          entry,
+          inUse: (totalCount ?? 0) > 0,
+          activeProducts: activeCount ?? 0,
+        };
+      }),
+    );
+
+    const relevant = usage.filter((item) => item.inUse);
+    if (relevant.length === 0) return null;
+
+    return {
+      blocked: relevant.map(({ entry }) => ({
+        provider: entry.provider,
+        label: entry.label,
+        missing: entry.missing,
+      })),
+      affectedProducts: relevant.reduce(
+        (total, item) => total + item.activeProducts,
+        0,
+      ),
+    };
+  } catch {
+    // Never let a reminder break the CMS shell.
+    return null;
+  }
+}

package/templates/nextblock-template/lib/cms-transfer/types.ts

@@ -1,145 +1,145 @@
-import type { Json } from "@nextblock-cms/db";
-
-export type CmsContentType = "pages" | "posts" | "products";
-export type CmsImportConflictMode = "create_new" | "overwrite_existing";
-export type CmsImportApplyMode = "draft" | "live";
-
-export interface CmsImportOptions {
-  conflictMode: CmsImportConflictMode;
-  applyMode: CmsImportApplyMode;
-  ignoreBlankFields?: boolean;
-  skipUnavailableProductContent?: boolean;
-}
-
-export interface CmsImportMessage {
-  row: number;
-  type: "error" | "warning";
-  message: string;
-}
-
-export interface CmsImportPreviewItem {
-  row: number;
-  action: "create" | "update" | "skip";
-  identifier: string;
-  contentType: CmsContentType;
-}
-
-export interface CmsImportSummary {
-  success: boolean;
-  totalRows: number;
-  created: number;
-  updated: number;
-  skipped: number;
-  errors: CmsImportMessage[];
-  warnings: CmsImportMessage[];
-  preview: CmsImportPreviewItem[];
-}
-
-export interface CmsTransferActionResult {
-  success: boolean;
-  error?: string;
-  fileName?: string;
-  mimeType?: string;
-  content?: string;
-}
-
-export interface CmsBackupBundleV1 {
-  version: 1;
-  exported_at: string;
-  languages: Array<{
-    id: number;
-    code: string;
-    name: string | null;
-  }>;
-  content: {
-    pages: BackupPageRecord[];
-    posts: BackupPostRecord[];
-    products: BackupProductRecord[];
-  };
-  // Optional for backward compatibility with bundles exported before the
-  // Blocks Library was added to the content backup.
-  custom_blocks?: BackupCustomBlockRecord[];
-}
-
-export interface BackupBlockRecord {
-  language_id?: number;
-  block_type: string;
-  content: Json;
-  order?: number;
-}
-
-export interface BackupCustomBlockRecord {
-  slug: string;
-  name: string;
-  description?: string;
-  fields: Json;
-  layout_schema: Json;
-  is_original?: boolean;
-}
-
-export interface BackupPageRecord {
-  id?: number | string | null;
-  translation_group_id?: string | null;
-  language_code: string;
-  title: string;
-  slug: string;
-  status: string;
-  meta_title?: string | null;
-  meta_description?: string | null;
-  feature_image_id?: string | null;
-  feature_image_object_key?: string | null;
-  blocks: BackupBlockRecord[];
-}
-
-export interface BackupPostRecord extends BackupPageRecord {
-  label?: string | null;
-  excerpt?: string | null;
-  subtitle?: string | null;
-  published_at?: string | null;
-}
-
-export interface BackupProductVariantRecord {
-  id?: string | null;
-  sku: string;
-  upc?: string | null;
-  price: number;
-  prices?: Record<string, number>;
-  sale_price?: number | null;
-  sale_prices?: Record<string, number | null> | null;
-  stock_quantity: number;
-  main_media_id?: string | null;
-  main_media_object_key?: string | null;
-  attribute_term_ids?: string[];
-}
-
-export interface BackupProductRecord {
-  id?: string | null;
-  translation_group_id?: string | null;
-  language_code: string;
-  product_type: string;
-  payment_provider: string;
-  title: string;
-  slug: string;
-  sku: string;
-  upc?: string | null;
-  status: string;
-  price: number;
-  prices?: Record<string, number>;
-  sale_price?: number | null;
-  sale_prices?: Record<string, number | null> | null;
-  stock: number;
-  is_taxable: boolean;
-  meta_title?: string | null;
-  meta_description?: string | null;
-  short_description?: string | null;
-  description_json?: Json;
-  description_blocks: BackupBlockRecord[];
-  category_slugs?: string[];
-  media_ids?: string[];
-  media_object_keys?: string[];
-  variants?: BackupProductVariantRecord[];
-  freemius_product_id?: string | null;
-  freemius_plan_id?: string | null;
-  trial_period_days?: number;
-  trial_requires_payment_method?: boolean;
-}
+import type { Json } from "@nextblock-cms/db";
+
+export type CmsContentType = "pages" | "posts" | "products";
+export type CmsImportConflictMode = "create_new" | "overwrite_existing";
+export type CmsImportApplyMode = "draft" | "live";
+
+export interface CmsImportOptions {
+  conflictMode: CmsImportConflictMode;
+  applyMode: CmsImportApplyMode;
+  ignoreBlankFields?: boolean;
+  skipUnavailableProductContent?: boolean;
+}
+
+export interface CmsImportMessage {
+  row: number;
+  type: "error" | "warning";
+  message: string;
+}
+
+export interface CmsImportPreviewItem {
+  row: number;
+  action: "create" | "update" | "skip";
+  identifier: string;
+  contentType: CmsContentType;
+}
+
+export interface CmsImportSummary {
+  success: boolean;
+  totalRows: number;
+  created: number;
+  updated: number;
+  skipped: number;
+  errors: CmsImportMessage[];
+  warnings: CmsImportMessage[];
+  preview: CmsImportPreviewItem[];
+}
+
+export interface CmsTransferActionResult {
+  success: boolean;
+  error?: string;
+  fileName?: string;
+  mimeType?: string;
+  content?: string;
+}
+
+export interface CmsBackupBundleV1 {
+  version: 1;
+  exported_at: string;
+  languages: Array<{
+    id: number;
+    code: string;
+    name: string | null;
+  }>;
+  content: {
+    pages: BackupPageRecord[];
+    posts: BackupPostRecord[];
+    products: BackupProductRecord[];
+  };
+  // Optional for backward compatibility with bundles exported before the
+  // Blocks Library was added to the content backup.
+  custom_blocks?: BackupCustomBlockRecord[];
+}
+
+export interface BackupBlockRecord {
+  language_id?: number;
+  block_type: string;
+  content: Json;
+  order?: number;
+}
+
+export interface BackupCustomBlockRecord {
+  slug: string;
+  name: string;
+  description?: string;
+  fields: Json;
+  layout_schema: Json;
+  is_original?: boolean;
+}
+
+export interface BackupPageRecord {
+  id?: number | string | null;
+  translation_group_id?: string | null;
+  language_code: string;
+  title: string;
+  slug: string;
+  status: string;
+  meta_title?: string | null;
+  meta_description?: string | null;
+  feature_image_id?: string | null;
+  feature_image_object_key?: string | null;
+  blocks: BackupBlockRecord[];
+}
+
+export interface BackupPostRecord extends BackupPageRecord {
+  label?: string | null;
+  excerpt?: string | null;
+  subtitle?: string | null;
+  published_at?: string | null;
+}
+
+export interface BackupProductVariantRecord {
+  id?: string | null;
+  sku: string;
+  upc?: string | null;
+  price: number;
+  prices?: Record<string, number>;
+  sale_price?: number | null;
+  sale_prices?: Record<string, number | null> | null;
+  stock_quantity: number;
+  main_media_id?: string | null;
+  main_media_object_key?: string | null;
+  attribute_term_ids?: string[];
+}
+
+export interface BackupProductRecord {
+  id?: string | null;
+  translation_group_id?: string | null;
+  language_code: string;
+  product_type: string;
+  payment_provider: string;
+  title: string;
+  slug: string;
+  sku: string;
+  upc?: string | null;
+  status: string;
+  price: number;
+  prices?: Record<string, number>;
+  sale_price?: number | null;
+  sale_prices?: Record<string, number | null> | null;
+  stock: number;
+  is_taxable: boolean;
+  meta_title?: string | null;
+  meta_description?: string | null;
+  short_description?: string | null;
+  description_json?: Json;
+  description_blocks: BackupBlockRecord[];
+  category_slugs?: string[];
+  media_ids?: string[];
+  media_object_keys?: string[];
+  variants?: BackupProductVariantRecord[];
+  freemius_product_id?: string | null;
+  freemius_plan_id?: string | null;
+  trial_period_days?: number;
+  trial_requires_payment_method?: boolean;
+}

package/templates/nextblock-template/lib/custom-block-definitions.ts

@@ -1,87 +1,87 @@
-import 'server-only';
-
-import { getSsgSupabaseClient } from '@nextblock-cms/db/server';
-import {
-  customBlockDefinitionRowSchema,
-  type CustomBlockDefinition,
-} from '@nextblock-cms/utils';
-import { unstable_cache } from 'next/cache';
-
-export const CUSTOM_BLOCK_DEFINITIONS_CACHE_TAG = 'custom-block-definitions';
-const CUSTOM_BLOCK_SELECT = 'id, slug, name, description, fields, layout_schema, is_original';
-
-export function getCustomBlockDefinitionCacheTag(idOrSlug: string) {
-  return `${CUSTOM_BLOCK_DEFINITIONS_CACHE_TAG}:${idOrSlug}`;
-}
-
-function parseCustomBlockDefinitionRows(rows: unknown[]): CustomBlockDefinition[] {
-  return rows.map((row) => customBlockDefinitionRowSchema.parse(row));
-}
-
-async function queryCustomBlockDefinitions() {
-  const supabase = getSsgSupabaseClient();
-  const { data, error } = await supabase
-    .from('custom_block_definitions')
-    .select(CUSTOM_BLOCK_SELECT)
-    .order('name', { ascending: true });
-
-  if (error) {
-    throw new Error(`Failed to load custom block definitions: ${error.message}`);
-  }
-
-  return parseCustomBlockDefinitionRows(data ?? []);
-}
-
-export const getCachedCustomBlockDefinitions = unstable_cache(
-  queryCustomBlockDefinitions,
-  [CUSTOM_BLOCK_DEFINITIONS_CACHE_TAG],
-  {
-    revalidate: 60,
-    tags: [CUSTOM_BLOCK_DEFINITIONS_CACHE_TAG],
-  }
-);
-
-const getCachedCustomBlockDefinitionBySlugInternal = unstable_cache(
-  async (slug: string) => {
-    const definitions = await queryCustomBlockDefinitions();
-    return definitions.find((definition) => definition.slug === slug) ?? null;
-  },
-  [`${CUSTOM_BLOCK_DEFINITIONS_CACHE_TAG}:by-slug`],
-  {
-    revalidate: 60,
-    tags: [CUSTOM_BLOCK_DEFINITIONS_CACHE_TAG],
-  }
-);
-
-async function queryCustomBlockDefinitionBySlug(slug: string): Promise<CustomBlockDefinition | null> {
-  const supabase = getSsgSupabaseClient();
-  const { data, error } = await supabase
-    .from('custom_block_definitions')
-    .select(CUSTOM_BLOCK_SELECT)
-    .eq('slug', slug)
-    .maybeSingle();
-
-  if (error) {
-    throw new Error(`Failed to load custom block definition "${slug}": ${error.message}`);
-  }
-
-  return data ? customBlockDefinitionRowSchema.parse(data) : null;
-}
-
-export async function getCachedCustomBlockDefinitionBySlug(slug: string) {
-  const cached = await getCachedCustomBlockDefinitionBySlugInternal(slug);
-  if (cached) {
-    return cached;
-  }
-
-  // The cached lookup can hold a stale "not found" result for a definition that
-  // was created or edited within the last revalidation window. Fall back to a
-  // direct read so a freshly saved custom block renders on the front end
-  // immediately instead of showing "Unsupported block type".
-  try {
-    return await queryCustomBlockDefinitionBySlug(slug);
-  } catch (error) {
-    console.error('[custom-block-definitions] Live definition fallback failed:', error);
-    return null;
-  }
-}
+import 'server-only';
+
+import { getSsgSupabaseClient } from '@nextblock-cms/db/server';
+import {
+  customBlockDefinitionRowSchema,
+  type CustomBlockDefinition,
+} from '@nextblock-cms/utils';
+import { unstable_cache } from 'next/cache';
+
+export const CUSTOM_BLOCK_DEFINITIONS_CACHE_TAG = 'custom-block-definitions';
+const CUSTOM_BLOCK_SELECT = 'id, slug, name, description, fields, layout_schema, is_original';
+
+export function getCustomBlockDefinitionCacheTag(idOrSlug: string) {
+  return `${CUSTOM_BLOCK_DEFINITIONS_CACHE_TAG}:${idOrSlug}`;
+}
+
+function parseCustomBlockDefinitionRows(rows: unknown[]): CustomBlockDefinition[] {
+  return rows.map((row) => customBlockDefinitionRowSchema.parse(row));
+}
+
+async function queryCustomBlockDefinitions() {
+  const supabase = getSsgSupabaseClient();
+  const { data, error } = await supabase
+    .from('custom_block_definitions')
+    .select(CUSTOM_BLOCK_SELECT)
+    .order('name', { ascending: true });
+
+  if (error) {
+    throw new Error(`Failed to load custom block definitions: ${error.message}`);
+  }
+
+  return parseCustomBlockDefinitionRows(data ?? []);
+}
+
+export const getCachedCustomBlockDefinitions = unstable_cache(
+  queryCustomBlockDefinitions,
+  [CUSTOM_BLOCK_DEFINITIONS_CACHE_TAG],
+  {
+    revalidate: 60,
+    tags: [CUSTOM_BLOCK_DEFINITIONS_CACHE_TAG],
+  }
+);
+
+const getCachedCustomBlockDefinitionBySlugInternal = unstable_cache(
+  async (slug: string) => {
+    const definitions = await queryCustomBlockDefinitions();
+    return definitions.find((definition) => definition.slug === slug) ?? null;
+  },
+  [`${CUSTOM_BLOCK_DEFINITIONS_CACHE_TAG}:by-slug`],
+  {
+    revalidate: 60,
+    tags: [CUSTOM_BLOCK_DEFINITIONS_CACHE_TAG],
+  }
+);
+
+async function queryCustomBlockDefinitionBySlug(slug: string): Promise<CustomBlockDefinition | null> {
+  const supabase = getSsgSupabaseClient();
+  const { data, error } = await supabase
+    .from('custom_block_definitions')
+    .select(CUSTOM_BLOCK_SELECT)
+    .eq('slug', slug)
+    .maybeSingle();
+
+  if (error) {
+    throw new Error(`Failed to load custom block definition "${slug}": ${error.message}`);
+  }
+
+  return data ? customBlockDefinitionRowSchema.parse(data) : null;
+}
+
+export async function getCachedCustomBlockDefinitionBySlug(slug: string) {
+  const cached = await getCachedCustomBlockDefinitionBySlugInternal(slug);
+  if (cached) {
+    return cached;
+  }
+
+  // The cached lookup can hold a stale "not found" result for a definition that
+  // was created or edited within the last revalidation window. Fall back to a
+  // direct read so a freshly saved custom block renders on the front end
+  // immediately instead of showing "Unsupported block type".
+  try {
+    return await queryCustomBlockDefinitionBySlug(slug);
+  } catch (error) {
+    console.error('[custom-block-definitions] Live definition fallback failed:', error);
+    return null;
+  }
+}