@shopify/hydrogen 2026.4.1 → 2026.4.3

package/dist/development/index.cjs

@@ -613,7 +613,7 @@ function getPrivacyBanner() {
 }
 
 // package.json
-var version = "2026.4.1";
+var version = "2026.4.3";
 
 // src/analytics-manager/ShopifyAnalytics.tsx
 function getCustomerPrivacyRequired() {
@@ -2009,7 +2009,7 @@ function generateUUID() {
 }
 
 // src/version.ts
-var LIB_VERSION = "2026.4.1";
+var LIB_VERSION = "2026.4.3";
 
 // src/utils/graphql.ts
 function minifyQuery(string) {
@@ -2559,7 +2559,7 @@ function cartGetDefault({
   cartFragment
 }) {
   return async (cartInput) => {
-    const cartId = getCartId();
+    const cartId = cartInput?.cartId ?? getCartId();
     if (!cartId) return null;
     const includeVisitorConsent = shouldIncludeVisitorConsent(cartInput);
     const [isCustomerLoggedIn, { cart, errors: errors2 }] = await Promise.all([
@@ -2572,10 +2572,10 @@ function cartGetDefault({
         }
       )
     ]);
-    if (isCustomerLoggedIn && cart?.checkoutUrl) {
+    if (isCustomerLoggedIn && cart && typeof cart === "object" && "checkoutUrl" in cart && typeof cart.checkoutUrl === "string") {
       const finalCheckoutUrl = new URL(cart.checkoutUrl);
       finalCheckoutUrl.searchParams.set("logged_in", "true");
-      cart.checkoutUrl = finalCheckoutUrl.toString();
+      Object.assign(cart, { checkoutUrl: finalCheckoutUrl.toString() });
     }
     return cart || errors2 ? formatAPIResult(cart, errors2) : null;
   };
@@ -3528,7 +3528,12 @@ function createCartHandler(options) {
       ...args[0].buyerIdentity
     };
     const result = await _cartCreate(...args);
-    cartId = result?.cart?.id;
+    if (result?.cart && (typeof result.cart !== "object" || !("id" in result.cart) || typeof result.cart.id !== "string")) {
+      throw new Error(
+        "[h2:error:createCartHandler] Cart created but response is missing a valid `id` field. Ensure your cart query fragment includes the `id` field."
+      );
+    }
+    cartId = result?.cart && typeof result.cart === "object" && "id" in result.cart && typeof result.cart.id === "string" ? result.cart.id : void 0;
     return result;
   };
   const methods = {
@@ -3576,7 +3581,10 @@ function createCartHandler(options) {
       ) : await cartCreate({ buyerIdentity: buyerIdentity2 }, optionalParams);
     },
     updateNote: async (note, optionalParams) => {
-      return cartId || optionalParams?.cartId ? await cartNoteUpdateDefault(mutateOptions)(note, optionalParams) : await cartCreate({ note }, optionalParams);
+      return cartId || optionalParams?.cartId ? await cartNoteUpdateDefault(mutateOptions)(
+        note,
+        optionalParams
+      ) : await cartCreate({ note }, optionalParams);
     },
     updateSelectedDeliveryOption: cartSelectedDeliveryOptionsUpdateDefault(mutateOptions),
     updateAttributes: async (attributes, optionalParams) => {
@@ -4581,7 +4589,9 @@ function createHydrogenContext(options, additionalContext) {
     setCartId: cartOptions.setId || cartSetIdDefault(),
     cartQueryFragment: cartOptions.queryFragment,
     cartMutateFragment: cartOptions.mutateFragment,
-    customMethods: cartOptions.customMethods,
+    ...cartOptions.customMethods && {
+      customMethods: cartOptions.customMethods
+    },
     buyerIdentity,
     // defaults
     storefront,
@@ -5307,9 +5317,9 @@ function hydrogenPreset() {
         v8_middleware: true,
         v8_splitRouteModules: true,
         v8_viteEnvironmentApi: false,
-        unstable_optimizeDeps: true,
-        unstable_subResourceIntegrity: false
-      }
+        unstable_optimizeDeps: true
+      },
+      subResourceIntegrity: false
     }),
     reactRouterConfigResolved: ({ reactRouterConfig }) => {
       if (reactRouterConfig.basename && reactRouterConfig.basename !== "/") {
@@ -5332,9 +5342,9 @@ function hydrogenPreset() {
           "[Hydrogen Preset] buildEnd is not supported in Hydrogen 2025.7.0.\nReason: Hydrogen CLI bypasses React Router buildEnd hook execution.\nWorkaround: Use external build scripts or package.json post-build hooks."
         );
       }
-      if (reactRouterConfig.future?.unstable_subResourceIntegrity === true) {
+      if (reactRouterConfig.subResourceIntegrity === true) {
         throw new Error(
-          "[Hydrogen Preset] unstable_subResourceIntegrity cannot be enabled.\nReason: Conflicts with Hydrogen CSP nonce-based authentication.\nImpact: Would break Content Security Policy and cause script execution failures."
+          "[Hydrogen Preset] subResourceIntegrity cannot be enabled.\nReason: Conflicts with Hydrogen CSP nonce-based authentication.\nImpact: Would break Content Security Policy and cause script execution failures."
         );
       }
     }
@@ -5728,6 +5738,9 @@ var graphiqlLoader = async function graphiqlLoader2({
 };
 
 // src/routing/redirect.ts
+var SINGLE_FETCH_DATA_SUFFIX = ".data";
+var SINGLE_FETCH_ROOT_SEGMENT = "_root.data";
+var SINGLE_FETCH_TRAILING_SLASH_SEGMENT = "_.data";
 async function storefrontRedirect(options) {
   const {
     storefront,
@@ -5737,13 +5750,13 @@ async function storefrontRedirect(options) {
     response = new Response("Not Found", { status: 404 })
   } = options;
   const url = new URL(request.url);
-  const { pathname, searchParams } = url;
-  const isSoftNavigation = searchParams.has("_data");
+  const { searchParams } = url;
+  const { pathname, isSoftNavigation } = parseSingleFetchPathname(url.pathname);
   searchParams.delete("redirect");
   searchParams.delete("return_to");
-  searchParams.delete("_data");
-  const redirectFrom = (matchQueryParams ? url.toString().replace(url.origin, "") : pathname).toLowerCase();
-  if (url.pathname === "/admin" && !noAdminRedirect) {
+  searchParams.delete("_routes");
+  const redirectFrom = (matchQueryParams ? `${pathname}${url.search}` : pathname).toLowerCase();
+  if (pathname === "/admin" && !noAdminRedirect) {
     return createRedirectResponse(
       `${storefront.getShopifyDomain()}/admin`,
       isSoftNavigation,
@@ -5793,7 +5806,7 @@ function createRedirectResponse(location, isSoftNavigation, searchParams, matchQ
   }
   if (isSoftNavigation) {
     return new Response(null, {
-      status: 200,
+      status: 204,
       headers: {
         "X-Remix-Redirect": url.toString().replace(TEMP_DOMAIN, ""),
         "X-Remix-Status": "301"
@@ -5806,6 +5819,28 @@ function createRedirectResponse(location, isSoftNavigation, searchParams, matchQ
     });
   }
 }
+function parseSingleFetchPathname(rawPathname) {
+  if (!rawPathname.endsWith(SINGLE_FETCH_DATA_SUFFIX)) {
+    return { pathname: rawPathname, isSoftNavigation: false };
+  }
+  if (rawPathname.endsWith("/" + SINGLE_FETCH_TRAILING_SLASH_SEGMENT)) {
+    return {
+      pathname: rawPathname.slice(
+        0,
+        -SINGLE_FETCH_TRAILING_SLASH_SEGMENT.length
+      ),
+      isSoftNavigation: true
+    };
+  }
+  if (rawPathname === "/" + SINGLE_FETCH_ROOT_SEGMENT || rawPathname.endsWith("/" + SINGLE_FETCH_ROOT_SEGMENT)) {
+    const prefix = rawPathname.slice(0, -SINGLE_FETCH_ROOT_SEGMENT.length);
+    return { pathname: prefix || "/", isSoftNavigation: true };
+  }
+  return {
+    pathname: rawPathname.slice(0, -SINGLE_FETCH_DATA_SUFFIX.length),
+    isSoftNavigation: true
+  };
+}
 var REDIRECT_QUERY = `#graphql
   query redirects($query: String) {
     urlRedirects(first: 1, query: $query) {