@shopify/hydrogen 0.22.0 → 0.24.0

package/dist/esnext/foundation/useQuery/hooks.js

@@ -1,8 +1,7 @@
 import { getLoggerWithContext, collectQueryCacheControlHeaders, collectQueryTimings, } from '../../utilities/log';
-import { deleteItemFromCache, generateSubRequestCacheControlHeader, getItemFromCache, isStale, setItemInCache, } from '../../framework/cache-sub-request';
-import { runDelayedFunction } from '../../framework/runtime';
+import { deleteItemFromCache, generateSubRequestCacheControlHeader, getItemFromCache, isStale, setItemInCache, } from '../Cache/cache-sub-request';
 import { useRequestCacheData, useServerRequest } from '../ServerRequestProvider';
-import { CacheSeconds } from '../../framework/CachingStrategy';
+import { CacheSeconds, NO_STORE } from '../Cache/strategies';
 /**
  * The `useQuery` hook executes an asynchronous operation like `fetch` in a way that
  * supports [Suspense](https://reactjs.org/docs/concurrent-mode-suspense.html). You can use this
@@ -25,7 +24,7 @@ queryOptions) {
     ];
     const fetcher = cachedQueryFnBuilder(withCacheIdKey, queryFn, queryOptions);
     collectQueryTimings(request, withCacheIdKey, 'requested');
-    if (queryOptions === null || queryOptions === void 0 ? void 0 : queryOptions.preload) {
+    if (shouldPreloadQuery(queryOptions)) {
         request.savePreloadQuery({
             preload: queryOptions === null || queryOptions === void 0 ? void 0 : queryOptions.preload,
             key: withCacheIdKey,
@@ -34,6 +33,20 @@ queryOptions) {
     }
     return useRequestCacheData(withCacheIdKey, fetcher);
 }
+export function shouldPreloadQuery(queryOptions) {
+    var _a, _b;
+    if (!queryOptions)
+        return true;
+    const hasCacheOverride = typeof ((_a = queryOptions === null || queryOptions === void 0 ? void 0 : queryOptions.cache) === null || _a === void 0 ? void 0 : _a.mode) !== 'undefined';
+    const hasPreloadOverride = typeof (queryOptions === null || queryOptions === void 0 ? void 0 : queryOptions.preload) !== 'undefined';
+    const cacheValue = (_b = queryOptions === null || queryOptions === void 0 ? void 0 : queryOptions.cache) === null || _b === void 0 ? void 0 : _b.mode;
+    const preloadValue = queryOptions === null || queryOptions === void 0 ? void 0 : queryOptions.preload;
+    // If preload is explicitly defined, then it takes precedence
+    if (hasPreloadOverride) {
+        return !!preloadValue;
+    }
+    return hasCacheOverride ? cacheValue !== NO_STORE : true;
+}
 function cachedQueryFnBuilder(key, queryFn, queryOptions) {
     var _a;
     const resolvedQueryOptions = {
@@ -44,6 +57,7 @@ function cachedQueryFnBuilder(key, queryFn, queryOptions) {
      * Attempt to read the query from cache. If it doesn't exist or if it's stale, regenerate it.
      */
     async function useCachedQueryFn() {
+        var _a, _b, _c, _d;
         // Call this hook before running any async stuff
         // to prevent losing the current React cycle.
         const request = useServerRequest();
@@ -60,8 +74,8 @@ function cachedQueryFnBuilder(key, queryFn, queryOptions) {
              */
             if (isStale(key, response)) {
                 const lockKey = ['lock', ...(typeof key === 'string' ? [key] : key)];
-                runDelayedFunction(async () => {
-                    const lockExists = await getItemFromCache(lockKey);
+                // Run revalidation asynchronously
+                const revalidatingPromise = getItemFromCache(lockKey).then(async (lockExists) => {
                     if (lockExists)
                         return;
                     await setItemInCache(lockKey, true, CacheSeconds({
@@ -80,6 +94,8 @@ function cachedQueryFnBuilder(key, queryFn, queryOptions) {
                         await deleteItemFromCache(lockKey);
                     }
                 });
+                // Asynchronously wait for it in workers
+                (_b = (_a = request.ctx.runtime) === null || _a === void 0 ? void 0 : _a.waitUntil) === null || _b === void 0 ? void 0 : _b.call(_a, revalidatingPromise);
             }
             return output;
         }
@@ -88,7 +104,8 @@ function cachedQueryFnBuilder(key, queryFn, queryOptions) {
          * Important: Do this async
          */
         if (shouldCacheResponse(newOutput)) {
-            runDelayedFunction(() => setItemInCache(key, newOutput, resolvedQueryOptions === null || resolvedQueryOptions === void 0 ? void 0 : resolvedQueryOptions.cache));
+            const setItemInCachePromise = setItemInCache(key, newOutput, resolvedQueryOptions === null || resolvedQueryOptions === void 0 ? void 0 : resolvedQueryOptions.cache);
+            (_d = (_c = request.ctx.runtime) === null || _c === void 0 ? void 0 : _c.waitUntil) === null || _d === void 0 ? void 0 : _d.call(_c, setItemInCachePromise);
         }
         collectQueryCacheControlHeaders(request, key, generateSubRequestCacheControlHeader(resolvedQueryOptions === null || resolvedQueryOptions === void 0 ? void 0 : resolvedQueryOptions.cache));
         return newOutput;

package/dist/esnext/foundation/useRequestContext/index.d.ts

@@ -0,0 +1,15 @@
+declare type ScopedContext = Record<string, any>;
+/**
+ * Provides access to the current request context.
+ * @param scope - An optional string used to scope the request context. It is recommended to
+ * prevent modifying the properties added by other plugins.
+ * @returns A request-scoped object that can be modified to provide and consume information
+ * across different React components in the tree.
+ * @example
+ * ```js
+ * import {useRequestContext} from '@shopify/hydrogen';
+ * useRequestContext('my-plugin-name');
+ * ```
+ */
+export declare function useRequestContext<T extends ScopedContext>(scope?: string): T;
+export {};

package/dist/esnext/foundation/useRequestContext/index.js

@@ -0,0 +1,23 @@
+import { META_ENV_SSR, useEnvContext } from '../ssr-interop';
+/**
+ * Provides access to the current request context.
+ * @param scope - An optional string used to scope the request context. It is recommended to
+ * prevent modifying the properties added by other plugins.
+ * @returns A request-scoped object that can be modified to provide and consume information
+ * across different React components in the tree.
+ * @example
+ * ```js
+ * import {useRequestContext} from '@shopify/hydrogen';
+ * useRequestContext('my-plugin-name');
+ * ```
+ */
+export function useRequestContext(scope = 'default') {
+    if (__HYDROGEN_DEV__ && !META_ENV_SSR) {
+        throw new Error('useRequestContext can only be used in the server');
+    }
+    const scopes = useEnvContext((req) => req.ctx.scopes);
+    if (!scopes.has(scope)) {
+        scopes.set(scope, Object.create(null));
+    }
+    return scopes.get(scope);
+}

package/dist/esnext/framework/Hydration/rsc.js

@@ -3,6 +3,7 @@
 import { createFromFetch, createFromReadableStream,
 // @ts-ignore
  } from '@shopify/hydrogen/vendor/react-server-dom-vite';
+import { ClientAnalytics } from '../../client';
 import { RSC_PATHNAME } from '../../constants';
 let rscReader;
 // Hydrate an SSR response from <meta> tags placed in the DOM.
@@ -88,6 +89,7 @@ export function useServerResponse(state) {
             /* @ts-ignore */
             window.BOOMR.plugins.Hydrogen.trackSubPageLoadPerformance();
         }
+        ClientAnalytics.resetPageAnalyticsData();
         // Request a new flight response.
         response = createFromFetch(fetch(`${RSC_PATHNAME}?state=` + encodeURIComponent(key)));
     }

package/dist/esnext/framework/plugin.js

@@ -11,6 +11,7 @@ import inspect from 'vite-plugin-inspect';
 import react from '@vitejs/plugin-react';
 import cssModulesRsc from './plugins/vite-plugin-css-modules-rsc';
 import clientImports from './plugins/vite-plugin-client-imports';
+import suppressWarnings from './plugins/vite-plugin-hydrogen-suppress-warnings';
 export default (pluginOptions = {}) => {
     return [
         process.env.VITE_INSPECT && inspect(),
@@ -25,6 +26,7 @@ export default (pluginOptions = {}) => {
         cssModulesRsc(),
         rsc(),
         platformEntry(),
+        suppressWarnings(),
         pluginOptions.purgeQueryCacheOnBuild && purgeQueryCache(),
     ];
 };

package/dist/esnext/framework/plugins/vite-plugin-hydrogen-config.js

@@ -82,11 +82,14 @@ export default () => {
                         'react-server-dom-vite/client-proxy',
                         // https://github.com/vitejs/vite/issues/6215
                         'react/jsx-runtime',
+                        // https://github.com/nfriedly/set-cookie-parser/issues/50
+                        'set-cookie-parser',
                     ],
                 },
                 define: {
-                    __DEV__: env.mode !== 'production',
-                    __WORKER__: isWorker,
+                    __HYDROGEN_DEV__: env.mode !== 'production',
+                    __HYDROGEN_WORKER__: isWorker,
+                    __HYDROGEN_TEST__: false, // Used in unit tests
                 },
                 envPrefix: ['VITE_', 'PUBLIC_'],
                 base: process.env.HYDROGEN_ASSET_BASE_URL,

package/dist/esnext/framework/plugins/vite-plugin-hydrogen-middleware.js

@@ -36,7 +36,7 @@ export default (pluginOptions) => {
                         headers: incomingMessage.headers,
                     });
                     // @ts-expect-error Manually set `normalizedUrl` which a developer expects to be available
-                    // via `ServerComponentRequest` during production runtime.
+                    // via `HydrogenRequest` during production runtime.
                     request.normalizedUrl = request.url;
                     const { shopify } = hydrogenConfig;
                     return typeof shopify === 'function' ? shopify(request) : shopify;

package/dist/esnext/framework/plugins/vite-plugin-hydrogen-rsc.js

@@ -2,9 +2,12 @@
 import reactServerDomVite from '@shopify/hydrogen/vendor/react-server-dom-vite/plugin';
 import { HYDROGEN_DEFAULT_SERVER_ENTRY } from './vite-plugin-hydrogen-middleware';
 import { VIRTUAL_PROXY_HYDROGEN_ROUTES_ID } from './vite-plugin-hydrogen-virtual-files';
-import { viteception } from '../viteception';
 export default function () {
     return reactServerDomVite({
+        serverBuildEntries: [
+            HYDROGEN_DEFAULT_SERVER_ENTRY,
+            VIRTUAL_PROXY_HYDROGEN_ROUTES_ID,
+        ],
         isServerComponentImporterAllowed(importer, source) {
             return (
             // Always allow the entry server (e.g. App.server.jsx) to be imported
@@ -15,16 +18,5 @@ export default function () {
                 // TODO: revisit this when RSC splits into two bundles
                 /\.test\.[tj]sx?$/.test(importer));
         },
-        async findClientComponentsForClientBuild() {
-            const { server } = await viteception([
-                // Load server entry to discover client components early
-                HYDROGEN_DEFAULT_SERVER_ENTRY,
-                // Route globs are placed in a virtual module and need to
-                // be loaded to discover client components in routes
-                VIRTUAL_PROXY_HYDROGEN_ROUTES_ID,
-            ]);
-            // At this point, the server has loaded all the components in the module graph
-            return reactServerDomVite.findClientComponentsFromServer(server);
-        },
     });
 }

package/dist/esnext/framework/plugins/vite-plugin-hydrogen-suppress-warnings.d.ts

@@ -0,0 +1,3 @@
+import { Plugin } from 'vite';
+declare const _default: () => Plugin;
+export default _default;

package/dist/esnext/framework/plugins/vite-plugin-hydrogen-suppress-warnings.js

@@ -0,0 +1,19 @@
+export default () => {
+    return {
+        name: 'hydrogen:suppress-warnings',
+        configResolved(config) {
+            // TODO: Fix the actual issues that cause these warnings
+            const filterOut = (msg) => msg.startsWith("@shopify/hydrogen doesn't appear to be written in CJS") ||
+                (msg.includes('missing source files') &&
+                    ['kolorist'].some((lib) => msg.includes(lib)));
+            for (const method of ['warn', 'warnOnce']) {
+                const original = config.logger[method];
+                config.logger[method] = (msg, ...args) => {
+                    if (filterOut(msg))
+                        return;
+                    return original(msg, ...args);
+                };
+            }
+        },
+    };
+};

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

@@ -7,15 +7,25 @@ export declare function useCartLine(): {
     attributes: ({
         __typename?: "Attribute" | undefined;
     } & Pick<import("../../storefront-api-types").Attribute, "key" | "value">)[];
+    estimatedCost: {
+        __typename?: "CartLineEstimatedCost" | undefined;
+    } & {
+        totalAmount: {
+            __typename?: "MoneyV2" | undefined;
+        } & Pick<import("../../storefront-api-types").MoneyV2, "amount" | "currencyCode">;
+        compareAtAmount?: import("../../storefront-api-types").Maybe<{
+            __typename?: "MoneyV2" | undefined;
+        } & Pick<import("../../storefront-api-types").MoneyV2, "amount" | "currencyCode">> | undefined;
+    };
     merchandise: {
         __typename?: "ProductVariant" | undefined;
     } & Pick<import("../../storefront-api-types").ProductVariant, "id" | "title" | "availableForSale" | "requiresShipping"> & {
         compareAtPriceV2?: import("../../storefront-api-types").Maybe<{
             __typename?: "MoneyV2" | undefined;
-        } & Pick<import("../../storefront-api-types").MoneyV2, "currencyCode" | "amount">> | undefined;
+        } & Pick<import("../../storefront-api-types").MoneyV2, "amount" | "currencyCode">> | undefined;
         priceV2: {
             __typename?: "MoneyV2" | undefined;
-        } & Pick<import("../../storefront-api-types").MoneyV2, "currencyCode" | "amount">;
+        } & Pick<import("../../storefront-api-types").MoneyV2, "amount" | "currencyCode">;
         image?: import("../../storefront-api-types").Maybe<{
             __typename?: "Image" | undefined;
         } & Pick<import("../../storefront-api-types").Image, "id" | "height" | "width" | "url" | "altText">> | undefined;

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

@@ -14,8 +14,8 @@ metafields?: PartialDeep<MetafieldConnection>): {
     description?: import("../../storefront-api-types").Maybe<string> | undefined;
     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").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;
+    parentResource?: 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").ProductVariant> | 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").Product> | 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").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").Page> | import("type-fest/source/partial-deep").PartialObjectDeep<import("../../storefront-api-types").Product> | import("type-fest/source/partial-deep").PartialObjectDeep<import("../../storefront-api-types").GenericFile> | null | undefined;
     type?: string | undefined;
     updatedAt?: string | undefined;
 }[];

package/dist/esnext/hooks/useProductOptions/types.d.ts

@@ -1,8 +1,9 @@
-import type { SelectedOption as SelectedOptionType, ProductVariant as ProductVariantType, ProductVariantConnection, SellingPlan as SellingPlanType, SellingPlanAllocation as SellingPlanAllocationType, SellingPlanGroup as SellingPlanGroupType, SellingPlanConnection } from '../../storefront-api-types';
+import type { SelectedOption as SelectedOptionType, ProductVariant as ProductVariantType, ProductVariantConnection, SellingPlan as SellingPlanType, SellingPlanAllocation as SellingPlanAllocationType, SellingPlanGroup as SellingPlanGroupType, SellingPlanGroupConnection } from '../../storefront-api-types';
+import type { PartialDeep } from 'type-fest';
 export declare type SelectedOptions = {
     [key: string]: string;
 };
-export declare type SelectVariantCallback = (variant: ProductVariantType) => void;
+export declare type SelectVariantCallback = (variant: ProductVariantType | null) => void;
 export declare type SelectOptionCallback = (name: SelectedOptionType['name'], value: SelectedOptionType['value']) => void;
 export declare type SelectOptionsCallback = (options: SelectedOptions) => void;
 export declare type OptionsInStockCallback = (name: SelectedOptionType['name'], value: SelectedOptionType['value']) => boolean;
@@ -11,7 +12,7 @@ export interface OptionWithValues {
     name: SelectedOptionType['name'];
     values: SelectedOptionType['value'][];
 }
-export interface ProductOptionsHookValue {
+export declare type ProductOptionsHookValue = PartialDeep<{
     /** An array of the variant `nodes` from the `VariantConnection`. */
     variants: ProductVariantType[];
     variantsConnection?: ProductVariantConnection;
@@ -19,17 +20,7 @@ export interface ProductOptionsHookValue {
     options: OptionWithValues[];
     /** The selected variant. */
     selectedVariant?: ProductVariantType | null;
-    /** A callback to set the selected variant to the variant passed as an argument. */
-    setSelectedVariant: SelectVariantCallback;
     selectedOptions: SelectedOptions;
-    /** A callback to set the selected option. */
-    setSelectedOption: SelectOptionCallback;
-    /** A callback to set multiple selected options at once. */
-    setSelectedOptions: SelectOptionsCallback;
-    /** A callback that returns a boolean indicating if the option is in stock. */
-    isOptionInStock: OptionsInStockCallback;
-    /** A callback to set the selected selling plan to the one passed as an argument. */
-    setSelectedSellingPlan: SelectedSellingPlanCallback;
     /** The selected selling plan. */
     selectedSellingPlan?: SellingPlanType;
     /** The selected selling plan allocation. */
@@ -38,5 +29,16 @@ export interface ProductOptionsHookValue {
     sellingPlanGroups?: (Omit<SellingPlanGroupType, 'sellingPlans'> & {
         sellingPlans: SellingPlanType[];
     })[];
-    sellingPlanGroupsConnection?: SellingPlanConnection;
-}
+    sellingPlanGroupsConnection?: SellingPlanGroupConnection;
+}> & {
+    /** A callback to set the selected variant to the variant passed as an argument. */
+    setSelectedVariant: SelectVariantCallback;
+    /** A callback to set the selected option. */
+    setSelectedOption: SelectOptionCallback;
+    /** A callback to set multiple selected options at once. */
+    setSelectedOptions: SelectOptionsCallback;
+    /** A callback to set the selected selling plan to the one passed as an argument. */
+    setSelectedSellingPlan: SelectedSellingPlanCallback;
+    /** A callback that returns a boolean indicating if the option is in stock. */
+    isOptionInStock: OptionsInStockCallback;
+};

package/dist/esnext/hooks/useProductOptions/useProductOptions.client.d.ts

@@ -1,15 +1 @@
-import { ProductOptionsHookValue } from './types';
-import type { ProductVariantConnection, SellingPlanGroupConnection, ProductVariant as ProductVariantType } from '../../storefront-api-types';
-import type { PartialDeep } from 'type-fest';
-/**
- * The `useProductOptions` hook returns an object that enables you to keep track of the
- * selected variant and/or selling plan state, as well as callbacks for modifying the state.
- */
-export declare function useProductOptions({ variants: variantsConnection, sellingPlanGroups: sellingPlanGroupsConnection, initialVariantId: explicitVariantId, }: {
-    /** The product's `VariantConnection`. */
-    variants?: PartialDeep<ProductVariantConnection>;
-    /** The product's `SellingPlanGroups`. */
-    sellingPlanGroups?: PartialDeep<SellingPlanGroupConnection>;
-    /** The initially selected variant. */
-    initialVariantId?: ProductVariantType['id'] | null;
-}): ProductOptionsHookValue;
+export declare function useProductOptions(): import("./types").ProductOptionsHookValue;

package/dist/esnext/hooks/useProductOptions/useProductOptions.client.js

@@ -1,108 +1,9 @@
-import { useCallback, useEffect, useMemo, useState } from 'react';
-import { flattenConnection } from '../../utilities';
-import { getOptions, getSelectedVariant } from './helpers';
-/**
- * The `useProductOptions` hook returns an object that enables you to keep track of the
- * selected variant and/or selling plan state, as well as callbacks for modifying the state.
- */
-export function useProductOptions({ variants: variantsConnection, sellingPlanGroups: sellingPlanGroupsConnection, initialVariantId: explicitVariantId, }) {
-    // The flattened variants
-    const variants = useMemo(() => (variantsConnection ? flattenConnection(variantsConnection) : []), [variantsConnection]);
-    // All the options available for a product, based on all the variants
-    const options = useMemo(() => getOptions(variants), [variants]);
-    // TODO: we have some weird variable shadowing going on here that probably needs to be looked at. This variable is the same name as a prop
-    const initialVariantId = explicitVariantId === null
-        ? explicitVariantId
-        : variants.find((variant) => variant.id === explicitVariantId) ||
-            variants.find((variant) => variant.availableForSale) ||
-            variants[0];
-    /**
-     * Track the selectedVariant within the hook. If `initialVariantId`
-     * is passed, use that as an initial value.
-     */
-    const [selectedVariant, setSelectedVariant] = useState(initialVariantId);
-    /**
-     * Track the selectedOptions within the hook. If a `initialVariantId`
-     * is passed, use that to select initial options.
-     */
-    const [selectedOptions, setSelectedOptions] = useState((selectedVariant === null || selectedVariant === void 0 ? void 0 : selectedVariant.selectedOptions)
-        ? selectedVariant.selectedOptions.reduce((memo, optionSet) => {
-            var _a, _b;
-            memo[(_a = optionSet === null || optionSet === void 0 ? void 0 : optionSet.name) !== null && _a !== void 0 ? _a : ''] = (_b = optionSet === null || optionSet === void 0 ? void 0 : optionSet.value) !== null && _b !== void 0 ? _b : '';
-            return memo;
-        }, {})
-        : {});
-    /**
-     * When the initialVariantId changes, we need to make sure we
-     * update the selected variant and selected options. If not,
-     * then the selected variant and options will reference incorrect
-     * values.
-     */
-    useEffect(() => {
-        const variant = getSelectedVariant(variants, selectedOptions);
-        setSelectedVariant(variant);
-    }, [selectedOptions, variants]);
-    /**
-     * Allow the developer to select an option.
-     */
-    const setSelectedOption = useCallback((name, value) => {
-        setSelectedOptions((selectedOptions) => ({
-            ...selectedOptions,
-            [name]: value,
-        }));
-    }, [setSelectedOptions]);
-    const isOptionInStock = useCallback((option, value) => {
-        var _a;
-        const proposedVariant = getSelectedVariant(variants, {
-            ...selectedOptions,
-            ...{ [option]: value },
-        });
-        return (_a = proposedVariant === null || proposedVariant === void 0 ? void 0 : proposedVariant.availableForSale) !== null && _a !== void 0 ? _a : true;
-    }, [selectedOptions, variants]);
-    const sellingPlanGroups = useMemo(() => sellingPlanGroupsConnection
-        ? flattenConnection(sellingPlanGroupsConnection).map((sellingPlanGroup) => ({
-            ...sellingPlanGroup,
-            sellingPlans: (sellingPlanGroup === null || sellingPlanGroup === void 0 ? void 0 : sellingPlanGroup.sellingPlans)
-                ? flattenConnection(sellingPlanGroup.sellingPlans)
-                : [],
-        }))
-        : [], [sellingPlanGroupsConnection]);
-    /**
-     * Track the selectedSellingPlan within the hook. If `initialSellingPlanId`
-     * is passed, use that as an initial value. Look it up from the `selectedVariant`, since
-     * that is also a requirement.
-     */
-    const [selectedSellingPlan, setSelectedSellingPlan] = useState(undefined);
-    const selectedSellingPlanAllocation = useMemo(() => {
-        if (!selectedVariant || !selectedSellingPlan) {
-            return;
-        }
-        if (!selectedVariant.sellingPlanAllocations) {
-            throw new Error(`You must include sellingPlanAllocations in your variants in order to calculate selectedSellingPlanAllocation`);
-        }
-        return flattenConnection(selectedVariant.sellingPlanAllocations).find(
-        // @ts-ignore The types here are broken on main, need to come back and fix them sometime
-        (allocation) => allocation.sellingPlan.id === selectedSellingPlan.id);
-    }, [selectedVariant, selectedSellingPlan]);
-    return {
-        // @ts-ignore The types here are broken on main, need to come back and fix them sometime
-        variants,
-        // @ts-ignore The types here are broken on main, need to come back and fix them sometime
-        variantsConnection,
-        options,
-        // @ts-ignore The types here are broken on main, need to come back and fix them sometime
-        selectedVariant,
-        setSelectedVariant,
-        selectedOptions,
-        setSelectedOption,
-        setSelectedOptions,
-        isOptionInStock,
-        selectedSellingPlan,
-        setSelectedSellingPlan,
-        selectedSellingPlanAllocation,
-        // @ts-ignore The types here are broken on main, need to come back and fix them sometime
-        sellingPlanGroups,
-        // @ts-ignore The types here are broken on main, need to come back and fix them sometime
-        sellingPlanGroupsConnection,
-    };
+import { useContext } from 'react';
+import { ProductOptionsContext } from '../../components/ProductOptionsProvider/context';
+export function useProductOptions() {
+    const context = useContext(ProductOptionsContext);
+    if (!context) {
+        throw new Error(`'useProductOptions' must be a child of <ProductOptionsProvider/>`);
+    }
+    return context;
 }

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

@@ -1,7 +1,6 @@
 import { useShop } from '../../foundation/useShop';
 import { getLoggerWithContext } from '../../utilities/log';
 import { graphqlRequestBody } from '../../utilities';
-import { getConfig } from '../../framework/config';
 import { useServerRequest } from '../../foundation/ServerRequestProvider';
 import { injectGraphQLTracker } from '../../utilities/graphql-tracker';
 import { sendMessageToClient } from '../../utilities/devtools';
@@ -40,15 +39,22 @@ export function useShopQuery({ query, variables = {}, cache, preload = false, })
     const log = getLoggerWithContext(serverRequest);
     const body = query ? graphqlRequestBody(query, variables) : '';
     const { url, requestInit } = useCreateShopRequest(body); // eslint-disable-line react-hooks/rules-of-hooks
+    let text;
     let data;
     let useQueryError;
     try {
-        data = fetchSync(url, {
+        text = fetchSync(url, {
             ...requestInit,
             cache,
             preload,
             shouldCacheResponse,
-        }).json();
+        }).text();
+        try {
+            data = JSON.parse(text);
+        }
+        catch (error) {
+            useQueryError = new Error('Unable to parse response:\n' + text);
+        }
     }
     catch (error) {
         // Pass-through thrown promise for Suspense functionality
@@ -64,7 +70,7 @@ export function useShopQuery({ query, variables = {}, cache, preload = false, })
         const errorMessage = createErrorMessage(useQueryError);
         log.error(errorMessage);
         log.error(useQueryError);
-        if (getConfig().dev) {
+        if (__HYDROGEN_DEV__ && !__HYDROGEN_TEST__) {
             throw new Error(errorMessage);
         }
         else {
@@ -79,7 +85,7 @@ export function useShopQuery({ query, variables = {}, cache, preload = false, })
     if (data === null || data === void 0 ? void 0 : data.errors) {
         const errors = Array.isArray(data.errors) ? data.errors : [data.errors];
         for (const error of errors) {
-            if (getConfig().dev) {
+            if (__HYDROGEN_DEV__ && !__HYDROGEN_TEST__) {
                 throw new Error(error.message);
             }
             else {
@@ -88,7 +94,7 @@ export function useShopQuery({ query, variables = {}, cache, preload = false, })
         }
         log.error(`GraphQL errors: ${errors.length}`);
     }
-    if (__DEV__ &&
+    if (__HYDROGEN_DEV__ &&
         log.options().showUnusedQueryProperties &&
         query &&
         (data === null || data === void 0 ? void 0 : data.data)) {

package/dist/esnext/index.d.ts

@@ -16,12 +16,16 @@ export * from './foundation/useServerProps';
 export { FileRoutes } from './foundation/FileRoutes/FileRoutes.server';
 export { Route } from './foundation/Route/Route.server';
 export { Router } from './foundation/Router/Router.server';
-export { log, setLogger, setLoggerOptions, Logger } from './utilities/log';
+export { log, type Logger } from './utilities/log';
 export { LocalizationProvider } from './components/LocalizationProvider/LocalizationProvider.server';
 export { ShopifyProvider } from './foundation/ShopifyProvider/ShopifyProvider.server';
-export { generateCacheControlHeader, NoStore, CacheSeconds, CacheMinutes, CacheHours, CacheDays, CacheWeeks, CacheMonths, CacheCustom, } from './framework/CachingStrategy';
+export { generateCacheControlHeader, NoStore, CacheSeconds, CacheMinutes, CacheHours, CacheDays, CacheWeeks, CacheMonths, CacheCustom, } from './foundation/Cache/strategies';
+export { useRequestContext } from './foundation/useRequestContext';
 export { useServerAnalytics } from './foundation/Analytics/hook';
-export * as PerformanceMetricsServerAnalyticsConnector from './foundation/Analytics/connectors/PerformanceMetrics/PerformanceMetrics.server';
+export { ShopifyAnalytics } from './foundation/Analytics/connectors/Shopify/ShopifyAnalytics.server';
+export { ShopifyAnalyticsConstants } from './foundation/Analytics/connectors/Shopify/const';
+export * as ShopifyServerAnalyticsConnector from './foundation/Analytics/connectors/Shopify/ServerAnalyticsConnector.server';
+export * as PerformanceMetricsServerAnalyticsConnector from './foundation/Analytics/connectors/PerformanceMetrics/ServerAnalyticsConnector.server';
 export { useSession } from './foundation/useSession/useSession';
 export { CookieSessionStorage } from './foundation/CookieSessionStorage/CookieSessionStorage';
 export { MemorySessionStorage } from './foundation/MemorySessionStorage/MemorySessionStorage';
@@ -35,3 +39,5 @@ export { CartQuery } from './components/CartProvider/cart-queries';
  * Override the client version of `fetchSync` with the server version.
  */
 export { fetchSync } from './foundation/fetchSync/server/fetchSync';
+export { type HydrogenRequest } from './foundation/HydrogenRequest/HydrogenRequest.server';
+export { type HydrogenResponse } from './foundation/HydrogenResponse/HydrogenResponse.server';

package/dist/esnext/index.js

@@ -16,12 +16,16 @@ export * from './foundation/useServerProps';
 export { FileRoutes } from './foundation/FileRoutes/FileRoutes.server';
 export { Route } from './foundation/Route/Route.server';
 export { Router } from './foundation/Router/Router.server';
-export { log, setLogger, setLoggerOptions } from './utilities/log';
+export { log } from './utilities/log';
 export { LocalizationProvider } from './components/LocalizationProvider/LocalizationProvider.server';
 export { ShopifyProvider } from './foundation/ShopifyProvider/ShopifyProvider.server';
-export { generateCacheControlHeader, NoStore, CacheSeconds, CacheMinutes, CacheHours, CacheDays, CacheWeeks, CacheMonths, CacheCustom, } from './framework/CachingStrategy';
+export { generateCacheControlHeader, NoStore, CacheSeconds, CacheMinutes, CacheHours, CacheDays, CacheWeeks, CacheMonths, CacheCustom, } from './foundation/Cache/strategies';
+export { useRequestContext } from './foundation/useRequestContext';
 export { useServerAnalytics } from './foundation/Analytics/hook';
-export * as PerformanceMetricsServerAnalyticsConnector from './foundation/Analytics/connectors/PerformanceMetrics/PerformanceMetrics.server';
+export { ShopifyAnalytics } from './foundation/Analytics/connectors/Shopify/ShopifyAnalytics.server';
+export { ShopifyAnalyticsConstants } from './foundation/Analytics/connectors/Shopify/const';
+export * as ShopifyServerAnalyticsConnector from './foundation/Analytics/connectors/Shopify/ServerAnalyticsConnector.server';
+export * as PerformanceMetricsServerAnalyticsConnector from './foundation/Analytics/connectors/PerformanceMetrics/ServerAnalyticsConnector.server';
 export { useSession } from './foundation/useSession/useSession';
 export { CookieSessionStorage } from './foundation/CookieSessionStorage/CookieSessionStorage';
 export { MemorySessionStorage } from './foundation/MemorySessionStorage/MemorySessionStorage';