@shopify/hydrogen 0.26.0 → 0.27.1

package/CHANGELOG.md

@@ -1,5 +1,61 @@
 # Changelog
 
+## 0.27.1
+
+### Patch Changes
+
+- [#1728](https://github.com/Shopify/hydrogen/pull/1728) [`e8d4980a`](https://github.com/Shopify/hydrogen/commit/e8d4980a691c68e71c56762596a59415f59600c6) Thanks [@jplhomer](https://github.com/jplhomer)! - This is an example of backporting a fix. You can ignore this version.
+
+## 0.27.0
+
+### Minor Changes
+
+- [#1697](https://github.com/Shopify/hydrogen/pull/1697) [`85aab092`](https://github.com/Shopify/hydrogen/commit/85aab092b2f47d77bb917659918a011783cd8c34) Thanks [@blittle](https://github.com/blittle)! - Remove `defaultLocale` from the Hydrogen Config and instead add `defaultCountryCode` and `defaultLanguageCode`. Both of which are also now available by the `useShop()` hook:
+
+  ```diff
+  export default defineConfig({
+    shopify: {
+  -    defaultLocale: 'EN-US',
+  +    defaultCountryCode: 'US',
+  +    defaultLanguageCode: 'EN',
+      storeDomain: 'hydrogen-preview.myshopify.com',
+      storefrontToken: '3b580e70970c4528da70c98e097c2fa0',
+      storefrontApiVersion: '2022-07',
+    },
+  }
+  ```
+
+* [#1662](https://github.com/Shopify/hydrogen/pull/1662) [`4262b319`](https://github.com/Shopify/hydrogen/commit/4262b3196afb96415d3b0f8f874f351030e6a734) Thanks [@wizardlyhel](https://github.com/wizardlyhel)! - Fix server analytics route
+
+  - Fix ServerAnalyticsRoute so that it does complete all async work
+  - Move Performance and Shopify analytic reporting to client side
+  - Make sure `ShopifyAnalytics` make its own query for shop id and currency
+  - Remove query for shop id and currency from `DefaultSeo` component
+  - Make Performance and Shopify server analytics connector do nothing
+
+  ### Deprecated components
+
+  Remove the following components from `hydrogen.config.js`
+
+  - `PerformanceMetricsServerAnalyticsConnector`
+  - `ShopifyServerAnalyticsConnector`
+
+## 0.26.1
+
+### Patch Changes
+
+- [#1663](https://github.com/Shopify/hydrogen/pull/1663) [`66200d6b`](https://github.com/Shopify/hydrogen/commit/66200d6b7d8e54b0746a048e950f067d4b8e0609) Thanks [@jplhomer](https://github.com/jplhomer)! - Default to 'US' CountryCode if locale cannot be parsed correctly
+
+* [#1690](https://github.com/Shopify/hydrogen/pull/1690) [`afde8989`](https://github.com/Shopify/hydrogen/commit/afde8989ae03e842de65ac698ab86033e56e7ee2) Thanks [@frehner](https://github.com/frehner)! - Add scale to the filename part of the url in `shopifyImageLoader()`
+
+- [#1676](https://github.com/Shopify/hydrogen/pull/1676) [`0149cbf6`](https://github.com/Shopify/hydrogen/commit/0149cbf60b331461ae0c97bb3e18d3f27e143d0a) Thanks [@frandiox](https://github.com/frandiox)! - Avoid writing to Node response if it has been closed early.
+
+* [#1674](https://github.com/Shopify/hydrogen/pull/1674) [`8068d3ce`](https://github.com/Shopify/hydrogen/commit/8068d3ce14f44ea83bde8f3729ae2a8cbbf8a52e) Thanks [@frandiox](https://github.com/frandiox)! - Throw error when `<Link>` component is used outside of `<Router>` component.
+
+- [#1680](https://github.com/Shopify/hydrogen/pull/1680) [`acf5223f`](https://github.com/Shopify/hydrogen/commit/acf5223fe34cfdd483ae9b0e714445c8cbf11a9d) Thanks [@blittle](https://github.com/blittle)! - Fix basepath to not apply to external URLs in the `<Link` component. Also default the attribute `rel="noreferrer noopener` for external URLs.
+
+* [#1670](https://github.com/Shopify/hydrogen/pull/1670) [`8b26f7a6`](https://github.com/Shopify/hydrogen/commit/8b26f7a6f034eaa36bb11974ff3dc5d992e2e97b) Thanks [@frandiox](https://github.com/frandiox)! - Optimize client boundaries only during build by default.
+
 ## 0.26.0
 
 ### Minor Changes
@@ -1525,11 +1581,11 @@
 
   `queryShop` accepts a single argument object with the following properties:
 
-  | Property    | Type                                   | Required |
-  | ----------- | -------------------------------------- | -------- |
-  | `query`     | `string \| ASTNode`                    | Yes      |
-  | `variables` | `Record<string, any>`                  | No       |
-  | `locale`    | `string` (defaults to `defaultLocale`) | No       |
+  | Property    | Type                                                                                                                                                             | Required |
+  | ----------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------- |
+  | `query`     | `string \| ASTNode`                                                                                                                                              | Yes      |
+  | `variables` | `Record<string, any>`                                                                                                                                            | No       |
+  | `locale`    | `string`. Defaults to the locale value from the [LocalizationProvider](https://shopify.dev/api/hydrogen/components/localization/localizationprovider) component. | No       |
 
   **Important**: In order to use `queryShop`, you should pass `shopifyConfig` to `renderHydrogen` inside `App.server.jsx`:
 

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

@@ -1,5 +1,5 @@
 import React, { useCallback, useEffect, useState } from 'react';
-import { useRouter } from '../../foundation/Router/BrowserRouter.client';
+import { useLocation } from '../../foundation/Router/BrowserRouter.client';
 import { createPath } from 'history';
 import { buildPath, useNavigate } from '../../foundation/useNavigate/useNavigate';
 import { RSC_PATHNAME } from '../../constants';
@@ -12,7 +12,7 @@ import { useBasePath } from '../../foundation/useRouteParams/RouteParamsProvider
  */
 export const Link = React.forwardRef(function Link(props, ref) {
     const navigate = useNavigate();
-    const { location } = useRouter();
+    const location = useLocation();
     const [_, startTransition] = React.useTransition();
     const routeBasePath = useBasePath();
     /**
@@ -98,12 +98,15 @@ export const Link = React.forwardRef(function Link(props, ref) {
                 'reloadDocument',
                 'prefetch',
                 'scroll',
-            ]), ref: ref, onClick: internalClick, onMouseEnter: onMouseEnter, onMouseLeave: onMouseLeave, onFocus: onFocus, onBlur: onBlur, onTouchStart: onTouchStart, href: to }, props.children),
+            ]), ref: ref, rel: props.rel ??
+                (to.startsWith('http') || to.startsWith('//')
+                    ? 'noreferrer noopener'
+                    : undefined), onClick: internalClick, onMouseEnter: onMouseEnter, onMouseLeave: onMouseLeave, onFocus: onFocus, onBlur: onBlur, onTouchStart: onTouchStart, href: to }, props.children),
         shouldPrefetch && React.createElement(Prefetch, { pathname: to })));
 });
 function Prefetch({ pathname }) {
     const { getProposedLocationServerProps } = useInternalServerProps();
-    const { location } = useRouter();
+    const location = useLocation();
     const newPath = createPath({ pathname });
     if (pathname.startsWith('http') || newPath === createPath(location)) {
         return null;

package/dist/esnext/components/LocalizationProvider/LocalizationProvider.server.js

@@ -10,8 +10,7 @@ import { useServerRequest } from '../../foundation/ServerRequestProvider';
  * Any descendents of this provider can use the `useLocalization` hook.
  */
 export function LocalizationProvider(props) {
-    const { languageCode: defaultLanguageCode, locale } = useShop();
-    const defaultCountryCode = locale.split(/[-_]/)[1] || '';
+    const { defaultLanguageCode, defaultCountryCode } = useShop();
     const languageCode = (props.languageCode ?? defaultLanguageCode).toUpperCase();
     const countryCode = (props.countryCode ?? defaultCountryCode).toUpperCase();
     const request = useServerRequest();

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

@@ -19,7 +19,7 @@ declare type MoneyProps<ComponentGeneric extends React.ElementType> = CustomProp
 /**
  * The `Money` component renders a string of the Storefront API's
  * [MoneyV2 object](https://shopify.dev/api/storefront/reference/common-objects/moneyv2) according to the
- * `defaultLocale` in [the `hydrogen.config.js` file](https://shopify.dev/custom-storefronts/hydrogen/framework/hydrogen-config).
+ * `locale` in [the `LocalizationProvider` component](https://shopify.dev/api/hydrogen/components/localization/localizationprovider).
  */
 export declare function Money<TTag extends React.ElementType>({ data, as, withoutCurrency, withoutTrailingZeros, measurement, measurementSeparator, ...passthroughProps }: MoneyProps<TTag>): JSX.Element;
 export {};

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

@@ -3,7 +3,7 @@ import { useMoney } from '../../hooks';
 /**
  * The `Money` component renders a string of the Storefront API's
  * [MoneyV2 object](https://shopify.dev/api/storefront/reference/common-objects/moneyv2) according to the
- * `defaultLocale` in [the `hydrogen.config.js` file](https://shopify.dev/custom-storefronts/hydrogen/framework/hydrogen-config).
+ * `locale` in [the `LocalizationProvider` component](https://shopify.dev/api/hydrogen/components/localization/localizationprovider).
  */
 export function Money({ data, as, withoutCurrency, withoutTrailingZeros, measurement, measurementSeparator = '/', ...passthroughProps }) {
     if (!isMoney(data)) {

package/dist/esnext/entry-server.js

@@ -337,11 +337,13 @@ async function runSSR({ rsc, state, request, response, nodeResponse, template, n
                 startWritingToNodeResponse(nodeResponse, dev ? didError() : undefined);
                 setTimeout(() => {
                     log.trace('node pipe response');
-                    pipe(nodeResponse);
+                    if (!nodeResponse.writableEnded)
+                        pipe(nodeResponse);
                 }, 0);
                 bufferReadableStream(rscReadable.getReader(), (chunk) => {
                     log.trace('rsc chunk');
-                    return nodeResponse.write(chunk);
+                    if (!nodeResponse.writableEnded)
+                        nodeResponse.write(chunk);
                 });
             },
             async onAllReady() {
@@ -370,8 +372,10 @@ async function runSSR({ rsc, state, request, response, nodeResponse, template, n
                         html = assembleHtml({ ssrHtml, rscPayload, request, template });
                         postRequestTasks('ssr', nodeResponse.statusCode, request, response);
                     }
-                    nodeResponse.write(html);
-                    nodeResponse.end();
+                    if (!nodeResponse.writableEnded) {
+                        nodeResponse.write(html);
+                        nodeResponse.end();
+                    }
                 });
                 pipe(bufferedResponse);
             },
@@ -385,8 +389,15 @@ async function runSSR({ rsc, state, request, response, nodeResponse, template, n
                 }
             },
             onError(error) {
+                if (error.message?.includes('stream closed early')) {
+                    // This seems to happen when Fizz is still streaming
+                    // but nodeResponse has been closed by the browser.
+                    // This is common in tests and during development
+                    // due to frequent page refresh.
+                    return;
+                }
                 ssrDidError = error;
-                if (dev && nodeResponse.headersSent) {
+                if (dev && nodeResponse.headersSent && !nodeResponse.writableEnded) {
                     // Calling write would flush headers automatically.
                     // Delay this error until headers are properly sent.
                     nodeResponse.write(getErrorMarkup(error));
@@ -420,6 +431,8 @@ function runRSC({ App, state, log, request, response }) {
 }
 export default renderHydrogen;
 function startWritingToNodeResponse(nodeResponse, error) {
+    if (nodeResponse.writableEnded)
+        return;
     if (!nodeResponse.headersSent) {
         nodeResponse.setHeader(CONTENT_TYPE, HTML_CONTENT_TYPE);
         nodeResponse.write(DOCTYPE);
@@ -483,7 +496,7 @@ function postRequestTasks(type, status, request, response) {
 function handleFetchResponseInNode(fetchResponsePromise, nodeResponse) {
     if (nodeResponse) {
         fetchResponsePromise.then((response) => {
-            if (!response)
+            if (!response || nodeResponse.writableEnded)
                 return;
             setNodeHeaders(response.headers, nodeResponse);
             nodeResponse.statusCode = response.status;

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

@@ -1,36 +1,51 @@
 import { log } from '../../utilities/log';
+const analyticsDefaultResponse = new Response(null, {
+    status: 200,
+});
 export async function ServerAnalyticsRoute(request, { hydrogenConfig }) {
+    const serverAnalyticsConnectors = hydrogenConfig.serverAnalyticsConnectors;
+    if (!serverAnalyticsConnectors) {
+        return analyticsDefaultResponse;
+    }
     const requestHeader = request.headers;
     const requestUrl = request.url;
-    const serverAnalyticsConnectors = hydrogenConfig.serverAnalyticsConnectors;
+    let analyticsPromise;
     if (requestHeader.get('Content-Length') === '0') {
-        serverAnalyticsConnectors?.forEach((connector) => {
-            connector.request(requestUrl, request.headers);
+        analyticsPromise = Promise.resolve(true)
+            .then(async () => {
+            return Promise.all(serverAnalyticsConnectors.map(async (connector) => {
+                return await connector.request(requestUrl, requestHeader);
+            }));
+        })
+            .catch((error) => {
+            log.warn('Failed to resolve server analytics (no content length): ', error);
         });
     }
     else if (requestHeader.get('Content-Type') === 'application/json') {
-        Promise.resolve(request.json())
+        analyticsPromise = Promise.resolve(request.json())
             .then((data) => {
-            serverAnalyticsConnectors?.forEach((connector) => {
-                connector.request(requestUrl, requestHeader, data, 'json');
-            });
+            return Promise.all(serverAnalyticsConnectors.map(async (connector) => {
+                return await connector.request(requestUrl, requestHeader, data, 'json');
+            }));
         })
             .catch((error) => {
-            log.warn('Fail to resolve server analytics: ', error);
+            log.warn('Fail to resolve server analytics (json): ', error);
         });
     }
     else {
-        Promise.resolve(request.text())
-            .then((data) => {
-            serverAnalyticsConnectors?.forEach((connector) => {
-                connector.request(requestUrl, requestHeader, data, 'text');
+        analyticsPromise = Promise.resolve(request.text())
+            .then(async (data) => {
+            await serverAnalyticsConnectors.forEach(async (connector) => {
+                await connector.request(requestUrl, requestHeader, data, 'text');
             });
+            return Promise.all(serverAnalyticsConnectors.map(async (connector) => {
+                return await connector.request(requestUrl, requestHeader, data, 'text');
+            }));
         })
             .catch((error) => {
-            log.warn('Fail to resolve server analytics: ', error);
+            log.warn('Failed to resolve server analytics (text): ', error);
         });
     }
-    return new Response(null, {
-        status: 200,
-    });
+    await analyticsPromise;
+    return analyticsDefaultResponse;
 }

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

@@ -15,10 +15,27 @@ export function PerformanceMetrics() {
                 // Executes only on first mount
                 window.BOOMR = window.BOOMR || {};
                 window.BOOMR.hydrogenPerformanceEvent = (data) => {
+                    const initTime = new Date().getTime();
                     ClientAnalytics.publish(ClientAnalytics.eventNames.PERFORMANCE, true, data);
-                    ClientAnalytics.pushToServer({
-                        body: JSON.stringify(data),
-                    }, ClientAnalytics.eventNames.PERFORMANCE);
+                    const pageData = ClientAnalytics.getPageAnalyticsData();
+                    const shopId = pageData.shopify.shopId || '';
+                    fetch('https://monorail-edge.shopifysvc.com/v1/produce', {
+                        method: 'post',
+                        headers: {
+                            'content-type': 'text/plain',
+                        },
+                        body: JSON.stringify({
+                            schema_id: 'hydrogen_buyer_performance/2.0',
+                            payload: {
+                                ...data,
+                                shop_id: shopId.substring(shopId.lastIndexOf('/') + 1) || '',
+                            },
+                            metadata: {
+                                event_created_at_ms: initTime,
+                                event_sent_at_ms: new Date().getTime(),
+                            },
+                        }),
+                    });
                 };
                 window.BOOMR.storeDomain = storeDomain;
                 function boomerangSaveLoadTime(e) {

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

@@ -1,3 +1,3 @@
 export declare const PerformanceMetricsServerAnalyticsConnector: {
-    request(requestUrl: string, requestHeader: Headers, data?: any, contentType?: string): void;
+    request(): Promise<any>;
 };

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

@@ -1,27 +1,7 @@
 import { log } from '../../../../utilities/log';
 export const PerformanceMetricsServerAnalyticsConnector = {
-    request(requestUrl, requestHeader, data, contentType) {
-        const url = new URL(requestUrl);
-        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': requestHeader.get('x-forwarded-for') || '',
-                    'user-agent': requestHeader.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((err) => {
-                log.error(err);
-            });
-        }
+    request() {
+        log.warn('PerformanceMetricsServerAnalyticsConnector has been removed - please remove its reference from hydrogen.config.js');
+        return Promise.resolve();
     },
 };

package/dist/esnext/foundation/Analytics/connectors/Shopify/ServerAnalyticsConnector.d.ts

@@ -1,3 +1,3 @@
 export declare const ShopifyServerAnalyticsConnector: {
-    request(requestUrl: string, requestHeader: Headers, data?: any, contentType?: string): void;
+    request(): Promise<any>;
 };

package/dist/esnext/foundation/Analytics/connectors/Shopify/ServerAnalyticsConnector.js

@@ -1,21 +1,7 @@
 import { log } from '../../../../utilities/log';
 export const ShopifyServerAnalyticsConnector = {
-    request(requestUrl, requestHeader, data, contentType) {
-        const url = new URL(requestUrl);
-        if (url.search === '?shopify' && contentType === 'json') {
-            data.events.forEach((event) => {
-                event.payload.client_ip_address = requestHeader.get('x-forwarded-for');
-                event.payload.client_user_agent = requestHeader.get('user-agent');
-            });
-            fetch('https://monorail-edge.shopifysvc.com/unstable/produce_batch', {
-                method: 'post',
-                headers: {
-                    'content-type': 'text/plain',
-                },
-                body: JSON.stringify(data),
-            }).catch((err) => {
-                log.error(err);
-            });
-        }
+    request() {
+        log.warn('ShopifyServerAnalyticsConnector has been removed - please remove its reference from hydrogen.config.js');
+        return Promise.resolve();
     },
 };

package/dist/esnext/foundation/Analytics/connectors/Shopify/ShopifyAnalytics.client.js

@@ -165,19 +165,8 @@ function sendToServer(data) {
         };
         batchedData = [];
         batchedTimeout = null;
-        // Send to server
+        // Send to Shopify
         try {
-            fetch('/__event?shopify', {
-                method: 'post',
-                headers: {
-                    'cache-control': 'no-cache',
-                    'Content-Type': 'application/json',
-                },
-                body: JSON.stringify(batchedDataToBeSent),
-            });
-        }
-        catch (error) {
-            // Fallback to client-side
             fetch('https://monorail-edge.shopifysvc.com/unstable/produce_batch', {
                 method: 'post',
                 headers: {
@@ -186,5 +175,8 @@ function sendToServer(data) {
                 body: JSON.stringify(batchedDataToBeSent),
             });
         }
+        catch (error) {
+            // Do nothing
+        }
     }, BATCH_SENT_TIMEOUT);
 }

package/dist/esnext/foundation/Analytics/connectors/Shopify/ShopifyAnalytics.server.js

@@ -6,13 +6,23 @@ import { useServerAnalytics } from '../../hook';
 import { useShop } from '../../../useShop';
 import { SHOPIFY_S, SHOPIFY_Y } from './const';
 import { ShopifyAnalyticsClient } from './ShopifyAnalytics.client';
+import { useShopQuery } from '../../../../hooks/useShopQuery';
+import { CacheLong } from '../../../Cache/strategies';
+import { gql } from '../../../../utilities/graphql-tag';
 export function ShopifyAnalytics({ cookieDomain }) {
     const { storeDomain } = useShop();
     const request = useServerRequest();
     const cookies = parse(request.headers.get('Cookie') || '');
     const domain = cookieDomain || storeDomain;
+    const { data: { shop: { id, paymentSettings: { currencyCode }, }, }, } = useShopQuery({
+        query: SHOP_QUERY,
+        cache: CacheLong(),
+        preload: '*',
+    });
     useServerAnalytics({
         shopify: {
+            shopId: id,
+            currency: currencyCode,
             storefrontId: globalThis.Oxygen?.env?.SHOPIFY_STOREFRONT_ID || '0',
             acceptedLanguage: request.headers.get('Accept-Language')?.replace(/-.*/, '') || 'en',
             isPersistentCookie: !!cookies[SHOPIFY_S] || !!cookies[SHOPIFY_Y],
@@ -21,3 +31,13 @@ export function ShopifyAnalytics({ cookieDomain }) {
     return (React.createElement(AnalyticsErrorBoundary, null,
         React.createElement(ShopifyAnalyticsClient, { cookieDomain: domain })));
 }
+const SHOP_QUERY = gql `
+  query shopAnalyticsInfo {
+    shop {
+      id
+      paymentSettings {
+        currencyCode
+      }
+    }
+  }
+`;

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

@@ -4,9 +4,9 @@ import { useServerRequest } from '../ServerRequestProvider';
 export function DevTools() {
     const serverRequest = useServerRequest();
     const { shopifyConfig } = serverRequest.ctx;
-    const { locale, storeDomain, storefrontApiVersion } = shopifyConfig || {};
+    const { defaultLanguageCode: languageCode, defaultCountryCode: countryCode, storeDomain, storefrontApiVersion, } = shopifyConfig || {};
     const settings = {
-        locale,
+        locale: `${languageCode}-${countryCode}`,
         storeDomain,
         storefrontApiVersion,
     };

package/dist/esnext/foundation/Router/BrowserRouter.client.d.ts

@@ -4,7 +4,7 @@ declare type RouterContextValue = {
     history: BrowserHistory;
     location: Location;
 };
-export declare const RouterContext: React.Context<{} | RouterContextValue>;
+export declare const RouterContext: React.Context<RouterContextValue | undefined>;
 export declare const BrowserRouter: FC<{
     history?: BrowserHistory;
     children: ReactNode;

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

@@ -2,7 +2,7 @@ import { createBrowserHistory } from 'history';
 import React, { createContext, useContext, useMemo, useState, useEffect, useLayoutEffect, useCallback, } from 'react';
 import { META_ENV_SSR } from '../ssr-interop';
 import { useInternalServerProps } from '../useServerProps/use-server-props';
-export const RouterContext = createContext({});
+export const RouterContext = createContext(undefined);
 let isFirstLoad = true;
 const positions = {};
 export const BrowserRouter = ({ history: pHistory, children }) => {
@@ -51,11 +51,13 @@ export const BrowserRouter = ({ history: pHistory, children }) => {
         } }, children));
 };
 export function useRouter() {
+    if (META_ENV_SSR)
+        return { location: {}, history: {} };
+    // eslint-disable-next-line react-hooks/rules-of-hooks
     const router = useContext(RouterContext);
-    if (!router && META_ENV_SSR) {
-        throw new Error('useRouter must be used within a <Router> component');
-    }
-    return router;
+    if (router)
+        return router;
+    throw new Error('Router hooks and <Link> component must be used within a <Router> component');
 }
 export function useLocation() {
     return useRouter().location;

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

@@ -1,16 +1,16 @@
 import React, { useMemo } from 'react';
 import { ShopifyProviderClient } from './ShopifyProvider.client';
-import { DEFAULT_LOCALE } from '../constants';
+import { DEFAULT_COUNTRY, DEFAULT_LANGUAGE } from '../constants';
 import { useRequestCacheData, useServerRequest } from '../ServerRequestProvider';
 import { getOxygenVariable } from '../../utilities/storefrontApi';
 import { SHOPIFY_STOREFRONT_ID_VARIABLE } from '../../constants';
 function makeShopifyContext(shopifyConfig) {
-    const locale = shopifyConfig.defaultLocale ?? DEFAULT_LOCALE;
-    const languageCode = locale.split(/[-_]/)[0];
+    const countryCode = shopifyConfig.defaultCountryCode ?? DEFAULT_COUNTRY;
+    const languageCode = shopifyConfig.defaultLanguageCode ?? DEFAULT_LANGUAGE;
     const storefrontId = getOxygenVariable(SHOPIFY_STOREFRONT_ID_VARIABLE);
     return {
-        locale: locale.toUpperCase(),
-        languageCode: languageCode.toUpperCase(),
+        defaultCountryCode: countryCode.toUpperCase(),
+        defaultLanguageCode: languageCode.toUpperCase(),
         storeDomain: shopifyConfig?.storeDomain?.replace(/^https?:\/\//, ''),
         storefrontToken: shopifyConfig.storefrontToken,
         storefrontApiVersion: shopifyConfig.storefrontApiVersion,

package/dist/esnext/foundation/ShopifyProvider/types.d.ts

@@ -1,9 +1,9 @@
 import type { CountryCode, LanguageCode } from '../../storefront-api-types';
 import type { ReactNode } from 'react';
 import type { ShopifyConfigFetcher, ShopifyConfig } from '../../types';
-export interface ShopifyContextValue extends Omit<ShopifyConfig, 'defaultLocale'> {
-    locale: `${LanguageCode}-${CountryCode}`;
-    languageCode: `${LanguageCode}`;
+export interface ShopifyContextValue extends Omit<ShopifyConfig, 'defaultLanguageCode' | 'defaultCountryCode'> {
+    defaultLanguageCode: `${LanguageCode}`;
+    defaultCountryCode: `${CountryCode}`;
     storefrontId: string | null;
 }
 export declare type ShopifyProviderProps = {

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

@@ -1 +1,2 @@
-export declare const DEFAULT_LOCALE = "EN-US";
+export declare const DEFAULT_COUNTRY = "US";
+export declare const DEFAULT_LANGUAGE = "EN";

package/dist/esnext/foundation/constants.js

@@ -1,3 +1,4 @@
 // Note: do not mix this export with other app-only logic
 // to avoid importing unnecessary code in the plugins.
-export const DEFAULT_LOCALE = 'EN-US';
+export const DEFAULT_COUNTRY = 'US';
+export const DEFAULT_LANGUAGE = 'EN';

package/dist/esnext/foundation/useNavigate/useNavigate.js

@@ -22,12 +22,18 @@ export function useNavigate() {
     };
 }
 export function buildPath(basePath, path) {
+    if (path.startsWith('http') || path.startsWith('//'))
+        return path;
     let builtPath = path;
     if (basePath !== '/') {
+        const pathFirstChar = path.charAt(0);
+        const basePathLastChar = basePath.charAt(basePath.length - 1);
         builtPath =
-            path.charAt(0) === '/' && basePath.charAt(0) === '/'
+            pathFirstChar === '/' && basePathLastChar === '/'
                 ? basePath + path.substring(1)
-                : basePath + path;
+                : basePathLastChar !== '/' && pathFirstChar !== '/'
+                    ? basePath + '/' + path
+                    : basePath + path;
     }
     return builtPath;
 }

package/dist/esnext/foundation/useUrl/useUrl.js

@@ -1,7 +1,7 @@
-import { useMemo } from 'react';
+import { useContext, useMemo } from 'react';
 import { RSC_PATHNAME } from '../../constants';
 import { parseJSON } from '../../utilities/parse';
-import { useLocation } from '../Router/BrowserRouter.client';
+import { RouterContext } from '../Router/BrowserRouter.client';
 import { useEnvContext, META_ENV_SSR } from '../ssr-interop';
 /**
  * The `useUrl` hook retrieves the current URL in a server or client component.
@@ -20,8 +20,10 @@ export function useUrl() {
     /**
      * We return a `URL` object instead of passing through `location` because
      * the URL object contains important info like hostname, etc.
+     * Note: do not call `useLocation` directly here to avoid throwing errors
+     * when `useUrl` is used outside of a Router component (e.g. in <Seo>).
      */
-    const location = useLocation(); // eslint-disable-line react-hooks/rules-of-hooks
+    const location = useContext(RouterContext); // eslint-disable-line react-hooks/rules-of-hooks
     // eslint-disable-next-line react-hooks/rules-of-hooks
     return useMemo(() => new URL(window.location.href), [location]); // eslint-disable-line react-hooks/exhaustive-deps
 }

package/dist/esnext/framework/load-config.d.ts

@@ -2,5 +2,4 @@ export declare function loadConfig(options?: {
     root: string;
 }): Promise<{
     configuration: any;
-    configurationPath: any;
 }>;

package/dist/esnext/framework/load-config.js

@@ -3,8 +3,5 @@ import { VIRTUAL_PROXY_HYDROGEN_CONFIG_ID } from './plugins/vite-plugin-hydrogen
 import { viteception } from './viteception';
 export async function loadConfig(options = { root: process.cwd() }) {
     const { loaded } = await viteception([VIRTUAL_PROXY_HYDROGEN_CONFIG_ID], options);
-    return {
-        configuration: loaded[0].default,
-        configurationPath: loaded[0].configPath,
-    };
+    return { configuration: loaded[0].default };
 }

package/dist/esnext/framework/plugin.js

@@ -24,7 +24,7 @@ const hydrogenPlugin = (pluginOptions = {}) => {
         hydrationAutoImport(),
         ssrInterop(),
         cssModulesRsc(),
-        rsc(),
+        rsc(pluginOptions),
         platformEntry(),
         suppressWarnings(),
         pluginOptions.purgeQueryCacheOnBuild && purgeQueryCache(),