@shopify/hydrogen 0.17.0 → 0.17.3

package/CHANGELOG.md

@@ -1,5 +1,37 @@
 # Changelog
 
+## 0.17.3
+
+### Patch Changes
+
+- [#1096](https://github.com/Shopify/hydrogen/pull/1096) [`0a15376e`](https://github.com/Shopify/hydrogen/commit/0a15376ec806054ddd5848d9dbfa6e50a85beb49) Thanks [@wizardlyhel](https://github.com/wizardlyhel)! - Make performance data available with ClientAnalytics and optional for developers to include
+
+* [#1209](https://github.com/Shopify/hydrogen/pull/1209) [`d0dada0a`](https://github.com/Shopify/hydrogen/commit/d0dada0a0b3170d2cb885d2f29bbbef0c6d9e9e4) Thanks [@blittle](https://github.com/blittle)! - Make metafields optional within the ProductProvider. Fixes #1127
+
+## 0.17.2
+
+### Patch Changes
+
+- [#1161](https://github.com/Shopify/hydrogen/pull/1161) [`6b963fb1`](https://github.com/Shopify/hydrogen/commit/6b963fb1fdd2824683870c8ff3258447bf7fedea) Thanks [@merwan7](https://github.com/merwan7)! - Adds ability to add multiple cookies in one response
+
+* [#1162](https://github.com/Shopify/hydrogen/pull/1162) [`5446d544`](https://github.com/Shopify/hydrogen/commit/5446d544f151e233e909e6a6f002e87863ae6151) Thanks [@arlyxiao](https://github.com/arlyxiao)! - Upgrade body-parser
+
+- [#1200](https://github.com/Shopify/hydrogen/pull/1200) [`7fb7ee49`](https://github.com/Shopify/hydrogen/commit/7fb7ee497091df3177d53e8745edcae6ba99a87d) Thanks [@blittle](https://github.com/blittle)! - Add bot user agents for Seoradar and Adresults, resolves #1199
+
+* [#1167](https://github.com/Shopify/hydrogen/pull/1167) [`0a5ac1cb`](https://github.com/Shopify/hydrogen/commit/0a5ac1cbec449eefe48041ed6aceaac375dfa601) Thanks [@benjaminsehl](https://github.com/benjaminsehl)! - Only warn in console on missing Model3D alt tag, do not throw error
+
+- [#1152](https://github.com/Shopify/hydrogen/pull/1152) [`d3e3e695`](https://github.com/Shopify/hydrogen/commit/d3e3e695457e6eb2a3ebf9767e0f10cc3570e880) Thanks [@jplhomer](https://github.com/jplhomer)! - Fix scroll restoration when server props are changed
+
+## 0.17.1
+
+### Patch Changes
+
+- [#1145](https://github.com/Shopify/hydrogen/pull/1145) [`865b66e9`](https://github.com/Shopify/hydrogen/commit/865b66e95d67965543bcb92f0f9f15b5742f3596) Thanks [@jplhomer](https://github.com/jplhomer)! - Fix search params on navigation
+
+* [#1139](https://github.com/Shopify/hydrogen/pull/1139) [`93525637`](https://github.com/Shopify/hydrogen/commit/9352563761c0405f2e2b39cb6b8b8f577f2522b9) Thanks [@blittle](https://github.com/blittle)! - Fix the scroll restoration on page transitions
+
+- [#1144](https://github.com/Shopify/hydrogen/pull/1144) [`dec5eb8e`](https://github.com/Shopify/hydrogen/commit/dec5eb8e34e75c806aa1cfea935814d228ab29d6) Thanks [@wizardlyhel](https://github.com/wizardlyhel)! - fix 0.17 build
+
 ## 0.17.0
 
 ### Minor Changes
@@ -333,7 +365,7 @@
   }, []);
   ```
 
-  See an example on how this could be done inside the Demo Store template [country selector](https://github.com/Shopify/hydrogen/blob/v1.x-2022-07/examples/template-hydrogen-default/src/components/CountrySelector.client.jsx)
+  See an example on how this could be done inside the Demo Store template [country selector](https://github.com/Shopify/hydrogen/blob/v1.x-2022-07/templates/template-hydrogen-default/src/components/CountrySelector.client.jsx)
 
 - [#698](https://github.com/Shopify/hydrogen/pull/698) [`6f30b9a1`](https://github.com/Shopify/hydrogen/commit/6f30b9a1327f06d648a01dd94d539c7dcb3061e0) Thanks [@jplhomer](https://github.com/jplhomer)! - Basic end-to-end tests have been added to the default Hydrogen template. You can run tests in development:
 

package/dist/esnext/client.d.ts

@@ -11,3 +11,5 @@ export { useRouteParams } from './foundation/useRouteParams/useRouteParams';
 export { useNavigate } from './foundation/useNavigate/useNavigate';
 export { fetchSync } from './foundation/fetchSync/client/fetchSync';
 export { suspendFunction, preloadFunction } from './utilities/suspense';
+export { PerformanceMetrics } from './foundation/Analytics/connectors/PerformanceMetrics/PerformanceMetrics.client';
+export { PerformanceMetricsDebug } from './foundation/Analytics/connectors/PerformanceMetrics/PerformanceMetricsDebug.client';

package/dist/esnext/client.js

@@ -11,3 +11,5 @@ export { useRouteParams } from './foundation/useRouteParams/useRouteParams';
 export { useNavigate } from './foundation/useNavigate/useNavigate';
 export { fetchSync } from './foundation/fetchSync/client/fetchSync';
 export { suspendFunction, preloadFunction } from './utilities/suspense';
+export { PerformanceMetrics } from './foundation/Analytics/connectors/PerformanceMetrics/PerformanceMetrics.client';
+export { PerformanceMetricsDebug } from './foundation/Analytics/connectors/PerformanceMetrics/PerformanceMetricsDebug.client';

package/dist/esnext/components/ModelViewer/ModelViewer.client.d.ts

@@ -112,7 +112,7 @@ interface ModelViewerProps {
     /** The callback to invoke when the 'scene-graph-ready' event is triggered. Refer to [scene-graph-ready in the <model-viewer> documentation](https://modelviewer.dev/docs/index.html#entrydocs-scenegraph-events-sceneGraphReady). */
     onSceneGraphReady?: (event: Event) => void;
 }
-declare type PropsWeControl = 'src' | 'alt' | 'poster';
+declare type PropsWeControl = 'src' | 'poster';
 declare global {
     namespace JSX {
         interface IntrinsicElements {

package/dist/esnext/components/ModelViewer/ModelViewer.client.js

@@ -99,7 +99,7 @@ export function ModelViewer(props) {
         throw new Error(`<ModelViewer/> requires 'data.sources' prop to be an array, with an object that has a property 'url' on it`);
     }
     if (!data.alt) {
-        throw new Error(`<ModelViewer/> requires the 'data.alt' prop`);
+        console.warn(`<ModelViewer/> requires the 'data.alt' prop for accessibility`);
     }
     return (React.createElement("model-viewer", { ref: callbackRef, ...passthroughProps, class: className, id: id, src: data.sources[0].url, alt: data.alt, "camera-controls": (_c = passthroughProps.cameraControls) !== null && _c !== void 0 ? _c : true, poster: passthroughProps.poster || ((_d = data.previewImage) === null || _d === void 0 ? void 0 : _d.url), autoplay: (_e = passthroughProps.autoplay) !== null && _e !== void 0 ? _e : true, loading: passthroughProps.loading, reveal: passthroughProps.reveal, ar: passthroughProps.ar, "ar-modes": passthroughProps.arModes, "ar-scale": passthroughProps.arScale, "ar-placement": passthroughProps.arPlacement, "ios-src": passthroughProps.iosSrc, "touch-action": passthroughProps.touchAction, "disable-zoom": passthroughProps.disableZoom, "orbit-sensitivity": passthroughProps.orbitSensitivity, "auto-rotate": passthroughProps.autoRotate, "auto-rotate-delay": passthroughProps.autoRotateDelay, "rotation-per-second": passthroughProps.rotationPerSecond, "interaction-policy": passthroughProps.interactionPolicy, "interaction-prompt": passthroughProps.interactionPrompt, "interaction-prompt-style": passthroughProps.interactionPromptStyle, "interaction-prompt-threshold": passthroughProps.interactionPromptThreshold, "camera-orbit": passthroughProps.cameraOrbit, "camera-target": passthroughProps.cameraTarget, "field-of-view": passthroughProps.fieldOfView, "max-camera-orbit": passthroughProps.maxCameraOrbit, "min-camera-orbit": passthroughProps.minCameraOrbit, "max-field-of-view": passthroughProps.maxFieldOfView, "min-field-of-view": passthroughProps.minFieldOfView, bounds: passthroughProps.bounds, "interpolation-decay": (_f = passthroughProps.interpolationDecay) !== null && _f !== void 0 ? _f : 100, "skybox-image": passthroughProps.skyboxImage, "environment-image": passthroughProps.environmentImage, exposure: passthroughProps.exposure, "shadow-intensity": (_g = passthroughProps.shadowIntensity) !== null && _g !== void 0 ? _g : 0, "shadow-softness": (_h = passthroughProps.shadowSoftness) !== null && _h !== void 0 ? _h : 0, "animation-name": passthroughProps.animationName, "animation-crossfade-duration": passthroughProps.animationCrossfadeDuration, "variant-name": passthroughProps.variantName, orientation: passthroughProps.orientation, scale: passthroughProps.scale }, children));
 }

package/dist/esnext/components/ProductProvider/ProductProvider.client.js

@@ -8,7 +8,7 @@ import { ProductOptionsProvider } from './ProductOptionsProvider.client';
  * this component can use the `useProduct` hook.
  */
 export function ProductProvider({ children, data: product, initialVariantId, }) {
-    const metafields = useParsedMetafields(product.metafields);
+    const metafields = useParsedMetafields(product.metafields || {});
     // @ts-expect-error The types here are broken on main, need to come back and fix them sometime
     const providerValue = useMemo(() => {
         return {

package/dist/esnext/entry-server.js

@@ -121,7 +121,7 @@ async function render(url, { App, routes, request, componentResponse, log, templ
      * TODO: Also add `Vary` headers for `accept-language` and any other keys
      * we want to shard our full-page cache for all Hydrogen storefronts.
      */
-    headers['cache-control'] = componentResponse.cacheControlHeader;
+    headers.set('cache-control', componentResponse.cacheControlHeader);
     if (componentResponse.customBody) {
         // This can be used to return sitemap.xml or any other custom response.
         postRequestTasks('ssr', status, request, componentResponse);
@@ -131,7 +131,7 @@ async function render(url, { App, routes, request, componentResponse, log, templ
             headers,
         });
     }
-    headers[CONTENT_TYPE] = HTML_CONTENT_TYPE;
+    headers.set(CONTENT_TYPE, HTML_CONTENT_TYPE);
     html = applyHtmlHead(html, request.ctx.head, template);
     if (flight) {
         html = html.replace('</body>', () => `${flightContainer({
@@ -220,8 +220,7 @@ async function stream(url, { App, routes, request, response, componentResponse,
              * queries which might be caught behind Suspense. Clarify this or add
              * additional checks downstream?
              */
-            responseOptions.headers['cache-control'] =
-                componentResponse.cacheControlHeader;
+            responseOptions.headers.set('cache-control', componentResponse.cacheControlHeader);
             if (isRedirect(responseOptions)) {
                 return false;
             }
@@ -230,7 +229,7 @@ async function stream(url, { App, routes, request, response, componentResponse,
                     writable.write(encoder.encode(await componentResponse.customBody));
                     return false;
                 }
-                responseOptions.headers[CONTENT_TYPE] = HTML_CONTENT_TYPE;
+                responseOptions.headers.set(CONTENT_TYPE, HTML_CONTENT_TYPE);
                 writable.write(encoder.encode(DOCTYPE));
                 if (didError) {
                     // This error was delayed until the headers were properly sent.
@@ -487,8 +486,7 @@ function startWritingHtmlToServerResponse(response, error) {
 function getResponseOptions({ headers, status, customStatus }, error) {
     var _a, _b;
     const responseInit = {};
-    // @ts-ignore
-    responseInit.headers = Object.fromEntries(headers.entries());
+    responseInit.headers = headers;
     if (error) {
         responseInit.status = 500;
     }
@@ -509,7 +507,7 @@ function writeHeadToServerResponse(response, serverComponentResponse, log, error
     if (statusText) {
         response.statusMessage = statusText;
     }
-    Object.entries(headers).forEach(([key, value]) => response.setHeader(key, value));
+    Object.entries(headers.raw()).forEach(([key, value]) => response.setHeader(key, value));
 }
 function isRedirect(response) {
     var _a, _b;

package/dist/esnext/foundation/Analytics/ClientAnalytics.d.ts

@@ -19,6 +19,7 @@ export declare const ClientAnalytics: {
         REMOVE_FROM_CART: string;
         UPDATE_CART: string;
         DISCOUNT_CODE_UPDATED: string;
+        PERFORMANCE: string;
     };
 };
 export {};

package/dist/esnext/foundation/Analytics/ClientAnalytics.js

@@ -78,7 +78,13 @@ function subscribe(eventname, callbackFunction) {
     };
 }
 function pushToServer(init, searchParam) {
-    return fetch(`${EVENT_PATHNAME}${searchParam ? `?${searchParam}` : ''}`, init);
+    return fetch(`${EVENT_PATHNAME}${searchParam ? `?${searchParam}` : ''}`, Object.assign({
+        method: 'post',
+        headers: {
+            'cache-control': 'no-cache',
+            'Content-Type': 'application/json',
+        },
+    }, init));
 }
 export const ClientAnalytics = {
     pushToPageAnalyticsData,

package/dist/esnext/foundation/Analytics/connectors/PerformanceMetrics/PerformanceMetrics.client.d.ts

@@ -0,0 +1,7 @@
+declare global {
+    interface Window {
+        BOOMR: any;
+        BOOMR_onload: any;
+    }
+}
+export declare function PerformanceMetrics(): null;

package/dist/esnext/foundation/Analytics/connectors/PerformanceMetrics/PerformanceMetrics.client.js

@@ -0,0 +1,64 @@
+import { useEffect } from 'react';
+import { loadScript } from '../../../../utilities';
+import { ClientAnalytics } from '../../index';
+import { useShop } from '../../../useShop';
+const URL = 'https://cdn.shopify.com/shopifycloud/boomerang/shopify-boomerang-hydrogen.min.js';
+export function PerformanceMetrics() {
+    const { storeDomain } = useShop();
+    useEffect(() => {
+        try {
+            (function () {
+                if (window.BOOMR &&
+                    (window.BOOMR.version || window.BOOMR.snippetExecuted)) {
+                    return;
+                }
+                // Executes only on first mount
+                window.BOOMR = window.BOOMR || {};
+                window.BOOMR.hydrogenPerformanceEvent = (data) => {
+                    ClientAnalytics.publish(ClientAnalytics.eventNames.PERFORMANCE, true, data);
+                    ClientAnalytics.pushToServer({
+                        body: JSON.stringify(data),
+                    }, ClientAnalytics.eventNames.PERFORMANCE);
+                };
+                window.BOOMR.storeDomain = storeDomain;
+                function boomerangSaveLoadTime(e) {
+                    window.BOOMR_onload = (e && e.timeStamp) || Date.now();
+                }
+                // @ts-ignore
+                function boomerangInit(e) {
+                    e.detail.BOOMR.init();
+                    e.detail.BOOMR.t_end = Date.now();
+                }
+                if (window.addEventListener) {
+                    window.addEventListener('load', boomerangSaveLoadTime, false);
+                    // @ts-ignore
+                }
+                else if (window.attachEvent) {
+                    // @ts-ignore
+                    window.attachEvent('onload', boomerangSaveLoadTime);
+                }
+                if (document.addEventListener) {
+                    document.addEventListener('onBoomerangLoaded', boomerangInit);
+                    // @ts-ignore
+                }
+                else if (document.attachEvent) {
+                    // @ts-ignore
+                    document.attachEvent('onpropertychange', function (e) {
+                        if (!e)
+                            e = event;
+                        if (e.propertyName === 'onBoomerangLoaded')
+                            boomerangInit(e);
+                    });
+                }
+            })();
+            loadScript(URL).catch(() => {
+                // ignore if boomerang doesn't load
+                // most likely because of an ad blocker
+            });
+        }
+        catch (err) {
+            // Do nothing
+        }
+    }, [storeDomain]);
+    return null;
+}

package/dist/esnext/foundation/Analytics/connectors/PerformanceMetrics/PerformanceMetrics.server.d.ts

@@ -0,0 +1 @@
+export declare function request(request: Request, data?: any, contentType?: string): void;

package/dist/esnext/foundation/Analytics/connectors/PerformanceMetrics/PerformanceMetrics.server.js

@@ -0,0 +1,24 @@
+export function request(request, data, contentType) {
+    const url = new URL(request.url);
+    if (url.search === '?performance' && contentType === 'json') {
+        const initTime = new Date().getTime();
+        fetch('https://monorail-edge.shopifysvc.com/v1/produce', {
+            method: 'post',
+            headers: {
+                'content-type': 'text/plain',
+                'x-forwarded-for': request.headers.get('x-forwarded-for') || '',
+                'user-agent': request.headers.get('user-agent') || '',
+            },
+            body: JSON.stringify({
+                schema_id: 'hydrogen_buyer_performance/2.0',
+                payload: data,
+                metadata: {
+                    event_created_at_ms: initTime,
+                    event_sent_at_ms: new Date().getTime(),
+                },
+            }),
+        }).catch((error) => {
+            // send to bugsnag? oxygen?
+        });
+    }
+}

package/dist/esnext/foundation/Analytics/connectors/PerformanceMetrics/PerformanceMetricsDebug.client.d.ts

@@ -0,0 +1 @@
+export declare function PerformanceMetricsDebug(): null;

package/dist/esnext/foundation/Analytics/connectors/PerformanceMetrics/PerformanceMetricsDebug.client.js

@@ -0,0 +1,23 @@
+import { useEffect } from 'react';
+import { ClientAnalytics } from '../../index';
+const PAD = 10;
+let isInit = false;
+export function PerformanceMetricsDebug() {
+    useEffect(() => {
+        if (!isInit) {
+            isInit = true;
+            ClientAnalytics.subscribe(ClientAnalytics.eventNames.PERFORMANCE, (data) => {
+                console.group(`Performance - ${data.page_load_type} load`);
+                logMetricIf('TTFB:', data.response_start - data.navigation_start);
+                logMetricIf('FCP:', data.first_contentful_paint);
+                logMetricIf('LCP:', data.largest_contentful_paint);
+                logMetricIf('Duration:', data.response_end - data.navigation_start);
+                console.groupEnd();
+            });
+        }
+    });
+    return null;
+}
+function logMetricIf(lable, data) {
+    data && console.log(`${lable.padEnd(PAD)}${Math.round(data)} ms`);
+}

package/dist/esnext/foundation/Analytics/const.d.ts

@@ -5,4 +5,5 @@ export declare const eventNames: {
     REMOVE_FROM_CART: string;
     UPDATE_CART: string;
     DISCOUNT_CODE_UPDATED: string;
+    PERFORMANCE: string;
 };

package/dist/esnext/foundation/Analytics/const.js

@@ -5,4 +5,5 @@ export const eventNames = {
     REMOVE_FROM_CART: 'remove-from-cart',
     UPDATE_CART: 'update-cart',
     DISCOUNT_CODE_UPDATED: 'discount-code-updated',
+    PERFORMANCE: 'performance',
 };

package/dist/esnext/foundation/Cookie/Cookie.d.ts

@@ -14,7 +14,7 @@ export declare type CookieOptions = {
      * within the [defined path](https://developer.mozilla.org/en-US/docs/Web/HTTP/Cookies#path_attribute).
      */
     path?: string;
-    /** [A date in which the cookie will expire](https://developer.mozilla.org/en-US/docs/Web/HTTP/Cookies#define_the_lifetime_of_a_cookie).
+    /** [A date on which the cookie will expire](https://developer.mozilla.org/en-US/docs/Web/HTTP/Cookies#define_the_lifetime_of_a_cookie).
      * If the date is in the past, then the browser will remove the cookie.
      */
     expires?: Date;

package/dist/esnext/foundation/FileRoutes/FileRoutes.server.js

@@ -1,6 +1,7 @@
 import React, { useMemo } from 'react';
 import { matchPath } from '../../utilities/matchPath';
 import { log } from '../../utilities/log';
+import { extractPathFromRoutesKey } from '../../utilities/apiRoutes';
 import { useServerRequest } from '../ServerRequestProvider';
 import { RouteParamsProvider } from '../useRouteParams/RouteParamsProvider.client';
 /**
@@ -34,24 +35,7 @@ export function createPageRoutes(pages, topLevelPath = '*', dirPrefix) {
     const topLevelPrefix = topLevelPath.replace('*', '').replace(/\/$/, '');
     const routes = Object.keys(pages)
         .map((key) => {
-        let path = key
-            .replace(dirPrefix, '')
-            .replace(/\.server\.(t|j)sx?$/, '')
-            /**
-             * Replace /index with /
-             */
-            .replace(/\/index$/i, '/')
-            /**
-             * Only lowercase the first letter. This allows the developer to use camelCase
-             * dynamic paths while ensuring their standard routes are normalized to lowercase.
-             */
-            .replace(/\b[A-Z]/, (firstLetter) => firstLetter.toLowerCase())
-            /**
-             * Convert /[handle].jsx and /[...handle].jsx to /:handle.jsx for react-router-dom
-             */
-            .replace(/\[(?:[.]{3})?(\w+?)\]/g, (_match, param) => `:${param}`);
-        if (path.endsWith('/') && path !== '/')
-            path = path.substring(0, path.length - 1);
+        const path = extractPathFromRoutesKey(key, dirPrefix);
         /**
          * Catch-all routes [...handle].jsx don't need an exact match
          * https://reactrouter.com/core/api/Route/exact-bool

package/dist/esnext/foundation/FileSessionStorage/FileSessionStorage.js

@@ -29,7 +29,7 @@ async function startFileLock(promise) {
 export const FileSessionStorage = function (
 /** The name of the cookie stored in the browser. */
 name, 
-/** A directory to store the session files within. Each session is stored in a separate file on the file system. */
+/** A directory to store the session files in. Each session is stored in a separate file on the file system. */
 dir, 
 /** An optional object to configure [how the cookie is persisted in the browser](https://shopify.dev/api/hydrogen/components/framework/cookie#cookie-options). */
 cookieOptions) {

package/dist/esnext/foundation/Route/Route.server.js

@@ -1,15 +1,12 @@
 import React, { cloneElement } from 'react';
 import { useServerRequest } from '../ServerRequestProvider';
 import { matchPath } from '../../utilities/matchPath';
-import { Boomerang } from '../Boomerang/Boomerang.client';
 import { RouteParamsProvider } from '../useRouteParams/RouteParamsProvider.client';
-import { useServerAnalytics } from '../Analytics';
 /**
  * The `Route` component is used to set up a route in Hydrogen that's independent of the file system. Routes are
  * matched in the order that they're defined.
  */
 export function Route({ path, page }) {
-    var _a;
     const request = useServerRequest();
     const { routeRendered, serverProps } = request.ctx.router;
     if (routeRendered)
@@ -25,13 +22,7 @@ export function Route({ path, page }) {
     if (match) {
         request.ctx.router.routeRendered = true;
         request.ctx.router.routeParams = match.params;
-        const name = (_a = page === null || page === void 0 ? void 0 : page.type) === null || _a === void 0 ? void 0 : _a.name;
-        useServerAnalytics({
-            templateName: name,
-        });
-        return (React.createElement(RouteParamsProvider, { routeParams: match.params },
-            cloneElement(page, { params: match.params || {}, ...serverProps }),
-            name ? React.createElement(Boomerang, { pageTemplate: name }) : null));
+        return (React.createElement(RouteParamsProvider, { routeParams: match.params }, cloneElement(page, { params: match.params || {}, ...serverProps })));
     }
     return null;
 }

package/dist/esnext/foundation/Router/BrowserRouter.client.js

@@ -10,19 +10,27 @@ export const BrowserRouter = ({ history: pHistory, children, }) => {
         return React.createElement(React.Fragment, null, children);
     const history = useMemo(() => pHistory || createBrowserHistory(), [pHistory]);
     const [location, setLocation] = useState(history.location);
+    const [locationChanged, setLocationChanged] = useState(false);
     const { pending, locationServerProps, setLocationServerProps } = useInternalServerProps();
-    useScrollRestoration(location, pending, locationServerProps);
+    useScrollRestoration({
+        location,
+        pending,
+        serverProps: locationServerProps,
+        locationChanged,
+        onFinishNavigating: () => setLocationChanged(false),
+    });
     useLayoutEffect(() => {
         const unlisten = history.listen(({ location: newLocation }) => {
             positions[location.key] = window.scrollY;
             setLocationServerProps({
                 pathname: newLocation.pathname,
-                search: location.search,
+                search: newLocation.search,
             });
             setLocation(newLocation);
+            setLocationChanged(true);
         });
         return () => unlisten();
-    }, [history, location]);
+    }, [history, location, setLocationChanged]);
     return (React.createElement(RouterContext.Provider, { value: {
             history,
             location,
@@ -49,7 +57,7 @@ function useBeforeUnload(callback) {
         };
     }, [callback]);
 }
-function useScrollRestoration(location, pending, serverProps) {
+function useScrollRestoration({ location, pending, serverProps, locationChanged, onFinishNavigating, }) {
     /**
      * Browsers have an API for scroll restoration. We wait for the page to load first,
      * in case the browser is able to restore scroll position automatically, and then
@@ -66,7 +74,7 @@ function useScrollRestoration(location, pending, serverProps) {
     }, []));
     useLayoutEffect(() => {
         // The app has just loaded
-        if (isFirstLoad) {
+        if (isFirstLoad || !locationChanged) {
             isFirstLoad = false;
             return;
         }
@@ -87,15 +95,27 @@ function useScrollRestoration(location, pending, serverProps) {
             const element = document.querySelector(location.hash);
             if (element) {
                 element.scrollIntoView();
+                onFinishNavigating();
                 return;
             }
         }
         // If we have a matching position, scroll to it
         if (position) {
             window.scrollTo(0, position);
+            onFinishNavigating();
             return;
         }
         // Scroll to the top of new pages
         window.scrollTo(0, 0);
-    }, [location, pending, serverProps]);
+        onFinishNavigating();
+    }, [
+        location.pathname,
+        location.search,
+        location.hash,
+        pending,
+        serverProps.pathname,
+        serverProps.search,
+        locationChanged,
+        onFinishNavigating,
+    ]);
 }

package/dist/esnext/foundation/ServerPropsProvider/ServerPropsProvider.js

@@ -1,6 +1,6 @@
 import React, { createContext, useMemo, useCallback, 
 // @ts-ignore
-useTransition, useState, useEffect, } from 'react';
+useTransition, useState, } from 'react';
 const PRIVATE_PROPS = ['request', 'response'];
 export const ServerPropsContext = createContext(null);
 export function ServerPropsProvider({ initialServerProps, setServerPropsForRsc, children, }) {
@@ -8,12 +8,18 @@ export function ServerPropsProvider({ initialServerProps, setServerPropsForRsc,
     const [serverProps, setServerProps] = useState({});
     const [pending, startTransition] = useTransition();
     const setServerPropsCallback = useCallback((input, propValue) => {
-        setServerProps((prev) => getNewValue(prev, input, propValue));
+        startTransition(() => {
+            setServerProps((prev) => getNewValue(prev, input, propValue));
+            setServerPropsForRsc((prev) => getNewValue(prev, input, propValue));
+        });
     }, []);
     const setLocationServerPropsCallback = useCallback((input, propValue) => {
         // Flush the existing user server state when location changes, leaving only the persisted state
-        setServerProps({});
-        setLocationServerProps((prev) => getNewValue(prev, input, propValue));
+        startTransition(() => {
+            setServerPropsForRsc((prev) => getNewValue(prev, input, propValue));
+            setServerProps({});
+            setLocationServerProps((prev) => getNewValue(prev, input, propValue));
+        });
     }, []);
     const getProposedLocationServerPropsCallback = useCallback((input, propValue) => {
         return getNewValue(locationServerProps, input, propValue);
@@ -40,34 +46,17 @@ export function ServerPropsProvider({ initialServerProps, setServerPropsForRsc,
             ...newValue,
         };
     }
-    const resolvedServerPropsForRsc = useMemo(() => {
-        return {
-            ...serverProps,
-            ...locationServerProps,
-        };
-    }, [serverProps, locationServerProps]);
-    const resolvedServerProps = useMemo(() => {
-        return {
-            ...serverProps,
-        };
-    }, [serverProps]);
-    useEffect(() => {
-        startTransition(() => {
-            setServerPropsForRsc(resolvedServerPropsForRsc);
-        });
-        return () => { };
-    }, [resolvedServerPropsForRsc]);
     const value = useMemo(() => ({
         pending,
         locationServerProps: locationServerProps,
-        serverProps: resolvedServerProps,
+        serverProps,
         setServerProps: setServerPropsCallback,
         setLocationServerProps: setLocationServerPropsCallback,
         getProposedLocationServerProps: getProposedLocationServerPropsCallback,
     }), [
         pending,
         locationServerProps,
-        resolvedServerProps,
+        serverProps,
         setServerPropsCallback,
         setLocationServerPropsCallback,
         getProposedLocationServerPropsCallback,

package/dist/esnext/framework/plugins/vite-plugin-hydrogen-config.js

@@ -17,6 +17,7 @@ export default () => {
          * certain files due to how it is named.
          */
         rollupOptions.output = {
+            ...rollupOptions.output,
             chunkFileNames: '[hash].js',
         };
     }

package/dist/esnext/framework/plugins/vite-plugin-platform-entry.js

@@ -19,7 +19,7 @@ export default () => {
             }
         },
         resolveId(source, importer) {
-            if (normalizePath(source).includes('@shopify/hydrogen/platforms/')) {
+            if (normalizePath(source).includes('/hydrogen/platforms/')) {
                 const hydrogenPath = path.dirname(require.resolve('@shopify/hydrogen/package.json'));
                 const platformEntryName = source.split(path.sep).pop() || '';
                 const platformEntryPath = path.resolve(hydrogenPath, 'dist', 'esnext', 'platforms', platformEntryName);
@@ -30,7 +30,7 @@ export default () => {
             return null;
         },
         transform(code, id) {
-            if (normalizePath(id).includes('@shopify/hydrogen/dist/esnext/platforms/')) {
+            if (normalizePath(id).includes('/hydrogen/dist/esnext/platforms/')) {
                 code = code
                     .replace('__SERVER_ENTRY__', process.env.HYDROGEN_SERVER_ENTRY || HYDROGEN_DEFAULT_SERVER_ENTRY)
                     .replace('__INDEX_TEMPLATE__', normalizePath(path.resolve(config.root, config.build.outDir, '..', 'client', 'index.html')));

package/dist/esnext/hooks/useParsedMetafields/useParsedMetafields.js

@@ -7,8 +7,6 @@ import { flattenConnection, parseMetafieldValue } from '../../utilities';
 export function useParsedMetafields(
 /** A [MetafieldConnection](https://shopify.dev/api/storefront/reference/common-objects/metafieldconnection). */
 metafields) {
-    var _a, _b;
-    (_b = (_a = metafields === null || metafields === void 0 ? void 0 : metafields.edges) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.node;
     return useMemo(() => {
         if (!metafields) {
             throw new Error(`'useParsedMetafields' needs metafields`);

package/dist/esnext/index.d.ts

@@ -15,6 +15,7 @@ export { CartQuery } from './components/CartProvider/cart-queries';
 export { generateCacheControlHeader, NoStore, CacheSeconds, CacheMinutes, CacheHours, CacheDays, CacheWeeks, CacheMonths, CacheCustom, } from './framework/CachingStrategy';
 export { fetchSync } from './foundation/fetchSync/server/fetchSync';
 export { useServerAnalytics } from './foundation/Analytics';
+export * as PerformanceMetricsServerAnalyticsConnector from './foundation/Analytics/connectors/PerformanceMetrics/PerformanceMetrics.server';
 export { useSession } from './foundation/useSession/useSession';
 export { CookieSessionStorage } from './foundation/CookieSessionStorage/CookieSessionStorage';
 export { MemorySessionStorage } from './foundation/MemorySessionStorage/MemorySessionStorage';

package/dist/esnext/index.js

@@ -19,6 +19,7 @@ export { CartQuery } from './components/CartProvider/cart-queries';
 export { generateCacheControlHeader, NoStore, CacheSeconds, CacheMinutes, CacheHours, CacheDays, CacheWeeks, CacheMonths, CacheCustom, } from './framework/CachingStrategy';
 export { fetchSync } from './foundation/fetchSync/server/fetchSync';
 export { useServerAnalytics } from './foundation/Analytics';
+export * as PerformanceMetricsServerAnalyticsConnector from './foundation/Analytics/connectors/PerformanceMetrics/PerformanceMetrics.server';
 export { useSession } from './foundation/useSession/useSession';
 export { CookieSessionStorage } from './foundation/CookieSessionStorage/CookieSessionStorage';
 export { MemorySessionStorage } from './foundation/MemorySessionStorage/MemorySessionStorage';

package/dist/esnext/utilities/apiRoutes.d.ts

@@ -19,6 +19,7 @@ export declare type ApiRouteMatch = {
     hasServerComponent: boolean;
     params: RouteParams;
 };
+export declare function extractPathFromRoutesKey(routesKey: string, dirPrefix: string): string;
 export declare function getApiRoutes(pages: ImportGlobEagerOutput | undefined, topLevelPath?: string): Array<HydrogenApiRoute>;
 export declare function getApiRouteFromURL(url: URL, routes: Array<HydrogenApiRoute>): ApiRouteMatch | null;
 /** The `queryShop` utility is a function that helps you query the Storefront API.

package/dist/esnext/utilities/apiRoutes.js

@@ -5,6 +5,28 @@ import { getStorefrontApiRequestHeaders } from './storefrontApi';
 import { emptySessionImplementation, } from '../foundation/session/session';
 let memoizedRoutes = [];
 let memoizedPages = {};
+export function extractPathFromRoutesKey(routesKey, dirPrefix) {
+    let path = routesKey
+        .replace(dirPrefix, '')
+        .replace(/\.server\.(t|j)sx?$/, '')
+        /**
+         * Replace /index with /
+         */
+        .replace(/\/index$/i, '/')
+        /**
+         * Only lowercase the first letter. This allows the developer to use camelCase
+         * dynamic paths while ensuring their standard routes are normalized to lowercase.
+         */
+        .replace(/\b[A-Z]/, (firstLetter) => firstLetter.toLowerCase())
+        /**
+         * Convert /[handle].jsx and /[...handle].jsx to /:handle.jsx for react-router-dom
+         */
+        .replace(/\[(?:[.]{3})?(\w+?)\]/g, (_match, param) => `:${param}`);
+    if (path.endsWith('/') && path !== '/') {
+        path = path.substring(0, path.length - 1);
+    }
+    return path;
+}
 export function getApiRoutes(pages, topLevelPath = '*') {
     if (!pages || memoizedPages === pages)
         return memoizedRoutes;
@@ -12,24 +34,7 @@ export function getApiRoutes(pages, topLevelPath = '*') {
     const routes = Object.keys(pages)
         .filter((key) => pages[key].api)
         .map((key) => {
-        let path = key
-            .replace('./routes', '')
-            .replace(/\.server\.(t|j)sx?$/, '')
-            /**
-             * Replace /index with /
-             */
-            .replace(/\/index$/i, '/')
-            /**
-             * Only lowercase the first letter. This allows the developer to use camelCase
-             * dynamic paths while ensuring their standard routes are normalized to lowercase.
-             */
-            .replace(/\b[A-Z]/, (firstLetter) => firstLetter.toLowerCase())
-            /**
-             * Convert /[handle].jsx and /[...handle].jsx to /:handle.jsx for react-router-dom
-             */
-            .replace(/\[(?:[.]{3})?(\w+?)\]/g, (_match, param) => `:${param}`);
-        if (path.endsWith('/') && path !== '/')
-            path = path.substring(0, path.length - 1);
+        const path = extractPathFromRoutesKey(key, './routes');
         /**
          * Catch-all routes [...handle].jsx don't need an exact match
          * https://reactrouter.com/core/api/Route/exact-bool

package/dist/esnext/utilities/bot-ua.js

@@ -41,6 +41,9 @@ const botUserAgents = [
     'W3C_Validator',
     'WhatsApp',
     'yandex',
+    // SEO Tools
+    'Seoradar',
+    'W3C html2txt',
 ];
 /**
  * Creates a regex based on the botUserAgents array

package/dist/esnext/version.d.ts

@@ -1 +1 @@
-export declare const LIB_VERSION = "0.17.0";
+export declare const LIB_VERSION = "0.17.3";

package/dist/esnext/version.js

@@ -1 +1 @@
-export const LIB_VERSION = '0.17.0';
+export const LIB_VERSION = '0.17.3';

package/dist/node/entry-server.js

@@ -148,7 +148,7 @@ async function render(url, { App, routes, request, componentResponse, log, templ
      * TODO: Also add `Vary` headers for `accept-language` and any other keys
      * we want to shard our full-page cache for all Hydrogen storefronts.
      */
-    headers['cache-control'] = componentResponse.cacheControlHeader;
+    headers.set('cache-control', componentResponse.cacheControlHeader);
     if (componentResponse.customBody) {
         // This can be used to return sitemap.xml or any other custom response.
         postRequestTasks('ssr', status, request, componentResponse);
@@ -158,7 +158,7 @@ async function render(url, { App, routes, request, componentResponse, log, templ
             headers,
         });
     }
-    headers[CONTENT_TYPE] = HTML_CONTENT_TYPE;
+    headers.set(CONTENT_TYPE, HTML_CONTENT_TYPE);
     html = (0, Html_1.applyHtmlHead)(html, request.ctx.head, template);
     if (flight) {
         html = html.replace('</body>', () => `${flightContainer({
@@ -247,8 +247,7 @@ async function stream(url, { App, routes, request, response, componentResponse,
              * queries which might be caught behind Suspense. Clarify this or add
              * additional checks downstream?
              */
-            responseOptions.headers['cache-control'] =
-                componentResponse.cacheControlHeader;
+            responseOptions.headers.set('cache-control', componentResponse.cacheControlHeader);
             if (isRedirect(responseOptions)) {
                 return false;
             }
@@ -257,7 +256,7 @@ async function stream(url, { App, routes, request, response, componentResponse,
                     writable.write(encoder.encode(await componentResponse.customBody));
                     return false;
                 }
-                responseOptions.headers[CONTENT_TYPE] = HTML_CONTENT_TYPE;
+                responseOptions.headers.set(CONTENT_TYPE, HTML_CONTENT_TYPE);
                 writable.write(encoder.encode(DOCTYPE));
                 if (didError) {
                     // This error was delayed until the headers were properly sent.
@@ -514,8 +513,7 @@ function startWritingHtmlToServerResponse(response, error) {
 function getResponseOptions({ headers, status, customStatus }, error) {
     var _a, _b;
     const responseInit = {};
-    // @ts-ignore
-    responseInit.headers = Object.fromEntries(headers.entries());
+    responseInit.headers = headers;
     if (error) {
         responseInit.status = 500;
     }
@@ -536,7 +534,7 @@ function writeHeadToServerResponse(response, serverComponentResponse, log, error
     if (statusText) {
         response.statusMessage = statusText;
     }
-    Object.entries(headers).forEach(([key, value]) => response.setHeader(key, value));
+    Object.entries(headers.raw()).forEach(([key, value]) => response.setHeader(key, value));
 }
 function isRedirect(response) {
     var _a, _b;

package/dist/node/foundation/Analytics/ClientAnalytics.d.ts

@@ -19,6 +19,7 @@ export declare const ClientAnalytics: {
         REMOVE_FROM_CART: string;
         UPDATE_CART: string;
         DISCOUNT_CODE_UPDATED: string;
+        PERFORMANCE: string;
     };
 };
 export {};

package/dist/node/foundation/Analytics/ClientAnalytics.js

@@ -81,7 +81,13 @@ function subscribe(eventname, callbackFunction) {
     };
 }
 function pushToServer(init, searchParam) {
-    return fetch(`${constants_1.EVENT_PATHNAME}${searchParam ? `?${searchParam}` : ''}`, init);
+    return fetch(`${constants_1.EVENT_PATHNAME}${searchParam ? `?${searchParam}` : ''}`, Object.assign({
+        method: 'post',
+        headers: {
+            'cache-control': 'no-cache',
+            'Content-Type': 'application/json',
+        },
+    }, init));
 }
 exports.ClientAnalytics = {
     pushToPageAnalyticsData,

package/dist/node/foundation/Analytics/const.d.ts

@@ -5,4 +5,5 @@ export declare const eventNames: {
     REMOVE_FROM_CART: string;
     UPDATE_CART: string;
     DISCOUNT_CODE_UPDATED: string;
+    PERFORMANCE: string;
 };

package/dist/node/foundation/Analytics/const.js

@@ -8,4 +8,5 @@ exports.eventNames = {
     REMOVE_FROM_CART: 'remove-from-cart',
     UPDATE_CART: 'update-cart',
     DISCOUNT_CODE_UPDATED: 'discount-code-updated',
+    PERFORMANCE: 'performance',
 };

package/dist/node/foundation/Router/BrowserRouter.client.js

@@ -36,19 +36,27 @@ const BrowserRouter = ({ history: pHistory, children, }) => {
         return react_1.default.createElement(react_1.default.Fragment, null, children);
     const history = (0, react_1.useMemo)(() => pHistory || (0, history_1.createBrowserHistory)(), [pHistory]);
     const [location, setLocation] = (0, react_1.useState)(history.location);
+    const [locationChanged, setLocationChanged] = (0, react_1.useState)(false);
     const { pending, locationServerProps, setLocationServerProps } = (0, use_server_props_1.useInternalServerProps)();
-    useScrollRestoration(location, pending, locationServerProps);
+    useScrollRestoration({
+        location,
+        pending,
+        serverProps: locationServerProps,
+        locationChanged,
+        onFinishNavigating: () => setLocationChanged(false),
+    });
     (0, react_1.useLayoutEffect)(() => {
         const unlisten = history.listen(({ location: newLocation }) => {
             positions[location.key] = window.scrollY;
             setLocationServerProps({
                 pathname: newLocation.pathname,
-                search: location.search,
+                search: newLocation.search,
             });
             setLocation(newLocation);
+            setLocationChanged(true);
         });
         return () => unlisten();
-    }, [history, location]);
+    }, [history, location, setLocationChanged]);
     return (react_1.default.createElement(exports.RouterContext.Provider, { value: {
             history,
             location,
@@ -78,7 +86,7 @@ function useBeforeUnload(callback) {
         };
     }, [callback]);
 }
-function useScrollRestoration(location, pending, serverProps) {
+function useScrollRestoration({ location, pending, serverProps, locationChanged, onFinishNavigating, }) {
     /**
      * Browsers have an API for scroll restoration. We wait for the page to load first,
      * in case the browser is able to restore scroll position automatically, and then
@@ -95,7 +103,7 @@ function useScrollRestoration(location, pending, serverProps) {
     }, []));
     (0, react_1.useLayoutEffect)(() => {
         // The app has just loaded
-        if (isFirstLoad) {
+        if (isFirstLoad || !locationChanged) {
             isFirstLoad = false;
             return;
         }
@@ -116,15 +124,27 @@ function useScrollRestoration(location, pending, serverProps) {
             const element = document.querySelector(location.hash);
             if (element) {
                 element.scrollIntoView();
+                onFinishNavigating();
                 return;
             }
         }
         // If we have a matching position, scroll to it
         if (position) {
             window.scrollTo(0, position);
+            onFinishNavigating();
             return;
         }
         // Scroll to the top of new pages
         window.scrollTo(0, 0);
-    }, [location, pending, serverProps]);
+        onFinishNavigating();
+    }, [
+        location.pathname,
+        location.search,
+        location.hash,
+        pending,
+        serverProps.pathname,
+        serverProps.search,
+        locationChanged,
+        onFinishNavigating,
+    ]);
 }

package/dist/node/foundation/ServerPropsProvider/ServerPropsProvider.js

@@ -32,12 +32,18 @@ function ServerPropsProvider({ initialServerProps, setServerPropsForRsc, childre
     const [serverProps, setServerProps] = (0, react_1.useState)({});
     const [pending, startTransition] = (0, react_1.useTransition)();
     const setServerPropsCallback = (0, react_1.useCallback)((input, propValue) => {
-        setServerProps((prev) => getNewValue(prev, input, propValue));
+        startTransition(() => {
+            setServerProps((prev) => getNewValue(prev, input, propValue));
+            setServerPropsForRsc((prev) => getNewValue(prev, input, propValue));
+        });
     }, []);
     const setLocationServerPropsCallback = (0, react_1.useCallback)((input, propValue) => {
         // Flush the existing user server state when location changes, leaving only the persisted state
-        setServerProps({});
-        setLocationServerProps((prev) => getNewValue(prev, input, propValue));
+        startTransition(() => {
+            setServerPropsForRsc((prev) => getNewValue(prev, input, propValue));
+            setServerProps({});
+            setLocationServerProps((prev) => getNewValue(prev, input, propValue));
+        });
     }, []);
     const getProposedLocationServerPropsCallback = (0, react_1.useCallback)((input, propValue) => {
         return getNewValue(locationServerProps, input, propValue);
@@ -64,34 +70,17 @@ function ServerPropsProvider({ initialServerProps, setServerPropsForRsc, childre
             ...newValue,
         };
     }
-    const resolvedServerPropsForRsc = (0, react_1.useMemo)(() => {
-        return {
-            ...serverProps,
-            ...locationServerProps,
-        };
-    }, [serverProps, locationServerProps]);
-    const resolvedServerProps = (0, react_1.useMemo)(() => {
-        return {
-            ...serverProps,
-        };
-    }, [serverProps]);
-    (0, react_1.useEffect)(() => {
-        startTransition(() => {
-            setServerPropsForRsc(resolvedServerPropsForRsc);
-        });
-        return () => { };
-    }, [resolvedServerPropsForRsc]);
     const value = (0, react_1.useMemo)(() => ({
         pending,
         locationServerProps: locationServerProps,
-        serverProps: resolvedServerProps,
+        serverProps,
         setServerProps: setServerPropsCallback,
         setLocationServerProps: setLocationServerPropsCallback,
         getProposedLocationServerProps: getProposedLocationServerPropsCallback,
     }), [
         pending,
         locationServerProps,
-        resolvedServerProps,
+        serverProps,
         setServerPropsCallback,
         setLocationServerPropsCallback,
         getProposedLocationServerPropsCallback,

package/dist/node/framework/plugins/vite-plugin-hydrogen-config.js

@@ -19,6 +19,7 @@ exports.default = () => {
          * certain files due to how it is named.
          */
         rollupOptions.output = {
+            ...rollupOptions.output,
             chunkFileNames: '[hash].js',
         };
     }

package/dist/node/framework/plugins/vite-plugin-platform-entry.js

@@ -24,7 +24,7 @@ exports.default = () => {
             }
         },
         resolveId(source, importer) {
-            if ((0, vite_1.normalizePath)(source).includes('@shopify/hydrogen/platforms/')) {
+            if ((0, vite_1.normalizePath)(source).includes('/hydrogen/platforms/')) {
                 const hydrogenPath = path_1.default.dirname(require.resolve('@shopify/hydrogen/package.json'));
                 const platformEntryName = source.split(path_1.default.sep).pop() || '';
                 const platformEntryPath = path_1.default.resolve(hydrogenPath, 'dist', 'esnext', 'platforms', platformEntryName);
@@ -35,7 +35,7 @@ exports.default = () => {
             return null;
         },
         transform(code, id) {
-            if ((0, vite_1.normalizePath)(id).includes('@shopify/hydrogen/dist/esnext/platforms/')) {
+            if ((0, vite_1.normalizePath)(id).includes('/hydrogen/dist/esnext/platforms/')) {
                 code = code
                     .replace('__SERVER_ENTRY__', process.env.HYDROGEN_SERVER_ENTRY || vite_plugin_hydrogen_middleware_1.HYDROGEN_DEFAULT_SERVER_ENTRY)
                     .replace('__INDEX_TEMPLATE__', (0, vite_1.normalizePath)(path_1.default.resolve(config.root, config.build.outDir, '..', 'client', 'index.html')));

package/dist/node/utilities/apiRoutes.d.ts

@@ -19,6 +19,7 @@ export declare type ApiRouteMatch = {
     hasServerComponent: boolean;
     params: RouteParams;
 };
+export declare function extractPathFromRoutesKey(routesKey: string, dirPrefix: string): string;
 export declare function getApiRoutes(pages: ImportGlobEagerOutput | undefined, topLevelPath?: string): Array<HydrogenApiRoute>;
 export declare function getApiRouteFromURL(url: URL, routes: Array<HydrogenApiRoute>): ApiRouteMatch | null;
 /** The `queryShop` utility is a function that helps you query the Storefront API.

package/dist/node/utilities/apiRoutes.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.renderApiRoute = exports.getApiRouteFromURL = exports.getApiRoutes = void 0;
+exports.renderApiRoute = exports.getApiRouteFromURL = exports.getApiRoutes = exports.extractPathFromRoutesKey = void 0;
 const matchPath_1 = require("./matchPath");
 const log_1 = require("../utilities/log/");
 const fetch_1 = require("./fetch");
@@ -8,6 +8,29 @@ const storefrontApi_1 = require("./storefrontApi");
 const session_1 = require("../foundation/session/session");
 let memoizedRoutes = [];
 let memoizedPages = {};
+function extractPathFromRoutesKey(routesKey, dirPrefix) {
+    let path = routesKey
+        .replace(dirPrefix, '')
+        .replace(/\.server\.(t|j)sx?$/, '')
+        /**
+         * Replace /index with /
+         */
+        .replace(/\/index$/i, '/')
+        /**
+         * Only lowercase the first letter. This allows the developer to use camelCase
+         * dynamic paths while ensuring their standard routes are normalized to lowercase.
+         */
+        .replace(/\b[A-Z]/, (firstLetter) => firstLetter.toLowerCase())
+        /**
+         * Convert /[handle].jsx and /[...handle].jsx to /:handle.jsx for react-router-dom
+         */
+        .replace(/\[(?:[.]{3})?(\w+?)\]/g, (_match, param) => `:${param}`);
+    if (path.endsWith('/') && path !== '/') {
+        path = path.substring(0, path.length - 1);
+    }
+    return path;
+}
+exports.extractPathFromRoutesKey = extractPathFromRoutesKey;
 function getApiRoutes(pages, topLevelPath = '*') {
     if (!pages || memoizedPages === pages)
         return memoizedRoutes;
@@ -15,24 +38,7 @@ function getApiRoutes(pages, topLevelPath = '*') {
     const routes = Object.keys(pages)
         .filter((key) => pages[key].api)
         .map((key) => {
-        let path = key
-            .replace('./routes', '')
-            .replace(/\.server\.(t|j)sx?$/, '')
-            /**
-             * Replace /index with /
-             */
-            .replace(/\/index$/i, '/')
-            /**
-             * Only lowercase the first letter. This allows the developer to use camelCase
-             * dynamic paths while ensuring their standard routes are normalized to lowercase.
-             */
-            .replace(/\b[A-Z]/, (firstLetter) => firstLetter.toLowerCase())
-            /**
-             * Convert /[handle].jsx and /[...handle].jsx to /:handle.jsx for react-router-dom
-             */
-            .replace(/\[(?:[.]{3})?(\w+?)\]/g, (_match, param) => `:${param}`);
-        if (path.endsWith('/') && path !== '/')
-            path = path.substring(0, path.length - 1);
+        const path = extractPathFromRoutesKey(key, './routes');
         /**
          * Catch-all routes [...handle].jsx don't need an exact match
          * https://reactrouter.com/core/api/Route/exact-bool

package/dist/node/utilities/bot-ua.js

@@ -44,6 +44,9 @@ const botUserAgents = [
     'W3C_Validator',
     'WhatsApp',
     'yandex',
+    // SEO Tools
+    'Seoradar',
+    'W3C html2txt',
 ];
 /**
  * Creates a regex based on the botUserAgents array

package/dist/node/version.d.ts

@@ -1 +1 @@
-export declare const LIB_VERSION = "0.17.0";
+export declare const LIB_VERSION = "0.17.3";

package/dist/node/version.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LIB_VERSION = void 0;
-exports.LIB_VERSION = '0.17.0';
+exports.LIB_VERSION = '0.17.3';

package/package.json

@@ -7,7 +7,7 @@
   "engines": {
     "node": ">=14"
   },
-  "version": "0.17.0",
+  "version": "0.17.3",
   "description": "Modern custom Shopify storefronts",
   "license": "MIT",
   "main": "dist/esnext/index.js",
@@ -81,7 +81,7 @@
     "rimraf": "^3.0.2"
   },
   "peerDependencies": {
-    "body-parser": "^1.19.1",
+    "body-parser": "^1.20.0",
     "compression": "^1.7.4",
     "react": "0.0.0-experimental-2bf7c02f0-20220314",
     "react-dom": "0.0.0-experimental-2bf7c02f0-20220314",

package/dist/esnext/foundation/Boomerang/Boomerang.client.d.ts

@@ -1,9 +0,0 @@
-declare global {
-    interface Window {
-        BOOMR: any;
-        BOOMR_onload: any;
-    }
-}
-export declare function Boomerang({ pageTemplate }: {
-    pageTemplate: string | null;
-}): null;

package/dist/esnext/foundation/Boomerang/Boomerang.client.js

@@ -1,66 +0,0 @@
-import { useEffect } from 'react';
-import { loadScript } from '../../utilities';
-import { useShop } from '../useShop';
-const URL = 'https://cdn.shopify.com/shopifycloud/boomerang/shopify-boomerang-hydrogen.min.js';
-export function Boomerang({ pageTemplate }) {
-    const { storeDomain } = useShop();
-    const templateName = pageTemplate && pageTemplate !== null
-        ? pageTemplate.toLowerCase()
-        : 'not-set';
-    useEffect(() => {
-        (function () {
-            function boomerangAddVar() {
-                if (window.BOOMR && window.BOOMR.addVar) {
-                    window.BOOMR.addVar('page_template', templateName);
-                }
-            }
-            // Executes on every mount
-            boomerangAddVar();
-            if (window.BOOMR &&
-                (window.BOOMR.version || window.BOOMR.snippetExecuted)) {
-                return;
-            }
-            // Executes only on first mount
-            window.BOOMR = window.BOOMR || {};
-            window.BOOMR.storeDomain = storeDomain;
-            window.BOOMR.pageTemplate = templateName;
-            function boomerangSaveLoadTime(e) {
-                window.BOOMR_onload = (e && e.timeStamp) || Date.now();
-            }
-            // @ts-ignore
-            function boomerangInit(e) {
-                e.detail.BOOMR.init({
-                    producer_url: 'https://monorail-edge.shopifysvc.com/v1/produce',
-                });
-                e.detail.BOOMR.t_end = Date.now();
-                boomerangAddVar();
-            }
-            if (window.addEventListener) {
-                window.addEventListener('load', boomerangSaveLoadTime, false);
-                // @ts-ignore
-            }
-            else if (window.attachEvent) {
-                // @ts-ignore
-                window.attachEvent('onload', boomerangSaveLoadTime);
-            }
-            if (document.addEventListener) {
-                document.addEventListener('onBoomerangLoaded', boomerangInit);
-                // @ts-ignore
-            }
-            else if (document.attachEvent) {
-                // @ts-ignore
-                document.attachEvent('onpropertychange', function (e) {
-                    if (!e)
-                        e = event;
-                    if (e.propertyName === 'onBoomerangLoaded')
-                        boomerangInit(e);
-                });
-            }
-        })();
-        loadScript(URL).catch(() => {
-            // ignore if boomerang doesn't load
-            // most likely because of a ad blocker
-        });
-    }, [storeDomain, pageTemplate]);
-    return null;
-}