storefrontRedirect doesn't work for client side navigation redirects

[diced-dev]

What is the location of your example repository?

No response

Which package or tool is having this issue?

Hydrogen

What version of that package or tool are you using?

2026.1.3

What version of React Router 7 are you using?

7.12.0

Steps to Reproduce

This issue requires a running store with a Hydrogen storefront to create a reproduction. Our project uses the starter skeleton as a base.

1. Create a URL redirect in the store admin
2. Visit the store, starting with a page that is NOT the one that should redirect
3. Navigate to the page that should redirect

Expected Behavior

There should be a client side redirection to the target page defined in the URL redirect in the admin.

Actual Behavior

No redirect occurs, returning a 404.

[diced-dev]

I've been able to resolve this for our project by patching @shopify/hydrogen with the following changes to storefrontRedirect:

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.searchParams;
+  let pathname = url.pathname;
+  const isSoftNavigation = pathname.endsWith(".data");
+  if(isSoftNavigation) pathname = pathname.replace('.data', '');
   searchParams.delete("redirect");
   searchParams.delete("return_to");
-  searchParams.delete("_data");
+  searchParams.delete("_routes");
- const redirectFrom = (matchQueryParams ? url.toString().replace(url.origin, "") : pathname).toLowerCase();
+ const redirectFrom = (matchQueryParams ? `${pathname}${url.search}` : pathname).toLowerCase();
-  if (url.pathname === "/admin" && !noAdminRedirect) {
+  if (pathname === "/admin" && !noAdminRedirect) {
     return createRedirectResponse(
       `${storefront.getShopifyDomain()}/admin`,
       isSoftNavigation,

And to createRedirectResponse:

   if (isSoftNavigation) {
     return new Response(null, {
-      status: 200,
+      status: 204,
       headers: {
         "X-Remix-Redirect": url.toString().replace(TEMP_DOMAIN, ""),
         "X-Remix-Status": "301"

This issue is related to the problem first arising with the introduction of single fetch and then how they've brought back support for the headers and 204 response that make it work.

I've updated the functions above to work with the updated single fetch data request and the supported response type.

It appears that this could have been broken for some time.

[diced-dev]

Just made a small update to ensure redirectFrom is the correct URL if matchQueryParams is true

[diced-dev]

@juanpprieto @frandiox

Sorry for the ping, just didn't want this to slip under the radar. Thanks!