create-brainerce-store 1.42.0 → 1.43.1

package/templates/nextjs/base/src/components/products/product-card.tsx

@@ -1,226 +1,226 @@
-'use client';
-
-import { useState } from 'react';
-import { Link, useRouter } from '@/lib/navigation';
-import Image from 'next/image';
-import type { Product } from 'brainerce';
-import { getProductPriceInfo, getVariantPrice, formatPrice } from 'brainerce';
-import { useTranslations } from '@/lib/translations';
-import { PriceDisplay } from '@/components/shared/price-display';
-import { StockBadge } from '@/components/products/stock-badge';
-import { DiscountBadge } from '@/components/products/discount-badge';
-import { useCart, useStoreInfo } from '@/providers/store-provider';
-import { cn } from '@/lib/utils';
-
-interface ProductCardProps {
-  product: Product;
-  className?: string;
-}
-
-function VariantPriceRange({ product }: { product: Product }) {
-  const { storeInfo } = useStoreInfo();
-  const currency = storeInfo?.currency || process.env.NEXT_PUBLIC_STORE_CURRENCY || 'USD';
-
-  let min: number;
-  let max: number;
-  if (product.priceMin && product.priceMax) {
-    min = parseFloat(product.priceMin);
-    max = parseFloat(product.priceMax);
-  } else {
-    const variants = product.variants ?? [];
-    if (variants.length === 0) return null;
-    const prices = variants.map((v) => getVariantPrice(v, product.basePrice));
-    min = Math.min(...prices);
-    max = Math.max(...prices);
-  }
-
-  if (isNaN(min) || isNaN(max)) return null;
-
-  return (
-    <span className="text-foreground text-sm font-medium">
-      {min === max
-        ? (formatPrice(min, { currency }) as string)
-        : `${formatPrice(min, { currency })} – ${formatPrice(max, { currency })}`}
-    </span>
-  );
-}
-
-export function ProductCard({ product, className }: ProductCardProps) {
-  const t = useTranslations('common');
-  const tp = useTranslations('productDetail');
-  const tProd = useTranslations('products');
-  const router = useRouter();
-  const { refreshCart } = useCart();
-  const { price, originalPrice, isOnSale } = getProductPriceInfo(product);
-  const mainImage = product.images?.[0];
-  const imageUrl = mainImage?.url || null;
-  const slug = product.slug || product.id;
-  const isVariable = product.type === 'VARIABLE';
-
-  const [adding, setAdding] = useState(false);
-  const [added, setAdded] = useState(false);
-
-  const canPurchase = product.inventory?.canPurchase !== false;
-
-  async function handleAddToCart(e: React.MouseEvent) {
-    e.preventDefault();
-    e.stopPropagation();
-
-    if (isVariable) {
-      router.push(`/products/${slug}`);
-      return;
-    }
-
-    if (adding || !canPurchase) return;
-
-    try {
-      setAdding(true);
-      const { getClient } = await import('@/lib/brainerce');
-      const client = getClient();
-      await client.smartAddToCart({ productId: product.id, quantity: 1 });
-      await refreshCart();
-      setAdded(true);
-      setTimeout(() => setAdded(false), 2000);
-    } catch (err) {
-      console.error('Failed to add to cart:', err);
-    } finally {
-      setAdding(false);
-    }
-  }
-
-  return (
-    <div
-      className={cn(
-        'border-border bg-background group block overflow-hidden rounded-lg border transition-shadow hover:shadow-md',
-        className
-      )}
-    >
-      {/* Image — clickable */}
-      <Link href={`/products/${slug}`} className="block">
-        <div className="bg-muted relative aspect-square overflow-hidden">
-          {imageUrl ? (
-            <Image
-              src={imageUrl}
-              alt={mainImage?.alt || product.name}
-              fill
-              sizes="(max-width: 640px) 100vw, (max-width: 1024px) 50vw, 25vw"
-              className="object-cover transition-transform duration-300 group-hover:scale-105"
-            />
-          ) : (
-            <div className="text-muted-foreground absolute inset-0 flex items-center justify-center">
-              <svg className="h-12 w-12" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-                <path
-                  strokeLinecap="round"
-                  strokeLinejoin="round"
-                  strokeWidth={1.5}
-                  d="M4 16l4.586-4.586a2 2 0 012.828 0L16 16m-2-2l1.586-1.586a2 2 0 012.828 0L20 14m-6-6h.01M6 20h12a2 2 0 002-2V6a2 2 0 00-2-2H6a2 2 0 00-2 2v12a2 2 0 002 2z"
-                />
-              </svg>
-            </div>
-          )}
-
-          {/* Badges */}
-          <div className="absolute start-2 top-2 flex flex-col gap-1">
-            {isOnSale && (
-              <span className="bg-destructive text-destructive-foreground rounded px-2 py-1 text-xs font-bold">
-                {t('sale')}
-              </span>
-            )}
-            <DiscountBadge discount={product.discount} />
-            {product.isDownloadable && (
-              <span className="bg-primary text-primary-foreground rounded px-2 py-1 text-xs font-bold">
-                {tp('digitalProduct')}
-              </span>
-            )}
-          </div>
-
-          {/* Add to cart overlay button */}
-          {(isVariable || canPurchase) && (
-            <button
-              onClick={handleAddToCart}
-              disabled={adding}
-              aria-label={isVariable ? tProd('selectOptions') : tp('addToCart')}
-              className={cn(
-                'absolute bottom-2 end-2 flex h-8 w-8 items-center justify-center rounded-full shadow-md transition-all',
-                'translate-y-2 opacity-0 group-hover:translate-y-0 group-hover:opacity-100',
-                added
-                  ? 'bg-green-500 text-white'
-                  : 'bg-primary text-primary-foreground hover:opacity-90'
-              )}
-            >
-              {added ? (
-                <svg
-                  className="h-4 w-4"
-                  fill="none"
-                  viewBox="0 0 24 24"
-                  stroke="currentColor"
-                  strokeWidth={2.5}
-                >
-                  <path strokeLinecap="round" strokeLinejoin="round" d="M5 13l4 4L19 7" />
-                </svg>
-              ) : isVariable ? (
-                <svg
-                  className="h-4 w-4"
-                  fill="none"
-                  viewBox="0 0 24 24"
-                  stroke="currentColor"
-                  strokeWidth={2}
-                >
-                  <path strokeLinecap="round" strokeLinejoin="round" d="M12 4v16m8-8H4" />
-                </svg>
-              ) : (
-                <svg
-                  className="h-4 w-4"
-                  fill="none"
-                  viewBox="0 0 24 24"
-                  stroke="currentColor"
-                  strokeWidth={2}
-                >
-                  <path
-                    strokeLinecap="round"
-                    strokeLinejoin="round"
-                    d="M3 3h2l.4 2M7 13h10l4-8H5.4M7 13L5.4 5M7 13l-2.293 2.293c-.63.63-.184 1.707.707 1.707H17m0 0a2 2 0 100 4 2 2 0 000-4zm-8 2a2 2 0 11-4 0 2 2 0 014 0z"
-                  />
-                </svg>
-              )}
-            </button>
-          )}
-        </div>
-      </Link>
-
-      {/* Content */}
-      <div className="space-y-2 p-3">
-        {/* Categories */}
-        {product.categories && product.categories.length > 0 && (
-          <div className="flex flex-wrap gap-1">
-            {product.categories.slice(0, 2).map((cat) => (
-              <span
-                key={cat.id}
-                className="text-muted-foreground bg-muted rounded px-1.5 py-0.5 text-[10px]"
-              >
-                {cat.name}
-              </span>
-            ))}
-          </div>
-        )}
-
-        {/* Name — clickable */}
-        <Link href={`/products/${slug}`}>
-          <h3 className="text-foreground hover:text-primary line-clamp-2 text-sm font-medium transition-colors">
-            {product.name}
-          </h3>
-        </Link>
-
-        {/* Price */}
-        {isVariable ? (
-          <VariantPriceRange product={product} />
-        ) : (
-          <PriceDisplay price={originalPrice} salePrice={isOnSale ? price : undefined} size="sm" />
-        )}
-
-        {/* Stock */}
-        <StockBadge inventory={product.inventory} />
-      </div>
-    </div>
-  );
-}
+'use client';
+
+import { useState } from 'react';
+import { Link, useRouter } from '@/lib/navigation';
+import Image from 'next/image';
+import type { Product } from 'brainerce';
+import { getProductPriceInfo, getVariantPrice, formatPrice } from 'brainerce';
+import { useTranslations } from '@/lib/translations';
+import { PriceDisplay } from '@/components/shared/price-display';
+import { StockBadge } from '@/components/products/stock-badge';
+import { DiscountBadge } from '@/components/products/discount-badge';
+import { useCart } from '@/providers/store-provider';
+import { useCurrency } from '@/lib/use-currency';
+import { cn } from '@/lib/utils';
+
+interface ProductCardProps {
+  product: Product;
+  className?: string;
+}
+
+function VariantPriceRange({ product }: { product: Product }) {
+  const currency = useCurrency();
+
+  let min: number;
+  let max: number;
+  if (product.priceMin && product.priceMax) {
+    min = parseFloat(product.priceMin);
+    max = parseFloat(product.priceMax);
+  } else {
+    const variants = product.variants ?? [];
+    if (variants.length === 0) return null;
+    const prices = variants.map((v) => getVariantPrice(v, product.basePrice));
+    min = Math.min(...prices);
+    max = Math.max(...prices);
+  }
+
+  if (isNaN(min) || isNaN(max)) return null;
+
+  return (
+    <span className="text-foreground text-sm font-medium">
+      {min === max
+        ? (formatPrice(min, { currency }) as string)
+        : `${formatPrice(min, { currency })} – ${formatPrice(max, { currency })}`}
+    </span>
+  );
+}
+
+export function ProductCard({ product, className }: ProductCardProps) {
+  const t = useTranslations('common');
+  const tp = useTranslations('productDetail');
+  const tProd = useTranslations('products');
+  const router = useRouter();
+  const { refreshCart } = useCart();
+  const { price, originalPrice, isOnSale } = getProductPriceInfo(product);
+  const mainImage = product.images?.[0];
+  const imageUrl = mainImage?.url || null;
+  const slug = product.slug || product.id;
+  const isVariable = product.type === 'VARIABLE';
+
+  const [adding, setAdding] = useState(false);
+  const [added, setAdded] = useState(false);
+
+  const canPurchase = product.inventory?.canPurchase !== false;
+
+  async function handleAddToCart(e: React.MouseEvent) {
+    e.preventDefault();
+    e.stopPropagation();
+
+    if (isVariable) {
+      router.push(`/products/${slug}`);
+      return;
+    }
+
+    if (adding || !canPurchase) return;
+
+    try {
+      setAdding(true);
+      const { getClient } = await import('@/lib/brainerce');
+      const client = getClient();
+      await client.smartAddToCart({ productId: product.id, quantity: 1 });
+      await refreshCart();
+      setAdded(true);
+      setTimeout(() => setAdded(false), 2000);
+    } catch (err) {
+      console.error('Failed to add to cart:', err);
+    } finally {
+      setAdding(false);
+    }
+  }
+
+  return (
+    <div
+      className={cn(
+        'border-border bg-background group block overflow-hidden rounded-lg border transition-shadow hover:shadow-md',
+        className
+      )}
+    >
+      {/* Image — clickable */}
+      <Link href={`/products/${slug}`} className="block">
+        <div className="bg-muted relative aspect-square overflow-hidden">
+          {imageUrl ? (
+            <Image
+              src={imageUrl}
+              alt={mainImage?.alt || product.name}
+              fill
+              sizes="(max-width: 640px) 100vw, (max-width: 1024px) 50vw, 25vw"
+              className="object-cover transition-transform duration-300 group-hover:scale-105"
+            />
+          ) : (
+            <div className="text-muted-foreground absolute inset-0 flex items-center justify-center">
+              <svg className="h-12 w-12" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                <path
+                  strokeLinecap="round"
+                  strokeLinejoin="round"
+                  strokeWidth={1.5}
+                  d="M4 16l4.586-4.586a2 2 0 012.828 0L16 16m-2-2l1.586-1.586a2 2 0 012.828 0L20 14m-6-6h.01M6 20h12a2 2 0 002-2V6a2 2 0 00-2-2H6a2 2 0 00-2 2v12a2 2 0 002 2z"
+                />
+              </svg>
+            </div>
+          )}
+
+          {/* Badges */}
+          <div className="absolute start-2 top-2 flex flex-col gap-1">
+            {isOnSale && (
+              <span className="bg-destructive text-destructive-foreground rounded px-2 py-1 text-xs font-bold">
+                {t('sale')}
+              </span>
+            )}
+            <DiscountBadge discount={product.discount} />
+            {product.isDownloadable && (
+              <span className="bg-primary text-primary-foreground rounded px-2 py-1 text-xs font-bold">
+                {tp('digitalProduct')}
+              </span>
+            )}
+          </div>
+
+          {/* Add to cart overlay button */}
+          {(isVariable || canPurchase) && (
+            <button
+              onClick={handleAddToCart}
+              disabled={adding}
+              aria-label={isVariable ? tProd('selectOptions') : tp('addToCart')}
+              className={cn(
+                'absolute bottom-2 end-2 flex h-8 w-8 items-center justify-center rounded-full shadow-md transition-all',
+                'translate-y-2 opacity-0 group-hover:translate-y-0 group-hover:opacity-100',
+                added
+                  ? 'bg-green-500 text-white'
+                  : 'bg-primary text-primary-foreground hover:opacity-90'
+              )}
+            >
+              {added ? (
+                <svg
+                  className="h-4 w-4"
+                  fill="none"
+                  viewBox="0 0 24 24"
+                  stroke="currentColor"
+                  strokeWidth={2.5}
+                >
+                  <path strokeLinecap="round" strokeLinejoin="round" d="M5 13l4 4L19 7" />
+                </svg>
+              ) : isVariable ? (
+                <svg
+                  className="h-4 w-4"
+                  fill="none"
+                  viewBox="0 0 24 24"
+                  stroke="currentColor"
+                  strokeWidth={2}
+                >
+                  <path strokeLinecap="round" strokeLinejoin="round" d="M12 4v16m8-8H4" />
+                </svg>
+              ) : (
+                <svg
+                  className="h-4 w-4"
+                  fill="none"
+                  viewBox="0 0 24 24"
+                  stroke="currentColor"
+                  strokeWidth={2}
+                >
+                  <path
+                    strokeLinecap="round"
+                    strokeLinejoin="round"
+                    d="M3 3h2l.4 2M7 13h10l4-8H5.4M7 13L5.4 5M7 13l-2.293 2.293c-.63.63-.184 1.707.707 1.707H17m0 0a2 2 0 100 4 2 2 0 000-4zm-8 2a2 2 0 11-4 0 2 2 0 014 0z"
+                  />
+                </svg>
+              )}
+            </button>
+          )}
+        </div>
+      </Link>
+
+      {/* Content */}
+      <div className="space-y-2 p-3">
+        {/* Categories */}
+        {product.categories && product.categories.length > 0 && (
+          <div className="flex flex-wrap gap-1">
+            {product.categories.slice(0, 2).map((cat) => (
+              <span
+                key={cat.id}
+                className="text-muted-foreground bg-muted rounded px-1.5 py-0.5 text-[10px]"
+              >
+                {cat.name}
+              </span>
+            ))}
+          </div>
+        )}
+
+        {/* Name — clickable */}
+        <Link href={`/products/${slug}`}>
+          <h3 className="text-foreground hover:text-primary line-clamp-2 text-sm font-medium transition-colors">
+            {product.name}
+          </h3>
+        </Link>
+
+        {/* Price */}
+        {isVariable ? (
+          <VariantPriceRange product={product} />
+        ) : (
+          <PriceDisplay price={originalPrice} salePrice={isOnSale ? price : undefined} size="sm" />
+        )}
+
+        {/* Stock */}
+        <StockBadge inventory={product.inventory} />
+      </div>
+    </div>
+  );
+}

package/templates/nextjs/base/src/components/products/variant-selector.tsx

@@ -4,7 +4,7 @@ import { useMemo } from 'react';
 import type { Product, ProductVariant } from 'brainerce';
 import { getVariantOptions, getProductSwatches, formatPrice } from 'brainerce';
 import type { InventoryInfo } from 'brainerce';
-import { useStoreInfo } from '@/providers/store-provider';
+import { useCurrency } from '@/lib/use-currency';
 import { useTranslations } from '@/lib/translations';
 import { cn } from '@/lib/utils';
 
@@ -33,9 +33,8 @@ export function VariantSelector({
   onVariantChange,
   className,
 }: VariantSelectorProps) {
-  const { storeInfo } = useStoreInfo();
   const t = useTranslations('productDetail');
-  const currency = storeInfo?.currency || process.env.NEXT_PUBLIC_STORE_CURRENCY || 'USD';
+  const currency = useCurrency();
   const variants = useMemo(() => product.variants || [], [product.variants]);
 
   // Get swatch metadata from product attribute options

package/templates/nextjs/base/src/components/seo/product-json-ld.tsx

@@ -1,6 +1,7 @@
 import type { Product } from 'brainerce';
 import { getProductPriceInfo } from 'brainerce';
 import { getNonce } from '@/lib/nonce';
+import { resolveCurrency } from '@/lib/resolve-currency';
 import { stripHtmlForSeo } from '@/lib/seo';
 
 interface ProductJsonLdProps {
@@ -9,11 +10,10 @@ interface ProductJsonLdProps {
   currency?: string;
 }
 
-export async function ProductJsonLd({
-  product,
-  url,
-  currency = process.env.NEXT_PUBLIC_STORE_CURRENCY || 'USD',
-}: ProductJsonLdProps) {
+export async function ProductJsonLd({ product, url, currency }: ProductJsonLdProps) {
+  // Defer to the shared server helper so the env-var + USD fallback chain
+  // lives in exactly one place across all server-side currency reads.
+  const resolvedCurrency = resolveCurrency(null, currency);
   const nonce = await getNonce();
   const priceInfo = getProductPriceInfo(product);
   const imageUrl = product.images?.[0]?.url;
@@ -32,14 +32,14 @@ export async function ProductJsonLd({
           lowPrice: product.priceMin,
           highPrice: product.priceMax ?? product.priceMin,
           offerCount: product.variants?.length ?? 1,
-          priceCurrency: currency,
+          priceCurrency: resolvedCurrency,
           availability,
           url,
         }
       : {
           '@type': 'Offer',
           price: priceInfo.price,
-          priceCurrency: currency,
+          priceCurrency: resolvedCurrency,
           availability,
           url,
         };

package/templates/nextjs/base/src/components/shared/price-display.tsx

@@ -1,7 +1,7 @@
 'use client';
 
 import { formatPrice } from 'brainerce';
-import { useStoreInfo } from '@/providers/store-provider';
+import { useCurrency } from '@/lib/use-currency';
 import { cn } from '@/lib/utils';
 
 interface PriceDisplayProps {
@@ -25,11 +25,7 @@ export function PriceDisplay({
   className,
   size = 'md',
 }: PriceDisplayProps) {
-  const { storeInfo } = useStoreInfo();
-  // SSR-safe fallback: storeInfo is hydrated client-side, so without the build-time env var
-  // the server renders 'USD' and search engines index a wrong currency symbol (e.g. $ for an ILS store).
-  const currencyCode =
-    currency || storeInfo?.currency || process.env.NEXT_PUBLIC_STORE_CURRENCY || 'USD';
+  const currencyCode = useCurrency(currency);
 
   const basePrice = typeof price === 'string' ? parseFloat(price) : price;
   const sale =

package/templates/nextjs/base/src/lib/resolve-currency.ts

@@ -0,0 +1,20 @@
+import type { PublicStoreInfo } from '@/lib/store-info';
+
+/**
+ * Server-side twin of `useCurrency()` — call from Server Components,
+ * `generateMetadata`, route handlers, and anywhere outside React render
+ * (where the client `useStoreInfo()` hook isn't available).
+ *
+ * Keeps the fallback chain in one place across both client and server.
+ *
+ * @param storeInfo result of `fetchStoreInfo()` — may be null if the SSR
+ *                  fetch failed transiently
+ * @param override  pass when the caller already has a specific currency
+ *                  (e.g. order-level currency that should win over store)
+ */
+export function resolveCurrency(
+  storeInfo: PublicStoreInfo | null | undefined,
+  override?: string | null
+): string {
+  return override || storeInfo?.currency || process.env.NEXT_PUBLIC_STORE_CURRENCY || 'USD';
+}

package/templates/nextjs/base/src/lib/use-currency.ts

@@ -0,0 +1,19 @@
+'use client';
+
+import { useStoreInfo } from '@/providers/store-provider';
+
+/**
+ * Single source of truth for "which currency code do I format prices with?"
+ * in client components. Collapses the historical three-line fallback chain
+ * (`storeInfo?.currency || process.env.NEXT_PUBLIC_STORE_CURRENCY || 'USD'`)
+ * into one call so the chain lives in exactly one place — and so the day
+ * we drop the env var or the USD last-resort, we only touch this file.
+ *
+ * @param override pass when the caller already has a specific currency
+ *                 (e.g. an `Order` is denominated in its own currency,
+ *                 not the live store currency). Wins over `storeInfo`.
+ */
+export function useCurrency(override?: string | null): string {
+  const { storeInfo } = useStoreInfo();
+  return override || storeInfo?.currency || process.env.NEXT_PUBLIC_STORE_CURRENCY || 'USD';
+}