create-nextblock 0.16.4 → 0.17.1

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

@@ -1,35 +1,35 @@
-import { NextResponse } from 'next/server';
-import {
-  buildProtocolError,
-  ensureEcommerceOnline,
-  getCatalogProduct,
-  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 getCatalogProduct(body, request);
-    return NextResponse.json(result.body, { status: result.status });
-  } catch (error) {
-    console.error('UCP catalog product error:', error);
-    return NextResponse.json(
-      buildProtocolError('internal_server_error', 'Catalog product lookup failed.'),
-      { status: 500 }
-    );
-  }
-}
+import { NextResponse } from 'next/server';
+import {
+  buildProtocolError,
+  ensureEcommerceOnline,
+  getCatalogProduct,
+  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 getCatalogProduct(body, request);
+    return NextResponse.json(result.body, { status: result.status });
+  } catch (error) {
+    console.error('UCP catalog product error:', error);
+    return NextResponse.json(
+      buildProtocolError('internal_server_error', 'Catalog product lookup failed.'),
+      { status: 500 }
+    );
+  }
+}

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

@@ -1,34 +1,34 @@
-import { NextResponse } from 'next/server';
-import {
-  buildProtocolError,
-  ensureEcommerceOnline,
-  parseJsonBody,
-  searchCatalogProducts,
-} 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);
-    return NextResponse.json(await searchCatalogProducts(body, request));
-  } catch (error) {
-    console.error('UCP catalog search error:', error);
-    return NextResponse.json(
-      buildProtocolError('internal_server_error', 'Catalog search failed.'),
-      { status: 500 }
-    );
-  }
-}
+import { NextResponse } from 'next/server';
+import {
+  buildProtocolError,
+  ensureEcommerceOnline,
+  parseJsonBody,
+  searchCatalogProducts,
+} 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);
+    return NextResponse.json(await searchCatalogProducts(body, request));
+  } catch (error) {
+    console.error('UCP catalog search error:', error);
+    return NextResponse.json(
+      buildProtocolError('internal_server_error', 'Catalog search failed.'),
+      { status: 500 }
+    );
+  }
+}

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

@@ -1,210 +1,210 @@
-'use client';
-
-import { useEffect, useRef } from 'react';
-import { useLanguage } from '../context/LanguageContext';
-import { useCartStore } from '@nextblock-cms/ecommerce/cart-store';
-import { isDigitalItem, type CartItem } from '@nextblock-cms/ecommerce/types';
-import { useIsCartHydrated } from '@nextblock-cms/ecommerce/use-cart';
-import { mapRawVariantRelations } from '@nextblock-cms/ecommerce/variation-utils';
-import { getTranslatedProductsForCart } from '@nextblock-cms/ecommerce/server-actions/product-actions';
-
-const R2_BASE_URL = process.env.NEXT_PUBLIC_R2_BASE_URL || '';
-
-function resolveMediaUrl(filePath?: string | null) {
-  if (!filePath) {
-    return null;
-  }
-
-  if (filePath.startsWith('http')) {
-    return filePath;
-  }
-
-  return R2_BASE_URL ? `${R2_BASE_URL}/${filePath}` : filePath;
-}
-
-function resolveProductImageUrl(product: any, fallback?: string | null) {
-  const firstMedia = product?.product_media?.[0]?.media;
-  return resolveMediaUrl(firstMedia?.file_path || firstMedia?.object_key) || fallback || null;
-}
-
-function buildCartTranslationSignature(items: CartItem[]) {
-  return JSON.stringify(
-    items.map((item) => ({
-      id: item.id,
-      product_id: item.product_id,
-      variant_id: item.variant_id ?? null,
-      sku: item.sku,
-      quantity: item.quantity,
-      language_id: item.language_id ?? null,
-      translation_group_id: item.translation_group_id ?? null,
-    }))
-  );
-}
-
-function syncCartItem(item: CartItem, translatedProduct: any, currentLocale: string): CartItem {
-  const productImageUrl = resolveProductImageUrl(translatedProduct, item.image_url);
-  const nextBase: CartItem = {
-    ...item,
-    id: translatedProduct.id,
-    product_id: translatedProduct.id,
-    title: translatedProduct.title,
-    slug: translatedProduct.slug,
-    sku: translatedProduct.sku || item.sku,
-    stock: typeof translatedProduct.stock === 'number' ? translatedProduct.stock : item.stock,
-    language_id: translatedProduct.language_id,
-    translation_group_id: translatedProduct.translation_group_id,
-    image_url: productImageUrl || item.image_url,
-    is_taxable: translatedProduct.is_taxable ?? item.is_taxable,
-    product_type: translatedProduct.product_type ?? item.product_type,
-    payment_provider: translatedProduct.payment_provider ?? item.payment_provider,
-    provider: translatedProduct.payment_provider ?? item.provider,
-    freemius_product_id: translatedProduct.freemius_product_id ?? item.freemius_product_id,
-    freemius_plan_id: translatedProduct.freemius_plan_id ?? item.freemius_plan_id,
-    trial_period_days: translatedProduct.trial_period_days ?? item.trial_period_days ?? 0,
-    trial_requires_payment_method:
-      translatedProduct.trial_requires_payment_method ??
-      item.trial_requires_payment_method ??
-      false,
-    prices: translatedProduct.prices || item.prices,
-    sale_prices: translatedProduct.sale_prices || item.sale_prices,
-    has_variants: Boolean(translatedProduct.product_variants?.length),
-  };
-
-  if (isDigitalItem(item)) {
-    return nextBase;
-  }
-
-  const isVariantLine = Boolean(item.variant_id || item.variant_label);
-  if (!isVariantLine) {
-    return {
-      ...nextBase,
-      price: translatedProduct.price,
-      prices: translatedProduct.prices || item.prices,
-      sale_price: translatedProduct.sale_price ?? null,
-      sale_prices: translatedProduct.sale_prices || item.sale_prices,
-    };
-  }
-
-  const { variants } = mapRawVariantRelations(translatedProduct.product_variants || [], currentLocale);
-  const matchedVariant = variants.find((variant) => variant.sku === item.sku);
-
-  if (!matchedVariant) {
-    return item;
-  }
-
-  return {
-    ...nextBase,
-    id: matchedVariant.id,
-    sku: matchedVariant.sku,
-    price: matchedVariant.price,
-    prices: matchedVariant.prices || item.prices,
-    sale_price: matchedVariant.sale_price ?? null,
-    sale_prices: matchedVariant.sale_prices || item.sale_prices,
-    stock: matchedVariant.stock_quantity,
-    image_url: matchedVariant.image_url || productImageUrl || item.image_url,
-    variant_id: matchedVariant.id,
-    variant_label: matchedVariant.label,
-    selected_options: matchedVariant.selected_options,
-  };
-}
-
-export function CartTranslator() {
-  const { currentLocale, availableLanguages } = useLanguage();
-  const { items, setItems } = useCartStore();
-  const isHydrated = useIsCartHydrated();
-  const prevLocaleRef = useRef<string | null>(null);
-
-  useEffect(() => {
-    async function translateCart() {
-      if (!items || items.length === 0) {
-        return;
-      }
-
-      const requestSignature = buildCartTranslationSignature(items);
-
-      const translationGroupIds = items
-        .map((item) => item.translation_group_id)
-        .filter(Boolean) as string[];
-      const skus = items
-        .map((item) => item.sku)
-        .filter(Boolean) as string[];
-      const productIds = items
-        .map((item) => item.product_id)
-        .filter(Boolean) as string[];
-
-      if (translationGroupIds.length === 0 && skus.length === 0 && productIds.length === 0) {
-        return;
-      }
-
-      try {
-        const translatedProducts = await getTranslatedProductsForCart(
-          translationGroupIds,
-          currentLocale,
-          skus,
-          productIds
-        ) as any[];
-
-        if (!translatedProducts || translatedProducts.length === 0) {
-          return;
-        }
-
-        const latestItems = useCartStore.getState().items;
-
-        if (buildCartTranslationSignature(latestItems) !== requestSignature) {
-          return;
-        }
-
-        const newItems = latestItems.map((item) => {
-          const translated = translatedProducts.find((product) =>
-            (item.translation_group_id && product.translation_group_id === item.translation_group_id) ||
-            product.id === item.product_id ||
-            product.sku === item.sku
-          );
-
-          if (!translated) {
-            return item;
-          }
-
-          return syncCartItem(item, translated, currentLocale);
-        });
-
-        const mergedItems = newItems.reduce((accumulator: CartItem[], current) => {
-          const existingIndex = accumulator.findIndex((item) => item.id === current.id);
-          if (existingIndex > -1) {
-            accumulator[existingIndex] = {
-              ...accumulator[existingIndex],
-              quantity: accumulator[existingIndex].quantity + current.quantity,
-            };
-            return accumulator;
-          }
-
-          accumulator.push({ ...current });
-          return accumulator;
-        }, []);
-
-        if (JSON.stringify(mergedItems) !== JSON.stringify(latestItems)) {
-          setItems(mergedItems);
-        }
-      } catch (error) {
-        console.error("[CartTranslator] Translation failed:", error);
-      }
-    }
-
-    if (!isHydrated || availableLanguages.length === 0) {
-      return;
-    }
-
-    const currentLanguage = availableLanguages.find((language) => language.code === currentLocale);
-    const hasLocaleMismatch = items.some((item) => item.language_id !== currentLanguage?.id);
-
-    if (currentLocale !== prevLocaleRef.current || hasLocaleMismatch) {
-      const timeoutId = setTimeout(() => {
-        translateCart();
-      }, 300);
-      prevLocaleRef.current = currentLocale;
-      return () => clearTimeout(timeoutId);
-    }
-  }, [availableLanguages, currentLocale, isHydrated, items, setItems]);
-
-  return null;
-}
+'use client';
+
+import { useEffect, useRef } from 'react';
+import { useLanguage } from '../context/LanguageContext';
+import { useCartStore } from '@nextblock-cms/ecommerce/cart-store';
+import { isDigitalItem, type CartItem } from '@nextblock-cms/ecommerce/types';
+import { useIsCartHydrated } from '@nextblock-cms/ecommerce/use-cart';
+import { mapRawVariantRelations } from '@nextblock-cms/ecommerce/variation-utils';
+import { getTranslatedProductsForCart } from '@nextblock-cms/ecommerce/server-actions/product-actions';
+
+const R2_BASE_URL = process.env.NEXT_PUBLIC_R2_BASE_URL || '';
+
+function resolveMediaUrl(filePath?: string | null) {
+  if (!filePath) {
+    return null;
+  }
+
+  if (filePath.startsWith('http')) {
+    return filePath;
+  }
+
+  return R2_BASE_URL ? `${R2_BASE_URL}/${filePath}` : filePath;
+}
+
+function resolveProductImageUrl(product: any, fallback?: string | null) {
+  const firstMedia = product?.product_media?.[0]?.media;
+  return resolveMediaUrl(firstMedia?.file_path || firstMedia?.object_key) || fallback || null;
+}
+
+function buildCartTranslationSignature(items: CartItem[]) {
+  return JSON.stringify(
+    items.map((item) => ({
+      id: item.id,
+      product_id: item.product_id,
+      variant_id: item.variant_id ?? null,
+      sku: item.sku,
+      quantity: item.quantity,
+      language_id: item.language_id ?? null,
+      translation_group_id: item.translation_group_id ?? null,
+    }))
+  );
+}
+
+function syncCartItem(item: CartItem, translatedProduct: any, currentLocale: string): CartItem {
+  const productImageUrl = resolveProductImageUrl(translatedProduct, item.image_url);
+  const nextBase: CartItem = {
+    ...item,
+    id: translatedProduct.id,
+    product_id: translatedProduct.id,
+    title: translatedProduct.title,
+    slug: translatedProduct.slug,
+    sku: translatedProduct.sku || item.sku,
+    stock: typeof translatedProduct.stock === 'number' ? translatedProduct.stock : item.stock,
+    language_id: translatedProduct.language_id,
+    translation_group_id: translatedProduct.translation_group_id,
+    image_url: productImageUrl || item.image_url,
+    is_taxable: translatedProduct.is_taxable ?? item.is_taxable,
+    product_type: translatedProduct.product_type ?? item.product_type,
+    payment_provider: translatedProduct.payment_provider ?? item.payment_provider,
+    provider: translatedProduct.payment_provider ?? item.provider,
+    freemius_product_id: translatedProduct.freemius_product_id ?? item.freemius_product_id,
+    freemius_plan_id: translatedProduct.freemius_plan_id ?? item.freemius_plan_id,
+    trial_period_days: translatedProduct.trial_period_days ?? item.trial_period_days ?? 0,
+    trial_requires_payment_method:
+      translatedProduct.trial_requires_payment_method ??
+      item.trial_requires_payment_method ??
+      false,
+    prices: translatedProduct.prices || item.prices,
+    sale_prices: translatedProduct.sale_prices || item.sale_prices,
+    has_variants: Boolean(translatedProduct.product_variants?.length),
+  };
+
+  if (isDigitalItem(item)) {
+    return nextBase;
+  }
+
+  const isVariantLine = Boolean(item.variant_id || item.variant_label);
+  if (!isVariantLine) {
+    return {
+      ...nextBase,
+      price: translatedProduct.price,
+      prices: translatedProduct.prices || item.prices,
+      sale_price: translatedProduct.sale_price ?? null,
+      sale_prices: translatedProduct.sale_prices || item.sale_prices,
+    };
+  }
+
+  const { variants } = mapRawVariantRelations(translatedProduct.product_variants || [], currentLocale);
+  const matchedVariant = variants.find((variant) => variant.sku === item.sku);
+
+  if (!matchedVariant) {
+    return item;
+  }
+
+  return {
+    ...nextBase,
+    id: matchedVariant.id,
+    sku: matchedVariant.sku,
+    price: matchedVariant.price,
+    prices: matchedVariant.prices || item.prices,
+    sale_price: matchedVariant.sale_price ?? null,
+    sale_prices: matchedVariant.sale_prices || item.sale_prices,
+    stock: matchedVariant.stock_quantity,
+    image_url: matchedVariant.image_url || productImageUrl || item.image_url,
+    variant_id: matchedVariant.id,
+    variant_label: matchedVariant.label,
+    selected_options: matchedVariant.selected_options,
+  };
+}
+
+export function CartTranslator() {
+  const { currentLocale, availableLanguages } = useLanguage();
+  const { items, setItems } = useCartStore();
+  const isHydrated = useIsCartHydrated();
+  const prevLocaleRef = useRef<string | null>(null);
+
+  useEffect(() => {
+    async function translateCart() {
+      if (!items || items.length === 0) {
+        return;
+      }
+
+      const requestSignature = buildCartTranslationSignature(items);
+
+      const translationGroupIds = items
+        .map((item) => item.translation_group_id)
+        .filter(Boolean) as string[];
+      const skus = items
+        .map((item) => item.sku)
+        .filter(Boolean) as string[];
+      const productIds = items
+        .map((item) => item.product_id)
+        .filter(Boolean) as string[];
+
+      if (translationGroupIds.length === 0 && skus.length === 0 && productIds.length === 0) {
+        return;
+      }
+
+      try {
+        const translatedProducts = await getTranslatedProductsForCart(
+          translationGroupIds,
+          currentLocale,
+          skus,
+          productIds
+        ) as any[];
+
+        if (!translatedProducts || translatedProducts.length === 0) {
+          return;
+        }
+
+        const latestItems = useCartStore.getState().items;
+
+        if (buildCartTranslationSignature(latestItems) !== requestSignature) {
+          return;
+        }
+
+        const newItems = latestItems.map((item) => {
+          const translated = translatedProducts.find((product) =>
+            (item.translation_group_id && product.translation_group_id === item.translation_group_id) ||
+            product.id === item.product_id ||
+            product.sku === item.sku
+          );
+
+          if (!translated) {
+            return item;
+          }
+
+          return syncCartItem(item, translated, currentLocale);
+        });
+
+        const mergedItems = newItems.reduce((accumulator: CartItem[], current) => {
+          const existingIndex = accumulator.findIndex((item) => item.id === current.id);
+          if (existingIndex > -1) {
+            accumulator[existingIndex] = {
+              ...accumulator[existingIndex],
+              quantity: accumulator[existingIndex].quantity + current.quantity,
+            };
+            return accumulator;
+          }
+
+          accumulator.push({ ...current });
+          return accumulator;
+        }, []);
+
+        if (JSON.stringify(mergedItems) !== JSON.stringify(latestItems)) {
+          setItems(mergedItems);
+        }
+      } catch (error) {
+        console.error("[CartTranslator] Translation failed:", error);
+      }
+    }
+
+    if (!isHydrated || availableLanguages.length === 0) {
+      return;
+    }
+
+    const currentLanguage = availableLanguages.find((language) => language.code === currentLocale);
+    const hasLocaleMismatch = items.some((item) => item.language_id !== currentLanguage?.id);
+
+    if (currentLocale !== prevLocaleRef.current || hasLocaleMismatch) {
+      const timeoutId = setTimeout(() => {
+        translateCart();
+      }, 300);
+      prevLocaleRef.current = currentLocale;
+      return () => clearTimeout(timeoutId);
+    }
+  }, [availableLanguages, currentLocale, isHydrated, items, setItems]);
+
+  return null;
+}

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

@@ -1,51 +1,51 @@
-"use client";
-
-import { useEffect, useState, type ComponentType } from "react";
-
-type CartTranslatorComponent = ComponentType<Record<string, never>>;
-
-function scheduleIdleWork(callback: () => void) {
-  if (typeof window === "undefined") {
-    return undefined;
-  }
-
-  const browserWindow = window as Window & {
-    requestIdleCallback?: (
-      callback: IdleRequestCallback,
-      options?: IdleRequestOptions
-    ) => number;
-    cancelIdleCallback?: (handle: number) => void;
-  };
-
-  if (browserWindow.requestIdleCallback && browserWindow.cancelIdleCallback) {
-    const idleId = browserWindow.requestIdleCallback(callback, { timeout: 3_000 });
-    return () => browserWindow.cancelIdleCallback?.(idleId);
-  }
-
-  const timeoutId = window.setTimeout(callback, 2_000);
-  return () => window.clearTimeout(timeoutId);
-}
-
-export function DeferredCartTranslator() {
-  const [CartTranslator, setCartTranslator] =
-    useState<CartTranslatorComponent | null>(null);
-
-  useEffect(() => {
-    let cancelled = false;
-
-    const cancelIdleWork = scheduleIdleWork(() => {
-      void import("./CartTranslator").then((module) => {
-        if (!cancelled) {
-          setCartTranslator(() => module.CartTranslator as CartTranslatorComponent);
-        }
-      });
-    });
-
-    return () => {
-      cancelled = true;
-      cancelIdleWork?.();
-    };
-  }, []);
-
-  return CartTranslator ? <CartTranslator /> : null;
-}
+"use client";
+
+import { useEffect, useState, type ComponentType } from "react";
+
+type CartTranslatorComponent = ComponentType<Record<string, never>>;
+
+function scheduleIdleWork(callback: () => void) {
+  if (typeof window === "undefined") {
+    return undefined;
+  }
+
+  const browserWindow = window as Window & {
+    requestIdleCallback?: (
+      callback: IdleRequestCallback,
+      options?: IdleRequestOptions
+    ) => number;
+    cancelIdleCallback?: (handle: number) => void;
+  };
+
+  if (browserWindow.requestIdleCallback && browserWindow.cancelIdleCallback) {
+    const idleId = browserWindow.requestIdleCallback(callback, { timeout: 3_000 });
+    return () => browserWindow.cancelIdleCallback?.(idleId);
+  }
+
+  const timeoutId = window.setTimeout(callback, 2_000);
+  return () => window.clearTimeout(timeoutId);
+}
+
+export function DeferredCartTranslator() {
+  const [CartTranslator, setCartTranslator] =
+    useState<CartTranslatorComponent | null>(null);
+
+  useEffect(() => {
+    let cancelled = false;
+
+    const cancelIdleWork = scheduleIdleWork(() => {
+      void import("./CartTranslator").then((module) => {
+        if (!cancelled) {
+          setCartTranslator(() => module.CartTranslator as CartTranslatorComponent);
+        }
+      });
+    });
+
+    return () => {
+      cancelled = true;
+      cancelIdleWork?.();
+    };
+  }, []);
+
+  return CartTranslator ? <CartTranslator /> : null;
+}