@shopify/hydrogen 0.7.0 → 0.8.2

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

@@ -7,7 +7,7 @@ export interface CartEstimatedCostProps {
     children?: React.ReactNode;
 }
 /**
- * The [CartEstimatedCost](/api/storefront/reference/cart/cartestimatedcost) component renders a `Money` component with the
+ * The `CartEstimatedCost` component renders a `Money` component with the
  * cost associated with the `amountType` prop. If no `amountType` prop is specified, then it defaults to `totalAmount`.
  * If `children` is a function, then it will pass down the render props provided by the parent component.
  */

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

@@ -2,7 +2,7 @@ import React from 'react';
 import { useCart } from '../CartProvider';
 import { Money } from '../Money';
 /**
- * The [CartEstimatedCost](/api/storefront/reference/cart/cartestimatedcost) component renders a `Money` component with the
+ * The `CartEstimatedCost` component renders a `Money` component with the
  * cost associated with the `amountType` prop. If no `amountType` prop is specified, then it defaults to `totalAmount`.
  * If `children` is a function, then it will pass down the render props provided by the parent component.
  */

package/dist/esnext/components/CartLineProvider/context.d.ts

@@ -6,7 +6,7 @@ export declare const CartLineContext: import("react").Context<({
     } & Pick<import("../../graphql/types/types").Attribute, "key" | "value">)[];
     merchandise: {
         __typename?: "ProductVariant" | undefined;
-    } & Pick<import("../../graphql/types/types").ProductVariant, "title" | "id" | "availableForSale" | "requiresShipping"> & {
+    } & Pick<import("../../graphql/types/types").ProductVariant, "id" | "title" | "availableForSale" | "requiresShipping"> & {
         compareAtPriceV2?: import("../../graphql/types/types").Maybe<{
             __typename?: "MoneyV2" | undefined;
         } & {
@@ -21,12 +21,12 @@ export declare const CartLineContext: import("react").Context<({
             __typename?: "Image" | undefined;
         } & {
             __typename?: "Image" | undefined;
-        } & Pick<import("../../graphql/types/types").Image, "height" | "width" | "url" | "id" | "altText">> | undefined;
+        } & Pick<import("../../graphql/types/types").Image, "id" | "height" | "width" | "url" | "altText">> | undefined;
         product: {
             __typename?: "Product" | undefined;
         } & Pick<import("../../graphql/types/types").Product, "title" | "handle">;
         selectedOptions: ({
             __typename?: "SelectedOption" | undefined;
-        } & Pick<import("../../graphql/types/types").SelectedOption, "value" | "name">)[];
+        } & Pick<import("../../graphql/types/types").SelectedOption, "name" | "value">)[];
     };
 }) | null>;

package/dist/esnext/components/CartLineQuantityAdjustButton/CartLineQuantityAdjustButton.js

@@ -17,6 +17,10 @@ export function CartLineQuantityAdjustButton(props) {
                 return;
             }
             const quantity = adjust === 'decrease' ? cartLine.quantity - 1 : cartLine.quantity + 1;
+            if (quantity <= 0) {
+                removeLines([cartLine.id]);
+                return;
+            }
             updateLines([{ id: cartLine.id, quantity }]);
         }, ...passthroughProps }, children));
 }

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

@@ -417,7 +417,6 @@ export function CartProvider({ children, numCartLines, onCreate, onLineAdd, onLi
             return;
         }
         buyerIdentityUpdate({ countryCode }, state);
-        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [countryCode]);
     const cartContextValue = useMemo(() => {
         return {

package/dist/esnext/components/ExternalVideo/ExternalVideo.d.ts

@@ -22,5 +22,5 @@ export declare function ExternalVideo<TTag extends React.ElementType = 'iframe'>
 export declare namespace ExternalVideo {
     var Fragment: string;
 }
-export declare const ExternalVideoFragment: string;
+export declare const ExternalVideoFragment = "fragment ExternalVideoFragment on ExternalVideo {\n  id\n  embeddedUrl\n  host\n}\n\n";
 export {};

package/dist/esnext/components/Image/Image.d.ts

@@ -38,5 +38,5 @@ export declare function Image<TTag extends React.ElementType = 'img'>(props: Pro
 export declare namespace Image {
     var Fragment: string;
 }
-export declare const ImageFragment: string;
+export declare const ImageFragment = "fragment ImageFragment on Image {\n  id\n  url\n  altText\n  width\n  height\n}\n\n";
 export {};

package/dist/esnext/components/LocalizationProvider/index.d.ts

@@ -1,2 +1,3 @@
+export { LocalizationProvider } from './LocalizationProvider.server';
 export { useCountry } from '../../hooks/useCountry/useCountry';
 export { useAvailableCountries } from '../../hooks/useAvailableCountries/useAvailableCountries';

package/dist/esnext/components/LocalizationProvider/index.js

@@ -1,2 +1,3 @@
+export { LocalizationProvider } from './LocalizationProvider.server';
 export { useCountry } from '../../hooks/useCountry/useCountry';
 export { useAvailableCountries } from '../../hooks/useAvailableCountries/useAvailableCountries';

package/dist/esnext/components/MediaFile/MediaFile.d.ts

@@ -24,5 +24,5 @@ export declare function MediaFile({ media, options, ...passthroughProps }: Media
 export declare namespace MediaFile {
     var Fragment: string;
 }
-export declare const MediaFileFragment: string;
+export declare const MediaFileFragment = "\nfragment MediaFileFragment on Media {\n  ... on MediaImage {\n    mediaContentType\n    image {\n      ...ImageFragment\n    }\n  }\n  ... on Video {\n    mediaContentType\n    ...VideoFragment\n  }\n  ... on ExternalVideo {\n    mediaContentType\n    ...ExternalVideoFragment\n  }\n  ... on Model3d {\n    mediaContentType\n    ...Model3DFragment\n  }\n}\n\nfragment ImageFragment on Image {\n  id\n  url\n  altText\n  width\n  height\n}\n\nfragment VideoFragment on Video {\n  id\n  previewImage {\n    url\n  }\n  sources {\n    mimeType\n    url\n  }\n}\n\nfragment ExternalVideoFragment on ExternalVideo {\n  id\n  embeddedUrl\n  host\n}\n\nfragment Model3DFragment on Model3d {\n  id\n  alt\n  mediaContentType\n  previewImage {\n    url\n  }\n  sources {\n    url\n  }\n}\n";
 export {};

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

@@ -22,4 +22,4 @@ export declare function Metafield<TTag extends ElementType>(props: Props<TTag> &
 export declare namespace Metafield {
     var Fragment: string;
 }
-export declare const MetafieldFragment: string;
+export declare const MetafieldFragment = "\nfragment MetafieldFragment on Metafield {\n  id\n  type\n  namespace\n  key\n  value\n  createdAt\n  updatedAt\n  description\n  reference @include(if: $includeReferenceMetafieldDetails) {\n    __typename\n    ... on MediaImage {\n      id\n      mediaContentType\n      image {\n        ...ImageFragment\n      }\n    }\n  }\n}\nfragment ImageFragment on Image {\n  id\n  url\n  altText\n  width\n  height\n}\n";

package/dist/esnext/components/Metafield/components/StarRating/StarRating.d.ts

@@ -8,5 +8,5 @@ export interface StarRatingProps {
 }
 export declare function StarRating<TTag extends ElementType>(props: Props<TTag> & StarRatingProps): JSX.Element;
 export declare function Star({ percentFilled }: {
-    percentFilled: Number;
+    percentFilled: number;
 }): JSX.Element;

package/dist/esnext/components/Metafield/index.d.ts

@@ -1,3 +1,3 @@
 export { Metafield, MetafieldFragment } from './Metafield.client';
-export { MetafieldType } from './types';
-export { MetafieldFragmentFragment } from './MetafieldFragment';
+export type { MetafieldType } from './types';
+export type { MetafieldFragmentFragment } from './MetafieldFragment';

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

@@ -134,5 +134,5 @@ export declare function Model3D<TTag extends ElementType>(props: Props<TTag, Pro
 export declare namespace Model3D {
     var Fragment: string;
 }
-export declare const Model3DFragment: string;
+export declare const Model3DFragment = "fragment Model3DFragment on Model3d {\n  id\n  alt\n  mediaContentType\n  previewImage {\n    url\n  }\n  sources {\n    url\n  }\n}\n\n";
 export {};

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

@@ -19,4 +19,4 @@ export declare function Money<TTag extends ElementType>(props: Props<TTag> & Mon
 export declare namespace Money {
     var Fragment: string;
 }
-export declare const MoneyFragment: string;
+export declare const MoneyFragment = "fragment MoneyFragment on MoneyV2 {\n  currencyCode\n  amount\n}\n";

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

@@ -8,8 +8,6 @@ export interface ProductPriceProps {
 }
 /**
  * The `ProductPrice` component renders a `Money` component with the product
- * [`priceRange`](/api/storefront/reference/products/productpricerange)'s `maxVariantPrice`
- * or `minVariantPrice`, for either the regular price or compare at price range.
- * It must be a descendent of the `ProductProvider` component.
+ * [`priceRange`](/api/storefront/reference/products/productpricerange)'s `maxVariantPrice` or `minVariantPrice`, for either the regular price or compare at price range. It must be a descendent of the `ProductProvider` component.
  */
 export declare function ProductPrice<TTag extends ElementType>(props: Props<TTag> & ProductPriceProps): JSX.Element | null;

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

@@ -3,9 +3,7 @@ import { Money } from '../Money';
 import { useProduct } from '../ProductProvider';
 /**
  * The `ProductPrice` component renders a `Money` component with the product
- * [`priceRange`](/api/storefront/reference/products/productpricerange)'s `maxVariantPrice`
- * or `minVariantPrice`, for either the regular price or compare at price range.
- * It must be a descendent of the `ProductProvider` component.
+ * [`priceRange`](/api/storefront/reference/products/productpricerange)'s `maxVariantPrice` or `minVariantPrice`, for either the regular price or compare at price range. It must be a descendent of the `ProductProvider` component.
  */
 export function ProductPrice(props) {
     var _a, _b, _c, _d;

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

@@ -15,4 +15,4 @@ export declare function ProductProvider({ children, product, initialVariantId, }
 export declare namespace ProductProvider {
     var Fragment: string;
 }
-export declare const ProductProviderFragment: string;
+export declare const ProductProviderFragment = "\nfragment ProductProviderFragment on Product  {\n  compareAtPriceRange {\n    maxVariantPrice {\n      ...MoneyFragment\n    }\n    minVariantPrice {\n      ...MoneyFragment\n    }\n  }\n  descriptionHtml\n  handle\n  id\n  media(first: $numProductMedia) {\n    edges {\n      node {\n        ...MediaFileFragment\n      }\n    }\n  }\n  metafields(first: $numProductMetafields) {\n    edges {\n      node {\n        ...MetafieldFragment\n      }\n    }\n  }\n  priceRange {\n    maxVariantPrice {\n      ...MoneyFragment\n    }\n    minVariantPrice {\n      ...MoneyFragment\n    }\n  }\n  title\n  variants(first: $numProductVariants) {\n    edges {\n      node {\n        ...VariantFragment\n      }\n    }\n  }\n  sellingPlanGroups(first: $numProductSellingPlanGroups) {\n    edges {\n      node {\n        ...SellingPlanGroupsFragment\n      }\n    }\n  }\n}\n\n\nfragment MediaFileFragment on Media {\n  ... on MediaImage {\n    mediaContentType\n    image {\n      ...ImageFragment\n    }\n  }\n  ... on Video {\n    mediaContentType\n    ...VideoFragment\n  }\n  ... on ExternalVideo {\n    mediaContentType\n    ...ExternalVideoFragment\n  }\n  ... on Model3d {\n    mediaContentType\n    ...Model3DFragment\n  }\n}\n\n\nfragment MetafieldFragment on Metafield {\n  id\n  type\n  namespace\n  key\n  value\n  createdAt\n  updatedAt\n  description\n  reference @include(if: $includeReferenceMetafieldDetails) {\n    __typename\n    ... on MediaImage {\n      id\n      mediaContentType\n      image {\n        ...ImageFragment\n      }\n    }\n  }\n}\n\nfragment VariantFragment on ProductVariant {\n  id\n  title\n  availableForSale\n  image {\n    ...ImageFragment\n  }\n  ...UnitPriceFragment\n  priceV2 {\n    ...MoneyFragment\n  }\n  compareAtPriceV2 {\n    ...MoneyFragment\n  }\n  selectedOptions {\n    name\n    value\n  }\n  metafields(first: $numProductVariantMetafields) {\n    edges {\n      node {\n        ...MetafieldFragment\n      }\n    }\n  }\n  sellingPlanAllocations(first: $numProductVariantSellingPlanAllocations) {\n    edges {\n      node {\n        priceAdjustments {\n          compareAtPrice {\n            ...MoneyFragment\n          }\n          perDeliveryPrice {\n            ...MoneyFragment\n          }\n          price {\n            ...MoneyFragment\n          }\n          unitPrice {\n            ...MoneyFragment\n          }\n        }\n        sellingPlan {\n          ...SellingPlanFragment\n        }\n      }\n    }\n  }\n}\n\n\nfragment SellingPlanGroupsFragment on SellingPlanGroup {\n  sellingPlans(first:$numProductSellingPlans) {\n    edges {\n      node {\n        ...SellingPlanFragment\n      }\n    }\n  }\n  appName\n  name\n  options {\n    name\n    values\n  }\n}\nfragment MoneyFragment on MoneyV2 {\n  currencyCode\n  amount\n}\nfragment ImageFragment on Image {\n  id\n  url\n  altText\n  width\n  height\n}\n\nfragment VideoFragment on Video {\n  id\n  previewImage {\n    url\n  }\n  sources {\n    mimeType\n    url\n  }\n}\n\nfragment ExternalVideoFragment on ExternalVideo {\n  id\n  embeddedUrl\n  host\n}\n\nfragment Model3DFragment on Model3d {\n  id\n  alt\n  mediaContentType\n  previewImage {\n    url\n  }\n  sources {\n    url\n  }\n}\n\nfragment ImageFragment on Image {\n  id\n  url\n  altText\n  width\n  height\n}\n\n\nfragment SellingPlanFragment on SellingPlan {\n  id\n  description\n  name\n  options {\n    name\n    value\n  }\n  priceAdjustments {\n    orderCount\n    adjustmentValue {\n      ...on SellingPlanFixedAmountPriceAdjustment {\n        adjustmentAmount {\n          ...MoneyFragment\n        }\n      }\n      ...on SellingPlanFixedPriceAdjustment {\n        price {\n          ...MoneyFragment\n        }\n      }\n      ...on SellingPlanPercentagePriceAdjustment {\n        adjustmentPercentage\n      }\n    }\n  }\n  recurringDeliveries\n}\nfragment MoneyFragment on MoneyV2 {\n  currencyCode\n  amount\n}\nfragment ImageFragment on Image {\n  id\n  url\n  altText\n  width\n  height\n}\n\n\nfragment UnitPriceFragment on ProductVariant {\n  unitPriceMeasurement {\n    measuredType\n    quantityUnit\n    quantityValue\n    referenceUnit\n    referenceValue\n  }\n  unitPrice {\n    ...MoneyFragment\n  }\n}\nfragment MoneyFragment on MoneyV2 {\n  currencyCode\n  amount\n}\nfragment MoneyFragment on MoneyV2 {\n  currencyCode\n  amount\n}\n\nfragment SellingPlanFragment on SellingPlan {\n  id\n  description\n  name\n  options {\n    name\n    value\n  }\n  priceAdjustments {\n    orderCount\n    adjustmentValue {\n      ...on SellingPlanFixedAmountPriceAdjustment {\n        adjustmentAmount {\n          ...MoneyFragment\n        }\n      }\n      ...on SellingPlanFixedPriceAdjustment {\n        price {\n          ...MoneyFragment\n        }\n      }\n      ...on SellingPlanPercentagePriceAdjustment {\n        adjustmentPercentage\n      }\n    }\n  }\n  recurringDeliveries\n}\nfragment MoneyFragment on MoneyV2 {\n  currencyCode\n  amount\n}";

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

@@ -11,7 +11,7 @@ export function ShopPayButton({ variantIds, className }) {
     const { storeDomain } = useShop();
     useEffect(() => {
         const ids = variantIds.reduce((accumulator, gid) => {
-            const id = atob(gid).split('/').pop();
+            const id = gid.split('/').pop();
             if (id) {
                 accumulator.push(id);
             }

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

@@ -13,8 +13,7 @@ export interface UnitPriceProps {
 }
 /**
  * The `UnitPrice` component renders a string with a [UnitPrice](/themes/pricing-payments/unit-pricing) as the
- * [Storefront API's `MoneyV2` object](/api/storefront/reference/common-objects/moneyv2) with a reference unit from
- * the [Storefront API's `UnitPriceMeasurement` object](/api/storefront/reference/products/unitpricemeasurement).
+ * [Storefront API's `MoneyV2` object](/api/storefront/reference/common-objects/moneyv2) with a reference unit from the [Storefront API's `UnitPriceMeasurement` object](/api/storefront/reference/products/unitpricemeasurement).
  *
  * If `children` is a function, then it will provide render props for the `children` corresponding to the object
  * returned by the `useMoney` hook and the `UnitPriceMeasurement` object.
@@ -23,4 +22,4 @@ export declare function UnitPrice<TTag extends ElementType>(props: Props<TTag> &
 export declare namespace UnitPrice {
     var Fragment: string;
 }
-export declare const UnitPriceFragment: string;
+export declare const UnitPriceFragment = "\nfragment UnitPriceFragment on ProductVariant {\n  unitPriceMeasurement {\n    measuredType\n    quantityUnit\n    quantityValue\n    referenceUnit\n    referenceValue\n  }\n  unitPrice {\n    ...MoneyFragment\n  }\n}\nfragment MoneyFragment on MoneyV2 {\n  currencyCode\n  amount\n}";

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

@@ -4,8 +4,7 @@ import { Money } from '../Money';
 import { UnitPriceFragment as Fragment } from '../../graphql/graphql-constants';
 /**
  * The `UnitPrice` component renders a string with a [UnitPrice](/themes/pricing-payments/unit-pricing) as the
- * [Storefront API's `MoneyV2` object](/api/storefront/reference/common-objects/moneyv2) with a reference unit from
- * the [Storefront API's `UnitPriceMeasurement` object](/api/storefront/reference/products/unitpricemeasurement).
+ * [Storefront API's `MoneyV2` object](/api/storefront/reference/common-objects/moneyv2) with a reference unit from the [Storefront API's `UnitPriceMeasurement` object](/api/storefront/reference/products/unitpricemeasurement).
  *
  * If `children` is a function, then it will provide render props for the `children` corresponding to the object
  * returned by the `useMoney` hook and the `UnitPriceMeasurement` object.

package/dist/esnext/components/Video/Video.d.ts

@@ -19,4 +19,4 @@ export declare function Video<TTag extends React.ElementType = 'video'>(props: P
 export declare namespace Video {
     var Fragment: string;
 }
-export declare const VideoFragment: string;
+export declare const VideoFragment = "fragment VideoFragment on Video {\n  id\n  previewImage {\n    url\n  }\n  sources {\n    mimeType\n    url\n  }\n}\n\n";

package/dist/esnext/components/index.d.ts

@@ -15,8 +15,8 @@ export type { Model3DProps } from './Model3D';
 export { Model3D } from './Model3D';
 export type { MoneyProps } from './Money';
 export { Money } from './Money';
-export { Metafield, MetafieldFragmentFragment } from './Metafield';
-export type { MetafieldType } from './Metafield';
+export { Metafield } from './Metafield';
+export type { MetafieldType, MetafieldFragmentFragment } from './Metafield';
 export { CartLineProvider, useCartLine } from './CartLineProvider';
 export { CartLineImage } from './CartLineImage';
 export { CartLinePrice } from './CartLinePrice';
@@ -28,6 +28,7 @@ export { CartLines } from './CartLines';
 export { CartCheckoutButton } from './CartCheckoutButton';
 export { CartShopPayButton } from './CartShopPayButton';
 export { CartEstimatedCost } from './CartEstimatedCost';
+export { CartLineSelectedOptions } from './CartLineSelectedOptions';
 export { CartProvider, useCart, useCartAttributesUpdateCallback, useCartBuyerIdentityUpdateCallback, useCartNoteUpdateCallback, useCartCheckoutUrl, useCartCreateCallback, useCartDiscountCodesUpdateCallback, useCartFetch, useCartLinesAddCallback, useCartLinesRemoveCallback, useCartLinesTotalQuantity, useCartLinesUpdateCallback, useInstantCheckout, } from './CartProvider';
 export type { State, Status, Cart, CartWithActions, CartAction, } from './CartProvider';
 export { ProductProvider, useProduct, ProductProviderFragment, } from './ProductProvider';

package/dist/esnext/components/index.js

@@ -19,6 +19,7 @@ export { CartLines } from './CartLines';
 export { CartCheckoutButton } from './CartCheckoutButton';
 export { CartShopPayButton } from './CartShopPayButton';
 export { CartEstimatedCost } from './CartEstimatedCost';
+export { CartLineSelectedOptions } from './CartLineSelectedOptions';
 export { CartProvider, useCart, useCartAttributesUpdateCallback, useCartBuyerIdentityUpdateCallback, useCartNoteUpdateCallback, useCartCheckoutUrl, useCartCreateCallback, useCartDiscountCodesUpdateCallback, useCartFetch, useCartLinesAddCallback, useCartLinesRemoveCallback, useCartLinesTotalQuantity, useCartLinesUpdateCallback, useInstantCheckout, } from './CartProvider';
 export { ProductProvider, useProduct, ProductProviderFragment, } from './ProductProvider';
 export { ProductDescription } from './ProductDescription';

package/dist/esnext/entry-client.js

@@ -6,7 +6,6 @@ import { ErrorBoundary } from 'react-error-boundary';
 import { HelmetProvider } from 'react-helmet-async';
 import { useServerResponse } from './framework/Hydration/Cache.client';
 import { ServerStateProvider, ServerStateRouter } from './client';
-import { QueryProvider } from './hooks';
 const renderHydrogen = async (ClientWrapper) => {
     const root = document.getElementById('root');
     if (!root) {
@@ -25,11 +24,10 @@ function Content({ clientWrapper: ClientWrapper }) {
     });
     const response = useServerResponse(serverState);
     return (React.createElement(ServerStateProvider, { serverState: serverState, setServerState: setServerState },
-        React.createElement(QueryProvider, null,
-            React.createElement(HelmetProvider, null,
-                React.createElement(BrowserRouter, null,
-                    React.createElement(ServerStateRouter, null),
-                    React.createElement(ClientWrapper, null, response.read()))))));
+        React.createElement(HelmetProvider, null,
+            React.createElement(BrowserRouter, null,
+                React.createElement(ServerStateRouter, null),
+                React.createElement(ClientWrapper, null, response.read())))));
 }
 function Error({ error }) {
     return (React.createElement("div", { style: { padding: '1em' } },

package/dist/esnext/entry-server.js

@@ -1,7 +1,11 @@
 import React from 'react';
-import { renderToReadableStream, pipeToNodeWritable,
+import { 
 // @ts-ignore
- } from 'react-dom/unstable-fizz';
+renderToPipeableStream, // Only available in Node context
+// @ts-ignore
+renderToReadableStream, // Only available in Browser/Worker context
+ } from 'react-dom/server';
+import { logServerResponse, getLoggerFromContext, } from './utilities/log/log';
 import { renderToString } from 'react-dom/server';
 import { getErrorMarkup } from './utilities/error';
 import ssrPrepass from 'react-ssr-prepass';
@@ -12,8 +16,8 @@ import { HelmetProvider } from 'react-helmet-async';
 import { Html } from './framework/Hydration/Html';
 import { HydrationWriter } from './framework/Hydration/writer.server';
 import { ServerComponentResponse } from './framework/Hydration/ServerComponentResponse.server';
-import { dehydrate } from 'react-query/hydration';
 import { getCacheControlHeader } from './framework/cache';
+import { RenderCacheProvider } from './foundation/RenderCacheProvider';
 /**
  * react-dom/unstable-fizz provides different entrypoints based on runtime:
  * - `renderToReadableStream` for "browser" (aka worker)
@@ -33,7 +37,8 @@ const renderHydrogen = (App, hook) => {
      * NOTE: This is currently only used for SEO bots or Worker runtime (where Stream is not yet supported).
      */
     const render = async function (url, { context, request, isReactHydrationRequest, dev }) {
-        var _a, _b;
+        var _a, _b, _c, _d, _f;
+        const log = getLoggerFromContext(request);
         const state = isReactHydrationRequest
             ? JSON.parse((_b = (_a = url.searchParams) === null || _a === void 0 ? void 0 : _a.get('state')) !== null && _b !== void 0 ? _b : '{}')
             : { pathname: url.pathname, search: url.search };
@@ -43,8 +48,10 @@ const renderHydrogen = (App, hook) => {
             context,
             request,
             dev,
+            log,
         });
-        const body = await renderApp(ReactApp, state, isReactHydrationRequest);
+        const body = await renderApp(ReactApp, state, log, isReactHydrationRequest);
+        logServerResponse('ssr', log, request, (_f = (_d = (_c = componentResponse.customStatus) === null || _c === void 0 ? void 0 : _c.code) !== null && _d !== void 0 ? _d : componentResponse.status) !== null && _f !== void 0 ? _f : 200);
         if (componentResponse.customBody) {
             return { body: await componentResponse.customBody, url, componentResponse };
         }
@@ -62,6 +69,7 @@ const renderHydrogen = (App, hook) => {
      * information, so this method should not be used by crawlers.
      */
     const stream = function (url, { context, request, response, template, dev }) {
+        const log = getLoggerFromContext(request);
         const state = { pathname: url.pathname, search: url.search };
         const { ReactApp, componentResponse } = buildReactApp({
             App,
@@ -69,34 +77,36 @@ const renderHydrogen = (App, hook) => {
             context,
             request,
             dev,
+            log,
         });
         response.socket.on('error', (error) => {
-            console.error('Fatal', error);
+            log.fatal(error);
         });
         let didError;
         const head = template.match(/<head>(.+?)<\/head>/s)[1];
-        const { startWriting, abort } = pipeToNodeWritable(React.createElement(Html, { head: head },
-            React.createElement(ReactApp, { ...state })), response, {
-            onReadyToStream() {
+        const { pipe, abort } = renderToPipeableStream(React.createElement(Html, { head: head },
+            React.createElement(ReactApp, { ...state })), {
+            onCompleteShell() {
                 /**
                  * TODO: This assumes `response.cache()` has been called _before_ any
                  * queries which might be caught behind Suspense. Clarify this or add
                  * additional checks downstream?
                  */
                 response.setHeader(getCacheControlHeader({ dev }), componentResponse.cacheControlHeader);
-                writeHeadToServerResponse(response, componentResponse, didError);
+                writeHeadToServerResponse(request, response, componentResponse, log, didError);
                 if (isRedirect(response)) {
                     // Return redirects early without further rendering/streaming
                     return response.end();
                 }
                 if (!componentResponse.canStream())
                     return;
-                startWritingHtmlToServerResponse(response, startWriting, dev ? didError : undefined);
+                startWritingHtmlToServerResponse(response, pipe, dev ? didError : undefined);
             },
             onCompleteAll() {
+                clearTimeout(streamTimeout);
                 if (componentResponse.canStream() || response.writableEnded)
                     return;
-                writeHeadToServerResponse(response, componentResponse, didError);
+                writeHeadToServerResponse(request, response, componentResponse, log, didError);
                 if (isRedirect(response)) {
                     // Redirects found after any async code
                     return response.end();
@@ -110,7 +120,7 @@ const renderHydrogen = (App, hook) => {
                     }
                 }
                 else {
-                    startWritingHtmlToServerResponse(response, startWriting, dev ? didError : undefined);
+                    startWritingHtmlToServerResponse(response, pipe, dev ? didError : undefined);
                 }
             },
             onError(error) {
@@ -120,15 +130,23 @@ const renderHydrogen = (App, hook) => {
                     // Delay this error until headers are properly sent.
                     response.write(getErrorMarkup(error));
                 }
-                console.error(error);
+                log.error(error);
             },
         });
-        setTimeout(abort, STREAM_ABORT_TIMEOUT_MS);
+        const streamTimeout = setTimeout(() => {
+            const errorMessage = `The app failed to stream after ${STREAM_ABORT_TIMEOUT_MS} ms`;
+            log.error(errorMessage);
+            if (dev && response.headersSent) {
+                response.write(getErrorMarkup(new Error(errorMessage)));
+            }
+            abort();
+        }, STREAM_ABORT_TIMEOUT_MS);
     };
     /**
      * Stream a hydration response to the client.
      */
     const hydrate = function (url, { context, request, response, dev }) {
+        const log = getLoggerFromContext(request);
         const state = JSON.parse(url.searchParams.get('state') || '{}');
         const { ReactApp, componentResponse } = buildReactApp({
             App,
@@ -136,33 +154,41 @@ const renderHydrogen = (App, hook) => {
             context,
             request,
             dev,
+            log,
         });
         response.socket.on('error', (error) => {
-            console.error('Fatal', error);
+            log.fatal(error);
         });
         let didError;
         const writer = new HydrationWriter();
-        const { startWriting, abort } = pipeToNodeWritable(React.createElement(HydrationContext.Provider, { value: true },
-            React.createElement(ReactApp, { ...state })), writer, {
+        const { pipe, abort } = renderToPipeableStream(React.createElement(HydrationContext.Provider, { value: true },
+            React.createElement(ReactApp, { ...state })), {
             /**
              * When hydrating, we have to wait until `onCompleteAll` to avoid having
              * `template` and `script` tags inserted and rendered as part of the hydration response.
              */
             onCompleteAll() {
+                clearTimeout(renderTimeout);
                 // Tell React to start writing to the writer
-                startWriting();
+                pipe(writer);
                 // Tell React that the writer is ready to drain, which sometimes results in a last "chunk" being written.
                 writer.drain();
                 response.statusCode = didError ? 500 : 200;
                 response.setHeader(getCacheControlHeader({ dev }), componentResponse.cacheControlHeader);
                 response.end(generateWireSyntaxFromRenderedHtml(writer.toString()));
+                logServerResponse('rsc', log, request, response.statusCode);
             },
             onError(error) {
                 didError = error;
-                console.error(error);
+                log.error(error);
             },
         });
-        setTimeout(abort, STREAM_ABORT_TIMEOUT_MS);
+        const renderTimeout = setTimeout(() => {
+            const errorMessage = `The app failed to render RSC after ${STREAM_ABORT_TIMEOUT_MS} ms`;
+            didError = new Error(errorMessage);
+            log.error(errorMessage);
+            abort();
+        }, STREAM_ABORT_TIMEOUT_MS);
     };
     return {
         render,
@@ -170,12 +196,19 @@ const renderHydrogen = (App, hook) => {
         hydrate,
     };
 };
-function buildReactApp({ App, state, context, request, dev, }) {
+function buildReactApp({ App, state, context, request, dev, log, }) {
+    const renderCache = {};
     const helmetContext = {};
     const componentResponse = new ServerComponentResponse();
-    const ReactApp = (props) => (React.createElement(StaticRouter, { location: { pathname: state.pathname, search: state.search }, context: context },
-        React.createElement(HelmetProvider, { context: helmetContext },
-            React.createElement(App, { ...props, request: request, response: componentResponse }))));
+    const hydrogenServerProps = {
+        request,
+        response: componentResponse,
+        log,
+    };
+    const ReactApp = (props) => (React.createElement(RenderCacheProvider, { cache: renderCache },
+        React.createElement(StaticRouter, { location: { pathname: state.pathname, search: state.search }, context: context },
+            React.createElement(HelmetProvider, { context: helmetContext },
+                React.createElement(App, { ...props, ...hydrogenServerProps })))));
     return { helmetContext, ReactApp, componentResponse };
 }
 function extractHeadElements(helmetContext) {
@@ -201,27 +234,31 @@ function supportsReadableStream() {
         return false;
     }
 }
-async function renderApp(ReactApp, state, isReactHydrationRequest) {
+async function renderApp(ReactApp, state, log, isReactHydrationRequest) {
     /**
      * Temporary workaround until all Worker runtimes support ReadableStream
      */
     if (isWorker && !supportsReadableStream()) {
-        return renderAppFromStringWithPrepass(ReactApp, state, isReactHydrationRequest);
+        return renderAppFromStringWithPrepass(ReactApp, state, log, isReactHydrationRequest);
     }
     const app = isReactHydrationRequest ? (React.createElement(HydrationContext.Provider, { value: true },
         React.createElement(ReactApp, { ...state }))) : (React.createElement(ReactApp, { ...state }));
-    return renderAppFromBufferedStream(app, isReactHydrationRequest);
+    return renderAppFromBufferedStream(app, log, isReactHydrationRequest);
 }
-function renderAppFromBufferedStream(app, isReactHydrationRequest) {
+function renderAppFromBufferedStream(app, log, isReactHydrationRequest) {
     return new Promise((resolve, reject) => {
+        const errorTimeout = setTimeout(() => {
+            reject(new Error(`The app failed to SSR after ${STREAM_ABORT_TIMEOUT_MS} ms`));
+        }, STREAM_ABORT_TIMEOUT_MS);
         if (isWorker) {
             let isComplete = false;
             const stream = renderToReadableStream(app, {
                 onCompleteAll() {
+                    clearTimeout(errorTimeout);
                     isComplete = true;
                 },
                 onError(error) {
-                    console.error(error);
+                    log.error(error);
                     reject(error);
                 },
             });
@@ -252,14 +289,15 @@ function renderAppFromBufferedStream(app, isReactHydrationRequest) {
         }
         else {
             const writer = new HydrationWriter();
-            const { startWriting } = pipeToNodeWritable(app, writer, {
+            const { pipe } = renderToPipeableStream(app, {
                 /**
                  * When hydrating, we have to wait until `onCompleteAll` to avoid having
                  * `template` and `script` tags inserted and rendered as part of the hydration response.
                  */
                 onCompleteAll() {
+                    clearTimeout(errorTimeout);
                     // Tell React to start writing to the writer
-                    startWriting();
+                    pipe(writer);
                     // Tell React that the writer is ready to drain, which sometimes results in a last "chunk" being written.
                     writer.drain();
                     if (isReactHydrationRequest) {
@@ -270,7 +308,7 @@ function renderAppFromBufferedStream(app, isReactHydrationRequest) {
                     }
                 },
                 onError(error) {
-                    console.error(error);
+                    log.error(error);
                     reject(error);
                 },
             });
@@ -286,37 +324,28 @@ function renderAppFromBufferedStream(app, isReactHydrationRequest) {
  * use ssr-prepass to fetch all the queries once, store
  * the results in a context object, and re-render.
  */
-async function renderAppFromStringWithPrepass(ReactApp, state, isReactHydrationRequest) {
-    const hydrationContext = {};
+async function renderAppFromStringWithPrepass(ReactApp, state, log, isReactHydrationRequest) {
     const app = isReactHydrationRequest ? (React.createElement(HydrationContext.Provider, { value: true },
-        React.createElement(ReactApp, { hydrationContext: hydrationContext, ...state }))) : (React.createElement(ReactApp, { hydrationContext: hydrationContext, ...state }));
+        React.createElement(ReactApp, { ...state }))) : (React.createElement(ReactApp, { ...state }));
     await ssrPrepass(app);
-    /**
-     * Dehydrate all the queries made during the prepass above and store
-     * them in the context object to be used for the next render pass.
-     * This prevents rendering the Suspense fallback in `renderToString`.
-     */
-    if (hydrationContext.queryClient) {
-        hydrationContext.dehydratedState = dehydrate(hydrationContext.queryClient);
-    }
     const body = renderToString(app);
     return isReactHydrationRequest
         ? generateWireSyntaxFromRenderedHtml(body)
         : body;
 }
 export default renderHydrogen;
-function startWritingHtmlToServerResponse(response, startWriting, error) {
+function startWritingHtmlToServerResponse(response, pipe, error) {
     if (!response.headersSent) {
         response.setHeader('Content-type', 'text/html');
         response.write('<!DOCTYPE html>');
     }
-    startWriting();
+    pipe(response);
     if (error) {
         // This error was delayed until the headers were properly sent.
         response.write(getErrorMarkup(error));
     }
 }
-function writeHeadToServerResponse(response, { headers, status, customStatus }, error) {
+function writeHeadToServerResponse(request, response, { headers, status, customStatus }, log, error) {
     var _a, _b;
     if (response.headersSent)
         return;
@@ -330,6 +359,7 @@ function writeHeadToServerResponse(response, { headers, status, customStatus },
             response.statusMessage = customStatus.text;
         }
     }
+    logServerResponse('str', log, request, response.statusCode);
 }
 function isRedirect(response) {
     return response.statusCode >= 300 && response.statusCode < 400;

package/dist/esnext/foundation/RenderCacheProvider/RenderCacheContext.d.ts

@@ -0,0 +1,2 @@
+import type { RenderCacheProviderProps } from './types';
+export declare const RenderCacheContext: import("react").Context<RenderCacheProviderProps>;

package/dist/esnext/foundation/RenderCacheProvider/RenderCacheContext.js

@@ -0,0 +1,4 @@
+import { createContext } from 'react';
+export const RenderCacheContext = createContext({
+    cache: {},
+});

package/dist/esnext/foundation/RenderCacheProvider/RenderCacheProvider.d.ts

@@ -0,0 +1,2 @@
+import type { RenderCacheProviderProps } from './types';
+export declare function RenderCacheProvider({ cache, children, }: RenderCacheProviderProps): JSX.Element;

package/dist/esnext/foundation/RenderCacheProvider/RenderCacheProvider.js

@@ -0,0 +1,5 @@
+import React from 'react';
+import { RenderCacheContext } from './RenderCacheContext';
+export function RenderCacheProvider({ cache, children, }) {
+    return (React.createElement(RenderCacheContext.Provider, { value: { cache } }, children));
+}