@shopify/hydrogen 2026.4.6 → 2026.4.8

package/dist/development/index.js

@@ -1,4 +1,4 @@
-import { createContext, forwardRef, lazy, useContext, useRef, useState, useMemo, useEffect, useCallback, createElement, Fragment as Fragment$1, Suspense } from 'react';
+import { createContext, forwardRef, lazy, useContext, useRef, useState, useMemo, useEffect, useCallback, startTransition, createElement, Fragment as Fragment$1, Suspense } from 'react';
 import { createContext as createContext$1, useRevalidator, useFetcher, useFetchers, RouterContextProvider, createRequestHandler as createRequestHandler$1, useNavigation, useLocation, useNavigate, Link, useMatches } from 'react-router';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import { useLoadScript, createStorefrontClient as createStorefrontClient$1, SHOPIFY_STOREFRONT_ID_HEADER, SHOPIFY_STOREFRONT_Y_HEADER, SHOPIFY_STOREFRONT_S_HEADER, SHOPIFY_UNIQUE_TOKEN_HEADER, SHOPIFY_VISIT_TOKEN_HEADER, flattenConnection, RichText as RichText$1, ShopPayButton as ShopPayButton$1, parseGid, getTrackingValues, sendShopifyAnalytics, AnalyticsEventName, AnalyticsPageType, getClientBrowserParameters } from '@shopify/hydrogen-react';
@@ -314,7 +314,7 @@ function getPrivacyBanner() {
 }
 
 // package.json
-var version = "2026.4.6";
+var version = "2026.4.8";
 
 // src/analytics-manager/ShopifyAnalytics.tsx
 function getCustomerPrivacyRequired() {
@@ -816,6 +816,8 @@ function register(key) {
     }
   };
 }
+var noopPublish = () => {
+};
 function messageOnError(field, envVar) {
   return `[h2:error:Analytics.Provider] - ${field} is required. Make sure ${envVar} is defined in your environment variables. See https://h2o.fyi/analytics/consent to learn how to setup environment variables in the Shopify admin.`;
 }
@@ -830,11 +832,25 @@ function AnalyticsProvider({
   const { shop } = useShopAnalytics(shopProp);
   const [consentVersion, setConsentVersion] = useState(0);
   const [privacyReady, setPrivacyReady] = useState(false);
-  const [carts, setCarts] = useState({ cart: null, prevCart: null });
+  const [carts, setCartsState] = useState({ cart: null, prevCart: null });
+  const setCarts = useCallback(
+    (update) => startTransition(() => setCartsState(update)),
+    []
+  );
   const canTrack = customCanTrack ?? hasAnalyticsConsent;
+  const canTrackRef = useRef(canTrack);
+  canTrackRef.current = canTrack;
+  const guardedPublish = useCallback(
+    (event, payload) => {
+      if (canTrackRef.current()) publish(event, payload);
+    },
+    []
+  );
   const onConsentChange = useCallback(() => {
-    setPrivacyReady(true);
-    setConsentVersion((version2) => version2 + 1);
+    startTransition(() => {
+      setPrivacyReady(true);
+      setConsentVersion((version2) => version2 + 1);
+    });
   }, []);
   if (!!shop) {
     if (/\/68817551382$/.test(shop.shopId)) {
@@ -872,8 +888,7 @@ function AnalyticsProvider({
       canTrack,
       ...carts,
       customData,
-      publish: canTrack() ? publish : () => {
-      },
+      publish: canTrack() ? guardedPublish : noopPublish,
       shop,
       subscribe,
       register,
@@ -886,7 +901,7 @@ function AnalyticsProvider({
     carts,
     carts.cart?.updatedAt,
     carts.prevCart,
-    publish,
+    guardedPublish,
     subscribe,
     customData,
     shop,
@@ -915,7 +930,9 @@ function useAnalytics() {
 function useShopAnalytics(shopProp) {
   const [shop, setShop] = useState(null);
   useEffect(() => {
-    Promise.resolve(shopProp).then(setShop);
+    Promise.resolve(shopProp).then((resolvedShop) => {
+      startTransition(() => setShop(resolvedShop));
+    });
     return () => {
     };
   }, [setShop, shopProp]);
@@ -1681,7 +1698,7 @@ function generateUUID() {
 }
 
 // src/version.ts
-var LIB_VERSION = "2026.4.6";
+var LIB_VERSION = "2026.4.8";
 
 // src/utils/graphql.ts
 function minifyQuery(string) {
@@ -3365,7 +3382,7 @@ function useOptimisticCart(cart) {
 }
 
 // src/changelogHandler.ts
-var DEFAULT_GITHUB_CHANGELOG_URL = "https://raw.githubusercontent.com/Shopify/hydrogen/main/docs/changelog.json";
+var DEFAULT_GITHUB_CHANGELOG_URL = "https://raw.githubusercontent.com/Shopify/hydrogen/2026-04/docs/changelog.json";
 async function changelogHandler({
   request,
   changelogUrl
@@ -3669,6 +3686,17 @@ function getRedirectUrl(requestUrl) {
     }
   }
 }
+function getSameOriginPath(target, origin) {
+  if (!target) return void 0;
+  try {
+    const url = target.startsWith("/") ? new URL(target, origin) : new URL(target);
+    if (url.origin !== origin) return void 0;
+    const path = `${url.pathname}${url.search}${url.hash}`;
+    return path.startsWith("//") ? void 0 : path;
+  } catch {
+    return void 0;
+  }
+}
 function isLocalPath(requestUrl, redirectUrl) {
   try {
     return new URL(requestUrl).origin === new URL(redirectUrl, requestUrl).origin;
@@ -4007,7 +4035,9 @@ function createCustomerAccountClient({
         codeVerifier: verifier,
         state,
         nonce,
-        redirectPath: getRedirectUrl(request.url) || getHeader(request, "Referer") || defaultRedirectPath
+        redirectPath: getRedirectUrl(request.url) || // The same HTTPS origin the OAuth `redirect_uri` uses, so an http
+        // `request.url` still matches the https pages customers browse.
+        getSameOriginPath(getHeader(request, "Referer"), httpsOrigin) || defaultRedirectPath
       });
       loginUrl.searchParams.append("code_challenge", challenge);
       loginUrl.searchParams.append("code_challenge_method", "S256");