@shopify/hydrogen 1.6.3 → 1.6.5

package/dist/esnext/components/CartProvider/CartProvider.client.d.ts

@@ -47,4 +47,3 @@ export declare function CartProvider({ children, numCartLines, onCreate, onLineA
     /** The ISO country code for i18n. */
     countryCode?: CountryCode;
 }): JSX.Element;
-export declare const defaultCartFragment = "\nfragment CartFragment on Cart {\n  id\n  checkoutUrl\n  totalQuantity\n  buyerIdentity {\n    countryCode\n    customer {\n      id\n      email\n      firstName\n      lastName\n      displayName\n    }\n    email\n    phone\n  }\n  lines(first: $numCartLines) {\n    edges {\n      node {\n        id\n        quantity\n        attributes {\n          key\n          value\n        }\n        cost {\n          totalAmount {\n            amount\n            currencyCode\n          }\n          compareAtAmountPerQuantity {\n            amount\n            currencyCode\n          }\n        }\n        merchandise {\n          ... on ProductVariant {\n            id\n            availableForSale\n            compareAtPriceV2 {\n              ...MoneyFragment\n            }\n            priceV2 {\n              ...MoneyFragment\n            }\n            requiresShipping\n            title\n            image {\n              ...ImageFragment\n            }\n            product {\n              handle\n              title\n            }\n            selectedOptions {\n              name\n              value\n            }\n          }\n        }\n      }\n    }\n  }\n  cost {\n    subtotalAmount {\n      ...MoneyFragment\n    }\n    totalAmount {\n      ...MoneyFragment\n    }\n    totalDutyAmount {\n      ...MoneyFragment\n    }\n    totalTaxAmount {\n      ...MoneyFragment\n    }\n  }\n  note\n  attributes {\n    key\n    value\n  }\n  discountCodes {\n    code\n  }\n}\n\nfragment MoneyFragment on MoneyV2 {\n  currencyCode\n  amount\n}\nfragment ImageFragment on Image {\n  id\n  url\n  altText\n  width\n  height\n}\n";

package/dist/esnext/components/CartProvider/CartProvider.client.js

@@ -1,5 +1,6 @@
 import React, { useCallback, useEffect, useMemo, useRef, useState, useTransition, } from 'react';
 import { CountryCode, } from '../../storefront-api-types.js';
+import { defaultCartFragment } from './cart-queries.js';
 import { CartContext } from './context.js';
 import { useCartAPIStateMachine } from './useCartAPIStateMachine.client.js';
 import { CART_ID_STORAGE_KEY } from './constants.js';
@@ -51,25 +52,23 @@ export function CartProvider({ children, numCartLines, onCreate, onLineAdd, onLi
         onNoteUpdate,
     ]);
     const onCartActionOptimisticUI = useCallback((context, event) => {
-        if (!context?.cart)
-            return { cart: undefined };
+        if (!context.cart)
+            return { ...context };
         switch (event.type) {
             case 'CARTLINE_REMOVE':
                 return {
                     ...context,
-                    lastValidCart: context.cart,
                     cart: {
                         ...context.cart,
-                        lines: context?.cart?.lines.filter(({ id }) => !event.payload.lines.includes(id)),
+                        lines: context.cart.lines.filter(({ id }) => !event.payload.lines.includes(id)),
                     },
                 };
             case 'CARTLINE_UPDATE':
                 return {
                     ...context,
-                    lastValidCart: context.cart,
                     cart: {
                         ...context.cart,
-                        lines: context.cart.lines.map((line) => {
+                        lines: context?.cart?.lines.map((line) => {
                             const updatedLine = event.payload.lines.find(({ id }) => id === line.id);
                             if (updatedLine && updatedLine.quantity) {
                                 return {
@@ -82,7 +81,7 @@ export function CartProvider({ children, numCartLines, onCreate, onLineAdd, onLi
                     },
                 };
         }
-        return { cart: context.cart ? { ...context.cart } : undefined };
+        return { ...context };
     }, []);
     const onCartActionComplete = useCallback((context, event) => {
         const cartActionEvent = event.payload.cartActionEvent;
@@ -432,103 +431,3 @@ function publishDiscountCodesUpdateAnalytics(context, event) {
         prevCart: context.prevCart,
     });
 }
-export const defaultCartFragment = `
-fragment CartFragment on Cart {
-  id
-  checkoutUrl
-  totalQuantity
-  buyerIdentity {
-    countryCode
-    customer {
-      id
-      email
-      firstName
-      lastName
-      displayName
-    }
-    email
-    phone
-  }
-  lines(first: $numCartLines) {
-    edges {
-      node {
-        id
-        quantity
-        attributes {
-          key
-          value
-        }
-        cost {
-          totalAmount {
-            amount
-            currencyCode
-          }
-          compareAtAmountPerQuantity {
-            amount
-            currencyCode
-          }
-        }
-        merchandise {
-          ... on ProductVariant {
-            id
-            availableForSale
-            compareAtPriceV2 {
-              ...MoneyFragment
-            }
-            priceV2 {
-              ...MoneyFragment
-            }
-            requiresShipping
-            title
-            image {
-              ...ImageFragment
-            }
-            product {
-              handle
-              title
-            }
-            selectedOptions {
-              name
-              value
-            }
-          }
-        }
-      }
-    }
-  }
-  cost {
-    subtotalAmount {
-      ...MoneyFragment
-    }
-    totalAmount {
-      ...MoneyFragment
-    }
-    totalDutyAmount {
-      ...MoneyFragment
-    }
-    totalTaxAmount {
-      ...MoneyFragment
-    }
-  }
-  note
-  attributes {
-    key
-    value
-  }
-  discountCodes {
-    code
-  }
-}
-
-fragment MoneyFragment on MoneyV2 {
-  currencyCode
-  amount
-}
-fragment ImageFragment on Image {
-  id
-  url
-  altText
-  width
-  height
-}
-`;

package/dist/esnext/components/CartProvider/useCartAPIStateMachine.client.js

@@ -7,6 +7,9 @@ function invokeCart(action, options) {
     return {
         entry: [
             ...(options?.entryActions || []),
+            assign({
+                lastValidCart: (context) => context?.cart,
+            }),
             'onCartActionEntry',
             'onCartActionOptimisticUI',
             action,
@@ -16,7 +19,7 @@ function invokeCart(action, options) {
                 target: options?.resolveTarget || 'idle',
                 actions: [
                     assign({
-                        prevCart: (context) => context?.cart,
+                        prevCart: (context) => context?.lastValidCart,
                         cart: (_, event) => event?.payload?.cart,
                         rawCartResult: (_, event) => event?.payload?.rawCartResult,
                         errors: (_) => undefined,
@@ -27,7 +30,7 @@ function invokeCart(action, options) {
                 target: options?.errorTarget || 'error',
                 actions: [
                     assign({
-                        prevCart: (context) => context?.cart,
+                        prevCart: (context) => context?.lastValidCart,
                         cart: (context, _) => context?.lastValidCart,
                         errors: (_, event) => event?.payload?.errors,
                     }),
@@ -39,6 +42,7 @@ function invokeCart(action, options) {
                     prevCart: (_) => undefined,
                     cart: (_) => undefined,
                     lastValidCart: (_) => undefined,
+                    rawCartResult: (_) => undefined,
                     errors: (_) => undefined,
                 }),
             },

package/dist/esnext/entry-server.js

@@ -573,7 +573,7 @@ function tagOnWrite(response) {
     const savedChunks = [];
     response.write = (arg) => {
         if (arg instanceof Uint8Array) {
-            savedChunks.push(decoder.decode(arg));
+            savedChunks.push(decoder.decode(arg, { stream: true }));
         }
         else {
             savedChunks.push(arg);

package/dist/esnext/foundation/Form/Form.client.d.ts

@@ -2,7 +2,10 @@ import React, { FormEvent } from 'react';
 interface FormProps {
     action: string;
     method?: string;
-    children?: Array<React.ReactNode>;
+    children?: Array<React.ReactNode> | ((props: {
+        loading: boolean;
+        error: Error | null;
+    }) => React.ReactNode);
     onSubmit?: (e: FormEvent<HTMLFormElement>) => void;
     encType?: string;
     noValidate?: boolean;

package/dist/esnext/streaming.server.js

@@ -14,7 +14,7 @@ export async function bufferReadableStream(reader, cb) {
         const { done, value } = await reader.read();
         if (done)
             break;
-        const stringValue = typeof value === 'string' ? value : decoder.decode(value);
+        const stringValue = typeof value === 'string' ? value : decoder.decode(value, { stream: true });
         result += stringValue;
         if (cb) {
             cb(stringValue);

package/dist/esnext/utilities/parse.d.ts

@@ -1,4 +1,2 @@
 export declare function parseJSON(json: any): any;
-export declare function parseState(url: URL): {
-    [k: string]: string;
-} | undefined;
+export declare function parseState(url: URL): Record<string, any> | undefined;

package/dist/esnext/utilities/parse.js

@@ -11,13 +11,16 @@ function noproto(k, v) {
 export function parseState(url) {
     try {
         const { pathname, search } = url;
+        const stateParam = url.searchParams.get('state');
         const state = pathname === RSC_PATHNAME
-            ? parseJSON(url.searchParams.get('state') ?? '{}')
-            : { pathname, search };
-        return Object.fromEntries(Object.entries(state).map(([key, value]) => [
-            decodeURIComponent(key ?? ''),
-            decodeURIComponent(value ?? ''),
-        ]));
+            ? stateParam
+                ? parseJSON(decodeURIComponent(stateParam))
+                : {}
+            : {
+                pathname: decodeURIComponent(pathname),
+                search: decodeURIComponent(search),
+            };
+        return state;
     }
     catch {
         // Do not throw to prevent unhandled errors

package/dist/esnext/version.d.ts

@@ -1 +1 @@
-export declare const LIB_VERSION = "1.6.3";
+export declare const LIB_VERSION = "1.6.5";

package/dist/esnext/version.js

@@ -1 +1 @@
-export const LIB_VERSION = '1.6.3';
+export const LIB_VERSION = '1.6.5';

package/package.json

@@ -7,7 +7,7 @@
   "engines": {
     "node": ">=14"
   },
-  "version": "1.6.3",
+  "version": "1.6.5",
   "description": "Modern custom Shopify storefronts",
   "license": "MIT",
   "main": "dist/esnext/index.js",