@shopify/hydrogen 2024.1.3 → 2024.1.5

package/dist/development/index.cjs

@@ -1,7 +1,6 @@
 'use strict';
 
 var hydrogenReact = require('@shopify/hydrogen-react');
-var serverRuntime = require('@remix-run/server-runtime');
 var react = require('react');
 var react$1 = require('@remix-run/react');
 var jsxRuntime = require('react/jsx-runtime');
@@ -493,7 +492,7 @@ var warnOnce = (string) => {
 };
 
 // src/version.ts
-var LIB_VERSION = "2024.1.3";
+var LIB_VERSION = "2024.1.5";
 
 // src/utils/graphql.ts
 function minifyQuery(string) {
@@ -1061,10 +1060,15 @@ async function storefrontRedirect(options) {
     noAdminRedirect,
     response = new Response("Not Found", { status: 404 })
   } = options;
-  const { pathname, search } = new URL(request.url);
-  const redirectFrom = pathname + search;
-  if (pathname === "/admin" && !noAdminRedirect) {
-    return serverRuntime.redirect(`${storefront.getShopifyDomain()}/admin`);
+  const url = new URL(request.url);
+  const isSoftNavigation = url.searchParams.has("_data");
+  url.searchParams.delete("_data");
+  const redirectFrom = url.toString().replace(url.origin, "");
+  if (url.pathname === "/admin" && !noAdminRedirect) {
+    return createRedirectResponse(
+      `${storefront.getShopifyDomain()}/admin`,
+      isSoftNavigation
+    );
   }
   try {
     const { urlRedirects } = await storefront.query(REDIRECT_QUERY, {
@@ -1072,11 +1076,11 @@ async function storefrontRedirect(options) {
     });
     const location = urlRedirects?.edges?.[0]?.node?.target;
     if (location) {
-      return new Response(null, { status: 301, headers: { location } });
+      return createRedirectResponse(location, isSoftNavigation);
     }
     const redirectTo = getRedirectUrl(request.url);
     if (redirectTo) {
-      return serverRuntime.redirect(redirectTo);
+      return createRedirectResponse(redirectTo, isSoftNavigation);
     }
   } catch (error) {
     console.error(
@@ -1086,6 +1090,19 @@ async function storefrontRedirect(options) {
   }
   return response;
 }
+function createRedirectResponse(location, isSoftNavigation) {
+  if (isSoftNavigation) {
+    return new Response(null, {
+      status: 200,
+      headers: { "X-Remix-Redirect": location, "X-Remix-Status": "302" }
+    });
+  } else {
+    return new Response(null, {
+      status: 302,
+      headers: { location }
+    });
+  }
+}
 var REDIRECT_QUERY = `#graphql
   query redirects($query: String) {
     urlRedirects(first: 1, query: $query) {
@@ -1410,6 +1427,19 @@ var graphiqlLoader = async function graphiqlLoader2({
   );
 };
 
+// src/seo/escape.ts
+var ESCAPE_LOOKUP = {
+  "&": "\\u0026",
+  ">": "\\u003e",
+  "<": "\\u003c",
+  "\u2028": "\\u2028",
+  "\u2029": "\\u2029"
+};
+var ESCAPE_REGEX = /[&><\u2028\u2029]/g;
+function escapeHtml(html) {
+  return html.replace(ESCAPE_REGEX, (match) => ESCAPE_LOOKUP[match]);
+}
+
 // src/seo/generate-seo-tags.ts
 var ERROR_PREFIX = "Error in SEO input: ";
 var schema = {
@@ -1585,7 +1615,9 @@ function generateSeoTags(seoInput) {
             "script",
             {
               type: "application/ld+json",
-              children: JSON.stringify(block)
+              children: JSON.stringify(block, (k, value) => {
+                return typeof value === "string" ? escapeHtml(value) : value;
+              })
             },
             // @ts-expect-error
             `json-ld-${block?.["@type"] || block?.name || index++}`
@@ -2061,7 +2093,7 @@ var logSubRequestEvent = ({
     }
   });
 } ;
-function redirect2(path, options = {}) {
+function redirect(path, options = {}) {
   const headers = options.headers ? new Headers(options.headers) : new Headers({});
   headers.set("location", path);
   return new Response(null, { status: options.status || 302, headers });
@@ -2281,7 +2313,7 @@ function defaultAuthStatusHandler(request) {
     return DEFAULT_LOGIN_URL;
   const { pathname } = new URL(request.url);
   const redirectTo = DEFAULT_LOGIN_URL + `?${new URLSearchParams({ return_to: pathname }).toString()}`;
-  return redirect2(redirectTo);
+  return redirect(redirectTo);
 }
 function createCustomerAccountClient({
   session,
@@ -2452,7 +2484,7 @@ function createCustomerAccountClient({
       });
       loginUrl.searchParams.append("code_challenge", challenge);
       loginUrl.searchParams.append("code_challenge_method", "S256");
-      return redirect2(loginUrl.toString(), {
+      return redirect(loginUrl.toString(), {
         headers: {
           "Set-Cookie": await session.commit()
         }
@@ -2461,7 +2493,7 @@ function createCustomerAccountClient({
     logout: async () => {
       const idToken = session.get(CUSTOMER_ACCOUNT_SESSION_KEY)?.idToken;
       clearSession(session);
-      return redirect2(
+      return redirect(
         `${customerAccountUrl}/auth/logout?id_token_hint=${idToken}`,
         {
           status: 302,
@@ -2591,7 +2623,7 @@ function createCustomerAccountClient({
         idToken: id_token,
         redirectPath: void 0
       });
-      return redirect2(redirectPath || DEFAULT_REDIRECT_PATH, {
+      return redirect(redirectPath || DEFAULT_REDIRECT_PATH, {
         headers: {
           "Set-Cookie": await session.commit()
         }
@@ -2615,9 +2647,10 @@ function CartForm({
   children,
   action,
   inputs,
-  route
+  route,
+  fetcherKey
 }) {
-  const fetcher = react$1.useFetcher();
+  const fetcher = react$1.useFetcher({ key: fetcherKey });
   return /* @__PURE__ */ jsxRuntime.jsxs(fetcher.Form, { action: route || "", method: "post", children: [
     (action || inputs) && /* @__PURE__ */ jsxRuntime.jsx(
       "input",