@shopify/hydrogen 2025.4.2 → 2025.5.1

package/dist/dev/hydrogen-routes.d.ts

@@ -1,4 +1,4 @@
-import { RouteConfigEntry } from '@remix-run/route-config';
+import { RouteConfigEntry } from '@react-router/dev/dist/routes';
 
 declare function hydrogenRoutes(currentRoutes: Array<RouteConfigEntry>): Promise<Array<RouteConfigEntry>>;
 

package/dist/development/index.cjs

@@ -1,11 +1,10 @@
 'use strict';
 
 var react = require('react');
-var react$1 = require('@remix-run/react');
+var reactRouter = require('react-router');
 var jsxRuntime = require('react/jsx-runtime');
 var hydrogenReact = require('@shopify/hydrogen-react');
 var cookie = require('worktop/cookie');
-var serverRuntime = require('@remix-run/server-runtime');
 var cspBuilder = require('content-security-policy-builder');
 require('url');
 require('path');
@@ -108,7 +107,7 @@ var init_log_seo_tags = __esm({
 });
 function AnalyticsView(props) {
   const { type, data = {}, customData } = props;
-  const location = react$1.useLocation();
+  const location = reactRouter.useLocation();
   const {
     publish: publish2,
     cart,
@@ -258,7 +257,7 @@ function useCustomerPrivacy(props) {
     ignoreDeprecatedCookies: true
   });
   const initialTrackingValues = react.useMemo(hydrogenReact.getTrackingValues, [cookiesReady]);
-  const { revalidate } = react$1.useRevalidator();
+  const { revalidate } = reactRouter.useRevalidator();
   hydrogenReact.useLoadScript(withPrivacyBanner ? CONSENT_API_WITH_BANNER : CONSENT_API, {
     attributes: {
       id: "customer-privacy-api"
@@ -303,7 +302,11 @@ function useCustomerPrivacy(props) {
     const consentCollectedHandler = (event) => {
       const latestTrackingValues = hydrogenReact.getTrackingValues();
       if (initialTrackingValues.visitToken !== latestTrackingValues.visitToken || initialTrackingValues.uniqueToken !== latestTrackingValues.uniqueToken) {
-        revalidate();
+        revalidate().catch(() => {
+          console.warn(
+            "[h2:warn:useCustomerPrivacy] Revalidation failed after consent change."
+          );
+        });
       }
       if (onVisitorConsentCollected) {
         const customerPrivacy = getCustomerPrivacy();
@@ -527,7 +530,7 @@ function getPrivacyBanner() {
 }
 
 // package.json
-var version = "2025.4.2";
+var version = "2025.5.1";
 
 // src/analytics-manager/ShopifyAnalytics.tsx
 function getCustomerPrivacyRequired() {
@@ -630,11 +633,11 @@ function prepareBasePageViewPayload(payload) {
     ...payload.shop,
     hasUserConsent,
     ...hydrogenReact.getClientBrowserParameters(),
+    ccpaEnforced: !customerPrivacy.saleOfDataAllowed(),
+    gdprEnforced: !(customerPrivacy.marketingAllowed() && customerPrivacy.analyticsProcessingAllowed()),
     analyticsAllowed: customerPrivacy.analyticsProcessingAllowed(),
     marketingAllowed: customerPrivacy.marketingAllowed(),
-    saleOfDataAllowed: customerPrivacy.saleOfDataAllowed(),
-    ccpaEnforced: !customerPrivacy.saleOfDataAllowed(),
-    gdprEnforced: !(customerPrivacy.marketingAllowed() && customerPrivacy.analyticsProcessingAllowed())
+    saleOfDataAllowed: customerPrivacy.saleOfDataAllowed()
   };
   return eventPayload;
 }
@@ -1232,6 +1235,16 @@ function getDebugHeaders(request) {
     purpose: request ? getHeader(request, "purpose") : void 0
   };
 }
+function getStorefrontHeaders(request) {
+  return {
+    requestGroupId: getHeader(request, "request-id"),
+    buyerIp: getHeader(request, "oxygen-buyer-ip"),
+    buyerIpSig: getHeader(request, SHOPIFY_CLIENT_IP_SIG_HEADER),
+    cookie: getHeader(request, "cookie"),
+    // sec-purpose is added by browsers automatically when using link/prefetch or Speculation Rules
+    purpose: getHeader(request, "sec-purpose") || getHeader(request, "purpose")
+  };
+}
 var SFAPI_RE = /^\/api\/(unstable|2\d{3}-\d{2})\/graphql\.json$/;
 var getSafePathname = (url) => {
   try {
@@ -1797,7 +1810,7 @@ function CartForm({
   route,
   fetcherKey
 }) {
-  const fetcher = react$1.useFetcher({ key: fetcherKey });
+  const fetcher = reactRouter.useFetcher({ key: fetcherKey });
   return /* @__PURE__ */ jsxRuntime.jsxs(fetcher.Form, { action: route || "", method: "post", children: [
     (action || inputs) && /* @__PURE__ */ jsxRuntime.jsx(
       "input",
@@ -1881,7 +1894,7 @@ function generateUUID() {
 }
 
 // src/version.ts
-var LIB_VERSION = "2025.4.2";
+var LIB_VERSION = "2025.5.1";
 
 // src/utils/graphql.ts
 function minifyQuery(string) {
@@ -2134,8 +2147,7 @@ function createStorefrontClient(options) {
       },
       onRawHeaders: (headers2) => {
         collectedSubrequestHeaders ??= {
-          // `getSetCookie` may not be available in all environments (e.g., classic Remix compiler)
-          setCookie: typeof headers2.getSetCookie === "function" ? headers2.getSetCookie() : [],
+          setCookie: headers2.getSetCookie(),
           serverTiming: headers2.get("server-timing") ?? ""
         };
       }
@@ -3209,7 +3221,7 @@ function createCartHandler(options) {
   }
 }
 function useOptimisticCart(cart) {
-  const fetchers = react$1.useFetchers();
+  const fetchers = reactRouter.useFetchers();
   if (!fetchers || !fetchers.length) return cart;
   const optimisticCart = cart?.lines ? structuredClone(cart) : { lines: { nodes: [] } };
   const cartLines = optimisticCart.lines.nodes;
@@ -4136,15 +4148,6 @@ function createHydrogenContext(options) {
     session
   };
 }
-function getStorefrontHeaders(request) {
-  return {
-    requestGroupId: getHeader(request, "request-id"),
-    buyerIp: getHeader(request, "oxygen-buyer-ip"),
-    buyerIpSig: getHeader(request, "X-Shopify-Client-IP-Sig"),
-    cookie: getHeader(request, "cookie"),
-    purpose: getHeader(request, "sec-purpose") || getHeader(request, "purpose")
-  };
-}
 function createRequestHandler({
   build,
   mode,
@@ -4153,7 +4156,7 @@ function createRequestHandler({
   collectTrackingInformation = true,
   proxyStandardRoutes = true
 }) {
-  const handleRequest = serverRuntime.createRequestHandler(build, mode);
+  const handleRequest = reactRouter.createRequestHandler(build, mode);
   const appendPoweredByHeader = poweredByHeader ? (response) => response.headers.append("powered-by", "Shopify, Hydrogen") : void 0;
   return async (request) => {
     const method = request.method;
@@ -4171,7 +4174,7 @@ function createRequestHandler({
         }
       });
     }
-    const context = getLoadContext ? await getLoadContext(request) : void 0;
+    const context = await getLoadContext?.(request);
     const storefront = context?.storefront;
     if (proxyStandardRoutes) {
       if (!storefront) {
@@ -4388,7 +4391,7 @@ async function hydrogenRoutes(currentRoutes) {
   return [...currentRoutes, virtualLayout];
 }
 function useOptimisticData(identifier) {
-  const fetchers = react$1.useFetchers();
+  const fetchers = reactRouter.useFetchers();
   const data = {};
   for (const { formData } of fetchers) {
     if (formData?.get("optimistic-identifier") === identifier) {
@@ -4427,9 +4430,9 @@ function Pagination({
   namespace = ""
 }) {
   const [isLoading, setIsLoading] = react.useState(false);
-  const transition = react$1.useNavigation();
-  const location = react$1.useLocation();
-  react$1.useNavigate();
+  const transition = reactRouter.useNavigation();
+  const location = reactRouter.useLocation();
+  reactRouter.useNavigate();
   react.useEffect(() => {
     if (transition.state === "idle") {
       setIsLoading(false);
@@ -4473,7 +4476,7 @@ function Pagination({
   const NextLink = react.useMemo(
     () => react.forwardRef(
       function NextLink2(props, ref) {
-        return hasNextPage ? react.createElement(react$1.Link, {
+        return hasNextPage ? react.createElement(reactRouter.Link, {
           preventScrollReset: true,
           ...props,
           to: nextPageUrl,
@@ -4489,7 +4492,7 @@ function Pagination({
   const PreviousLink = react.useMemo(
     () => react.forwardRef(
       function PrevLink(props, ref) {
-        return hasPreviousPage ? react.createElement(react$1.Link, {
+        return hasPreviousPage ? react.createElement(reactRouter.Link, {
           preventScrollReset: true,
           ...props,
           to: previousPageUrl,
@@ -4547,9 +4550,9 @@ function usePagination(connection, namespace = "") {
   if (typeof connection.pageInfo.hasPreviousPage === "undefined") {
     makeError("pageInfo.hasPreviousPage");
   }
-  const transition = react$1.useNavigation();
-  const navigate = react$1.useNavigate();
-  const { state, search, pathname } = react$1.useLocation();
+  const transition = reactRouter.useNavigation();
+  const navigate = reactRouter.useNavigate();
+  const { state, search, pathname } = reactRouter.useLocation();
   const cursorParam = namespace ? `${namespace}_cursor` : "cursor";
   const directionParam = namespace ? `${namespace}_direction` : "direction";
   const params = new URLSearchParams(search);
@@ -4669,7 +4672,7 @@ function getPaginationVariables(request, options = { pageBy: 20 }) {
   return variables;
 }
 function useOptimisticVariant(selectedVariant, variants) {
-  const navigation = react$1.useNavigation();
+  const navigation = reactRouter.useNavigation();
   const [resolvedVariants, setResolvedVariants] = react.useState([]);
   react.useEffect(() => {
     Promise.resolve(variants).then((productWithVariants) => {
@@ -4823,8 +4826,8 @@ var getSelectedProductOptions = (request) => {
   return selectedOptions;
 };
 function useVariantPath(handle, productPath, waitForNavigation) {
-  const { pathname, search } = react$1.useLocation();
-  const navigation = react$1.useNavigation();
+  const { pathname, search } = reactRouter.useLocation();
+  const navigation = reactRouter.useNavigation();
   return react.useMemo(() => {
     const match = /(\/[a-zA-Z]{2}-[a-zA-Z]{2}\/)/g.exec(pathname);
     const isLocalePathname = match && match.length > 0;
@@ -4854,7 +4857,7 @@ var RichText = function(props) {
       ...props,
       components: {
         link: ({ node }) => /* @__PURE__ */ jsxRuntime.jsx(
-          react$1.Link,
+          reactRouter.Link,
           {
             to: node.url,
             title: node.title,
@@ -5805,8 +5808,8 @@ function getSeoMeta(...seoInputs) {
 }
 var SeoLogger = react.lazy(() => Promise.resolve().then(() => (init_log_seo_tags(), log_seo_tags_exports)));
 function Seo({ debug }) {
-  const matches = react$1.useMatches();
-  const location = react$1.useLocation();
+  const matches = reactRouter.useMatches();
+  const location = reactRouter.useLocation();
   console.warn(
     "[h2:warn:Seo] The `<Seo/>` component is deprecated. Use `getSeoMeta` instead.\nSee: https://shopify.dev/docs/api/hydrogen/2025-04/utilities/getseometa"
   );