@shopify/hydrogen 0.13.0 → 0.14.0

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

@@ -25,13 +25,7 @@ export class ServerComponentRequest extends Request {
             super(input, init);
         }
         else {
-            super(getUrlFromNodeRequest(input), {
-                headers: new Headers(input.headers),
-                method: input.method,
-                body: input.method !== 'GET' && input.method !== 'HEAD'
-                    ? input.body
-                    : undefined,
-            });
+            super(getUrlFromNodeRequest(input), getInitFromNodeRequest(input));
         }
         this.time = getTime();
         this.id = generateId();
@@ -85,6 +79,15 @@ export class ServerComponentRequest extends Request {
     savePreloadQueries() {
         preloadCache.set(this.preloadURL, this.ctx.preloadQueries);
     }
+    /**
+     * Buyer IP varies by hosting provider and runtime. The developer should provide this
+     * as an argument to the `handleRequest` function for their runtime.
+     * Defaults to `x-forwarded-for` header value.
+     */
+    getBuyerIp() {
+        var _a;
+        return this.headers.get((_a = this.ctx.buyerIpHeader) !== null && _a !== void 0 ? _a : 'x-forwarded-for');
+    }
 }
 function mergeMapEntries(map1, map2) {
     map2 && map2.forEach((v, k) => map1.set(k, v));
@@ -112,3 +115,17 @@ function getUrlFromNodeRequest(request) {
     const secure = request.headers['x-forwarded-proto'] === 'https';
     return new URL(`${secure ? 'https' : 'http'}://${request.headers.host + url}`).toString();
 }
+function getInitFromNodeRequest(request) {
+    const init = {
+        headers: new Headers(request.headers),
+        method: request.method,
+        body: request.method !== 'GET' && request.method !== 'HEAD'
+            ? request.body
+            : undefined,
+    };
+    const remoteAddress = request.socket.remoteAddress;
+    if (!init.headers.has('x-forwarded-for') && remoteAddress) {
+        init.headers.set('x-forwarded-for', remoteAddress);
+    }
+    return init;
+}

package/dist/esnext/framework/cache/in-memory.d.ts

@@ -8,4 +8,5 @@ export declare class InMemoryCache {
     put(request: Request, response: Response): void;
     match(request: Request): Response | undefined;
     delete(request: Request): void;
+    keys(request?: Request): Promise<Request[]>;
 }

package/dist/esnext/framework/cache/in-memory.js

@@ -15,16 +15,17 @@ export class InMemoryCache {
         });
     }
     match(request) {
+        var _a, _b;
         const match = this.store.get(request.url);
         if (!match) {
             logCacheApiStatus('MISS', request.url);
             return;
         }
         const { value, date } = match;
-        const cacheControl = value.headers.get('cache-control');
-        const maxAge = parseInt(cacheControl.match(/max-age=(\d+)/)[1], 10);
-        const swr = parseInt(cacheControl.match(/stale-while-revalidate=(\d+)/)[1], 10);
-        const age = (new Date().valueOf() - date) / 1000;
+        const cacheControl = value.headers.get('cache-control') || '';
+        const maxAge = parseInt(((_a = cacheControl.match(/max-age=(\d+)/)) === null || _a === void 0 ? void 0 : _a[1]) || '0', 10);
+        const swr = parseInt(((_b = cacheControl.match(/stale-while-revalidate=(\d+)/)) === null || _b === void 0 ? void 0 : _b[1]) || '0', 10);
+        const age = (new Date().valueOf() - date.valueOf()) / 1000;
         const isMiss = age > maxAge + swr;
         if (isMiss) {
             logCacheApiStatus('MISS', request.url);
@@ -34,7 +35,7 @@ export class InMemoryCache {
         const isStale = age > maxAge;
         const headers = new Headers(value.headers);
         headers.set('cache', isStale ? 'STALE' : 'HIT');
-        headers.set('date', date.toGMTString());
+        headers.set('date', date.toUTCString());
         logCacheApiStatus(headers.get('cache'), request.url);
         const response = new Response(value.body, {
             headers,
@@ -45,4 +46,13 @@ export class InMemoryCache {
         this.store.delete(request.url);
         logCacheApiStatus('DELETE', request.url);
     }
+    keys(request) {
+        const cacheKeys = [];
+        for (const url of this.store.keys()) {
+            if (!request || request.url === url) {
+                cacheKeys.push(new Request(url));
+            }
+        }
+        return Promise.resolve(cacheKeys);
+    }
 }

package/dist/esnext/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/esnext/framework/cache.js

@@ -3,14 +3,6 @@ import { CacheSeconds, generateCacheControlHeader, } from '../framework/CachingS
 export function generateSubRequestCacheControlHeader(userCacheOptions) {
     return generateCacheControlHeader(userCacheOptions || CacheSeconds());
 }
-/**
- * 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 function getCacheControlHeader({ dev }) {
-    return dev ? 'cache-control-preview' : 'cache-control';
-}
 export function hashKey(key) {
     const rawKey = key instanceof Array ? key : [key];
     /**

package/dist/esnext/hooks/useParsedMetafields/useParsedMetafields.d.ts

@@ -15,7 +15,7 @@ metafields?: PartialDeep<MetafieldConnection>): {
     key?: string | undefined;
     namespace?: string | undefined;
     parentResource?: import("type-fest/source/partial-deep").PartialObjectDeep<import("../../storefront-api-types").ProductVariant> | import("type-fest/source/partial-deep").PartialObjectDeep<import("../../storefront-api-types").Product> | import("type-fest/source/partial-deep").PartialObjectDeep<import("../../storefront-api-types").Blog> | import("type-fest/source/partial-deep").PartialObjectDeep<import("../../storefront-api-types").Article> | import("type-fest/source/partial-deep").PartialObjectDeep<import("../../storefront-api-types").Customer> | import("type-fest/source/partial-deep").PartialObjectDeep<import("../../storefront-api-types").Order> | import("type-fest/source/partial-deep").PartialObjectDeep<import("../../storefront-api-types").Collection> | import("type-fest/source/partial-deep").PartialObjectDeep<import("../../storefront-api-types").Page> | import("type-fest/source/partial-deep").PartialObjectDeep<import("../../storefront-api-types").Shop> | undefined;
-    reference?: import("type-fest/source/partial-deep").PartialObjectDeep<import("../../storefront-api-types").MediaImage> | import("type-fest/source/partial-deep").PartialObjectDeep<import("../../storefront-api-types").ProductVariant> | import("type-fest/source/partial-deep").PartialObjectDeep<import("../../storefront-api-types").Product> | import("type-fest/source/partial-deep").PartialObjectDeep<import("../../storefront-api-types").Page> | null | undefined;
+    reference?: import("type-fest/source/partial-deep").PartialObjectDeep<import("../../storefront-api-types").Video> | import("type-fest/source/partial-deep").PartialObjectDeep<import("../../storefront-api-types").MediaImage> | import("type-fest/source/partial-deep").PartialObjectDeep<import("../../storefront-api-types").ProductVariant> | import("type-fest/source/partial-deep").PartialObjectDeep<import("../../storefront-api-types").Product> | import("type-fest/source/partial-deep").PartialObjectDeep<import("../../storefront-api-types").Page> | import("type-fest/source/partial-deep").PartialObjectDeep<import("../../storefront-api-types").GenericFile> | null | undefined;
     type?: string | undefined;
     updatedAt?: string | undefined;
 }[];

package/dist/esnext/hooks/useShopQuery/hooks.d.ts

@@ -8,7 +8,7 @@ export interface UseShopQueryResponse<T> {
 /**
  * The `useShopQuery` hook allows you to make server-only GraphQL queries to the Storefront API. It must be a descendent of a `ShopifyProvider` component.
  */
-export declare function useShopQuery<T>({ query, variables, cache, locale, preload, }: {
+export declare function useShopQuery<T>({ query, variables, cache, preload, }: {
     /** A string of the GraphQL query.
      * If no query is provided, useShopQuery will make no calls to the Storefront API.
      */

package/dist/esnext/hooks/useShopQuery/hooks.js

@@ -6,22 +6,26 @@ import { getConfig } from '../../framework/config';
 import { useServerRequest } from '../../foundation/ServerRequestProvider';
 import { injectGraphQLTracker } from '../../utilities/graphql-tracker';
 import { sendMessageToClient } from '../../utilities/devtools';
+import { META_ENV_SSR } from '../../foundation/ssr-interop';
+// Check if the response body has GraphQL errors
+// https://spec.graphql.org/June2018/#sec-Response-Format
+const shouldCacheResponse = (body) => !(body === null || body === void 0 ? void 0 : body.errors);
 /**
  * The `useShopQuery` hook allows you to make server-only GraphQL queries to the Storefront API. It must be a descendent of a `ShopifyProvider` component.
  */
-export function useShopQuery({ query, variables = {}, cache, locale = '', preload = false, }) {
+export function useShopQuery({ query, variables = {}, cache, preload = false, }) {
     var _a;
-    if (!import.meta.env.SSR) {
+    if (!META_ENV_SSR) {
         throw new Error('Shopify Storefront API requests should only be made from the server.');
     }
     const serverRequest = useServerRequest();
     const log = getLoggerWithContext(serverRequest);
     const body = query ? graphqlRequestBody(query, variables) : '';
-    const { key, url, requestInit } = createShopRequest(body, locale);
+    const { key, url, requestInit } = useCreateShopRequest(body);
     const { data, error: useQueryError } = useQuery(key, query
         ? fetchBuilder(url, requestInit)
         : // If no query, avoid calling SFAPI & return nothing
-            async () => ({ data: undefined, errors: undefined }), { cache, preload });
+            async () => ({ data: undefined, errors: undefined }), { cache, shouldCacheResponse, preload });
     /**
      * The fetch request itself failed, so we handle that differently than a GraphQL error
      */
@@ -42,7 +46,7 @@ export function useShopQuery({ query, variables = {}, cache, locale = '', preloa
      * get returned to the consumer.
      */
     if (data === null || data === void 0 ? void 0 : data.errors) {
-        const errors = data.errors instanceof Array ? data.errors : [data.errors];
+        const errors = Array.isArray(data.errors) ? data.errors : [data.errors];
         for (const error of errors) {
             if (getConfig().dev) {
                 throw new Error(error.message);
@@ -53,7 +57,7 @@ export function useShopQuery({ query, variables = {}, cache, locale = '', preloa
         }
         log.error(`GraphQL errors: ${errors.length}`);
     }
-    if (import.meta.env.DEV &&
+    if (__DEV__ &&
         log.options().showUnusedQueryProperties &&
         query &&
         typeof query !== 'string' &&
@@ -90,28 +94,45 @@ export function useShopQuery({ query, variables = {}, cache, locale = '', preloa
     }
     return data;
 }
-function createShopRequest(body, locale) {
+function useCreateShopRequest(body) {
     var _a;
-    const { storeDomain, storefrontToken, storefrontApiVersion, locale: defaultLocale, } = useShop();
+    const { storeDomain, storefrontToken, storefrontApiVersion } = useShop();
+    const request = useServerRequest();
+    const secretToken = typeof Oxygen !== 'undefined'
+        ? (_a = Oxygen === null || Oxygen === void 0 ? void 0 : Oxygen.env) === null || _a === void 0 ? void 0 : _a.SHOPIFY_STOREFRONT_API_SECRET_TOKEN
+        : null;
+    const buyerIp = request.getBuyerIp();
+    const extraHeaders = {};
+    /**
+     * Only pass one type of storefront token at a time.
+     */
+    if (secretToken) {
+        extraHeaders['Shopify-Storefront-Private-Token'] = secretToken;
+    }
+    else {
+        extraHeaders['X-Shopify-Storefront-Access-Token'] = storefrontToken;
+    }
+    if (buyerIp) {
+        extraHeaders['Shopify-Storefront-Buyer-IP'] = buyerIp;
+    }
     return {
-        key: [storeDomain, storefrontApiVersion, body, locale],
+        key: [storeDomain, storefrontApiVersion, body],
         url: `https://${storeDomain}/api/${storefrontApiVersion}/graphql.json`,
         requestInit: {
             body,
             method: 'POST',
             headers: {
-                'X-Shopify-Storefront-Access-Token': storefrontToken,
                 'X-SDK-Variant': 'hydrogen',
                 'X-SDK-Version': storefrontApiVersion,
                 'content-type': 'application/json',
-                'Accept-Language': (_a = locale) !== null && _a !== void 0 ? _a : defaultLocale,
+                ...extraHeaders,
             },
         },
     };
 }
 function createErrorMessage(fetchError) {
     if (fetchError instanceof Response) {
-        `An error occurred while fetching from the Storefront API. ${
+        return `An error occurred while fetching from the Storefront API. ${
         // 403s to the SF API (almost?) always mean that your Shopify credentials are bad/wrong
         fetchError.status === 403
             ? `You may have a bad value in 'shopify.config.js'`

package/dist/esnext/platforms/node.d.ts

@@ -1,10 +1,9 @@
 import '../utilities/web-api-polyfill';
 import connect from 'connect';
 declare type CreateServerOptions = {
-    port?: number | string;
+    cache?: Cache;
 };
-export declare function createServer({ port, }?: CreateServerOptions): Promise<{
+export declare function createServer({ cache }?: CreateServerOptions): Promise<{
     app: connect.Server;
-    port: string | number;
 }>;
 export {};

package/dist/esnext/platforms/node.js

@@ -14,7 +14,7 @@ import compression from 'compression';
 import bodyParser from 'body-parser';
 import connect from 'connect';
 const handleRequest = entrypoint;
-export async function createServer({ port = process.env.PORT || 8080, } = {}) {
+export async function createServer({ cache } = {}) {
     // @ts-ignore
     globalThis.Oxygen = { env: process.env };
     const app = connect();
@@ -26,11 +26,13 @@ export async function createServer({ port = process.env.PORT || 8080, } = {}) {
     app.use(hydrogenMiddleware({
         getServerEntrypoint: () => handleRequest,
         indexTemplate,
+        cache,
     }));
-    return { app, port };
+    return { app };
 }
 if (require.main === module) {
-    createServer().then(({ app, port }) => {
+    createServer().then(({ app }) => {
+        const port = process.env.PORT || 8080;
         app.listen(port, () => {
             console.log(`Hydrogen server running at http://localhost:${port}`);
         });

package/dist/esnext/platforms/worker.js

@@ -13,8 +13,9 @@ export default {
         try {
             return (await handleRequest(request, {
                 indexTemplate,
-                cache: caches.default,
+                cache: await caches.open('oxygen'),
                 context,
+                buyerIpHeader: 'oxygen-buyer-ip',
             }));
         }
         catch (error) {

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