@shopify/hydrogen 0.13.2 → 0.14.0

package/dist/esnext/storefront-api-types.d.ts

@@ -215,6 +215,8 @@ export declare type ArticleConnection = {
     __typename?: 'ArticleConnection';
     /** A list of edges. */
     edges: Array<ArticleEdge>;
+    /** A list of the nodes contained in ArticleEdge. */
+    nodes: Array<Article>;
     /** Information to aid in pagination. */
     pageInfo: PageInfo;
 };
@@ -362,6 +364,8 @@ export declare type BlogConnection = {
     __typename?: 'BlogConnection';
     /** A list of edges. */
     edges: Array<BlogEdge>;
+    /** A list of the nodes contained in BlogEdge. */
+    nodes: Array<Blog>;
     /** Information to aid in pagination. */
     pageInfo: PageInfo;
 };
@@ -417,6 +421,8 @@ export declare type Cart = Node & {
     checkoutUrl: Scalars['URL'];
     /** The date and time when the cart was created. */
     createdAt: Scalars['DateTime'];
+    /** The delivery groups available for the cart, based on the default address of the logged-in customer. */
+    deliveryGroups: CartDeliveryGroupConnection;
     /** The discount codes that have been applied to the cart. */
     discountCodes: Array<CartDiscountCode>;
     /** The estimated costs that the buyer will pay at checkout. The estimated costs are subject to change and changes will be reflected at checkout. The `estimatedCost` field uses the `buyerIdentity` field to determine [international pricing](https://shopify.dev/api/examples/international-pricing#create-a-cart). */
@@ -431,6 +437,14 @@ export declare type Cart = Node & {
     updatedAt: Scalars['DateTime'];
 };
 /** A cart represents the merchandise that a buyer intends to purchase, and the estimated cost associated with the cart. To learn how to interact with a cart during a customer's session, refer to [Manage a cart with the Storefront API](https://shopify.dev/api/examples/cart). */
+export declare type CartDeliveryGroupsArgs = {
+    after?: InputMaybe<Scalars['String']>;
+    before?: InputMaybe<Scalars['String']>;
+    first?: InputMaybe<Scalars['Int']>;
+    last?: InputMaybe<Scalars['Int']>;
+    reverse?: InputMaybe<Scalars['Boolean']>;
+};
+/** A cart represents the merchandise that a buyer intends to purchase, and the estimated cost associated with the cart. To learn how to interact with a cart during a customer's session, refer to [Manage a cart with the Storefront API](https://shopify.dev/api/examples/cart). */
 export declare type CartLinesArgs = {
     after?: InputMaybe<Scalars['String']>;
     before?: InputMaybe<Scalars['String']>;
@@ -507,6 +521,64 @@ export declare type CartCreatePayload = {
     /** The list of errors that occurred from executing the mutation. */
     userErrors: Array<CartUserError>;
 };
+/** Information about the options available for one or more line items to be delivered to a specific address. */
+export declare type CartDeliveryGroup = {
+    __typename?: 'CartDeliveryGroup';
+    /** A list of cart lines for the delivery group. */
+    cartLines: CartLineConnection;
+    /** The destination address for the delivery group. */
+    deliveryAddress: MailingAddress;
+    /** The delivery options available for the delivery group. */
+    deliveryOptions: Array<CartDeliveryOption>;
+    /** The ID for the delivery group. */
+    id: Scalars['ID'];
+};
+/** Information about the options available for one or more line items to be delivered to a specific address. */
+export declare type CartDeliveryGroupCartLinesArgs = {
+    after?: InputMaybe<Scalars['String']>;
+    before?: InputMaybe<Scalars['String']>;
+    first?: InputMaybe<Scalars['Int']>;
+    last?: InputMaybe<Scalars['Int']>;
+    reverse?: InputMaybe<Scalars['Boolean']>;
+};
+/**
+ * An auto-generated type for paginating through multiple CartDeliveryGroups.
+ *
+ */
+export declare type CartDeliveryGroupConnection = {
+    __typename?: 'CartDeliveryGroupConnection';
+    /** A list of edges. */
+    edges: Array<CartDeliveryGroupEdge>;
+    /** A list of the nodes contained in CartDeliveryGroupEdge. */
+    nodes: Array<CartDeliveryGroup>;
+    /** Information to aid in pagination. */
+    pageInfo: PageInfo;
+};
+/**
+ * An auto-generated type which holds one CartDeliveryGroup and a cursor during pagination.
+ *
+ */
+export declare type CartDeliveryGroupEdge = {
+    __typename?: 'CartDeliveryGroupEdge';
+    /** A cursor for use in pagination. */
+    cursor: Scalars['String'];
+    /** The item at the end of CartDeliveryGroupEdge. */
+    node: CartDeliveryGroup;
+};
+/** Information about a delivery option. */
+export declare type CartDeliveryOption = {
+    __typename?: 'CartDeliveryOption';
+    /** The code of the delivery option. */
+    code?: Maybe<Scalars['String']>;
+    /** The method for the delivery option. */
+    deliveryMethodType: DeliveryMethodType;
+    /** The description of the delivery option. */
+    description?: Maybe<Scalars['String']>;
+    /** The estimated cost for the delivery option. */
+    estimatedCost: MoneyV2;
+    /** The title of the delivery option. */
+    title?: Maybe<Scalars['String']>;
+};
 /** The discounts that have been applied to the cart line. */
 export declare type CartDiscountAllocation = {
     /** The discounted amount that has been applied to the cart line. */
@@ -597,6 +669,8 @@ export declare type CartLineConnection = {
     __typename?: 'CartLineConnection';
     /** A list of edges. */
     edges: Array<CartLineEdge>;
+    /** A list of the nodes contained in CartLineEdge. */
+    nodes: Array<CartLine>;
     /** Information to aid in pagination. */
     pageInfo: PageInfo;
 };
@@ -1282,6 +1356,8 @@ export declare type CheckoutLineItemConnection = {
     __typename?: 'CheckoutLineItemConnection';
     /** A list of edges. */
     edges: Array<CheckoutLineItemEdge>;
+    /** A list of the nodes contained in CheckoutLineItemEdge. */
+    nodes: Array<CheckoutLineItem>;
     /** Information to aid in pagination. */
     pageInfo: PageInfo;
 };
@@ -1484,6 +1560,8 @@ export declare type CollectionConnection = {
     __typename?: 'CollectionConnection';
     /** A list of edges. */
     edges: Array<CollectionEdge>;
+    /** A list of the nodes contained in CollectionEdge. */
+    nodes: Array<Collection>;
     /** Information to aid in pagination. */
     pageInfo: PageInfo;
 };
@@ -1545,6 +1623,8 @@ export declare type CommentConnection = {
     __typename?: 'CommentConnection';
     /** A list of edges. */
     edges: Array<CommentEdge>;
+    /** A list of the nodes contained in CommentEdge. */
+    nodes: Array<Comment>;
     /** Information to aid in pagination. */
     pageInfo: PageInfo;
 };
@@ -2845,6 +2925,21 @@ export declare type CustomerUserError = DisplayableError & {
     /** The error message. */
     message: Scalars['String'];
 };
+/** List of different delivery method types. */
+export declare enum DeliveryMethodType {
+    /** Local Delivery. */
+    Local = "LOCAL",
+    /** None. */
+    None = "NONE",
+    /** Shipping to a Pickup Point. */
+    PickupPoint = "PICKUP_POINT",
+    /** Local Pickup. */
+    PickUp = "PICK_UP",
+    /** Retail. */
+    Retail = "RETAIL",
+    /** Shipping. */
+    Shipping = "SHIPPING"
+}
 /** Digital wallet, such as Apple Pay, which can be used for accelerated checkouts. */
 export declare enum DigitalWallet {
     /** Android Pay. */
@@ -2899,6 +2994,8 @@ export declare type DiscountApplicationConnection = {
     __typename?: 'DiscountApplicationConnection';
     /** A list of edges. */
     edges: Array<DiscountApplicationEdge>;
+    /** A list of the nodes contained in DiscountApplicationEdge. */
+    nodes: Array<AutomaticDiscountApplication | DiscountCodeApplication | ManualDiscountApplication | ScriptDiscountApplication>;
     /** Information to aid in pagination. */
     pageInfo: PageInfo;
 };
@@ -3076,6 +3173,8 @@ export declare type FulfillmentLineItemConnection = {
     __typename?: 'FulfillmentLineItemConnection';
     /** A list of edges. */
     edges: Array<FulfillmentLineItemEdge>;
+    /** A list of the nodes contained in FulfillmentLineItemEdge. */
+    nodes: Array<FulfillmentLineItem>;
     /** Information to aid in pagination. */
     pageInfo: PageInfo;
 };
@@ -3098,6 +3197,22 @@ export declare type FulfillmentTrackingInfo = {
     /** The URL to track the fulfillment. */
     url?: Maybe<Scalars['URL']>;
 };
+/** The generic file resource lets you manage files in a merchant’s store. Generic files include any file that doesn’t fit into a designated type such as image or video. Example: PDF, JSON. */
+export declare type GenericFile = Node & {
+    __typename?: 'GenericFile';
+    /** A word or phrase to indicate the contents of a file. */
+    alt?: Maybe<Scalars['String']>;
+    /** A globally-unique identifier. */
+    id: Scalars['ID'];
+    /** The mime type of the file. */
+    mimeType?: Maybe<Scalars['String']>;
+    /** The size of the original file in bytes. */
+    originalFileSize?: Maybe<Scalars['Int']>;
+    /** The preview image for the file. */
+    previewImage?: Maybe<Image>;
+    /** The URL of the file. */
+    url?: Maybe<Scalars['URL']>;
+};
 /** Used to specify a geographical location. */
 export declare type GeoCoordinateInput = {
     /** The coordinate's latitude value. */
@@ -3195,6 +3310,8 @@ export declare type ImageConnection = {
     __typename?: 'ImageConnection';
     /** A list of edges. */
     edges: Array<ImageEdge>;
+    /** A list of the nodes contained in ImageEdge. */
+    nodes: Array<Image>;
     /** Information to aid in pagination. */
     pageInfo: PageInfo;
 };
@@ -3600,6 +3717,8 @@ export declare type LocationConnection = {
     __typename?: 'LocationConnection';
     /** A list of edges. */
     edges: Array<LocationEdge>;
+    /** A list of the nodes contained in LocationEdge. */
+    nodes: Array<Location>;
     /** Information to aid in pagination. */
     pageInfo: PageInfo;
 };
@@ -3716,6 +3835,8 @@ export declare type MailingAddressConnection = {
     __typename?: 'MailingAddressConnection';
     /** A list of edges. */
     edges: Array<MailingAddressEdge>;
+    /** A list of the nodes contained in MailingAddressEdge. */
+    nodes: Array<MailingAddress>;
     /** Information to aid in pagination. */
     pageInfo: PageInfo;
 };
@@ -3806,6 +3927,8 @@ export declare type MediaConnection = {
     __typename?: 'MediaConnection';
     /** A list of edges. */
     edges: Array<MediaEdge>;
+    /** A list of the nodes contained in MediaEdge. */
+    nodes: Array<ExternalVideo | MediaImage | Model3d | Video>;
     /** Information to aid in pagination. */
     pageInfo: PageInfo;
 };
@@ -3957,6 +4080,8 @@ export declare type MetafieldConnection = {
     __typename?: 'MetafieldConnection';
     /** A list of edges. */
     edges: Array<MetafieldEdge>;
+    /** A list of the nodes contained in MetafieldEdge. */
+    nodes: Array<Metafield>;
     /** Information to aid in pagination. */
     pageInfo: PageInfo;
 };
@@ -3995,7 +4120,7 @@ export declare type MetafieldParentResource = Article | Blog | Collection | Cust
  * Returns the resource which is being referred to by a metafield.
  *
  */
-export declare type MetafieldReference = MediaImage | Page | Product | ProductVariant;
+export declare type MetafieldReference = GenericFile | MediaImage | Page | Product | ProductVariant | Video;
 /** Represents a Shopify hosted 3D model. */
 export declare type Model3d = Media & Node & {
     __typename?: 'Model3d';
@@ -4634,6 +4759,8 @@ export declare type OrderConnection = {
     __typename?: 'OrderConnection';
     /** A list of edges. */
     edges: Array<OrderEdge>;
+    /** A list of the nodes contained in OrderEdge. */
+    nodes: Array<Order>;
     /** Information to aid in pagination. */
     pageInfo: PageInfo;
 };
@@ -4714,6 +4841,8 @@ export declare type OrderLineItemConnection = {
     __typename?: 'OrderLineItemConnection';
     /** A list of edges. */
     edges: Array<OrderLineItemEdge>;
+    /** A list of the nodes contained in OrderLineItemEdge. */
+    nodes: Array<OrderLineItem>;
     /** Information to aid in pagination. */
     pageInfo: PageInfo;
 };
@@ -4795,6 +4924,8 @@ export declare type PageConnection = {
     __typename?: 'PageConnection';
     /** A list of edges. */
     edges: Array<PageEdge>;
+    /** A list of the nodes contained in PageEdge. */
+    nodes: Array<Page>;
     /** Information to aid in pagination. */
     pageInfo: PageInfo;
 };
@@ -4816,10 +4947,14 @@ export declare type PageEdge = {
  */
 export declare type PageInfo = {
     __typename?: 'PageInfo';
+    /** The cursor corresponding to the last node in edges. */
+    endCursor?: Maybe<Scalars['String']>;
     /** Whether there are more pages to fetch following the current page. */
     hasNextPage: Scalars['Boolean'];
     /** Whether there are any pages prior to the current page. */
     hasPreviousPage: Scalars['Boolean'];
+    /** The cursor corresponding to the first node in edges. */
+    startCursor?: Maybe<Scalars['String']>;
 };
 /** The set of valid sort keys for the Page query. */
 export declare enum PageSortKeys {
@@ -5141,6 +5276,8 @@ export declare type ProductConnection = {
     edges: Array<ProductEdge>;
     /** A list of available filters. */
     filters: Array<Filter>;
+    /** A list of the nodes contained in ProductEdge. */
+    nodes: Array<Product>;
     /** Information to aid in pagination. */
     pageInfo: PageInfo;
 };
@@ -5349,6 +5486,8 @@ export declare type ProductVariantConnection = {
     __typename?: 'ProductVariantConnection';
     /** A list of edges. */
     edges: Array<ProductVariantEdge>;
+    /** A list of the nodes contained in ProductVariantEdge. */
+    nodes: Array<ProductVariant>;
     /** Information to aid in pagination. */
     pageInfo: PageInfo;
 };
@@ -5419,9 +5558,9 @@ export declare type QueryRoot = {
     /** A storefront menu. */
     menu?: Maybe<Menu>;
     /** Returns a specific node by ID. */
-    node?: Maybe<AppliedGiftCard | Article | Blog | Cart | CartLine | Checkout | CheckoutLineItem | Collection | Comment | ExternalVideo | Location | MailingAddress | MediaImage | Menu | MenuItem | Metafield | Model3d | Order | Page | Payment | Product | ProductOption | ProductVariant | Shop | ShopPolicy | Video>;
+    node?: Maybe<AppliedGiftCard | Article | Blog | Cart | CartLine | Checkout | CheckoutLineItem | Collection | Comment | ExternalVideo | GenericFile | Location | MailingAddress | MediaImage | Menu | MenuItem | Metafield | Model3d | Order | Page | Payment | Product | ProductOption | ProductVariant | Shop | ShopPolicy | Video>;
     /** Returns the list of nodes with the given IDs. */
-    nodes: Array<Maybe<AppliedGiftCard | Article | Blog | Cart | CartLine | Checkout | CheckoutLineItem | Collection | Comment | ExternalVideo | Location | MailingAddress | MediaImage | Menu | MenuItem | Metafield | Model3d | Order | Page | Payment | Product | ProductOption | ProductVariant | Shop | ShopPolicy | Video>>;
+    nodes: Array<Maybe<AppliedGiftCard | Article | Blog | Cart | CartLine | Checkout | CheckoutLineItem | Collection | Comment | ExternalVideo | GenericFile | Location | MailingAddress | MediaImage | Menu | MenuItem | Metafield | Model3d | Order | Page | Payment | Product | ProductOption | ProductVariant | Shop | ShopPolicy | Video>>;
     /** Fetch a specific `Page` by one of its unique attributes. */
     page?: Maybe<Page>;
     /**
@@ -5665,6 +5804,8 @@ export declare type SellingPlanAllocationConnection = {
     __typename?: 'SellingPlanAllocationConnection';
     /** A list of edges. */
     edges: Array<SellingPlanAllocationEdge>;
+    /** A list of the nodes contained in SellingPlanAllocationEdge. */
+    nodes: Array<SellingPlanAllocation>;
     /** Information to aid in pagination. */
     pageInfo: PageInfo;
 };
@@ -5699,6 +5840,8 @@ export declare type SellingPlanConnection = {
     __typename?: 'SellingPlanConnection';
     /** A list of edges. */
     edges: Array<SellingPlanEdge>;
+    /** A list of the nodes contained in SellingPlanEdge. */
+    nodes: Array<SellingPlan>;
     /** Information to aid in pagination. */
     pageInfo: PageInfo;
 };
@@ -5753,6 +5896,8 @@ export declare type SellingPlanGroupConnection = {
     __typename?: 'SellingPlanGroupConnection';
     /** A list of edges. */
     edges: Array<SellingPlanGroupEdge>;
+    /** A list of the nodes contained in SellingPlanGroupEdge. */
+    nodes: Array<SellingPlanGroup>;
     /** Information to aid in pagination. */
     pageInfo: PageInfo;
 };
@@ -5919,6 +6064,8 @@ export declare type StoreAvailabilityConnection = {
     __typename?: 'StoreAvailabilityConnection';
     /** A list of edges. */
     edges: Array<StoreAvailabilityEdge>;
+    /** A list of the nodes contained in StoreAvailabilityEdge. */
+    nodes: Array<StoreAvailability>;
     /** Information to aid in pagination. */
     pageInfo: PageInfo;
 };

package/dist/esnext/storefront-api-types.js

@@ -1038,6 +1038,22 @@ export var CustomerErrorCode;
     /** Unidentified customer. */
     CustomerErrorCode["UnidentifiedCustomer"] = "UNIDENTIFIED_CUSTOMER";
 })(CustomerErrorCode || (CustomerErrorCode = {}));
+/** List of different delivery method types. */
+export var DeliveryMethodType;
+(function (DeliveryMethodType) {
+    /** Local Delivery. */
+    DeliveryMethodType["Local"] = "LOCAL";
+    /** None. */
+    DeliveryMethodType["None"] = "NONE";
+    /** Shipping to a Pickup Point. */
+    DeliveryMethodType["PickupPoint"] = "PICKUP_POINT";
+    /** Local Pickup. */
+    DeliveryMethodType["PickUp"] = "PICK_UP";
+    /** Retail. */
+    DeliveryMethodType["Retail"] = "RETAIL";
+    /** Shipping. */
+    DeliveryMethodType["Shipping"] = "SHIPPING";
+})(DeliveryMethodType || (DeliveryMethodType = {}));
 /** Digital wallet, such as Apple Pay, which can be used for accelerated checkouts. */
 export var DigitalWallet;
 (function (DigitalWallet) {

package/dist/esnext/version.d.ts

@@ -1 +1 @@
-export declare const LIB_VERSION = "0.13.2";
+export declare const LIB_VERSION = "0.14.0";

package/dist/esnext/version.js

@@ -1 +1 @@
-export const LIB_VERSION = '0.13.2';
+export const LIB_VERSION = '0.14.0';

package/dist/node/entry-server.js

@@ -34,7 +34,6 @@ const defer_1 = require("./utilities/defer");
 const Html_1 = require("./framework/Hydration/Html");
 const ServerComponentResponse_server_1 = require("./framework/Hydration/ServerComponentResponse.server");
 const ServerComponentRequest_server_1 = require("./framework/Hydration/ServerComponentRequest.server");
-const cache_1 = require("./framework/cache");
 const ServerRequestProvider_1 = require("./foundation/ServerRequestProvider");
 const apiRoutes_1 = require("./utilities/apiRoutes");
 const ServerStateProvider_1 = require("./foundation/ServerStateProvider");
@@ -139,7 +138,7 @@ async function render(url, { App, routes, request, componentResponse, log, templ
      * TODO: Also add `Vary` headers for `accept-language` and any other keys
      * we want to shard our full-page cache for all Hydrogen storefronts.
      */
-    headers[(0, cache_1.getCacheControlHeader)({ dev })] = componentResponse.cacheControlHeader;
+    headers['cache-control'] = componentResponse.cacheControlHeader;
     if (componentResponse.customBody) {
         // This can be used to return sitemap.xml or any other custom response.
         postRequestTasks('ssr', status, request, componentResponse);
@@ -234,7 +233,7 @@ async function stream(url, { App, routes, request, response, componentResponse,
              * queries which might be caught behind Suspense. Clarify this or add
              * additional checks downstream?
              */
-            responseOptions.headers[(0, cache_1.getCacheControlHeader)({ dev })] =
+            responseOptions.headers['cache-control'] =
                 componentResponse.cacheControlHeader;
             if (isRedirect(responseOptions)) {
                 return false;
@@ -302,7 +301,7 @@ async function stream(url, { App, routes, request, response, componentResponse,
                  * queries which might be caught behind Suspense. Clarify this or add
                  * additional checks downstream?
                  */
-                response.setHeader((0, cache_1.getCacheControlHeader)({ dev }), componentResponse.cacheControlHeader);
+                response.setHeader('cache-control', componentResponse.cacheControlHeader);
                 writeHeadToServerResponse(response, componentResponse, log, didError);
                 if (isRedirect(response)) {
                     // Return redirects early without further rendering/streaming
@@ -386,15 +385,21 @@ async function hydrate(url, { App, routes, request, response, componentResponse,
         // Note: CFW does not support reader.piteTo nor iterable syntax
         const bufferedBody = await (0, streaming_server_1.bufferReadableStream)(rscReadable.getReader());
         postRequestTasks('rsc', 200, request, componentResponse);
-        return new Response(bufferedBody);
+        return new Response(bufferedBody, {
+            headers: {
+                'cache-control': componentResponse.cacheControlHeader,
+            },
+        });
     }
     else if (response) {
         const rscWriter = await Promise.resolve().then(() => __importStar(require(
         // @ts-ignore
         '@shopify/hydrogen/vendor/react-server-dom-vite/writer.node.server')));
-        const stream = rscWriter
-            .renderToPipeableStream(AppRSC)
-            .pipe(response);
+        const streamer = rscWriter.renderToPipeableStream(AppRSC);
+        response.writeHead(200, 'ok', {
+            'cache-control': componentResponse.cacheControlHeader,
+        });
+        const stream = streamer.pipe(response);
         stream.on('finish', function () {
             postRequestTasks('rsc', response.statusCode, request, componentResponse);
         });

package/dist/node/foundation/ServerStateProvider/ServerStateProvider.d.ts

@@ -7,13 +7,18 @@ export interface ServerState {
     search: string;
     [key: string]: any;
 }
+declare type ServerStateSetterInput = ((prev: ServerState) => Partial<ServerState>) | Partial<ServerState> | string;
 export interface ServerStateSetter {
-    (input: ((prev: ServerState) => Partial<ServerState>) | Partial<ServerState> | string, propValue?: any): void;
+    (input: ServerStateSetterInput, propValue?: any): void;
+}
+interface ProposedServerStateSetter {
+    (input: ServerStateSetterInput, propValue?: any): ServerState;
 }
 export interface ServerStateContextValue {
     pending: boolean;
     serverState: ServerState;
     setServerState: ServerStateSetter;
+    getProposedServerState: ProposedServerStateSetter;
 }
 export declare const ServerStateContext: React.Context<ServerStateContextValue>;
 interface ServerStateProviderProps {

package/dist/node/foundation/ServerStateProvider/ServerStateProvider.js

@@ -38,34 +38,39 @@ function ServerStateProvider({ serverState, setServerState, children, }) {
          * the `pending` flag also provided by the hook to display in the UI.
          */
         startTransition(() => {
-            return setServerState((prev) => {
-                let newValue;
-                if (typeof input === 'function') {
-                    newValue = input(prev);
-                }
-                else if (typeof input === 'string') {
-                    newValue = { [input]: propValue };
-                }
-                else {
-                    newValue = input;
-                }
-                if (__DEV__) {
-                    const privateProp = PRIVATE_PROPS.find((prop) => prop in newValue);
-                    if (privateProp) {
-                        console.warn(`Custom "${privateProp}" property in server state is ignored. Use a different name.`);
-                    }
-                }
-                return {
-                    ...prev,
-                    ...newValue,
-                };
-            });
+            return setServerState((prev) => getNewServerState(prev, input, propValue));
         });
     }, [setServerState, startTransition]);
+    const getProposedServerStateCallback = (0, react_1.useCallback)((input, propValue) => {
+        return getNewServerState(serverState, input, propValue);
+    }, [serverState]);
+    function getNewServerState(prev, input, propValue) {
+        let newValue;
+        if (typeof input === 'function') {
+            newValue = input(prev);
+        }
+        else if (typeof input === 'string') {
+            newValue = { [input]: propValue };
+        }
+        else {
+            newValue = input;
+        }
+        if (__DEV__) {
+            const privateProp = PRIVATE_PROPS.find((prop) => prop in newValue);
+            if (privateProp) {
+                console.warn(`Custom "${privateProp}" property in server state is ignored. Use a different name.`);
+            }
+        }
+        return {
+            ...prev,
+            ...newValue,
+        };
+    }
     const value = (0, react_1.useMemo)(() => ({
         pending,
         serverState,
         setServerState: setServerStateCallback,
+        getProposedServerState: getProposedServerStateCallback,
     }), [serverState, setServerStateCallback, pending]);
     return (react_1.default.createElement(exports.ServerStateContext.Provider, { value: value }, children));
 }

package/dist/node/foundation/ShopifyProvider/types.d.ts

@@ -1,7 +1,9 @@
+import type { CountryCode, LanguageCode } from '../../storefront-api-types';
 import type { ReactNode } from 'react';
 import type { ShopifyConfig } from '../../types';
 export declare type ShopifyContextValue = {
-    locale: string;
+    locale: `${LanguageCode}-${CountryCode}`;
+    languageCode: `${LanguageCode}`;
     storeDomain: ShopifyConfig['storeDomain'];
     storefrontToken: ShopifyConfig['storefrontToken'];
     storefrontApiVersion: string;

package/dist/node/framework/Hydration/ServerComponentRequest.server.js

@@ -127,8 +127,9 @@ function getInitFromNodeRequest(request) {
             ? request.body
             : undefined,
     };
-    if (!init.headers.has('x-forwarded-for')) {
-        init.headers.set('x-forwarded-for', request.socket.remoteAddress);
+    const remoteAddress = request.socket.remoteAddress;
+    if (!init.headers.has('x-forwarded-for') && remoteAddress) {
+        init.headers.set('x-forwarded-for', remoteAddress);
     }
     return init;
 }

package/dist/node/framework/cache.d.ts

@@ -1,13 +1,5 @@
 import type { QueryKey, CachingStrategy } from '../types';
 export declare function generateSubRequestCacheControlHeader(userCacheOptions?: CachingStrategy): string;
-/**
- * Use a preview header during development.
- * TODO: Support an override of this to force the cache
- * header to be present during dev. ENV var maybe?
- */
-export declare function getCacheControlHeader({ dev }: {
-    dev?: boolean;
-}): "cache-control-preview" | "cache-control";
 export declare function hashKey(key: QueryKey): string;
 /**
  * Get an item from the cache. If a match is found, returns a tuple

package/dist/node/framework/cache.js

@@ -1,21 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isStale = exports.deleteItemFromCache = exports.setItemInCache = exports.getItemFromCache = exports.hashKey = exports.getCacheControlHeader = exports.generateSubRequestCacheControlHeader = void 0;
+exports.isStale = exports.deleteItemFromCache = exports.setItemInCache = exports.getItemFromCache = exports.hashKey = exports.generateSubRequestCacheControlHeader = void 0;
 const runtime_1 = require("./runtime");
 const CachingStrategy_1 = require("../framework/CachingStrategy");
 function generateSubRequestCacheControlHeader(userCacheOptions) {
     return (0, CachingStrategy_1.generateCacheControlHeader)(userCacheOptions || (0, CachingStrategy_1.CacheSeconds)());
 }
 exports.generateSubRequestCacheControlHeader = generateSubRequestCacheControlHeader;
-/**
- * Use a preview header during development.
- * TODO: Support an override of this to force the cache
- * header to be present during dev. ENV var maybe?
- */
-function getCacheControlHeader({ dev }) {
-    return dev ? 'cache-control-preview' : 'cache-control';
-}
-exports.getCacheControlHeader = getCacheControlHeader;
 function hashKey(key) {
     const rawKey = key instanceof Array ? key : [key];
     /**