Add page metadata across every route

The root layout exported no metadata, so routes without their own export rendered no title at all, and no route had a description. Add a root metadata block with a title template, Open Graph and Twitter defaults, and fill in the routes that were missing tags. - config/site.ts: description and env-driven absolute url for metadataBase - home, /collections and /shop/collections: titles and descriptions - products/[handle] and collections/[handle]: generateMetadata off the existing catalog fetchers, with canonical and OG image - existing titles: drop the hand-written " — Shop" suffix now that the root template appends it Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_011x5jT4fJJCnqPx3umEvXRk
Re-enable image optimization and default header logo text
2026-08-09 09:35:57 -04:00 · 2026-08-09 09:07:42 -04:00 · 2026-08-08 17:57:17 -04:00 · 2026-08-08 17:48:19 -04:00 · 2026-08-08 14:21:24 -04:00
46 changed files with 861 additions and 384 deletions
@@ -1,7 +1,7 @@
 # Shopify Storefront
 NEXT_PUBLIC_SHOPIFY_DOMAIN=mock.shop
-# NEXT_PUBLIC_SHOPIFY_STOREFRONT_ACCESS_TOKEN=
-# NEXT_PUBLIC_SHOPIFY_API_VERSION=2025-07
+# NEXT_PUBLIC_SHOPIFY_PUBLIC_ACCESS_TOKEN=
+# NEXT_PUBLIC_SHOPIFY_API_VERSION=2026-07

 # Store assistant — set to 1 to show the Ask launcher; anything else hides it
 NEXT_PUBLIC_ENABLE_AI=0
@@ -5,3 +5,6 @@ next-env.d.ts
 .yarn/install-state.gz
 .env*.local
 tsconfig.tsbuildinfo
+
+# Temp tsconfig written by `hydrogen gql check`; normally cleaned up on exit
+.hydrogen-gql-*.json
@@ -1,6 +1,6 @@
 import AccountForm from '@/components/shopify/account-form';

-export const metadata = { title: 'Activate your account — Shop' };
+export const metadata = { title: 'Activate your account' };

 // Shopify's emailed activation link is /account/activate/{id}/{token}.
 export default async function Page({
@@ -1,6 +1,6 @@
 import AccountForm, { AccountFormLink } from '@/components/shopify/account-form';

-export const metadata = { title: 'Sign in — Shop' };
+export const metadata = { title: 'Sign in' };

 export default function Page() {
  return (
@@ -3,7 +3,7 @@ import OrderHistory from '@/components/shopify/order-history';
 import { getSessionToken } from '@/services/shopify/session';
 import { getCustomer } from '@/services/shopify/customer';

-export const metadata = { title: 'Order history — Shop' };
+export const metadata = { title: 'Order history' };

 export default async function Page() {
  const token = await getSessionToken();
@@ -1,6 +1,6 @@
 import AccountForm, { AccountFormLink } from '@/components/shopify/account-form';

-export const metadata = { title: 'Reset password — Shop' };
+export const metadata = { title: 'Reset password' };

 export default function Page() {
  return (
@@ -1,6 +1,6 @@
 import AccountForm, { AccountFormLink } from '@/components/shopify/account-form';

-export const metadata = { title: 'Create account — Shop' };
+export const metadata = { title: 'Create account' };

 export default function Page() {
  return (
@@ -1,6 +1,6 @@
 import AccountForm from '@/components/shopify/account-form';

-export const metadata = { title: 'Set a new password — Shop' };
+export const metadata = { title: 'Set a new password' };

 // Shopify's emailed reset link is /account/reset/{id}/{token}.
 export default async function Page({
@@ -1,4 +1,52 @@
+import type { Metadata } from 'next';
 import CollectionDetail from '@/components/shopify/collection-detail';
+import { getCollectionProductsPage } from '@/services/shopify/catalog';
+import { truncate } from '@/lib/utils';
+
+export async function generateMetadata({
+  params,
+}: {
+  params: Promise<{ handle: string }>;
+}): Promise<Metadata> {
+  const { handle } = await params;
+
+  // No collection-only query exists, so ask for the smallest page of products
+  // and use just the collection node off it.
+  const { collection } = await getCollectionProductsPage(handle, {
+    first: 1,
+  }).catch(() => ({ collection: null }));
+
+  if (!collection) return { title: 'Collection' };
+
+  const description = collection.description
+    ? truncate(collection.description, 160)
+    : `Shop the ${collection.title} collection.`;
+
+  return {
+    title: collection.title,
+    description,
+    alternates: { canonical: `/collections/${collection.handle}` },
+    openGraph: {
+      title: collection.title,
+      description,
+      url: `/collections/${collection.handle}`,
+      images: collection.image
+        ? [
+            {
+              url: collection.image.url,
+              alt: collection.image.altText ?? collection.title,
+            },
+          ]
+        : undefined,
+    },
+    twitter: {
+      card: 'summary_large_image',
+      title: collection.title,
+      description,
+      images: collection.image ? [collection.image.url] : undefined,
+    },
+  };
+}

 export default function Page() {
  return <CollectionDetail />;
@@ -1,5 +1,11 @@
+import type { Metadata } from 'next';
 import Collections from '@/components/shopify/collections';

+export const metadata: Metadata = {
+  title: 'Collections',
+  description: 'Browse every collection in the store.',
+};
+
 export default function Page() {
  return <Collections title="Our Collections" />;
 }
@@ -1,4 +1,5 @@
 import React from 'react';
+import type { Metadata } from 'next';
 import './globals.css';
 import { Geist, Geist_Mono } from 'next/font/google';
 import Header from '@/components/shopify/header';
@@ -16,6 +17,29 @@ const geistMono = Geist_Mono({
  variable: '--font-geist-mono',
 });

+// Routes only set their own `title`; the template appends the store name, and
+// everything else here is inherited unless a page overrides it.
+export const metadata: Metadata = {
+  metadataBase: new URL(site.url),
+  title: {
+    default: site.storeName,
+    template: `%s — ${site.storeName}`,
+  },
+  description: site.description,
+  openGraph: {
+    type: 'website',
+    siteName: site.storeName,
+    title: site.storeName,
+    description: site.description,
+    url: '/',
+  },
+  twitter: {
+    card: 'summary_large_image',
+    title: site.storeName,
+    description: site.description,
+  },
+};
+
 export default function RootLayout({
  children,
 }: {
@@ -1,4 +1,13 @@
+import type { Metadata } from 'next';
 import Products from '@/components/shopify/products';
+import { site } from '@/config/site';
+
+// The home page keeps the bare store name, so `title.absolute` opts out of the
+// root template rather than rendering "Shop — Shop".
+export const metadata: Metadata = {
+  title: { absolute: site.storeName },
+  description: site.description,
+};

 export default function Page() {
  return (
@@ -1,5 +1,6 @@
 import { notFound } from 'next/navigation';
 import { getShopPolicy, POLICY_HANDLES } from '@/hooks/use-shopify-policies';
+import { site } from '@/config/site';

 export function generateStaticParams() {
  return POLICY_HANDLES.map((handle) => ({ handle }));
@@ -13,8 +14,12 @@ export async function generateMetadata({
  const { handle } = await params;
  const policy = await getShopPolicy(handle);

+  if (!policy) return { title: 'Policy' };
+
  return {
-    title: policy ? `${policy.title} — Shop` : 'Policy — Shop',
+    title: policy.title,
+    description: `Read the ${policy.title.toLowerCase()} for ${site.storeName}.`,
+    alternates: { canonical: `/policies/${policy.handle}` },
  };
 }

@@ -1,5 +1,47 @@
+import type { Metadata } from 'next';
 import ProductDetail from '@/components/shopify/product-detail';
 import ProductRecommendations from '@/components/shopify/product-recommendations';
+import { getProduct } from '@/services/shopify/catalog';
+import { truncate } from '@/lib/utils';
+import { site } from '@/config/site';
+
+export async function generateMetadata({
+  params,
+}: {
+  params: Promise<{ handle: string }>;
+}): Promise<Metadata> {
+  const { handle } = await params;
+
+  // ProductDetail fetches client-side and renders its own empty state, so a
+  // failed lookup here falls back to generic tags rather than a 500.
+  const product = await getProduct(handle).catch(() => null);
+  if (!product) return { title: 'Product' };
+
+  const description = product.description
+    ? truncate(product.description, 160)
+    : site.description;
+  const image = product.images.edges[0]?.node;
+
+  return {
+    title: product.title,
+    description,
+    alternates: { canonical: `/products/${product.handle}` },
+    openGraph: {
+      title: product.title,
+      description,
+      url: `/products/${product.handle}`,
+      images: image
+        ? [{ url: image.url, alt: image.altText ?? product.title }]
+        : undefined,
+    },
+    twitter: {
+      card: 'summary_large_image',
+      title: product.title,
+      description,
+      images: image ? [image.url] : undefined,
+    },
+  };
+}

 export default function Page() {
  return (
@@ -2,7 +2,8 @@ import { Suspense } from 'react';
 import SearchResults from '@/components/shopify/search-results';

 export const metadata = {
-  title: 'Search — Shop',
+  title: 'Search',
+  description: 'Search the catalogue by product name, description or type.',
 };

 export default function Page() {
@@ -1,5 +1,13 @@
+import type { Metadata } from 'next';
 import Collections from '@/components/shopify/collections';

+export const metadata: Metadata = {
+  title: 'Collections',
+  description: 'Browse every collection in the store.',
+  // Same listing as /collections; point crawlers at the canonical route.
+  alternates: { canonical: '/collections' },
+};
+
 export default function Page() {
  return <Collections title="Our Collections" />;
 }
@@ -1,6 +1,7 @@
 'use client';

 import React, { useState } from 'react';
+import Image from 'next/image';
 import { useCartStore, redirectToCheckout } from '@/hooks/use-shopify-cart';
 import { Button } from '@/components/ui/button';
 import { Loader } from '@/components/ui/loader';
@@ -171,9 +172,11 @@ const CartDrawer: React.FC = () => {
                        {/* Product Image */}
                        <div className="w-16 h-16 bg-zinc-100 overflow-hidden shrink-0">
                          {image ? (
-                            <img
+                            <Image
                              src={image}
                              alt={item.merchandise.product.title}
+                              width={64}
+                              height={64}
                              className="w-full h-full object-cover"
                            />
                          ) : (
@@ -1,9 +1,10 @@
 import React from 'react';
 import Link from 'next/link';
+import Image from 'next/image';

 interface CollectionImage {
  url: string;
-  altText?: string;
+  altText?: string | null;
 }

 interface Collection {
@@ -11,7 +12,7 @@ interface Collection {
  title: string;
  handle: string;
  description?: string;
-  image?: CollectionImage;
+  image?: CollectionImage | null;
 }

 interface CollectionCardProps {
@@ -27,10 +28,12 @@ const CollectionCard: React.FC<CollectionCardProps> = ({ collection }) => {
      {/* Collection Image */}
      <div className="relative aspect-square overflow-hidden">
        {collection.image ? (
-          <img
+          <Image
            src={collection.image.url}
            alt={collection.image.altText || collection.title}
-            className="w-full h-full object-cover transition-transform duration-500 group-hover:scale-[1.04]"
+            fill
+            sizes="(min-width: 1024px) 25vw, 50vw"
+            className="object-cover transition-transform duration-500 group-hover:scale-[1.04]"
          />
        ) : (
          <div className="absolute inset-0 flex items-center justify-center text-zinc-300">
@@ -50,7 +50,7 @@ interface HeaderProps {
 }

 const Header: React.FC<HeaderProps> = ({
-  storeName = 'Shop',
+  storeName = 'Logo',
  logoUrl,
  links = [
    { label: 'Shop', url: '/' },
@@ -1,6 +1,7 @@
 'use client';

 import React, { useState } from 'react';
+import Image from 'next/image';
 import { RiImageLine } from '@remixicon/react';
 import type { Customer, CustomerOrder } from '@/services/shopify/customer';

@@ -123,9 +124,11 @@ const OrderHistory: React.FC<OrderHistoryProps> = ({ customer }) => {
                <li key={index} className="flex items-start gap-x-3">
                  <div className="h-16 w-16 shrink-0 overflow-hidden bg-zinc-100">
                    {node.variant?.image ? (
-                      <img
+                      <Image
                        src={node.variant.image.url}
                        alt={node.variant.image.altText || node.title}
+                        width={64}
+                        height={64}
                        className="h-full w-full object-cover"
                      />
                    ) : (
@@ -1,10 +1,11 @@
 import React from 'react';
 import Link from 'next/link';
+import Image from 'next/image';
 import { truncate } from '@/lib/utils';

 interface ProductImage {
  url: string;
-  altText?: string;
+  altText?: string | null;
 }

 interface ProductPrice {
@@ -68,10 +69,12 @@ const ProductCard: React.FC<ProductCardProps> = ({ product }) => {
      {/* Product Image */}
      <div className="relative aspect-square overflow-hidden">
        {firstImage ? (
-          <img
+          <Image
            src={firstImage.url}
            alt={firstImage.altText || product.title}
-            className="w-full h-full object-contain transition-transform duration-500 group-hover:scale-[1.04]"
+            fill
+            sizes="(min-width: 1280px) 20vw, (min-width: 1024px) 25vw, (min-width: 640px) 33vw, 50vw"
+            className="object-contain transition-transform duration-500 group-hover:scale-[1.04]"
          />
        ) : (
          <div className="absolute inset-0 flex items-center justify-center text-zinc-300">
@@ -29,8 +29,8 @@ interface ProductVariant {
  }>;
  image?: {
    url: string;
-    altText?: string;
-  };
+    altText?: string | null;
+  } | null;
 }

 export type { Product };
@@ -1,12 +1,15 @@
 'use client';

 import React, { useCallback, useEffect, useRef, useState } from 'react';
+import Image from 'next/image';
 import { RiCloseLine } from '@remixicon/react';
 import { Button } from '@/components/ui/button';

 interface ProductImage {
  url: string;
-  altText?: string;
+  altText?: string | null;
+  width?: number | null;
+  height?: number | null;
 }

 interface ProductDetailGalleryProps {
@@ -136,11 +139,14 @@ const ProductDetailGallery: React.FC<ProductDetailGalleryProps> = ({
              isSingle ? 'sm:col-span-2' : ''
            }`}
          >
-            <img
+            <Image
              src={image.url}
              alt={image.altText || 'Product image'}
+              fill
+              sizes="(min-width: 1024px) 30vw, (min-width: 640px) 50vw, 100vw"
+              priority={index === 0}
              draggable={false}
-              className="w-full h-full object-cover select-none"
+              className="object-cover select-none"
            />
          </button>
        ))}
@@ -173,11 +179,19 @@ const ProductDetailGallery: React.FC<ProductDetailGalleryProps> = ({
          onClick={close}
          className="fixed inset-0 z-100 flex items-center justify-center bg-foreground/20 backdrop-blur-md p-6 md:p-10"
        >
-          <img
+          <Image
            src={zoomedImage.url}
            alt={zoomedImage.altText || 'Product image'}
+            // Shopify gives us the intrinsic size; the square fallback only
+            // reserves space until CSS scales it down to fit the overlay.
+            width={zoomedImage.width || 1600}
+            height={zoomedImage.height || 1600}
+            sizes="100vw"
            onClick={(event) => event.stopPropagation()}
-            className="max-h-full max-w-full object-contain"
+            // w/h-auto keeps the box at the image's own ratio; without it the
+            // width+height attributes make both axes definite and the element
+            // stretches to the overlay, swallowing backdrop clicks that close it.
+            className="max-h-full max-w-full w-auto h-auto object-contain"
          />

          <Button
@@ -172,12 +172,22 @@ const ProductDetailInfo: React.FC<ProductDetailInfoProps> = ({
                          : 'ring-1 ring-border hover:ring-foreground/40'
                      } ${isSoldOut ? 'option-unavailable text-foreground/60 opacity-60' : ''}`}
                      style={{
-                        backgroundColor: background,
+                        // With no colour and no image the circle would be fully
+                        // transparent, leaving just a hairline ring that
+                        // antialiases unevenly and reads as a speckled border.
+                        // A neutral fill makes the initial-letter fallback look
+                        // deliberate. Set inline so it beats the ghost variant's
+                        // hover background.
+                        backgroundColor:
+                          background ??
+                          (image ? undefined : 'var(--color-muted)'),
                        backgroundImage: image ? `url(${image})` : undefined,
                      }}
                    >
                      {!background && !image && (
-                        <span className="text-[10px]">{value.name.at(0)}</span>
+                        <span className="text-[10px] font-medium uppercase text-muted-foreground">
+                          {value.name.at(0)}
+                        </span>
                      )}
                    </Button>
                  );
@@ -208,10 +208,15 @@ const ProductFilters: React.FC<ProductFiltersProps> = ({
                                ? 'ring-2 ring-foreground ring-offset-2'
                                : 'ring-1 ring-border hover:ring-foreground/40'
                            }`}
-                            style={{ backgroundColor: color ?? undefined }}
+                            style={{
+                              // A colourless swatch would otherwise be a fully
+                              // transparent circle behind a hairline ring,
+                              // which antialiases into a speckled border.
+                              backgroundColor: color ?? 'var(--color-muted)',
+                            }}
                          >
                            {!color && (
-                              <span className="text-[10px]">
+                              <span className="text-[10px] font-medium uppercase text-muted-foreground">
                                {value.label.at(0)}
                              </span>
                            )}
@@ -8,7 +8,7 @@ import { Loader } from '@/components/ui/loader';

 interface ProductImage {
  url: string;
-  altText?: string;
+  altText?: string | null;
 }

 interface ProductPrice {
@@ -1,6 +1,7 @@
 'use client';

 import React, { useEffect, useRef, useState } from 'react';
+import Image from 'next/image';
 import { useRouter } from 'next/navigation';
 import {
  CommandDialog,
@@ -162,9 +163,11 @@ const SearchDialog: React.FC = () => {
                    >
                      <div className="h-14 w-14 shrink-0 overflow-hidden bg-zinc-100">
                        {product.featuredImage ? (
-                          <img
+                          <Image
                            src={product.featuredImage.url}
                            alt={product.featuredImage.altText || product.title}
+                            width={56}
+                            height={56}
                            className="h-full w-full object-cover"
                          />
                        ) : (
@@ -1,7 +1,7 @@
 'use client';

 import React from 'react';
-import { SHOPIFY_STORE_DOMAIN } from '@/services/shopify/client';
+import { SHOPIFY_STORE_DOMAIN } from '@/services/shopify/config';
 import ShopPayLogo from '@/components/shopify/shop-pay-logo';
 import { Loader } from '@/components/ui/loader';
 import { Button } from '@/components/ui/button';
@@ -3,6 +3,15 @@ import type { NavLink } from '@/components/shopify/header';
 /** Chrome shared by every route — rendered once in the root layout. */
 export const site = {
  storeName: 'Shop',
+  description:
+    'An agent-friendly Shopify storefront built with Next.js and Hydrogen.',
+  // Absolute origin behind `metadataBase`, so Open Graph images resolve to full
+  // URLs. Vercel injects VERCEL_PROJECT_PRODUCTION_URL on deployed builds.
+  url:
+    process.env.NEXT_PUBLIC_SITE_URL ??
+    (process.env.VERCEL_PROJECT_PRODUCTION_URL
+      ? `https://${process.env.VERCEL_PROJECT_PRODUCTION_URL}`
+      : 'http://localhost:3000'),
  logoUrl: '',
  copyright: '© 2026 Shop. All rights reserved.',
  navLinks: [
@@ -1,5 +1,7 @@
+import { gql } from '@shopify/hydrogen';
+
 // Cart Fragment for consistent cart data
-const CartFragment = `
+const CartFragment = gql(`
  fragment CartFragment on Cart {
    id
    checkoutUrl
@@ -64,12 +66,13 @@ const CartFragment = `
      }
    }
  }
-`;
+`);

 // Create a new cart
-export const CREATE_CART_MUTATION = `
-  ${CartFragment}
-  mutation CreateCart($lines: [CartLineInput!]) {
+export const CREATE_CART_MUTATION = gql(
+  `
+  mutation CreateCart($lines: [CartLineInput!], $country: CountryCode, $language: LanguageCode)
+  @inContext(country: $country, language: $language) {
    cartCreate(input: { lines: $lines }) {
      cart {
        ...CartFragment
@@ -80,12 +83,15 @@ export const CREATE_CART_MUTATION = `
      }
    }
  }
-`;
+`,
+  [CartFragment]
+);

 // Add lines to cart
-export const ADD_CART_LINES_MUTATION = `
-  ${CartFragment}
-  mutation AddCartLines($cartId: ID!, $lines: [CartLineInput!]!) {
+export const ADD_CART_LINES_MUTATION = gql(
+  `
+  mutation AddCartLines($cartId: ID!, $lines: [CartLineInput!]!, $country: CountryCode, $language: LanguageCode)
+  @inContext(country: $country, language: $language) {
    cartLinesAdd(cartId: $cartId, lines: $lines) {
      cart {
        ...CartFragment
@@ -96,12 +102,15 @@ export const ADD_CART_LINES_MUTATION = `
      }
    }
  }
-`;
+`,
+  [CartFragment]
+);

 // Update cart lines
-export const UPDATE_CART_LINES_MUTATION = `
-  ${CartFragment}
-  mutation UpdateCartLines($cartId: ID!, $lines: [CartLineUpdateInput!]!) {
+export const UPDATE_CART_LINES_MUTATION = gql(
+  `
+  mutation UpdateCartLines($cartId: ID!, $lines: [CartLineUpdateInput!]!, $country: CountryCode, $language: LanguageCode)
+  @inContext(country: $country, language: $language) {
    cartLinesUpdate(cartId: $cartId, lines: $lines) {
      cart {
        ...CartFragment
@@ -112,12 +121,15 @@ export const UPDATE_CART_LINES_MUTATION = `
      }
    }
  }
-`;
+`,
+  [CartFragment]
+);

 // Remove lines from cart
-export const REMOVE_CART_LINES_MUTATION = `
-  ${CartFragment}
-  mutation RemoveCartLines($cartId: ID!, $lineIds: [ID!]!) {
+export const REMOVE_CART_LINES_MUTATION = gql(
+  `
+  mutation RemoveCartLines($cartId: ID!, $lineIds: [ID!]!, $country: CountryCode, $language: LanguageCode)
+  @inContext(country: $country, language: $language) {
    cartLinesRemove(cartId: $cartId, lineIds: $lineIds) {
      cart {
        ...CartFragment
@@ -128,12 +140,15 @@ export const REMOVE_CART_LINES_MUTATION = `
      }
    }
  }
-`;
+`,
+  [CartFragment]
+);

 // Apply (or clear) discount codes on the cart
-export const UPDATE_CART_DISCOUNT_CODES_MUTATION = `
-  ${CartFragment}
-  mutation UpdateCartDiscountCodes($cartId: ID!, $discountCodes: [String!]) {
+export const UPDATE_CART_DISCOUNT_CODES_MUTATION = gql(
+  `
+  mutation UpdateCartDiscountCodes($cartId: ID!, $discountCodes: [String!]!, $country: CountryCode, $language: LanguageCode)
+  @inContext(country: $country, language: $language) {
    cartDiscountCodesUpdate(cartId: $cartId, discountCodes: $discountCodes) {
      cart {
        ...CartFragment
@@ -144,14 +159,19 @@ export const UPDATE_CART_DISCOUNT_CODES_MUTATION = `
      }
    }
  }
-`;
+`,
+  [CartFragment]
+);

 // Get cart by ID
-export const GET_CART_QUERY = `
-  ${CartFragment}
-  query GetCart($cartId: ID!) {
+export const GET_CART_QUERY = gql(
+  `
+  query GetCart($cartId: ID!, $country: CountryCode, $language: LanguageCode)
+  @inContext(country: $country, language: $language) {
    cart(id: $cartId) {
      ...CartFragment
    }
  }
-`;
+`,
+  [CartFragment]
+);
@@ -1,8 +1,10 @@
+import { gql } from '@shopify/hydrogen';
 import { ProductFragment } from '@/graphql/products';

 // Get all collections
-export const GET_COLLECTIONS_QUERY = `
-  query GetCollections($first: Int!) {
+export const GET_COLLECTIONS_QUERY = gql(`
+  query GetCollections($first: Int!, $country: CountryCode, $language: LanguageCode)
+  @inContext(country: $country, language: $language) {
    collections(first: $first) {
      edges {
        node {
@@ -26,11 +28,11 @@ export const GET_COLLECTIONS_QUERY = `
      }
    }
  }
-`;
+`);

 // Get products in a collection
-export const GET_COLLECTION_PRODUCTS_QUERY = `
-  ${ProductFragment}
+export const GET_COLLECTION_PRODUCTS_QUERY = gql(
+  `
  query GetCollectionProducts(
    $handle: String!
    $first: Int!
@@ -38,7 +40,9 @@ export const GET_COLLECTION_PRODUCTS_QUERY = `
    $sortKey: ProductCollectionSortKeys
    $reverse: Boolean
    $filters: [ProductFilter!]
-  ) {
+    $country: CountryCode
+    $language: LanguageCode
+  ) @inContext(country: $country, language: $language) {
    collection(handle: $handle) {
      id
      title
@@ -82,4 +86,6 @@ export const GET_COLLECTION_PRODUCTS_QUERY = `
      }
    }
  }
-`;
+`,
+  [ProductFragment]
+);
@@ -1,7 +1,8 @@
 // Customer account operations (classic Storefront customer accounts).
 // https://shopify.dev/docs/api/storefront/latest/objects/Customer
+import { gql } from '@shopify/hydrogen';

-const CustomerFragment = `
+const CustomerFragment = gql(`
  fragment CustomerFragment on Customer {
    id
    email
@@ -24,10 +25,10 @@ const CustomerFragment = `
      phone
    }
  }
-`;
+`);

-export const CUSTOMER_QUERY = `
-  ${CustomerFragment}
+export const CUSTOMER_QUERY = gql(
+  `
  query GetCustomer($customerAccessToken: String!, $orderCount: Int!) {
    customer(customerAccessToken: $customerAccessToken) {
      ...CustomerFragment
@@ -63,9 +64,11 @@ export const CUSTOMER_QUERY = `
      }
    }
  }
-`;
+`,
+  [CustomerFragment]
+);

-export const CUSTOMER_CREATE_MUTATION = `
+export const CUSTOMER_CREATE_MUTATION = gql(`
  mutation CustomerCreate($input: CustomerCreateInput!) {
    customerCreate(input: $input) {
      customer {
@@ -79,9 +82,9 @@ export const CUSTOMER_CREATE_MUTATION = `
      }
    }
  }
-`;
+`);

-export const CUSTOMER_ACCESS_TOKEN_CREATE_MUTATION = `
+export const CUSTOMER_ACCESS_TOKEN_CREATE_MUTATION = gql(`
  mutation CustomerAccessTokenCreate($input: CustomerAccessTokenCreateInput!) {
    customerAccessTokenCreate(input: $input) {
      customerAccessToken {
@@ -95,9 +98,9 @@ export const CUSTOMER_ACCESS_TOKEN_CREATE_MUTATION = `
      }
    }
  }
-`;
+`);

-export const CUSTOMER_ACCESS_TOKEN_DELETE_MUTATION = `
+export const CUSTOMER_ACCESS_TOKEN_DELETE_MUTATION = gql(`
  mutation CustomerAccessTokenDelete($customerAccessToken: String!) {
    customerAccessTokenDelete(customerAccessToken: $customerAccessToken) {
      deletedAccessToken
@@ -107,10 +110,10 @@ export const CUSTOMER_ACCESS_TOKEN_DELETE_MUTATION = `
      }
    }
  }
-`;
+`);

 // Sends the "reset your password" email.
-export const CUSTOMER_RECOVER_MUTATION = `
+export const CUSTOMER_RECOVER_MUTATION = gql(`
  mutation CustomerRecover($email: String!) {
    customerRecover(email: $email) {
      customerUserErrors {
@@ -120,10 +123,10 @@ export const CUSTOMER_RECOVER_MUTATION = `
      }
    }
  }
-`;
+`);

 // Completes the reset using the id + token from the emailed link.
-export const CUSTOMER_RESET_MUTATION = `
+export const CUSTOMER_RESET_MUTATION = gql(`
  mutation CustomerReset($id: ID!, $input: CustomerResetInput!) {
    customerReset(id: $id, input: $input) {
      customerAccessToken {
@@ -137,10 +140,10 @@ export const CUSTOMER_RESET_MUTATION = `
      }
    }
  }
-`;
+`);

 // Activation link sent to customers created by the merchant.
-export const CUSTOMER_ACTIVATE_MUTATION = `
+export const CUSTOMER_ACTIVATE_MUTATION = gql(`
  mutation CustomerActivate($id: ID!, $input: CustomerActivateInput!) {
    customerActivate(id: $id, input: $input) {
      customerAccessToken {
@@ -154,10 +157,10 @@ export const CUSTOMER_ACTIVATE_MUTATION = `
      }
    }
  }
-`;
+`);

-export const CUSTOMER_UPDATE_MUTATION = `
-  ${CustomerFragment}
+export const CUSTOMER_UPDATE_MUTATION = gql(
+  `
  mutation CustomerUpdate($customerAccessToken: String!, $customer: CustomerUpdateInput!) {
    customerUpdate(customerAccessToken: $customerAccessToken, customer: $customer) {
      customer {
@@ -170,4 +173,6 @@ export const CUSTOMER_UPDATE_MUTATION = `
      }
    }
  }
-`;
+`,
+  [CustomerFragment]
+);
@@ -1,6 +1,8 @@
+import { gql } from '@shopify/hydrogen';
+
 // Shop policies are exposed on the `shop` object of the Storefront API.
 // There is no lookup-by-handle field, so we fetch all of them and match.
-export const GET_SHOP_POLICIES_QUERY = `
+export const GET_SHOP_POLICIES_QUERY = gql(`
  query GetShopPolicies {
    shop {
      privacyPolicy {
@@ -40,4 +42,4 @@ export const GET_SHOP_POLICIES_QUERY = `
      }
    }
  }
-`;
+`);
@@ -1,5 +1,7 @@
+import { gql } from '@shopify/hydrogen';
+
 // Product Fragment for consistent product data
-export const ProductFragment = `
+export const ProductFragment = gql(`
  fragment ProductFragment on Product {
    id
    title
@@ -98,12 +100,13 @@ export const ProductFragment = `
      }
    }
  }
-`;
+`);

 // Get multiple products
-export const GET_PRODUCTS_QUERY = `
-  ${ProductFragment}
-  query GetProducts($first: Int!, $after: String, $query: String, $sortKey: ProductSortKeys, $reverse: Boolean) {
+export const GET_PRODUCTS_QUERY = gql(
+  `
+  query GetProducts($first: Int!, $after: String, $query: String, $sortKey: ProductSortKeys, $reverse: Boolean, $country: CountryCode, $language: LanguageCode)
+  @inContext(country: $country, language: $language) {
    products(first: $first, after: $after, query: $query, sortKey: $sortKey, reverse: $reverse) {
      edges {
        node {
@@ -116,24 +119,32 @@ export const GET_PRODUCTS_QUERY = `
      }
    }
  }
-`;
+`,
+  [ProductFragment]
+);

 // Get a single product by handle
-export const GET_PRODUCT_QUERY = `
-  ${ProductFragment}
-  query GetProduct($handle: String!) {
+export const GET_PRODUCT_QUERY = gql(
+  `
+  query GetProduct($handle: String!, $country: CountryCode, $language: LanguageCode)
+  @inContext(country: $country, language: $language) {
    product(handle: $handle) {
      ...ProductFragment
    }
  }
-`;
+`,
+  [ProductFragment]
+);

 // Get product recommendations
-export const QUERY_PRODUCT_RECOMMENDATIONS = `
-  ${ProductFragment}
-  query GetProductRecommendations($productId: ID!) {
+export const QUERY_PRODUCT_RECOMMENDATIONS = gql(
+  `
+  query GetProductRecommendations($productId: ID!, $country: CountryCode, $language: LanguageCode)
+  @inContext(country: $country, language: $language) {
    productRecommendations(productId: $productId) {
      ...ProductFragment
    }
  }
-`;
+`,
+  [ProductFragment]
+);
@@ -1,10 +1,11 @@
+import { gql } from '@shopify/hydrogen';
 import { ProductFragment } from '@/graphql/products';

 // Storefront search over products. `productFilters` accepts the raw `input`
 // values returned in `productFilters[].values[].input`, so facets round-trip
 // without the client needing to know each filter's shape.
-export const SEARCH_PRODUCTS_QUERY = `
-  ${ProductFragment}
+export const SEARCH_PRODUCTS_QUERY = gql(
+  `
  query SearchProducts(
    $query: String!
    $first: Int!
@@ -12,7 +13,9 @@ export const SEARCH_PRODUCTS_QUERY = `
    $sortKey: SearchSortKeys
    $reverse: Boolean
    $productFilters: [ProductFilter!]
-  ) {
+    $country: CountryCode
+    $language: LanguageCode
+  ) @inContext(country: $country, language: $language) {
    search(
      query: $query
      first: $first
@@ -40,6 +43,9 @@ export const SEARCH_PRODUCTS_QUERY = `
      }
      edges {
        node {
+          # types: PRODUCT already narrows the results, but the schema still
+          # types nodes as a union — __typename lets callers narrow too.
+          __typename
          ... on Product {
            ...ProductFragment
          }
@@ -47,16 +53,20 @@ export const SEARCH_PRODUCTS_QUERY = `
      }
    }
  }
-`;
+`,
+  [ProductFragment]
+);

 // Lightweight variant for the autocomplete dropdown — just enough to render a
 // row, so the dialog stays responsive while typing.
-export const SEARCH_SUGGESTIONS_QUERY = `
-  query SearchSuggestions($query: String!, $first: Int!) {
+export const SEARCH_SUGGESTIONS_QUERY = gql(`
+  query SearchSuggestions($query: String!, $first: Int!, $country: CountryCode, $language: LanguageCode)
+  @inContext(country: $country, language: $language) {
    search(query: $query, first: $first, types: PRODUCT) {
      totalCount
      edges {
        node {
+          __typename
          ... on Product {
            id
            title
@@ -76,4 +86,4 @@ export const SEARCH_SUGGESTIONS_QUERY = `
      }
    }
  }
-`;
+`);
@@ -1,7 +1,7 @@
 'use client';

 import { create } from 'zustand';
-import { shopifyFetch } from '@/services/shopify/client';
+import { storefront, unwrapStorefrontResult } from '@/services/shopify/client';
 import {
  CREATE_CART_MUTATION,
  ADD_CART_LINES_MUTATION,
@@ -45,12 +45,12 @@ interface CartLine {
      currencyCode: string;
    };
    image?: {
-      id: string;
+      id?: string | null;
      url: string;
-      altText?: string;
-      width: number;
-      height: number;
-    };
+      altText?: string | null;
+      width?: number | null;
+      height?: number | null;
+    } | null;
    product: {
      id: string;
      title: string;
@@ -82,7 +82,7 @@ export interface Cart {
    totalTaxAmount?: {
      amount: string;
      currencyCode: string;
-    };
+    } | null;
  };
  lines: {
    edges: Array<{
@@ -93,92 +93,105 @@ export interface Cart {

 // ─── Shopify API functions ───────────────────────────────────────────

-async function createCartApi(lines: CartLineInput[] = []): Promise<Cart> {
-  const response = await shopifyFetch({
-    query: CREATE_CART_MUTATION,
-    variables: { lines: lines.length > 0 ? lines : null },
-  });
-
-  if (response.data.cartCreate.userErrors.length > 0) {
-    throw new Error(response.data.cartCreate.userErrors[0].message);
+/**
+ * Every cart mutation returns the same `{ cart, userErrors }` payload, and both
+ * the payload and the cart inside it are nullable — Shopify returns no cart when
+ * the mutation could not be applied. Callers want a cart or an exception.
+ */
+function unwrapCartPayload<T>(
+  payload:
+    | {
+        cart?: T | null;
+        userErrors: ReadonlyArray<{ message: string }>;
+      }
+    | null
+    | undefined
+): T {
+  if (payload?.userErrors.length) {
+    throw new Error(payload.userErrors[0].message);
  }

-  return response.data.cartCreate.cart;
+  if (!payload?.cart) {
+    throw new Error('Cart update failed. Please try again.');
+  }
+
+  return payload.cart;
+}
+
+async function createCartApi(lines: CartLineInput[] = []): Promise<Cart> {
+  const data = unwrapStorefrontResult(
+    await storefront.graphql(CREATE_CART_MUTATION, {
+      variables: { lines: lines.length > 0 ? lines : null },
+    }),
+    'CreateCart'
+  );
+
+  return unwrapCartPayload(data.cartCreate);
 }

 async function addCartLinesApi(
  cartId: string,
  lines: CartLineInput[]
 ): Promise<Cart> {
-  const response = await shopifyFetch({
-    query: ADD_CART_LINES_MUTATION,
-    variables: { cartId, lines },
-  });
+  const data = unwrapStorefrontResult(
+    await storefront.graphql(ADD_CART_LINES_MUTATION, {
+      variables: { cartId, lines },
+    }),
+    'AddCartLines'
+  );

-  if (response.data.cartLinesAdd.userErrors.length > 0) {
-    throw new Error(response.data.cartLinesAdd.userErrors[0].message);
-  }
-
-  return response.data.cartLinesAdd.cart;
+  return unwrapCartPayload(data.cartLinesAdd);
 }

 async function updateCartLinesApi(
  cartId: string,
  lines: CartLineUpdateInput[]
 ): Promise<Cart> {
-  const response = await shopifyFetch({
-    query: UPDATE_CART_LINES_MUTATION,
-    variables: { cartId, lines },
-  });
+  const data = unwrapStorefrontResult(
+    await storefront.graphql(UPDATE_CART_LINES_MUTATION, {
+      variables: { cartId, lines },
+    }),
+    'UpdateCartLines'
+  );

-  if (response.data.cartLinesUpdate.userErrors.length > 0) {
-    throw new Error(response.data.cartLinesUpdate.userErrors[0].message);
-  }
-
-  return response.data.cartLinesUpdate.cart;
+  return unwrapCartPayload(data.cartLinesUpdate);
 }

 async function removeCartLinesApi(
  cartId: string,
  lineIds: string[]
 ): Promise<Cart> {
-  const response = await shopifyFetch({
-    query: REMOVE_CART_LINES_MUTATION,
-    variables: { cartId, lineIds },
-  });
+  const data = unwrapStorefrontResult(
+    await storefront.graphql(REMOVE_CART_LINES_MUTATION, {
+      variables: { cartId, lineIds },
+    }),
+    'RemoveCartLines'
+  );

-  if (response.data.cartLinesRemove.userErrors.length > 0) {
-    throw new Error(response.data.cartLinesRemove.userErrors[0].message);
-  }
-
-  return response.data.cartLinesRemove.cart;
+  return unwrapCartPayload(data.cartLinesRemove);
 }

 async function updateCartDiscountCodesApi(
  cartId: string,
  discountCodes: string[]
 ): Promise<Cart> {
-  const response = await shopifyFetch({
-    query: UPDATE_CART_DISCOUNT_CODES_MUTATION,
-    variables: { cartId, discountCodes },
-  });
+  const data = unwrapStorefrontResult(
+    await storefront.graphql(UPDATE_CART_DISCOUNT_CODES_MUTATION, {
+      variables: { cartId, discountCodes },
+    }),
+    'UpdateCartDiscountCodes'
+  );

-  if (response.data.cartDiscountCodesUpdate.userErrors.length > 0) {
-    throw new Error(
-      response.data.cartDiscountCodesUpdate.userErrors[0].message
-    );
-  }
-
-  return response.data.cartDiscountCodesUpdate.cart;
+  return unwrapCartPayload(data.cartDiscountCodesUpdate);
 }

 async function getCartApi(cartId: string): Promise<Cart | null> {
-  const response = await shopifyFetch({
-    query: GET_CART_QUERY,
-    variables: { cartId },
-  });
+  const data = unwrapStorefrontResult(
+    await storefront.graphql(GET_CART_QUERY, { variables: { cartId } }),
+    'GetCart'
+  );

-  return response.data.cart;
+  return data.cart;
 }

 export function redirectToCheckout(checkoutUrl: string): void {
@@ -1,4 +1,7 @@
-import { SHOPIFY_STOREFRONT_API_URL } from '@/services/shopify/client';
+import {
+  cachedStorefront,
+  unwrapStorefrontResult,
+} from '@/services/shopify/client';
 import { GET_SHOP_POLICIES_QUERY } from '@/graphql/policies';

 export interface ShopPolicy {
@@ -9,12 +12,6 @@ export interface ShopPolicy {
  url: string;
 }

-interface ShopPoliciesResponse {
-  data?: {
-    shop?: Record<string, ShopPolicy | null>;
-  };
-}
-
 // Handles Shopify uses for each policy — also the routes under /policies/[handle].
 export const POLICY_HANDLES = [
  'terms-of-service',
@@ -24,32 +21,23 @@ export const POLICY_HANDLES = [
  'subscription-policy',
 ] as const;

-// Policies change rarely, so this uses its own fetch (revalidated hourly)
-// rather than the no-store `shopifyFetch` used for carts and products.
+// Policies change rarely, so this reads through the cached client (revalidated
+// hourly) rather than the no-store one used for carts and products.
 export async function getShopPolicies(): Promise<ShopPolicy[]> {
-  const token = process.env.NEXT_PUBLIC_SHOPIFY_STOREFRONT_ACCESS_TOKEN;
+  try {
+    const data = unwrapStorefrontResult(
+      await cachedStorefront.graphql(GET_SHOP_POLICIES_QUERY),
+      'GetShopPolicies'
+    );

-  const response = await fetch(SHOPIFY_STOREFRONT_API_URL, {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-      ...(token ? { 'X-Shopify-Storefront-Access-Token': token } : {}),
-    },
-    body: JSON.stringify({ query: GET_SHOP_POLICIES_QUERY }),
-    next: { revalidate: 3600 },
-  });
-
-  if (!response.ok) {
-    console.error('Failed to load shop policies:', response.status);
+    return Object.values(data.shop ?? {}).filter(
+      (policy): policy is ShopPolicy => Boolean(policy?.handle)
+    );
+  } catch (err) {
+    // A storefront without policies configured shouldn't break the footer.
+    console.error('Failed to load shop policies:', err);
    return [];
  }
-
-  const json: ShopPoliciesResponse = await response.json();
-  const shop = json.data?.shop ?? {};
-
-  return Object.values(shop).filter((policy): policy is ShopPolicy =>
-    Boolean(policy?.handle)
-  );
 }

 export async function getShopPolicy(
@@ -3,23 +3,23 @@ export default {
  typescript: {
    ignoreBuildErrors: true,
  },
-  images: { 
-    unoptimized: true,
+  images: {
    remotePatterns: [
-    {
-      protocol: 'https',
-      hostname: 'images.unsplash.com',
-    },
-    {
-      protocol: 'https',
-      hostname: 'cdn.shopify.com',
-    },
-    {
-      protocol: 'https',
-      hostname: '**.frontend.co',
-    },
-  ], 
-  }, 
+      {
+        protocol: 'https',
+        hostname: 'images.unsplash.com',
+      },
+      // Covers cdn.shopify.com plus any other Shopify-hosted image subdomain.
+      {
+        protocol: 'https',
+        hostname: '**.shopify.com',
+      },
+      {
+        protocol: 'https',
+        hostname: '**.frontend.co',
+      },
+    ],
+  },
  experimental: { 
    reactDebugChannel: false 
  }, 
@@ -5,7 +5,8 @@
    "scripts": {
        "dev": "next dev --webpack",
        "build": "next build --webpack",
-        "start": "next start"
+        "start": "next start",
+        "typecheck": "tsc --noEmit && hydrogen gql check"
    },
    "version": "0.0.0",
    "dependencies": {
@@ -15,7 +16,7 @@
        "@radix-ui/react-slot": "^1.3.3",
        "@radix-ui/react-use-controllable-state": "^1.2.6",
        "@remixicon/react": "^4.9.0",
-        "@shopify/storefront-api-client": "^1.0.0",
+        "@shopify/hydrogen": "0.0.0-preview-116d5d7-20260730141607",
        "ai": "^7",
        "class-variance-authority": "0.7.1",
        "clsx": "^2.1.1",
@@ -52,5 +53,6 @@
        "@types/react": "^19",
        "@types/react-dom": "^19",
        "typescript": "^5.7.3"
-    }
+    },
+    "packageManager": "yarn@4.18.0+sha512.fcb8716fe7cd0eece141ffc18b92193a9df9204c1ba83189c288835223fc0bbe64af473bab0d5e9927a7daeb5caf2bb07eb2787cc9338ca040ea125f2a1f2f7e"
 }
@@ -3,7 +3,8 @@
 // These are plain async functions with no React imports, so they can be called
 // from Route Handlers (see app/api/chat/route.ts) as well as from the client
 // hooks in hooks/use-shopify-*.ts, which re-export them.
-import { shopifyFetch } from '@/services/shopify/client';
+import type { StorefrontApi } from '@shopify/hydrogen';
+import { storefront, unwrapStorefrontResult } from '@/services/shopify/client';
 import {
  GET_PRODUCTS_QUERY,
  GET_PRODUCT_QUERY,
@@ -18,9 +19,11 @@ import {
  SEARCH_SUGGESTIONS_QUERY,
 } from '@/graphql/search';

+// Optional fields are `| null` rather than just optional: the Storefront API
+// returns explicit nulls, and the typed `gql()` documents now surface that.
 interface ProductImage {
  url: string;
-  altText?: string;
+  altText?: string | null;
 }

 interface ProductPrice {
@@ -37,7 +40,7 @@ interface ProductVariant {
    name: string;
    value: string;
  }>;
-  image?: ProductImage;
+  image?: ProductImage | null;
 }

 export interface ProductOptionValue {
@@ -146,12 +149,14 @@ export async function getProductsPage({
  sortKey = 'BEST_SELLING',
  reverse = false,
 }: UseProductsOptions = {}): Promise<ProductsPage> {
-  const response = await shopifyFetch({
-    query: GET_PRODUCTS_QUERY,
-    variables: { first, after, query, sortKey, reverse },
-  });
+  const data = unwrapStorefrontResult(
+    await storefront.graphql(GET_PRODUCTS_QUERY, {
+      variables: { first, after, query, sortKey, reverse },
+    }),
+    'GetProducts'
+  );

-  const { edges, pageInfo } = response.data.products;
+  const { edges, pageInfo } = data.products;

  return {
    products: edges.map((edge: { node: Product }) => edge.node),
@@ -162,28 +167,30 @@ export async function getProductsPage({

 // Fetch a single product by handle
 export async function getProduct(handle: string): Promise<Product | null> {
-  const response = await shopifyFetch({
-    query: GET_PRODUCT_QUERY,
-    variables: { handle },
-  });
+  const data = unwrapStorefrontResult(
+    await storefront.graphql(GET_PRODUCT_QUERY, { variables: { handle } }),
+    'GetProduct'
+  );

-  return response.data.product;
+  return data.product;
 }

 // Fetch product recommendations
 export async function getProductRecommendations(productId: string): Promise<Product[]> {
-  const response = await shopifyFetch({
-    query: QUERY_PRODUCT_RECOMMENDATIONS,
-    variables: { productId },
-  });
+  const data = unwrapStorefrontResult(
+    await storefront.graphql(QUERY_PRODUCT_RECOMMENDATIONS, {
+      variables: { productId },
+    }),
+    'GetProductRecommendations'
+  );

-  return response.data.productRecommendations || [];
+  return data.productRecommendations ?? [];
 }


 interface CollectionImage {
  url: string;
-  altText?: string;
+  altText?: string | null;
 }

 export interface Collection {
@@ -192,7 +199,7 @@ export interface Collection {
  handle: string;
  description?: string;
  descriptionHtml?: string;
-  image?: CollectionImage;
+  image?: CollectionImage | null;
 }

 export interface CollectionWithProducts extends Collection {
@@ -237,12 +244,12 @@ export interface ProductFilterFacet {

 // Fetch all collections
 export async function getCollections(first = 50): Promise<Collection[]> {
-  const response = await shopifyFetch({
-    query: GET_COLLECTIONS_QUERY,
-    variables: { first },
-  });
+  const data = unwrapStorefrontResult(
+    await storefront.graphql(GET_COLLECTIONS_QUERY, { variables: { first } }),
+    'GetCollections'
+  );

-  return response.data.collections.edges.map((edge: { node: Collection }) => edge.node);
+  return data.collections.edges.map((edge) => edge.node);
 }

 // Fetch products in a collection by handle
@@ -267,28 +274,23 @@ export async function getCollectionProductsPage(
    filterInputs = [],
  }: UseCollectionProductsOptions = {}
 ): Promise<CollectionProductsPage> {
-  const filters = filterInputs.flatMap((input) => {
-    try {
-      return [JSON.parse(input)];
-    } catch {
-      console.warn('Ignoring malformed product filter input:', input);
-      return [];
-    }
-  });
+  const filters = parseFilterInputs(filterInputs);

-  const response = await shopifyFetch({
-    query: GET_COLLECTION_PRODUCTS_QUERY,
-    variables: {
-      handle,
-      first,
-      after,
-      sortKey,
-      reverse,
-      filters: filters.length ? filters : null,
-    },
-  });
+  const data = unwrapStorefrontResult(
+    await storefront.graphql(GET_COLLECTION_PRODUCTS_QUERY, {
+      variables: {
+        handle,
+        first,
+        after,
+        sortKey,
+        reverse,
+        filters: filters.length ? filters : null,
+      },
+    }),
+    'GetCollectionProducts'
+  );

-  const collection = response.data.collection;
+  const collection = data.collection;
  if (!collection) {
    return {
      collection: null,
@@ -342,7 +344,7 @@ export interface SearchSuggestion {
  handle: string;
  featuredImage?: {
    url: string;
-    altText?: string;
+    altText?: string | null;
  } | null;
  priceRange: {
    minVariantPrice: {
@@ -362,10 +364,18 @@ interface SearchProductsOptions {
  filterInputs?: string[];
 }

-function parseFilterInputs(inputs: string[]): unknown[] {
+// The `ProductFilter` input shape, taken from the query that consumes it so it
+// tracks the schema rather than being restated here.
+type ProductFilterInput = NonNullable<
+  StorefrontApi.VariablesOf<typeof GET_COLLECTION_PRODUCTS_QUERY>['filters']
+>[number];
+
+// Facet `input` values are opaque JSON strings produced by Shopify and handed
+// straight back as filter inputs, so they are parsed, not constructed.
+function parseFilterInputs(inputs: string[]): ProductFilterInput[] {
  return inputs.flatMap((input) => {
    try {
-      return [JSON.parse(input)];
+      return [JSON.parse(input) as ProductFilterInput];
    } catch {
      console.warn('Ignoring malformed product filter input:', input);
      return [];
@@ -381,24 +391,30 @@ export async function searchProducts({
  reverse = false,
  filterInputs = [],
 }: SearchProductsOptions): Promise<SearchProductsResult> {
-  const response = await shopifyFetch({
-    query: SEARCH_PRODUCTS_QUERY,
-    variables: {
-      query,
-      first,
-      after,
-      sortKey,
-      reverse,
-      productFilters: filterInputs.length
-        ? parseFilterInputs(filterInputs)
-        : null,
-    },
-  });
+  const data = unwrapStorefrontResult(
+    await storefront.graphql(SEARCH_PRODUCTS_QUERY, {
+      variables: {
+        query,
+        first,
+        after,
+        sortKey,
+        reverse,
+        productFilters: filterInputs.length
+          ? parseFilterInputs(filterInputs)
+          : null,
+      },
+    }),
+    'SearchProducts'
+  );

-  const search = response.data.search;
+  const search = data.search;

  return {
-    products: search.edges.map((edge: { node: Product }) => edge.node),
+    products: search.edges
+      .map((edge) => edge.node)
+      .filter((node): node is Extract<typeof node, { __typename: 'Product' }> =>
+        node.__typename === 'Product'
+      ),
    totalCount: search.totalCount ?? 0,
    filters: search.productFilters ?? [],
    hasNextPage: Boolean(search.pageInfo?.hasNextPage),
@@ -410,15 +426,21 @@ export async function searchSuggestions(
  query: string,
  first = 3
 ): Promise<{ products: SearchSuggestion[]; totalCount: number }> {
-  const response = await shopifyFetch({
-    query: SEARCH_SUGGESTIONS_QUERY,
-    variables: { query, first },
-  });
+  const data = unwrapStorefrontResult(
+    await storefront.graphql(SEARCH_SUGGESTIONS_QUERY, {
+      variables: { query, first },
+    }),
+    'SearchSuggestions'
+  );

-  const search = response.data.search;
+  const search = data.search;

  return {
-    products: search.edges.map((edge: { node: SearchSuggestion }) => edge.node),
+    products: search.edges
+      .map((edge) => edge.node)
+      .filter((node): node is Extract<typeof node, { __typename: 'Product' }> =>
+        node.__typename === 'Product'
+      ),
    totalCount: search.totalCount ?? 0,
  };
 }
@@ -1,48 +0,0 @@
-// Shopify Storefront API Service
-const SHOPIFY_STORE_DOMAIN = process.env.NEXT_PUBLIC_SHOPIFY_DOMAIN;
-const SHOPIFY_STOREFRONT_ACCESS_TOKEN = process.env.NEXT_PUBLIC_SHOPIFY_STOREFRONT_ACCESS_TOKEN;
-const SHOPIFY_API_VERSION = process.env.NEXT_PUBLIC_SHOPIFY_API_VERSION || '2025-07';
-const SHOPIFY_STOREFRONT_API_URL = `https://${SHOPIFY_STORE_DOMAIN}/api/${SHOPIFY_API_VERSION}/graphql.json`;
-
-// Shopify API request with optional access token
-async function shopifyFetch({ query, variables = {} }) {
-  try {
-    const headers = {
-      'Content-Type': 'application/json',
-    };
-
-    // Add access token if available
-    if (SHOPIFY_STOREFRONT_ACCESS_TOKEN) {
-      headers['X-Shopify-Storefront-Access-Token'] = SHOPIFY_STOREFRONT_ACCESS_TOKEN;
-    }
-
-    const response = await fetch(SHOPIFY_STOREFRONT_API_URL, {
-      method: 'POST',
-      headers,
-      body: JSON.stringify({
-        query,
-        variables,
-      }),
-      cache: 'no-store', // Ensure fresh data for cart operations
-    });
-
-    if (!response.ok) {
-      const errorBody = await response.text();
-      throw new Error(`Shopify API HTTP error! Status: ${response.status}, Body: ${errorBody}`);
-    }
-
-    const json = await response.json();
-
-    if (json.errors) {
-      console.error('Shopify API errors:', json.errors);
-      throw new Error(`Shopify GraphQL errors: ${JSON.stringify(json.errors)}`);
-    }
-
-    return json;
-  } catch (error) {
-    console.error('Shopify fetch error:', error);
-    throw error;
-  }
-}
-
-export { shopifyFetch, SHOPIFY_STORE_DOMAIN, SHOPIFY_STOREFRONT_API_URL };
@@ -0,0 +1,105 @@
+// Storefront API clients, built on `@shopify/hydrogen`.
+//
+// Call sites use the package's own API — `storefront.graphql(DOCUMENT, {
+// variables })` — and pass the result through `unwrapStorefrontResult`, which
+// applies this app's error policy: fail loudly. Hydrogen deliberately does not
+// do that itself, because a 200 carrying partial data and GraphQL errors is a
+// valid response that some callers want to render.
+import {
+  createShopifyRequestContext,
+  createStorefrontClient,
+  type GraphQLFormattedError,
+} from '@shopify/hydrogen';
+import {
+  SHOPIFY_API_VERSION,
+  SHOPIFY_PUBLIC_ACCESS_TOKEN,
+  SHOPIFY_STORE_DOMAIN,
+} from '@/services/shopify/config';
+
+// No incoming request and no buyer context: these clients are module-scoped and
+// serve both server rendering and the browser-side hooks, so they must not close
+// over per-request state. `$country`/`$language` are injected from this i18n.
+const requestContext = createShopifyRequestContext({
+  request: { headers: new Headers() },
+  i18n: { country: 'US', language: 'EN' },
+});
+
+/**
+ * Workaround for a bug in this preview build of `@shopify/hydrogen`.
+ *
+ * The client tags every request with `X-Hydrogen-Version`, but the Storefront
+ * API does not list that header in its CORS `access-control-allow-headers`.
+ * Browsers therefore reject the preflight and `fetch` throws, which hydrogen
+ * reports as the generic "SFAPI request failed". It only bites against real
+ * stores — `mock.shop` answers `access-control-allow-headers: *`.
+ *
+ * Stripped in the browser only: server-side requests are not subject to CORS,
+ * so they keep sending the header. Remove this once the API allows it (or once
+ * these queries move server-side, which is the better long-term fix).
+ */
+const CORS_BLOCKED_HEADERS = ['X-Hydrogen-Version'];
+
+// Hydrogen calls `fetch(url, init, cacheOptions)`; Next's caching hints ride
+// along on `init`, which is how the two ways of caching get to coexist.
+const fetchWith = (overrides: RequestInit): typeof globalThis.fetch =>
+  ((url, init) => {
+    const headers = new Headers(init?.headers);
+
+    if (typeof document !== 'undefined') {
+      for (const header of CORS_BLOCKED_HEADERS) headers.delete(header);
+    }
+
+    return globalThis.fetch(url, { ...init, ...overrides, headers });
+  }) as typeof globalThis.fetch;
+
+const config = {
+  storeDomain: SHOPIFY_STORE_DOMAIN!,
+  apiVersion: SHOPIFY_API_VERSION,
+  publicStorefrontToken: SHOPIFY_PUBLIC_ACCESS_TOKEN,
+};
+
+/**
+ * Default client. Uncached, because carts and customer reads must never serve a
+ * stale response.
+ */
+export const storefront = createStorefrontClient({
+  type: 'public',
+  requestContext,
+  config: { ...config, fetch: fetchWith({ cache: 'no-store' }) },
+});
+
+/**
+ * Client for data that changes rarely (shop policies, and anything else safe to
+ * serve from Next's data cache for an hour).
+ */
+export const cachedStorefront = createStorefrontClient({
+  type: 'public',
+  requestContext,
+  config: { ...config, fetch: fetchWith({ next: { revalidate: 3600 } }) },
+});
+
+/**
+ * Returns the data from a `graphql()` result, throwing if Shopify reported any
+ * GraphQL errors. Transport failures — non-200, timeouts, unparseable bodies —
+ * have already thrown as `StorefrontApiError` by this point.
+ *
+ * `operation` names the query in the log and the thrown message, so a failure
+ * points at the call site rather than just at "Shopify".
+ */
+export function unwrapStorefrontResult<TData>(
+  result: { data: TData | null; errors?: GraphQLFormattedError[] },
+  operation: string
+): TData {
+  if (result.errors?.length) {
+    console.error(`Shopify GraphQL errors (${operation}):`, result.errors);
+    throw new Error(
+      `Shopify GraphQL errors (${operation}): ${JSON.stringify(result.errors)}`
+    );
+  }
+
+  if (result.data == null) {
+    throw new Error(`Shopify returned no data for ${operation}.`);
+  }
+
+  return result.data;
+}
@@ -0,0 +1,16 @@
+// Storefront configuration, read from the environment in one place.
+//
+// These are all `NEXT_PUBLIC_*`, so Next inlines them at build time and they are
+// safe to read from client components as well as server code.
+export const SHOPIFY_STORE_DOMAIN = process.env.NEXT_PUBLIC_SHOPIFY_DOMAIN;
+
+/**
+ * Public Storefront API access token. Safe to expose to the browser — that is
+ * what "public" means here. Omitted for tokenless storefronts such as
+ * `mock.shop`. Never put a *private* token behind a `NEXT_PUBLIC_` name.
+ */
+export const SHOPIFY_PUBLIC_ACCESS_TOKEN =
+  process.env.NEXT_PUBLIC_SHOPIFY_PUBLIC_ACCESS_TOKEN;
+
+export const SHOPIFY_API_VERSION =
+  process.env.NEXT_PUBLIC_SHOPIFY_API_VERSION || '2026-07';
@@ -3,7 +3,7 @@
 // The customer access token is a credential: it is only ever handled here and
 // in the /api/account route handlers, and is stored in an httpOnly cookie so
 // client JavaScript can never read it.
-import { shopifyFetch } from '@/services/shopify/client';
+import { storefront, unwrapStorefrontResult } from '@/services/shopify/client';
 import {
  CUSTOMER_QUERY,
  CUSTOMER_CREATE_MUTATION,
@@ -18,7 +18,8 @@ import {
 export const CUSTOMER_TOKEN_COOKIE = 'customerAccessToken';

 export interface CustomerUserError {
-  code?: string;
+  /** One of `CustomerErrorCode`; kept as a string so new codes don't break. */
+  code?: string | null;
  field?: string[] | null;
  message: string;
 }
@@ -57,7 +58,7 @@ export interface CustomerOrder {

 export interface Customer {
  id: string;
-  email: string;
+  email: string | null;
  firstName?: string | null;
  lastName?: string | null;
  phone?: string | null;
@@ -84,6 +85,13 @@ const firstMessage = (errors: CustomerUserError[]) =>

 export { firstMessage as customerErrorMessage };

+// Shopify returns a null mutation payload when the mutation could not run at
+// all. That is not a success, so it surfaces as a generic error rather than an
+// empty error list, which callers read as "it worked".
+const MUTATION_FAILED: CustomerUserError[] = [
+  { message: 'Something went wrong. Please try again.' },
+];
+
 export async function createCustomer(input: {
  email: string;
  password: string;
@@ -91,24 +99,32 @@ export async function createCustomer(input: {
  lastName?: string;
  acceptsMarketing?: boolean;
 }): Promise<{ errors: CustomerUserError[] }> {
-  const response = await shopifyFetch({
-    query: CUSTOMER_CREATE_MUTATION,
-    variables: { input },
-  });
+  const data = unwrapStorefrontResult(
+    await storefront.graphql(CUSTOMER_CREATE_MUTATION, {
+      variables: { input },
+    }),
+    'CustomerCreate'
+  );

-  return { errors: response.data.customerCreate.customerUserErrors ?? [] };
+  const result = data.customerCreate;
+  if (!result) return { errors: MUTATION_FAILED };
+
+  return { errors: result.customerUserErrors ?? [] };
 }

 export async function login(
  email: string,
  password: string
 ): Promise<AuthResult> {
-  const response = await shopifyFetch({
-    query: CUSTOMER_ACCESS_TOKEN_CREATE_MUTATION,
-    variables: { input: { email, password } },
-  });
+  const data = unwrapStorefrontResult(
+    await storefront.graphql(CUSTOMER_ACCESS_TOKEN_CREATE_MUTATION, {
+      variables: { input: { email, password } },
+    }),
+    'CustomerAccessTokenCreate'
+  );

-  const result = response.data.customerAccessTokenCreate;
+  const result = data.customerAccessTokenCreate;
+  if (!result) return { token: null, errors: MUTATION_FAILED };

  return {
    token: result.customerAccessToken ?? null,
@@ -118,8 +134,7 @@ export async function login(

 export async function logout(accessToken: string): Promise<void> {
  try {
-    await shopifyFetch({
-      query: CUSTOMER_ACCESS_TOKEN_DELETE_MUTATION,
+    await storefront.graphql(CUSTOMER_ACCESS_TOKEN_DELETE_MUTATION, {
      variables: { customerAccessToken: accessToken },
    });
  } catch (err) {
@@ -132,8 +147,7 @@ export async function logout(accessToken: string): Promise<void> {
 // would leak account membership.
 export async function recoverPassword(email: string): Promise<void> {
  try {
-    await shopifyFetch({
-      query: CUSTOMER_RECOVER_MUTATION,
+    await storefront.graphql(CUSTOMER_RECOVER_MUTATION, {
      variables: { email },
    });
  } catch (err) {
@@ -146,12 +160,15 @@ export async function resetPassword(
  resetToken: string,
  password: string
 ): Promise<AuthResult> {
-  const response = await shopifyFetch({
-    query: CUSTOMER_RESET_MUTATION,
-    variables: { id, input: { resetToken, password } },
-  });
+  const data = unwrapStorefrontResult(
+    await storefront.graphql(CUSTOMER_RESET_MUTATION, {
+      variables: { id, input: { resetToken, password } },
+    }),
+    'CustomerReset'
+  );

-  const result = response.data.customerReset;
+  const result = data.customerReset;
+  if (!result) return { token: null, errors: MUTATION_FAILED };

  return {
    token: result.customerAccessToken ?? null,
@@ -164,12 +181,15 @@ export async function activateAccount(
  activationToken: string,
  password: string
 ): Promise<AuthResult> {
-  const response = await shopifyFetch({
-    query: CUSTOMER_ACTIVATE_MUTATION,
-    variables: { id, input: { activationToken, password } },
-  });
+  const data = unwrapStorefrontResult(
+    await storefront.graphql(CUSTOMER_ACTIVATE_MUTATION, {
+      variables: { id, input: { activationToken, password } },
+    }),
+    'CustomerActivate'
+  );

-  const result = response.data.customerActivate;
+  const result = data.customerActivate;
+  if (!result) return { token: null, errors: MUTATION_FAILED };

  return {
    token: result.customerAccessToken ?? null,
@@ -182,12 +202,14 @@ export async function getCustomer(
  orderCount = 10
 ): Promise<Customer | null> {
  try {
-    const response = await shopifyFetch({
-      query: CUSTOMER_QUERY,
-      variables: { customerAccessToken: accessToken, orderCount },
-    });
+    const data = unwrapStorefrontResult(
+      await storefront.graphql(CUSTOMER_QUERY, {
+        variables: { customerAccessToken: accessToken, orderCount },
+      }),
+      'GetCustomer'
+    );

-    return response.data.customer ?? null;
+    return data.customer ?? null;
  } catch (err) {
    // An expired or revoked token reads as "not signed in".
    console.error('Failed to load customer:', err);
@@ -204,12 +226,15 @@ export async function updateCustomer(
    phone?: string;
  }
 ): Promise<{ customer: Customer | null; errors: CustomerUserError[] }> {
-  const response = await shopifyFetch({
-    query: CUSTOMER_UPDATE_MUTATION,
-    variables: { customerAccessToken: accessToken, customer },
-  });
+  const data = unwrapStorefrontResult(
+    await storefront.graphql(CUSTOMER_UPDATE_MUTATION, {
+      variables: { customerAccessToken: accessToken, customer },
+    }),
+    'CustomerUpdate'
+  );

-  const result = response.data.customerUpdate;
+  const result = data.customerUpdate;
+  if (!result) return { customer: null, errors: MUTATION_FAILED };

  return {
    customer: result.customer ?? null,
@@ -20,6 +20,9 @@
    "plugins": [
      {
        "name": "next"
+      },
+      {
+        "name": "@shopify/hydrogen/ts-plugin"
      }
    ],
    "paths": {
@@ -5,6 +5,31 @@ __metadata:
  version: 10
  cacheKey: 10c0

+"@0no-co/graphql.web@npm:^1.0.5, @0no-co/graphql.web@npm:^1.3.1":
+  version: 1.3.3
+  resolution: "@0no-co/graphql.web@npm:1.3.3"
+  peerDependencies:
+    graphql: ^14.0.0 || ^15.0.0 || ^16.0.0
+  peerDependenciesMeta:
+    graphql:
+      optional: true
+  checksum: 10c0/7237b805118049e9023e5fa4fd71c9334e1f85df6f98933038cc1b919f388e814fd1beae9e41b6a7509643f6a208ece0422dbc5d8474d24bec957020c899fb93
+  languageName: node
+  linkType: hard
+
+"@0no-co/graphqlsp@npm:^1.12.13":
+  version: 1.17.3
+  resolution: "@0no-co/graphqlsp@npm:1.17.3"
+  dependencies:
+    "@gql.tada/internal": "npm:^1.2.0"
+    graphql: "npm:^15.5.0 || ^16.0.0 || ^17.0.0"
+  peerDependencies:
+    graphql: ^15.5.0 || ^16.0.0 || ^17.0.0
+    typescript: ^5.0.0 || ^6.0.0
+  checksum: 10c0/fa0f2d74275827e1c8aee36e07aaa0d86138b9f450e3e06e51be05cd507a95c1f7e7f603eaf611f6defdb2634f19acd0c2be16c222eff4802c67916ca77d4d7d
+  languageName: node
+  linkType: hard
+
 "@ai-sdk/gateway@npm:4.0.33":
  version: 4.0.33
  resolution: "@ai-sdk/gateway@npm:4.0.33"
@@ -144,6 +169,52 @@ __metadata:
  languageName: node
  linkType: hard

+"@gql.tada/cli-utils@npm:1.7.3":
+  version: 1.7.3
+  resolution: "@gql.tada/cli-utils@npm:1.7.3"
+  dependencies:
+    "@0no-co/graphqlsp": "npm:^1.12.13"
+    "@gql.tada/internal": "npm:1.0.9"
+    graphql: "npm:^15.5.0 || ^16.0.0 || ^17.0.0"
+  peerDependencies:
+    "@0no-co/graphqlsp": ^1.12.13
+    "@gql.tada/svelte-support": 1.0.2
+    "@gql.tada/vue-support": 1.0.2
+    graphql: ^15.5.0 || ^16.0.0 || ^17.0.0
+    typescript: ^5.0.0 || ^6.0.0
+  peerDependenciesMeta:
+    "@gql.tada/svelte-support":
+      optional: true
+    "@gql.tada/vue-support":
+      optional: true
+  checksum: 10c0/55405687375cbda9a9e963fc627939a55c64e81816c8d6433add3564f2fc2c0600ec60c98e01de77fa21511713daf9e84b644362d9ce571f0ea5c43851c68b6f
+  languageName: node
+  linkType: hard
+
+"@gql.tada/internal@npm:1.0.9":
+  version: 1.0.9
+  resolution: "@gql.tada/internal@npm:1.0.9"
+  dependencies:
+    "@0no-co/graphql.web": "npm:^1.0.5"
+  peerDependencies:
+    graphql: ^15.5.0 || ^16.0.0 || ^17.0.0
+    typescript: ^5.0.0 || ^6.0.0
+  checksum: 10c0/5599ab58bc5859bf9d38f13e4ca0aae564cf7e94fbfa9afdb9932d4719fb945cb19da917fe23ed0cf115550ce07d31bcac89c229385fe7077754b54c2bed16e9
+  languageName: node
+  linkType: hard
+
+"@gql.tada/internal@npm:^1.2.0":
+  version: 1.2.2
+  resolution: "@gql.tada/internal@npm:1.2.2"
+  dependencies:
+    "@0no-co/graphql.web": "npm:^1.3.1"
+  peerDependencies:
+    graphql: ^15.5.0 || ^16.0.0 || ^17.0.0
+    typescript: ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0
+  checksum: 10c0/2861061a64fa88dbd8bac84cff87bc33a30e9ed971cbee9f8d9a52ec27a17ffc64c389fb6a75f2231458524556829b81f4744b55ccb433e46d28e1066a5d4655
+  languageName: node
+  linkType: hard
+
 "@img/colour@npm:^1.0.0":
  version: 1.1.0
  resolution: "@img/colour@npm:1.1.0"
@@ -1810,19 +1881,22 @@ __metadata:
  languageName: node
  linkType: hard

-"@shopify/graphql-client@npm:^1.4.2":
-  version: 1.4.2
-  resolution: "@shopify/graphql-client@npm:1.4.2"
-  checksum: 10c0/f18d898ec3fb12a819b6c2941d9ddaebd1ab7152ffe55450ab9255c11860de9422ba1e9eadee5f44ef314f664fe411c642ba3debd6671851b9cdc647eb85e0be
-  languageName: node
-  linkType: hard
-
-"@shopify/storefront-api-client@npm:^1.0.0":
-  version: 1.0.10
-  resolution: "@shopify/storefront-api-client@npm:1.0.10"
+"@shopify/hydrogen@npm:0.0.0-preview-116d5d7-20260730141607":
+  version: 0.0.0-preview-116d5d7-20260730141607
+  resolution: "@shopify/hydrogen@npm:0.0.0-preview-116d5d7-20260730141607"
  dependencies:
-    "@shopify/graphql-client": "npm:^1.4.2"
-  checksum: 10c0/e8eff260e91857e87cffb543ca57c8a4a6e549316e0b6ccef2c345b857ef59e4092e92ecd2904706aa386bca1d21af4ef3e7447f9966b8dcceda06b3ad7dadc9
+    gql.tada: "npm:1.9.2"
+  peerDependencies:
+    react: ^18.0.0 || ^19.0.0
+    vue: ^3.5.0
+  peerDependenciesMeta:
+    react:
+      optional: true
+    vue:
+      optional: true
+  bin:
+    hydrogen: bin/hydrogen.mjs
+  checksum: 10c0/b12e230d174a910d8abb7ab18ecb99357dce82d2125054b30af6dcbecf280c6fea40c8ca5fd67d8931e1079fd73e587e3ea1484f50c294f4a79ad714c9664ecd
  languageName: node
  linkType: hard

@@ -2427,6 +2501,23 @@ __metadata:
  languageName: node
  linkType: hard

+"gql.tada@npm:1.9.2":
+  version: 1.9.2
+  resolution: "gql.tada@npm:1.9.2"
+  dependencies:
+    "@0no-co/graphql.web": "npm:^1.0.5"
+    "@0no-co/graphqlsp": "npm:^1.12.13"
+    "@gql.tada/cli-utils": "npm:1.7.3"
+    "@gql.tada/internal": "npm:1.0.9"
+  peerDependencies:
+    typescript: ^5.0.0 || ^6.0.0
+  bin:
+    gql-tada: bin/cli.js
+    gql.tada: bin/cli.js
+  checksum: 10c0/e6995d5ddd41a0049f7e2494758d605567027c57b270e59c48355d7fbd0ca95db77db2385c14d2add1198ef59b91c1b5a7f9b70d9eac8668c2be534e55a56517
+  languageName: node
+  linkType: hard
+
 "graceful-fs@npm:^4.2.4":
  version: 4.2.11
  resolution: "graceful-fs@npm:4.2.11"
@@ -2434,6 +2525,13 @@ __metadata:
  languageName: node
  linkType: hard

+"graphql@npm:^15.5.0 || ^16.0.0 || ^17.0.0":
+  version: 17.0.2
+  resolution: "graphql@npm:17.0.2"
+  checksum: 10c0/766546216b891439ed09fd8584963df2013e26f2f79f096036eaaa2788c38964e049c8a142d68e3afdabdd8bbe70042639e83f0f4b82edbc7c6850421f072bb6
+  languageName: node
+  linkType: hard
+
 "hast-util-sanitize@npm:^5.0.0":
  version: 5.0.2
  resolution: "hast-util-sanitize@npm:5.0.2"
@@ -3371,7 +3469,7 @@ __metadata:
    "@radix-ui/react-slot": "npm:^1.3.3"
    "@radix-ui/react-use-controllable-state": "npm:^1.2.6"
    "@remixicon/react": "npm:^4.9.0"
-    "@shopify/storefront-api-client": "npm:^1.0.0"
+    "@shopify/hydrogen": "npm:0.0.0-preview-116d5d7-20260730141607"
    "@tailwindcss/postcss": "npm:^4"
    "@types/hast": "npm:^3.0.5"
    "@types/node": "npm:^22"
Author	SHA1	Message	Date
Rami BitarandClaude Opus 5	0263a59c6a	Add page metadata across every route The root layout exported no metadata, so routes without their own export rendered no title at all, and no route had a description. Add a root metadata block with a title template, Open Graph and Twitter defaults, and fill in the routes that were missing tags. - config/site.ts: description and env-driven absolute url for metadataBase - home, /collections and /shop/collections: titles and descriptions - products/[handle] and collections/[handle]: generateMetadata off the existing catalog fetchers, with canonical and OG image - existing titles: drop the hand-written " — Shop" suffix now that the root template appends it Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_011x5jT4fJJCnqPx3umEvXRk	2026-08-09 09:35:57 -04:00
Rami BitarandClaude Opus 5	a230187e9f	Re-enable image optimization and default header logo text Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01NK7oe8iYPiNvVCvg5z1eyQ	2026-08-09 09:07:42 -04:00
Rami BitarandClaude Opus 5	70ebd65a18	Disable the image optimizer again Restore images.unoptimized so <Image> renders as a passthrough. The next/image call sites stay as they are; they simply serve the original Shopify URLs rather than routing through /_next/image. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_015uSQQNWrmiYDRW9L9VnsGC	2026-08-08 17:57:17 -04:00
Rami BitarandClaude Opus 5	82c9626c75	Render Shopify imagery through next/image Turn the optimizer back on by dropping images.unoptimized, and widen the Shopify remote pattern to **.shopify.com so any image subdomain resolves. With the optimizer live, remotePatterns is now actually enforced. Convert the seven Shopify CDN call sites: the product/collection cards and the gallery carousel size with fill + sizes, while the cart, order and search thumbnails carry explicit dimensions. The avatar, markdown, attachment, assistant and logo images stay plain <img> — they take blob:/data: or arbitrary hosts that next/image cannot process. The lightbox needs w-auto h-auto: the width and height attributes next/image requires make both axes definite, so max-w/max-h clamp them independently instead of preserving the ratio. object-contain masked that, but the stretched element covered the overlay and ate the backdrop clicks that close the dialog. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_015uSQQNWrmiYDRW9L9VnsGC	2026-08-08 17:48:19 -04:00
Rami Bitar	58742d5d00	Initial commit	2026-08-08 14:21:24 -04:00