Call hydrogen's storefront.graphql directly, drop the compat shim

Completes the migration started in f8c3ef9. That commit put hydrogen
underneath the existing shopifyFetch wrapper; this one removes the
wrapper so every query uses the package's own client API.

- All 22 call sites now call storefront.graphql(DOCUMENT, { variables })
  (cachedStorefront for shop policies) instead of shopifyFetch, which
  emulated the old client's {query, variables} -> {data} shape.
- shopifyFetch is replaced by unwrapStorefrontResult(result, operation),
  which is only an error policy, not a transport wrapper: it returns
  data and throws when Shopify reports GraphQL errors, since hydrogen
  returns those rather than throwing. Naming the operation means a
  failure points at the call site instead of just at "Shopify".
- Environment reads move to services/shopify/config, so client.ts is
  only the hydrogen clients and shop-pay-button no longer imports from
  a query module just to get the store domain.
- Removes @shopify/storefront-api-client, the superseded client. It had
  no importers.

The SHOPIFY_STOREFRONT_API_URL export is gone too — hydrogen builds the
endpoint from storeDomain and apiVersion, and nothing else used it.

No behaviour change intended: same documents, same env var names, same
2025-07 API pin, same caching split between the two clients.

yarn typecheck passes with 0 errors. Verified against mock.shop: build
prerenders the policy pages, and in the browser product grid, search,
collection filters, cart restore, quantity update and discount-code
apply all work with no console errors. Customer account flows remain
untested — they need real credentials.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01JaxgqPbFxLsSuLPZom2kdC

.gitignore

@@ -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

components/shopify/collection-card.tsx

@@ -3,7 +3,7 @@ import Link from 'next/link';
 
 interface CollectionImage {
   url: string;
-  altText?: string;
+  altText?: string | null;
 }
 
 interface Collection {
@@ -11,7 +11,7 @@ interface Collection {
   title: string;
   handle: string;
   description?: string;
-  image?: CollectionImage;
+  image?: CollectionImage | null;
 }
 
 interface CollectionCardProps {

components/shopify/product-card.tsx

@@ -4,7 +4,7 @@ import { truncate } from '@/lib/utils';
 
 interface ProductImage {
   url: string;
-  altText?: string;
+  altText?: string | null;
 }
 
 interface ProductPrice {

components/shopify/product-detail/index.tsx

@@ -29,8 +29,8 @@ interface ProductVariant {
   }>;
   image?: {
     url: string;
-    altText?: string;
+    altText?: string | null;
-  };
+  } | null;
 }
 
 export type { Product };

components/shopify/product-detail/product-detail-gallery.tsx

@@ -6,7 +6,7 @@ import { Button } from '@/components/ui/button';
 
 interface ProductImage {
   url: string;
-  altText?: string;
+  altText?: string | null;
 }
 
 interface ProductDetailGalleryProps {

components/shopify/products.tsx

@@ -8,7 +8,7 @@ import { Loader } from '@/components/ui/loader';
 
 interface ProductImage {
   url: string;
-  altText?: string;
+  altText?: string | null;
 }
 
 interface ProductPrice {

components/shopify/shop-pay-button.tsx

@@ -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';

graphql/cart.ts

@@ -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 = `
+export const CREATE_CART_MUTATION = gql(
-  ${CartFragment}
+  `
-  mutation CreateCart($lines: [CartLineInput!]) {
+  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 = `
+export const ADD_CART_LINES_MUTATION = gql(
-  ${CartFragment}
+  `
-  mutation AddCartLines($cartId: ID!, $lines: [CartLineInput!]!) {
+  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 = `
+export const UPDATE_CART_LINES_MUTATION = gql(
-  ${CartFragment}
+  `
-  mutation UpdateCartLines($cartId: ID!, $lines: [CartLineUpdateInput!]!) {
+  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 = `
+export const REMOVE_CART_LINES_MUTATION = gql(
-  ${CartFragment}
+  `
-  mutation RemoveCartLines($cartId: ID!, $lineIds: [ID!]!) {
+  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 = `
+export const UPDATE_CART_DISCOUNT_CODES_MUTATION = gql(
-  ${CartFragment}
+  `
-  mutation UpdateCartDiscountCodes($cartId: ID!, $discountCodes: [String!]) {
+  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 = `
+export const GET_CART_QUERY = gql(
-  ${CartFragment}
+  `
-  query GetCart($cartId: ID!) {
+  query GetCart($cartId: ID!, $country: CountryCode, $language: LanguageCode)
+  @inContext(country: $country, language: $language) {
     cart(id: $cartId) {
       ...CartFragment
     }
   }
-`;
+`,
+  [CartFragment]
+);

graphql/collections.ts

@@ -1,8 +1,10 @@
+import { gql } from '@shopify/hydrogen';
 import { ProductFragment } from '@/graphql/products';
 
 // Get all collections
-export const GET_COLLECTIONS_QUERY = `
+export const GET_COLLECTIONS_QUERY = gql(`
-  query GetCollections($first: Int!) {
+  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 = `
+export const GET_COLLECTION_PRODUCTS_QUERY = gql(
-  ${ProductFragment}
+  `
   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]
+);

graphql/customer.ts

@@ -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 = `
+export const CUSTOMER_QUERY = gql(
-  ${CustomerFragment}
+  `
   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 = `
+export const CUSTOMER_UPDATE_MUTATION = gql(
-  ${CustomerFragment}
+  `
   mutation CustomerUpdate($customerAccessToken: String!, $customer: CustomerUpdateInput!) {
     customerUpdate(customerAccessToken: $customerAccessToken, customer: $customer) {
       customer {
@@ -170,4 +173,6 @@ export const CUSTOMER_UPDATE_MUTATION = `
       }
     }
   }
-`;
+`,
+  [CustomerFragment]
+);

graphql/policies.ts

@@ -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 = `
       }
     }
   }
-`;
+`);

graphql/products.ts

@@ -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 = `
+export const GET_PRODUCTS_QUERY = gql(
-  ${ProductFragment}
+  `
-  query GetProducts($first: Int!, $after: String, $query: String, $sortKey: ProductSortKeys, $reverse: Boolean) {
+  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 = `
+export const GET_PRODUCT_QUERY = gql(
-  ${ProductFragment}
+  `
-  query GetProduct($handle: String!) {
+  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 = `
+export const QUERY_PRODUCT_RECOMMENDATIONS = gql(
-  ${ProductFragment}
+  `
-  query GetProductRecommendations($productId: ID!) {
+  query GetProductRecommendations($productId: ID!, $country: CountryCode, $language: LanguageCode)
+  @inContext(country: $country, language: $language) {
     productRecommendations(productId: $productId) {
       ...ProductFragment
     }
   }
-`;
+`,
+  [ProductFragment]
+);

graphql/search.ts

@@ -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 = `
+export const SEARCH_PRODUCTS_QUERY = gql(
-  ${ProductFragment}
+  `
   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 = `
+export const SEARCH_SUGGESTIONS_QUERY = gql(`
-  query SearchSuggestions($query: String!, $first: Int!) {
+  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 = `
       }
     }
   }
-`;
+`);

hooks/use-shopify-cart.ts

@@ -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;
+      altText?: string | null;
-      width: number;
+      width?: number | null;
-      height: number;
+      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({
+ * Every cart mutation returns the same `{ cart, userErrors }` payload, and both
-    query: CREATE_CART_MUTATION,
+ * the payload and the cart inside it are nullable — Shopify returns no cart when
-    variables: { lines: lines.length > 0 ? lines : null },
+ * the mutation could not be applied. Callers want a cart or an exception.
-  });
+ */
-
+function unwrapCartPayload<T>(
-  if (response.data.cartCreate.userErrors.length > 0) {
+  payload:
-    throw new Error(response.data.cartCreate.userErrors[0].message);
+    | {
+        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({
+  const data = unwrapStorefrontResult(
-    query: ADD_CART_LINES_MUTATION,
+    await storefront.graphql(ADD_CART_LINES_MUTATION, {
-    variables: { cartId, lines },
+      variables: { cartId, lines },
-  });
+    }),
+    'AddCartLines'
+  );
 
-  if (response.data.cartLinesAdd.userErrors.length > 0) {
+  return unwrapCartPayload(data.cartLinesAdd);
-    throw new Error(response.data.cartLinesAdd.userErrors[0].message);
-  }
-
-  return response.data.cartLinesAdd.cart;
 }
 
 async function updateCartLinesApi(
   cartId: string,
   lines: CartLineUpdateInput[]
 ): Promise<Cart> {
-  const response = await shopifyFetch({
+  const data = unwrapStorefrontResult(
-    query: UPDATE_CART_LINES_MUTATION,
+    await storefront.graphql(UPDATE_CART_LINES_MUTATION, {
-    variables: { cartId, lines },
+      variables: { cartId, lines },
-  });
+    }),
+    'UpdateCartLines'
+  );
 
-  if (response.data.cartLinesUpdate.userErrors.length > 0) {
+  return unwrapCartPayload(data.cartLinesUpdate);
-    throw new Error(response.data.cartLinesUpdate.userErrors[0].message);
-  }
-
-  return response.data.cartLinesUpdate.cart;
 }
 
 async function removeCartLinesApi(
   cartId: string,
   lineIds: string[]
 ): Promise<Cart> {
-  const response = await shopifyFetch({
+  const data = unwrapStorefrontResult(
-    query: REMOVE_CART_LINES_MUTATION,
+    await storefront.graphql(REMOVE_CART_LINES_MUTATION, {
-    variables: { cartId, lineIds },
+      variables: { cartId, lineIds },
-  });
+    }),
+    'RemoveCartLines'
+  );
 
-  if (response.data.cartLinesRemove.userErrors.length > 0) {
+  return unwrapCartPayload(data.cartLinesRemove);
-    throw new Error(response.data.cartLinesRemove.userErrors[0].message);
-  }
-
-  return response.data.cartLinesRemove.cart;
 }
 
 async function updateCartDiscountCodesApi(
   cartId: string,
   discountCodes: string[]
 ): Promise<Cart> {
-  const response = await shopifyFetch({
+  const data = unwrapStorefrontResult(
-    query: UPDATE_CART_DISCOUNT_CODES_MUTATION,
+    await storefront.graphql(UPDATE_CART_DISCOUNT_CODES_MUTATION, {
-    variables: { cartId, discountCodes },
+      variables: { cartId, discountCodes },
-  });
+    }),
+    'UpdateCartDiscountCodes'
+  );
 
-  if (response.data.cartDiscountCodesUpdate.userErrors.length > 0) {
+  return unwrapCartPayload(data.cartDiscountCodesUpdate);
-    throw new Error(
-      response.data.cartDiscountCodesUpdate.userErrors[0].message
-    );
-  }
-
-  return response.data.cartDiscountCodesUpdate.cart;
 }
 
 async function getCartApi(cartId: string): Promise<Cart | null> {
-  const response = await shopifyFetch({
+  const data = unwrapStorefrontResult(
-    query: GET_CART_QUERY,
+    await storefront.graphql(GET_CART_QUERY, { variables: { cartId } }),
-    variables: { cartId },
+    'GetCart'
-  });
+  );
 
-  return response.data.cart;
+  return data.cart;
 }
 
 export function redirectToCheckout(checkoutUrl: string): void {

hooks/use-shopify-policies.ts

@@ -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)
+// Policies change rarely, so this reads through the cached client (revalidated
-// rather than the no-store `shopifyFetch` used for carts and products.
+// 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, {
+    return Object.values(data.shop ?? {}).filter(
-    method: 'POST',
+      (policy): policy is ShopPolicy => Boolean(policy?.handle)
-    headers: {
+    );
-      'Content-Type': 'application/json',
+  } catch (err) {
-      ...(token ? { 'X-Shopify-Storefront-Access-Token': token } : {}),
+    // A storefront without policies configured shouldn't break the footer.
-    },
+    console.error('Failed to load shop policies:', err);
-    body: JSON.stringify({ query: GET_SHOP_POLICIES_QUERY }),
-    next: { revalidate: 3600 },
-  });
-
-  if (!response.ok) {
-    console.error('Failed to load shop policies:', response.status);
     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(

package.json

@@ -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"
 }

services/shopify/catalog.ts

@@ -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({
+  const data = unwrapStorefrontResult(
-    query: GET_PRODUCTS_QUERY,
+    await storefront.graphql(GET_PRODUCTS_QUERY, {
-    variables: { first, after, query, sortKey, reverse },
+      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({
+  const data = unwrapStorefrontResult(
-    query: GET_PRODUCT_QUERY,
+    await storefront.graphql(GET_PRODUCT_QUERY, { variables: { handle } }),
-    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({
+  const data = unwrapStorefrontResult(
-    query: QUERY_PRODUCT_RECOMMENDATIONS,
+    await storefront.graphql(QUERY_PRODUCT_RECOMMENDATIONS, {
-    variables: { productId },
+      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({
+  const data = unwrapStorefrontResult(
-    query: GET_COLLECTIONS_QUERY,
+    await storefront.graphql(GET_COLLECTIONS_QUERY, { variables: { first } }),
-    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) => {
+  const filters = parseFilterInputs(filterInputs);
-    try {
-      return [JSON.parse(input)];
-    } catch {
-      console.warn('Ignoring malformed product filter input:', input);
-      return [];
-    }
-  });
 
-  const response = await shopifyFetch({
+  const data = unwrapStorefrontResult(
-    query: GET_COLLECTION_PRODUCTS_QUERY,
+    await storefront.graphql(GET_COLLECTION_PRODUCTS_QUERY, {
-    variables: {
+      variables: {
-      handle,
+        handle,
-      first,
+        first,
-      after,
+        after,
-      sortKey,
+        sortKey,
-      reverse,
+        reverse,
-      filters: filters.length ? filters : null,
+        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({
+  const data = unwrapStorefrontResult(
-    query: SEARCH_PRODUCTS_QUERY,
+    await storefront.graphql(SEARCH_PRODUCTS_QUERY, {
-    variables: {
+      variables: {
-      query,
+        query,
-      first,
+        first,
-      after,
+        after,
-      sortKey,
+        sortKey,
-      reverse,
+        reverse,
-      productFilters: filterInputs.length
+        productFilters: filterInputs.length
-        ? parseFilterInputs(filterInputs)
+          ? parseFilterInputs(filterInputs)
-        : null,
+          : 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({
+  const data = unwrapStorefrontResult(
-    query: SEARCH_SUGGESTIONS_QUERY,
+    await storefront.graphql(SEARCH_SUGGESTIONS_QUERY, {
-    variables: { query, first },
+      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,
   };
 }

services/shopify/client.js

@@ -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 };

services/shopify/client.ts

@@ -0,0 +1,83 @@
+// 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_STORE_DOMAIN,
+  SHOPIFY_STOREFRONT_ACCESS_TOKEN,
+} 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' },
+});
+
+// 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) =>
+    globalThis.fetch(url, { ...init, ...overrides })) as typeof globalThis.fetch;
+
+const config = {
+  storeDomain: SHOPIFY_STORE_DOMAIN!,
+  apiVersion: SHOPIFY_API_VERSION,
+  publicStorefrontToken: SHOPIFY_STOREFRONT_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;
+}

services/shopify/config.ts

@@ -0,0 +1,12 @@
+// 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;
+
+/** Omitted for tokenless storefronts such as `mock.shop`. */
+export const SHOPIFY_STOREFRONT_ACCESS_TOKEN =
+  process.env.NEXT_PUBLIC_SHOPIFY_STOREFRONT_ACCESS_TOKEN;
+
+export const SHOPIFY_API_VERSION =
+  process.env.NEXT_PUBLIC_SHOPIFY_API_VERSION || '2025-07';

services/shopify/customer.ts

@@ -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({
+  const data = unwrapStorefrontResult(
-    query: CUSTOMER_CREATE_MUTATION,
+    await storefront.graphql(CUSTOMER_CREATE_MUTATION, {
-    variables: { input },
+      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({
+  const data = unwrapStorefrontResult(
-    query: CUSTOMER_ACCESS_TOKEN_CREATE_MUTATION,
+    await storefront.graphql(CUSTOMER_ACCESS_TOKEN_CREATE_MUTATION, {
-    variables: { input: { email, password } },
+      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({
+    await storefront.graphql(CUSTOMER_ACCESS_TOKEN_DELETE_MUTATION, {
-      query: 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({
+    await storefront.graphql(CUSTOMER_RECOVER_MUTATION, {
-      query: 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({
+  const data = unwrapStorefrontResult(
-    query: CUSTOMER_RESET_MUTATION,
+    await storefront.graphql(CUSTOMER_RESET_MUTATION, {
-    variables: { id, input: { resetToken, password } },
+      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({
+  const data = unwrapStorefrontResult(
-    query: CUSTOMER_ACTIVATE_MUTATION,
+    await storefront.graphql(CUSTOMER_ACTIVATE_MUTATION, {
-    variables: { id, input: { activationToken, password } },
+      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({
+    const data = unwrapStorefrontResult(
-      query: CUSTOMER_QUERY,
+      await storefront.graphql(CUSTOMER_QUERY, {
-      variables: { customerAccessToken: accessToken, orderCount },
+        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({
+  const data = unwrapStorefrontResult(
-    query: CUSTOMER_UPDATE_MUTATION,
+    await storefront.graphql(CUSTOMER_UPDATE_MUTATION, {
-    variables: { customerAccessToken: accessToken, customer },
+      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,

tsconfig.json

@@ -20,6 +20,9 @@
     "plugins": [
       {
         "name": "next"
+      },
+      {
+        "name": "@shopify/hydrogen/ts-plugin"
       }
     ],
     "paths": {

yarn.lock

@@ -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":
+"@shopify/hydrogen@npm:0.0.0-preview-116d5d7-20260730141607":
-  version: 1.4.2
+  version: 0.0.0-preview-116d5d7-20260730141607
-  resolution: "@shopify/graphql-client@npm:1.4.2"
+  resolution: "@shopify/hydrogen@npm:0.0.0-preview-116d5d7-20260730141607"
-  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"
   dependencies:
-    "@shopify/graphql-client": "npm:^1.4.2"
+    gql.tada: "npm:1.9.2"
-  checksum: 10c0/e8eff260e91857e87cffb543ca57c8a4a6e549316e0b6ccef2c345b857ef59e4092e92ecd2904706aa386bca1d21af4ef3e7447f9966b8dcceda06b3ad7dadc9
+  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"