@shopify/hydrogen 1.6.7 → 1.7.0

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

@@ -1,11 +1,13 @@
 import React, { useCallback, useEffect, useMemo, useRef, useState, useTransition, } from 'react';
-import { CountryCode, } from '../../storefront-api-types.js';
 import { defaultCartFragment } from './cart-queries.js';
 import { CartContext } from './context.js';
 import { useCartAPIStateMachine } from './useCartAPIStateMachine.client.js';
 import { CART_ID_STORAGE_KEY } from './constants.js';
 import { ClientAnalytics } from '../../foundation/Analytics/ClientAnalytics.js';
-export function CartProvider({ children, numCartLines, onCreate, onLineAdd, onLineRemove, onLineUpdate, onNoteUpdate, onBuyerIdentityUpdate, onAttributesUpdate, onDiscountCodesUpdate, onCreateComplete, onLineAddComplete, onLineRemoveComplete, onLineUpdateComplete, onNoteUpdateComplete, onBuyerIdentityUpdateComplete, onAttributesUpdateComplete, onDiscountCodesUpdateComplete, data: cart, cartFragment = defaultCartFragment, customerAccessToken, countryCode = CountryCode.Us, }) {
+import { useLocalization } from '../../hooks/useLocalization/useLocalization.js';
+export function CartProvider({ children, numCartLines, onCreate, onLineAdd, onLineRemove, onLineUpdate, onNoteUpdate, onBuyerIdentityUpdate, onAttributesUpdate, onDiscountCodesUpdate, onCreateComplete, onLineAddComplete, onLineRemoveComplete, onLineUpdateComplete, onNoteUpdateComplete, onBuyerIdentityUpdateComplete, onAttributesUpdateComplete, onDiscountCodesUpdateComplete, data: cart, cartFragment = defaultCartFragment, customerAccessToken, countryCode, }) {
+    const { country } = useLocalization();
+    countryCode = (countryCode ?? country.isoCode).toUpperCase();
     if (countryCode)
         countryCode = countryCode.toUpperCase();
     const [prevCountryCode, setPrevCountryCode] = useState(countryCode);

package/dist/esnext/entry-server.js

@@ -71,7 +71,7 @@ export const renderHydrogen = (App) => {
         }
         if (hydrogenConfig.poweredByHeader ?? true) {
             // If undefined in the config, then always show the header
-            response.headers.set('powered-by', 'Shopify-Hydrogen');
+            response.headers.set('powered-by', 'Shopify, Hydrogen');
         }
         sessionApi ??= hydrogenConfig.session?.(log);
         request.ctx.session = getSyncSessionApi(request, response, log, sessionApi);
@@ -171,7 +171,8 @@ async function processRequest(handleRequest, App, url, request, sessionApi, opti
             headers: response.headers,
         });
     }
-    if (isBotUA(url, request.headers.get('user-agent'))) {
+    if (request.headers.get('oxygen-do-not-stream-response') === 'true' ||
+        isBotUA(url, request.headers.get('user-agent'))) {
         response.doNotStream();
     }
     return runSSR({

package/dist/esnext/foundation/Cache/cache.js

@@ -81,13 +81,14 @@ export async function setItemInCache(request, response, userCacheOptions) {
      */
     const cacheControl = getCacheControlSetting(userCacheOptions);
     // The padded cache-control to mimic stale-while-revalidate
-    request.headers.set('cache-control', generateDefaultCacheControlHeader(getCacheControlSetting(cacheControl, {
+    const paddedCacheControlString = generateDefaultCacheControlHeader(getCacheControlSetting(cacheControl, {
         maxAge: (cacheControl.maxAge || 0) + (cacheControl.staleWhileRevalidate || 0),
-    })));
+    }));
     // The cache-control we want to set on response
-    const cacheControlString = generateDefaultCacheControlHeader(getCacheControlSetting(cacheControl));
+    const cacheControlString = generateDefaultCacheControlHeader(cacheControl);
     // CF will override cache-control, so we need to keep a
     // non-modified real-cache-control
+    response.headers.set('cache-control', paddedCacheControlString);
     response.headers.set('real-cache-control', cacheControlString);
     response.headers.set('cache-put-date', new Date().toUTCString());
     logCacheApiStatus('PUT', request.url);

package/dist/esnext/utilities/bot-ua.js

@@ -4,54 +4,56 @@
  * https://github.com/GoogleChrome/rendertron/blob/6f681688737846b28754fbfdf5db173846a826df/middleware/src/middleware.ts#L24-L41
  */
 const botUserAgents = [
-    'AdsBot-Google',
-    'AdsBot-Google-Mobile',
+    '360spider',
+    'adsbot-google',
+    'adsbot-google-mobile',
     'applebot',
-    'Baiduspider',
     'baiduspider',
-    'Bytespider',
-    '360Spider',
-    'PetalBot',
-    'Yisouspider',
+    'baiduspider',
+    'bingbot',
     'bingbot',
-    'Bingbot',
-    'BingPreview',
+    'bingpreview',
     'bitlybot',
-    'Discordbot',
-    'DuckDuckBot',
-    'Embedly',
+    'bytespider',
+    'discordbot',
+    'duckduckbot',
+    'embedly',
     'facebookcatalog',
     'facebookexternalhit',
-    'Google-PageRenderer',
-    'Googlebot',
-    'Googlebot-Image',
-    'Googlebot-News',
-    'Googlebot-Video',
+    'google-inspectiontool',
+    'google-pagerenderer',
+    'googlebot',
+    'googlebot-image',
+    'googlebot-news',
+    'googlebot-video',
+    'googleother',
     'googleweblight',
     'ia_archive',
-    'LinkedInBot',
-    'Mediapartners-Google',
+    'ia_archiver',
+    'linkedinbot',
+    'mediapartners-google',
     'outbrain',
+    'petalbot',
     'pinterest',
     'quora link preview',
     'redditbot',
     'rogerbot',
+    'seoradar',
     'showyoubot',
-    'SkypeUriPreview',
-    'Slackbot',
-    'Slurp',
+    'skypeuripreview',
+    'slackbot',
+    'slurp',
     'sogou',
-    'Storebot-Google',
-    'TelegramBot',
+    'storebot-google',
+    'telegrambot',
     'tumblr',
-    'Twitterbot',
-    'vkShare',
-    'W3C_Validator',
-    'WhatsApp',
+    'twitterbot',
+    'vkshare',
+    'w3c html2txt',
+    'w3c_validator',
+    'whatsapp',
     'yandex',
-    // SEO Tools
-    'Seoradar',
-    'W3C html2txt',
+    'yisouspider',
 ];
 /**
  * Creates a regex based on the botUserAgents array

package/dist/esnext/utilities/hash.js

@@ -22,5 +22,5 @@ export function hashKey(queryKey) {
             }
         }
     }
-    return hash;
+    return encodeURIComponent(hash);
 }

package/dist/esnext/version.d.ts

@@ -1 +1 @@
-export declare const LIB_VERSION = "1.6.7";
+export declare const LIB_VERSION = "1.7.0";

package/dist/esnext/version.js

@@ -1 +1 @@
-export const LIB_VERSION = '1.6.7';
+export const LIB_VERSION = '1.7.0';

package/package.json

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