@jetshop/core 5.8.3 → 5.11.0

package/components/Cart/CartIdContext.js

@@ -1,8 +1,24 @@
 import React, { useContext, useEffect, useMemo, useState } from 'react';
 const CartIdContext = React.createContext({
     cartId: null,
-    setCartId: undefined,
+    setCartId: () => undefined
 });
+const usePersistedCartId = (cartId, setCartId) => {
+    useEffect(() => {
+        const listener = (e) => {
+            const persistedCartId = localStorage.getItem('cartId');
+            if (e.storageArea === localStorage &&
+                e.key === 'cartId' &&
+                cartId !== persistedCartId) {
+                setCartId(persistedCartId);
+            }
+        };
+        window.addEventListener('storage', listener);
+        return () => {
+            window.removeEventListener('storage', listener);
+        };
+    }, [cartId]);
+};
 const CartIdProvider = function CartIdProvider(props) {
     let persistedCartId = null;
     try {
@@ -33,27 +49,11 @@ const CartIdProvider = function CartIdProvider(props) {
     const value = useMemo(() => {
         return {
             cartId,
-            setCartId,
+            setCartId
         };
     }, [cartId]);
     return React.createElement(CartIdContext.Provider, Object.assign({ value: value }, props));
 };
-const usePersistedCartId = (cartId, setCartId) => {
-    useEffect(() => {
-        const listener = (e) => {
-            const persistedCartId = localStorage.getItem('cartId');
-            if (e.storageArea === localStorage &&
-                e.key === 'cartId' &&
-                cartId !== persistedCartId) {
-                setCartId(persistedCartId);
-            }
-        };
-        window.addEventListener('storage', listener);
-        return () => {
-            window.removeEventListener('storage', listener);
-        };
-    }, [cartId]);
-};
 export { CartIdProvider, CartIdContext };
 export function useCartId() {
     return useContext(CartIdContext);

package/components/Cart/CartIdContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"CartIdContext.js","sourceRoot":"","sources":["CartIdContext.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAExE,MAAM,aAAa,GAAG,KAAK,CAAC,aAAa,CAGtC;IACD,MAAM,EAAE,IAAI;IACZ,SAAS,EAAE,SAAS;CACrB,CAAC,CAAC;AAEH,MAAM,cAAc,GAAa,SAAS,cAAc,CAAC,KAAK;IAC5D,IAAI,eAAe,GAAW,IAAI,CAAC;IACnC,IAAI;QACF,eAAe,GAAG,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC;KAC1D;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;KAChB;IAED,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,CAAC,eAAe,CAAC,CAAC;IAEtD,+BAA+B;IAC/B,kBAAkB,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACtC,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,eAAe;YAAE,OAAO;QAE/D,IAAI;YACF,IAAI,MAAM,EAAE;gBACV,YAAY,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;aACxC;iBAAM;gBACL,YAAY,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;aACnC;SACF;QAAC,OAAO,CAAC,EAAE;YACV,mBAAmB;YACnB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;SAChB;IACH,CAAC,EAAE,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC,CAAC;IAE9B,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,EAAE;QACzB,OAAO;YACL,MAAM;YACN,SAAS;SACV,CAAC;IACJ,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IAEb,OAAO,oBAAC,aAAa,CAAC,QAAQ,kBAAC,KAAK,EAAE,KAAK,IAAM,KAAK,EAAI,CAAC;AAC7D,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,CACzB,MAAc,EACd,SAAiC,EACjC,EAAE;IACF,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,QAAQ,GAAG,CAAC,CAAe,EAAE,EAAE;YACnC,MAAM,eAAe,GAAG,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YACvD,IACE,CAAC,CAAC,WAAW,KAAK,YAAY;gBAC9B,CAAC,CAAC,GAAG,KAAK,QAAQ;gBAClB,MAAM,KAAK,eAAe,EAC1B;gBACA,SAAS,CAAC,eAAe,CAAC,CAAC;aAC5B;QACH,CAAC,CAAC;QAEF,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QAE7C,OAAO,GAAG,EAAE;YACV,MAAM,CAAC,mBAAmB,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QAClD,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;AACf,CAAC,CAAC;AAEF,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,CAAC;AAEzC,MAAM,UAAU,SAAS;IACvB,OAAO,UAAU,CAAC,aAAa,CAAC,CAAC;AACnC,CAAC"}
+{"version":3,"file":"CartIdContext.js","sourceRoot":"","sources":["CartIdContext.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAExE,MAAM,aAAa,GAAG,KAAK,CAAC,aAAa,CAGtC;IACD,MAAM,EAAE,IAAI;IACZ,SAAS,EAAE,GAAG,EAAE,CAAC,SAAS;CAC3B,CAAC,CAAC;AAEH,MAAM,kBAAkB,GAAG,CACzB,MAAc,EACd,SAAiC,EACjC,EAAE;IACF,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,QAAQ,GAAG,CAAC,CAAe,EAAE,EAAE;YACnC,MAAM,eAAe,GAAG,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YACvD,IACE,CAAC,CAAC,WAAW,KAAK,YAAY;gBAC9B,CAAC,CAAC,GAAG,KAAK,QAAQ;gBAClB,MAAM,KAAK,eAAe,EAC1B;gBACA,SAAS,CAAC,eAAe,CAAC,CAAC;aAC5B;QACH,CAAC,CAAC;QAEF,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QAE7C,OAAO,GAAG,EAAE;YACV,MAAM,CAAC,mBAAmB,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;QAClD,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;AACf,CAAC,CAAC;AAEF,MAAM,cAAc,GAAa,SAAS,cAAc,CAAC,KAAK;IAC5D,IAAI,eAAe,GAAW,IAAI,CAAC;IACnC,IAAI;QACF,eAAe,GAAG,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC;KAC1D;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;KAChB;IAED,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,CAAC,eAAe,CAAC,CAAC;IAEtD,+BAA+B;IAC/B,kBAAkB,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACtC,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,eAAe;YAAE,OAAO;QAE/D,IAAI;YACF,IAAI,MAAM,EAAE;gBACV,YAAY,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;aACxC;iBAAM;gBACL,YAAY,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;aACnC;SACF;QAAC,OAAO,CAAC,EAAE;YACV,mBAAmB;YACnB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;SAChB;IACH,CAAC,EAAE,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC,CAAC;IAE9B,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,EAAE;QACzB,OAAO;YACL,MAAM;YACN,SAAS;SACV,CAAC;IACJ,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IAEb,OAAO,oBAAC,aAAa,CAAC,QAAQ,kBAAC,KAAK,EAAE,KAAK,IAAM,KAAK,EAAI,CAAC;AAC7D,CAAC,CAAC;AAEF,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,CAAC;AAEzC,MAAM,UAAU,SAAS;IACvB,OAAO,UAAU,CAAC,aAAa,CAAC,CAAC;AACnC,CAAC"}

package/components/ChannelContext/ChannelProvider.d.ts

@@ -1,12 +1,10 @@
 import React from 'react';
-import ApolloClient from 'apollo-client';
 import { BootOptions } from '../ConfigProvider';
 import { ChannelHandler } from '../../ChannelHandler/ChannelHandler';
 export interface ChannelProviderProps {
-    client: ApolloClient<any>;
     channelHandler: ChannelHandler;
     children?: React.ReactNode;
     config: BootOptions;
 }
-declare const ChannelProvider: ({ client, channelHandler, children, config }: ChannelProviderProps) => JSX.Element;
+declare const ChannelProvider: ({ channelHandler, children, config }: ChannelProviderProps) => JSX.Element;
 export default ChannelProvider;

package/components/ChannelContext/ChannelProvider.js

@@ -1,14 +1,14 @@
 import React, { useMemo } from 'react';
 import ChannelContext from './ChannelContext';
-const ChannelProvider = ({ client, channelHandler, children, config }) => {
+const ChannelProvider = ({ channelHandler, children, config }) => {
     const { channels, selectedChannel, recommendedChannel } = channelHandler;
     const value = useMemo(() => {
         const updateChannelSingleDomain = (newChannel) => {
-            channelHandler.updateChannel({ config, client, newChannel });
+            channelHandler.updateChannel({ config, newChannel });
         };
         const channelsById = {};
-        channelHandler.channels &&
-            channelHandler.channels.forEach(channel => {
+        channels &&
+            channels.forEach((channel) => {
                 channelsById[channel.id] = channel;
             });
         return {
@@ -17,16 +17,9 @@ const ChannelProvider = ({ client, channelHandler, children, config }) => {
             channels,
             selectedChannel,
             channelsById,
-            basename: channelHandler.getChannelBasename()
+            basename: channelHandler.getChannelBasename() // TODO This isn't used anywhere?
         };
-    }, [
-        channelHandler,
-        channels,
-        client,
-        config,
-        recommendedChannel,
-        selectedChannel
-    ]);
+    }, [channelHandler, channels, config, recommendedChannel, selectedChannel]);
     return (React.createElement(ChannelContext.Provider, { value: value }, children));
 };
 export default ChannelProvider;

package/components/ChannelContext/ChannelProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"ChannelProvider.js","sourceRoot":"","sources":["ChannelProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,cAAmC,MAAM,kBAAkB,CAAC;AAanE,MAAM,eAAe,GAAG,CAAC,EACvB,MAAM,EACN,cAAc,EACd,QAAQ,EACR,MAAM,EACe,EAAE,EAAE;IACzB,MAAM,EAAE,QAAQ,EAAE,eAAe,EAAE,kBAAkB,EAAE,GAAG,cAAc,CAAC;IACzE,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,EAAE;QACzB,MAAM,yBAAyB,GAAG,CAAC,UAA2B,EAAE,EAAE;YAChE,cAAc,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC;QAC/D,CAAC,CAAC;QAEF,MAAM,YAAY,GAA+B,EAAE,CAAC;QAEpD,cAAc,CAAC,QAAQ;YACrB,cAAc,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;gBACxC,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC;YACrC,CAAC,CAAC,CAAC;QAEL,OAAO;YACL,kBAAkB;YAClB,aAAa,EAAE,yBAAyB;YACxC,QAAQ;YACR,eAAe;YACf,YAAY;YACZ,QAAQ,EAAE,cAAc,CAAC,kBAAkB,EAAE;SAC9C,CAAC;IACJ,CAAC,EAAE;QACD,cAAc;QACd,QAAQ;QACR,MAAM;QACN,MAAM;QACN,kBAAkB;QAClB,eAAe;KAChB,CAAC,CAAC;IAEH,OAAO,CACL,oBAAC,cAAc,CAAC,QAAQ,IAAC,KAAK,EAAE,KAAK,IAAG,QAAQ,CAA2B,CAC5E,CAAC;AACJ,CAAC,CAAC;AACF,eAAe,eAAe,CAAC"}
+{"version":3,"file":"ChannelProvider.js","sourceRoot":"","sources":["ChannelProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,cAAmC,MAAM,kBAAkB,CAAC;AAWnE,MAAM,eAAe,GAAG,CAAC,EACvB,cAAc,EACd,QAAQ,EACR,MAAM,EACe,EAAE,EAAE;IACzB,MAAM,EAAE,QAAQ,EAAE,eAAe,EAAE,kBAAkB,EAAE,GAAG,cAAc,CAAC;IACzE,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,EAAE;QACzB,MAAM,yBAAyB,GAAG,CAAC,UAA2B,EAAE,EAAE;YAChE,cAAc,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC;QACvD,CAAC,CAAC;QAEF,MAAM,YAAY,GAA+B,EAAE,CAAC;QAEpD,QAAQ;YACN,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;gBAC3B,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC;YACrC,CAAC,CAAC,CAAC;QAEL,OAAO;YACL,kBAAkB;YAClB,aAAa,EAAE,yBAAyB;YACxC,QAAQ;YACR,eAAe;YACf,YAAY;YACZ,QAAQ,EAAE,cAAc,CAAC,kBAAkB,EAAE,CAAC,iCAAiC;SAChF,CAAC;IACJ,CAAC,EAAE,CAAC,cAAc,EAAE,QAAQ,EAAE,MAAM,EAAE,kBAAkB,EAAE,eAAe,CAAC,CAAC,CAAC;IAE5E,OAAO,CACL,oBAAC,cAAc,CAAC,QAAQ,IAAC,KAAK,EAAE,KAAK,IAAG,QAAQ,CAA2B,CAC5E,CAAC;AACJ,CAAC,CAAC;AACF,eAAe,eAAe,CAAC"}

package/components/ChannelContext/ChannelProvider.test.js

@@ -0,0 +1,110 @@
+import React, { useContext } from 'react';
+import { render } from '@testing-library/react';
+import ChannelContext, { ChannelProvider } from '../ChannelContext/';
+import { ChannelHandler } from '../../ChannelHandler/ChannelHandler';
+import { createSelectedChannel } from '../../ChannelHandler/channelUtils';
+import { channels } from '@jetshop/core/test-utils/variables';
+
+function SelectedChannel() {
+  const { selectedChannel } = useContext(ChannelContext);
+  return <div id="selected-channel">{selectedChannel.displayName}</div>;
+}
+
+describe('ChannelProvider', () => {
+  const selectedChannel = createSelectedChannel(channels[0]);
+
+  const oldWindowLocation = window.location;
+  let mockAssign = jest.fn();
+
+  beforeAll(() => {
+    // Mock the window.location object so we can test redirects
+    delete window.location;
+    window.location = Object.defineProperties(
+      {},
+      {
+        ...Object.getOwnPropertyDescriptors(oldWindowLocation),
+        assign: {
+          configurable: true,
+          value: mockAssign
+        }
+      }
+    );
+  });
+
+  beforeEach(() => {
+    window.location.assign.mockReset();
+  });
+
+  afterAll(() => {
+    window.location = oldWindowLocation;
+  });
+
+  test('Selected channel should be available', () => {
+    const channelHandler = new ChannelHandler({
+      selectedChannel,
+      channels
+    });
+
+    render(
+      <ChannelProvider channelHandler={channelHandler}>
+        <SelectedChannel />
+      </ChannelProvider>
+    );
+    const selectedChannelElement = document.getElementById('selected-channel');
+
+    expect(selectedChannelElement.textContent).toBe(
+      selectedChannel.displayName
+    );
+  });
+
+  function sleep(ms) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+  }
+
+  test('Updating a channel', async () => {
+    const newChannel = createSelectedChannel(channels[1]);
+
+    const channelHandler = new ChannelHandler({
+      selectedChannel,
+      channels,
+      getPrimaryRoutePath: (path) => Promise.resolve(path)
+    });
+
+    render(
+      <ChannelProvider
+        channelHandler={channelHandler}
+        config={{ preserveRedirect: true }}
+      >
+        <SelectedChannel />
+      </ChannelProvider>
+    );
+    channelHandler.updateChannel({
+      config: { preserveRedirect: true },
+      newChannel
+    });
+    const selectedChannelElement = document.getElementById('selected-channel');
+
+    expect(selectedChannelElement.textContent).not.toBe(newChannel.name);
+
+    expect(selectedChannelElement.textContent).toBe(
+      selectedChannel.displayName
+    );
+
+    // NOTE
+    // We need to sleep briefly here, otherwise the call to
+    // window.location.assign is not detected(!) in .toHaveBeenCalled()
+    await sleep(10);
+
+    // Updating a channel should trigger a redirect
+    expect(window.location.assign).toHaveBeenCalled();
+
+    const newUrl = new URL(window.location.assign.mock.calls[0][0]);
+    expect(newUrl.searchParams.get('channel')).toBe(newChannel.name);
+    expect(newUrl.searchParams.get('channelCountry')).toBe(
+      newChannel.country.code
+    );
+    expect(newUrl.searchParams.get('culture')).toBe(
+      newChannel.language.culture
+    );
+  });
+});

package/components/ConfigProvider.d.ts

@@ -50,6 +50,7 @@ export interface BootOptions {
     apolloConfig: ApolloConfig;
     trackingID: string;
     additionalGtagTrackingIds: string[];
+    brandCustomField?: string;
     useArticleNumberAsId?: boolean;
     tagManagerID: string;
     intl: IntlOptions;

package/components/ConfigProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"ConfigProvider.js","sourceRoot":"","sources":["ConfigProvider.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAK,EAAE,EAAE,aAAa,EAAgB,MAAM,OAAO,CAAC;AAM3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAkG5D,MAAM,CAAC,MAAM,iBAAiB,GAAG,aAAa,CAC5C,SAAS,CACV,CAAC;AAEF,MAAM,UAAU,cAAc,CAAC,EAO9B;QAP8B,EAC7B,MAAM,EAAE,UAAU,EAClB,QAAQ,OAKT,EAJI,IAAI,cAHsB,sBAI9B,CADQ;IAKP,MAAM,MAAM,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAC;IAC5C,OAAO,CACL,oBAAC,iBAAiB,CAAC,QAAQ,kBAAC,KAAK,EAAE,MAAM,IAAM,IAAI,GAChD,QAAQ,CACkB,CAC9B,CAAC;AACJ,CAAC"}
+{"version":3,"file":"ConfigProvider.js","sourceRoot":"","sources":["ConfigProvider.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAK,EAAE,EAAE,aAAa,EAAgB,MAAM,OAAO,CAAC;AAM3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAmG5D,MAAM,CAAC,MAAM,iBAAiB,GAAG,aAAa,CAC5C,SAAS,CACV,CAAC;AAEF,MAAM,UAAU,cAAc,CAAC,EAO9B;QAP8B,EAC7B,MAAM,EAAE,UAAU,EAClB,QAAQ,OAKT,EAJI,IAAI,cAHsB,sBAI9B,CADQ;IAKP,MAAM,MAAM,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAC;IAC5C,OAAO,CACL,oBAAC,iBAAiB,CAAC,QAAQ,kBAAC,KAAK,EAAE,MAAM,IAAM,IAAI,GAChD,QAAQ,CACkB,CAC9B,CAAC;AACJ,CAAC"}

package/components/DynamicRoute/ContentRoute.d.ts

@@ -1,6 +1,6 @@
 import React, { ComponentType } from 'react';
 import { QueryResult } from 'react-apollo';
-import { Page } from 'packages/core/types';
+import { Page } from '@jetshop/core/types';
 export interface ContentProps {
     result: QueryResult;
     page: Page;

package/components/DynamicRoute/ProductRoute.d.ts

@@ -8,6 +8,7 @@ export interface ProductProps {
 export interface ProductRouteProps {
     component: ComponentType<ProductProps>;
     result: QueryResult;
+    partialProduct?: Partial<Product>;
 }
 declare const ProductRoute: (props: ProductRouteProps) => JSX.Element;
 export default ProductRoute;

package/components/DynamicRoute/ProductRoute.js

@@ -19,8 +19,10 @@ import { StructuredProductData } from '../StructuredData';
 import { OpenGraphProductData } from '../OpenGraph';
 const ProductRoute = (props) => {
     var _a, _b, _c;
-    const { component: ProductPage } = props, rest = __rest(props, ["component"]);
-    const product = ((_b = (_a = props.result.data) === null || _a === void 0 ? void 0 : _a.route) === null || _b === void 0 ? void 0 : _b.object) || ((_c = props.result.data) === null || _c === void 0 ? void 0 : _c.product);
+    const { component: ProductPage, partialProduct } = props, rest = __rest(props, ["component", "partialProduct"]);
+    const product = ((_b = (_a = props.result.data) === null || _a === void 0 ? void 0 : _a.route) === null || _b === void 0 ? void 0 : _b.object) ||
+        ((_c = props.result.data) === null || _c === void 0 ? void 0 : _c.product) ||
+        partialProduct;
     const { structuredData, openGraph } = useShopConfig();
     const location = useLocation();
     const track = useTracker();

package/components/DynamicRoute/ProductRoute.js.map

@@ -1 +1 @@
-{"version":3,"file":"ProductRoute.js","sourceRoot":"","sources":["ProductRoute.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAErE,OAAO,KAAK,EAAE,EAAiB,SAAS,EAAE,MAAM,OAAO,CAAC;AAExD,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,4BAA4B,MAAM,8DAA8D,CAAC;AACxG,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAWpD,MAAM,YAAY,GAAG,CAAC,KAAwB,EAAE,EAAE;;IAChD,MAAM,EAAE,SAAS,EAAE,WAAW,KAAc,KAAK,EAAd,IAAI,UAAK,KAAK,EAA3C,aAAmC,CAAQ,CAAC;IAElD,MAAM,OAAO,GACX,CAAA,MAAA,MAAA,KAAK,CAAC,MAAM,CAAC,IAAI,0CAAE,KAAK,0CAAE,MAAM,MAAI,MAAA,KAAK,CAAC,MAAM,CAAC,IAAI,0CAAE,OAAO,CAAA,CAAC;IAEjE,MAAM,EAAE,cAAc,EAAE,SAAS,EAAE,GAAG,aAAa,EAAE,CAAC;IACtD,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,MAAM,KAAK,GAAG,UAAU,EAAE,CAAC;IAE3B,MAAM,4BAA4B,GAAG,cAAc;QACjD,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,yBAAyB;QAC5C,CAAC,CAAC,KAAK,CAAC;IAEV,MAAM,2BAA2B,GAAG,SAAS;QAC3C,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,yBAAyB;QACvC,CAAC,CAAC,KAAK,CAAC;IAEV,SAAS,CAAC,GAAG,EAAE;;QACb,OAAO;YACL,KAAK,CACH,iBAAiB,CAAC;gBAChB,MAAM,EAAE,MAAM;gBACd,OAAO;gBACP,IAAI,EAAE,MAAA,QAAQ,CAAC,KAAK,0CAAE,IAAI;aAC3B,CAAC,CACH,CAAC;IACN,CAAC,EAAE,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;IAErC,OAAO,CACL;QACG,OAAO,IAAI,CACV;YACG,CAAC,4BAA4B,IAAI,CAChC,oBAAC,qBAAqB,IAAC,OAAO,EAAE,OAAO,GAAI,CAC5C;YACA,CAAC,2BAA2B,IAAI,CAC/B,oBAAC,oBAAoB,IAAC,OAAO,EAAE,OAAO,GAAI,CAC3C,CACA,CACJ;QACD,oBAAC,4BAA4B,IAAC,OAAO,EAAE,OAAO;YAC5C,oBAAC,WAAW,oBAAK,IAAI,IAAE,OAAO,EAAE,OAAO,IAAI,CACd,CAC9B,CACJ,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,YAAY,CAAC"}
+{"version":3,"file":"ProductRoute.js","sourceRoot":"","sources":["ProductRoute.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAErE,OAAO,KAAK,EAAE,EAAiB,SAAS,EAAE,MAAM,OAAO,CAAC;AAExD,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,4BAA4B,MAAM,8DAA8D,CAAC;AACxG,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAYpD,MAAM,YAAY,GAAG,CAAC,KAAwB,EAAE,EAAE;;IAChD,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,cAAc,KAAc,KAAK,EAAd,IAAI,UAAK,KAAK,EAA3D,+BAAmD,CAAQ,CAAC;IAElE,MAAM,OAAO,GACX,CAAA,MAAA,MAAA,KAAK,CAAC,MAAM,CAAC,IAAI,0CAAE,KAAK,0CAAE,MAAM;SAChC,MAAA,KAAK,CAAC,MAAM,CAAC,IAAI,0CAAE,OAAO,CAAA;QAC1B,cAAc,CAAC;IAEjB,MAAM,EAAE,cAAc,EAAE,SAAS,EAAE,GAAG,aAAa,EAAE,CAAC;IACtD,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,MAAM,KAAK,GAAG,UAAU,EAAE,CAAC;IAE3B,MAAM,4BAA4B,GAAG,cAAc;QACjD,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,yBAAyB;QAC5C,CAAC,CAAC,KAAK,CAAC;IAEV,MAAM,2BAA2B,GAAG,SAAS;QAC3C,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,yBAAyB;QACvC,CAAC,CAAC,KAAK,CAAC;IAEV,SAAS,CAAC,GAAG,EAAE;;QACb,OAAO;YACL,KAAK,CACH,iBAAiB,CAAC;gBAChB,MAAM,EAAE,MAAM;gBACd,OAAO;gBACP,IAAI,EAAE,MAAA,QAAQ,CAAC,KAAK,0CAAE,IAAI;aAC3B,CAAC,CACH,CAAC;IACN,CAAC,EAAE,CAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;IAErC,OAAO,CACL;QACG,OAAO,IAAI,CACV;YACG,CAAC,4BAA4B,IAAI,CAChC,oBAAC,qBAAqB,IAAC,OAAO,EAAE,OAAO,GAAI,CAC5C;YACA,CAAC,2BAA2B,IAAI,CAC/B,oBAAC,oBAAoB,IAAC,OAAO,EAAE,OAAO,GAAI,CAC3C,CACA,CACJ;QACD,oBAAC,4BAA4B,IAAC,OAAO,EAAE,OAAO;YAC5C,oBAAC,WAAW,oBAAK,IAAI,IAAE,OAAO,EAAE,OAAO,IAAI,CACd,CAC9B,CACJ,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,YAAY,CAAC"}

package/components/DynamicRoute/RouteResolver.js

@@ -22,9 +22,11 @@ const isRouteType = (state, result, type) => {
     }
 };
 const isEmptyRoute = (result) => {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     const errorCode = (_e = (_d = (_c = (_b = (_a = result === null || result === void 0 ? void 0 : result.error) === null || _a === void 0 ? void 0 : _a.graphQLErrors) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.extensions) === null || _d === void 0 ? void 0 : _d.code) !== null && _e !== void 0 ? _e : '';
+    const route = (_f = result === null || result === void 0 ? void 0 : result.data) === null || _f === void 0 ? void 0 : _f.route;
     return (errorCode.includes('EmptyRoute') ||
+        !route ||
         (typeof window !== 'undefined' && window.__STATUS_CODE__ === '404'));
 };
 const Loading = (LoadingPage) => LoadingPage ? React.createElement(LoadingPage, null) : React.createElement("div", null, "Loading...");
@@ -40,7 +42,7 @@ const RouteResolver = ({ productPage, categoryPage, contentPage, notFoundPage: N
                 } })));
     }
     else if (isRouteType(state, result, 'Product')) {
-        return React.createElement(ProductRoute, { result: result, component: productPage });
+        return (React.createElement(ProductRoute, { result: result, partialProduct: state === null || state === void 0 ? void 0 : state.product, component: productPage }));
     }
     else if (isRouteType(state, result, 'Category')) {
         return React.createElement(CategoryRoute, { result: result, component: categoryPage });

package/components/DynamicRoute/RouteResolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"RouteResolver.js","sourceRoot":"","sources":["RouteResolver.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"RouteResolver.js","sourceRoot":"","sources":["RouteResolver.tsx"],"names":[],"mappings":"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"}

package/components/Mutation/AddToCart/addToCartUtils.js

@@ -2,7 +2,8 @@ import { useTracker } from '@jetshop/core/analytics/Analytics';
 import { useCallback } from 'react';
 import { trackProductEvent } from '@jetshop/core/analytics/tracking';
 export function getArticleNumber(product, selectedVariation) {
-    return product.variants.values.length > 0
+    var _a, _b;
+    return ((_b = (_a = product === null || product === void 0 ? void 0 : product.variants) === null || _a === void 0 ? void 0 : _a.values) === null || _b === void 0 ? void 0 : _b.length) > 0
         ? selectedVariation === null || selectedVariation === void 0 ? void 0 : selectedVariation.articleNumber
         : product === null || product === void 0 ? void 0 : product.articleNumber;
 }
@@ -18,7 +19,7 @@ export function useTrackProductAdd(selectedVariation) {
     }, [selectedVariation, track]);
 }
 export function getCommentsFromFormikValues(values) {
-    return Object.keys(values.comments).map(name => {
+    return Object.keys(values.comments).map((name) => {
         return {
             name,
             value: values.comments[name]

package/components/Mutation/AddToCart/addToCartUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"addToCartUtils.js","sourceRoot":"","sources":["addToCartUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAE/D,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAOrE,MAAM,UAAU,gBAAgB,CAC9B,OAAgB,EAChB,iBAAiC;IAEjC,OAAO,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC;QACvC,CAAC,CAAC,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,aAAa;QAClC,CAAC,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,aAAa,CAAC;AAC7B,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,iBAAiC;IAClE,MAAM,KAAK,GAAG,UAAU,EAAE,CAAC;IAE3B,OAAO,WAAW,CAChB,SAAS,mBAAmB,CAAC,OAAO,EAAE,QAAQ;QAC5C,KAAK,CACH,iBAAiB,CAAC;YAChB,MAAM,EAAE,KAAK;YACb,OAAO;YACP,QAAQ;YACR,iBAAiB;SAClB,CAAC,CACH,CAAC;IACJ,CAAC,EACD,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAC3B,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,2BAA2B,CAAC,MAA6B;IACvE,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;QAC7C,OAAO;YACL,IAAI;YACJ,KAAK,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC;SAC7B,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,EAC/B,kBAAkB,EAClB,eAAe,EACf,MAAM,EACN,SAAS,EAMV;IACC,OAAO,CAAC,EAAE,IAAI,EAAO,EAAE,EAAE;QACvB,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,KAAK,MAAM,EAAE;YAChD,IAAI,CAAC,SAAS,IAAI,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;SACrD;QACD,kBAAkB,IAAI,kBAAkB,CAAC,eAAe,CAAC,CAAC;IAC5D,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,EAC7B,gBAAgB,EAChB,eAAe,EAIhB;IACC,OAAO,CAAC,KAAU,EAAE,EAAE;QACpB,OAAO,CAAC,KAAK,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAC;QAC3C,IAAI,CAAC,gBAAgB,EAAE;YACrB,MAAM,KAAK,CAAC;SACb;QACD,gBAAgB,iCAAM,eAAe,KAAE,KAAK,IAAG,CAAC;IAClD,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"addToCartUtils.js","sourceRoot":"","sources":["addToCartUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAE/D,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAOrE,MAAM,UAAU,gBAAgB,CAC9B,OAAgB,EAChB,iBAAiC;;IAEjC,OAAO,CAAA,MAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,0CAAE,MAAM,0CAAE,MAAM,IAAG,CAAC;QAC1C,CAAC,CAAC,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,aAAa;QAClC,CAAC,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,aAAa,CAAC;AAC7B,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,iBAAiC;IAClE,MAAM,KAAK,GAAG,UAAU,EAAE,CAAC;IAE3B,OAAO,WAAW,CAChB,SAAS,mBAAmB,CAAC,OAAO,EAAE,QAAQ;QAC5C,KAAK,CACH,iBAAiB,CAAC;YAChB,MAAM,EAAE,KAAK;YACb,OAAO;YACP,QAAQ;YACR,iBAAiB;SAClB,CAAC,CACH,CAAC;IACJ,CAAC,EACD,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAC3B,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,2BAA2B,CAAC,MAA6B;IACvE,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QAC/C,OAAO;YACL,IAAI;YACJ,KAAK,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC;SAC7B,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,EAC/B,kBAAkB,EAClB,eAAe,EACf,MAAM,EACN,SAAS,EAMV;IACC,OAAO,CAAC,EAAE,IAAI,EAAO,EAAE,EAAE;QACvB,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,KAAK,MAAM,EAAE;YAChD,IAAI,CAAC,SAAS,IAAI,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;SACrD;QACD,kBAAkB,IAAI,kBAAkB,CAAC,eAAe,CAAC,CAAC;IAC5D,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,EAC7B,gBAAgB,EAChB,eAAe,EAIhB;IACC,OAAO,CAAC,KAAU,EAAE,EAAE;QACpB,OAAO,CAAC,KAAK,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAC;QAC3C,IAAI,CAAC,gBAAgB,EAAE;YACrB,MAAM,KAAK,CAAC;SACb;QACD,gBAAgB,iCAAM,eAAe,KAAE,KAAK,IAAG,CAAC;IAClD,CAAC,CAAC;AACJ,CAAC"}

package/components/Mutation/RemoveFromCart.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
 import { CartMutationProps } from './cartMutationUtils';
-declare type RemoveFromCartProps = {} & CartMutationProps;
+declare type RemoveFromCartProps = CartMutationProps;
 declare const RemoveFromCart: ({ cartQuery, children }: RemoveFromCartProps) => JSX.Element;
 export default RemoveFromCart;

package/components/Mutation/cartMutationUtils.js

@@ -2,6 +2,7 @@ import throwErrorInDev from '../../helpers/throwErrorInDev';
 export const TEMP_CART_ID = 'TEMP_CART_ID';
 export const getAddToCartOptimisticResponse = (product, quantity = 1, cartId, client, cartQuery) => {
     const defaultOptimisticCart = {
+        __optimistic: true,
         id: TEMP_CART_ID,
         totalQuantity: quantity,
         __typename: 'Cart',
@@ -38,7 +39,7 @@ export const getAddToCartOptimisticResponse = (product, quantity = 1, cartId, cl
                 const newTotalQuantity = cart.totalQuantity + quantity;
                 const newItemQuantity = cart.items[index].quantity + quantity;
                 // Already in cart, increase/decrease quantity
-                const optimisticCart = Object.assign(Object.assign({}, cart), { totalQuantity: newTotalQuantity, items: [
+                const optimisticCart = Object.assign(Object.assign({}, cart), { __optimistic: true, totalQuantity: newTotalQuantity, items: [
                         ...cart.items.slice(0, index),
                         ...(newItemQuantity > 0
                             ? [
@@ -50,7 +51,7 @@ export const getAddToCartOptimisticResponse = (product, quantity = 1, cartId, cl
                 return optimisticCart;
             }
             else {
-                const optimisticCart = Object.assign(Object.assign({}, cart), { totalQuantity: cart.totalQuantity + quantity });
+                const optimisticCart = Object.assign(Object.assign({}, cart), { __optimistic: true, totalQuantity: cart.totalQuantity + quantity });
                 return optimisticCart;
             }
         }
@@ -69,7 +70,7 @@ export const getDecrementQuantityOptimisticResponse = ({ itemId, client, cartId,
         variables: { cartId }
     });
     const items = cart.items.map((item) => item.id === itemId ? Object.assign(Object.assign({}, item), { quantity: item.quantity - 1 }) : item);
-    const optimisticCart = Object.assign(Object.assign({}, cart), { items });
+    const optimisticCart = Object.assign(Object.assign({}, cart), { items, __optimistic: true });
     return optimisticCart;
 };
 export const getIncrementQuantityOptimisticResponse = ({ itemId, client, cartId, cartQuery }) => {
@@ -79,7 +80,7 @@ export const getIncrementQuantityOptimisticResponse = ({ itemId, client, cartId,
         variables: { cartId }
     });
     const items = cart.items.map((item) => item.id === itemId ? Object.assign(Object.assign({}, item), { quantity: item.quantity + 1 }) : item);
-    const optimisticCart = Object.assign(Object.assign({}, cart), { items });
+    const optimisticCart = Object.assign(Object.assign({}, cart), { items, __optimistic: true });
     return optimisticCart;
 };
 export const getRemoveFromCartOptimisticResponse = ({ itemId, client, cartId, setCartId, cartQuery }) => {
@@ -92,7 +93,7 @@ export const getRemoveFromCartOptimisticResponse = ({ itemId, client, cartId, se
     if (items.length === 0) {
         setCartId(null);
     }
-    const optimisticCart = Object.assign(Object.assign({}, cart), { items });
+    const optimisticCart = Object.assign(Object.assign({}, cart), { items, __optimistic: true });
     return optimisticCart;
 };
 export const getSetQuantityOptimisticResponse = ({ itemId, quantity, client, cartId, cartQuery }) => {
@@ -102,7 +103,7 @@ export const getSetQuantityOptimisticResponse = ({ itemId, quantity, client, car
         variables: { cartId }
     });
     const items = cart.items.map((item) => item.id === itemId ? Object.assign(Object.assign({}, item), { quantity }) : item);
-    const optimisticCart = Object.assign(Object.assign({}, cart), { items });
+    const optimisticCart = Object.assign(Object.assign({}, cart), { items, __optimistic: true });
     return optimisticCart;
 };
 //# sourceMappingURL=cartMutationUtils.js.map

package/components/Mutation/cartMutationUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"cartMutationUtils.js","sourceRoot":"","sources":["cartMutationUtils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cartMutationUtils.js","sourceRoot":"","sources":["cartMutationUtils.ts"],"names":[],"mappings":"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"}

package/components/OpenGraph/OpenGraph.test.js

@@ -6,6 +6,8 @@ import { HelmetProvider } from 'react-helmet-async';
 import { OpenGraphProductData, OpenGraphGeneralPageData } from './';
 import { ChannelProvider } from '../ChannelContext';
 import { ChannelHandler } from '../../ChannelHandler/ChannelHandler';
+import { ConfigProvider } from '../ConfigProvider';
+import mockShopConfig from '../../test-utils/mockShopConfig';
 
 function getMetaProperty(propertyName) {
   const metas = document.getElementsByTagName('meta');
@@ -27,11 +29,13 @@ function Providers({ children }) {
   });
   const context = {};
   return (
-    <HelmetProvider context={context}>
-      <ChannelProvider channelHandler={channelHandler}>
-        {children}
-      </ChannelProvider>
-    </HelmetProvider>
+    <ConfigProvider config={mockShopConfig}>
+      <HelmetProvider context={context}>
+        <ChannelProvider channelHandler={channelHandler}>
+          {children}
+        </ChannelProvider>
+      </HelmetProvider>
+    </ConfigProvider>
   );
 }
 
@@ -150,4 +154,27 @@ describe('<OpenGraphProductData>', () => {
       expect(getMetaProperty('custom-property')).toEqual('custom-value');
     });
   });
+
+  it('Overriding brandCustomField in shop config should work', async () => {
+    const product = {
+      ...sampleProduct,
+      customFields: [
+        {
+          key: 'customBrandField',
+          stringValue: 'HyperBrand'
+        }
+      ]
+    };
+    render(
+      <Providers>
+        <ConfigProvider config={{ brandCustomField: 'customBrandField' }}>
+          <OpenGraphProductData product={product} />
+        </ConfigProvider>
+      </Providers>
+    );
+
+    await wait(() => {
+      expect(getMetaProperty('product:brand')).toEqual('HyperBrand');
+    });
+  });
 });

package/components/OpenGraph/OpenGraphProductData.d.ts

@@ -16,5 +16,10 @@ export interface OpenGraphProductDataProps {
      */
     optionalFields?: OpenGraphDataTag[];
 }
-export declare function getBrand(product: Product): any;
+/**
+ * Get the brand field from a product's customFields.
+ *
+ * Usually you'd want to pass in the brand field from your shop config.
+ */
+export declare function getBrand(product: Product, brandField?: string): any;
 export declare const OpenGraphProductData: React.FC<OpenGraphProductDataProps>;

package/components/OpenGraph/OpenGraphProductData.js

@@ -1,38 +1,44 @@
 import React from 'react';
 import { useProductVariants } from '../../hooks/useProductVariants';
+import { useShopConfig } from '@jetshop/core/hooks/useShopConfig';
 import ChannelContext from '../ChannelContext';
 import { Helmet } from 'react-helmet-async';
-// Key should be set in shopconfig (emanuels instruction)
-export function getBrand(product) {
+/**
+ * Get the brand field from a product's customFields.
+ *
+ * Usually you'd want to pass in the brand field from your shop config.
+ */
+export function getBrand(product, brandField = 'brand') {
     var _a;
-    const field = (_a = product === null || product === void 0 ? void 0 : product.customFields) === null || _a === void 0 ? void 0 : _a.find(({ key }) => key === 'brand');
+    const field = (_a = product === null || product === void 0 ? void 0 : product.customFields) === null || _a === void 0 ? void 0 : _a.find(({ key }) => key === brandField);
     if (field) {
         return field === null || field === void 0 ? void 0 : field.stringValue;
     }
 }
-export const OpenGraphProductData = ({ product, initialVariant, optionalFields = [], }) => {
-    var _a, _b, _c;
-    const { selectedVariant: variant, } = useProductVariants(product, {
-        initialVariant,
+export const OpenGraphProductData = ({ product, initialVariant, optionalFields = [] }) => {
+    var _a, _b, _c, _d;
+    const { selectedVariant: variant } = useProductVariants(product, {
+        initialVariant
     });
     const { selectedChannel } = React.useContext(ChannelContext);
+    const { brandCustomField } = useShopConfig();
     const prod = variant || product;
-    const brand = getBrand(product);
+    const brand = getBrand(product, brandCustomField);
     const overrides = optionalFields.map((tag) => tag.property);
     // If these are updated, please also update the docs (OpenGraph.mdx)
     const defaultTags = [
         {
             property: 'product:original_price:amount',
-            content: (_a = prod.previousPrice) === null || _a === void 0 ? void 0 : _a.incVat,
+            content: (_a = prod.previousPrice) === null || _a === void 0 ? void 0 : _a.incVat
         },
         { property: 'product:price:amount', content: (_b = prod.price) === null || _b === void 0 ? void 0 : _b.incVat },
         {
             property: 'og:price:currency',
-            content: selectedChannel.currency.format.code,
+            content: selectedChannel.currency.format.code
         },
-        { property: 'product:availability', content: prod.stockStatus.buyable },
+        { property: 'product:availability', content: (_c = prod.stockStatus) === null || _c === void 0 ? void 0 : _c.buyable },
         { property: 'product:brand', content: brand },
-        { property: 'product:category', content: (_c = product.canonicalCategory) === null || _c === void 0 ? void 0 : _c.name },
+        { property: 'product:category', content: (_d = product.canonicalCategory) === null || _d === void 0 ? void 0 : _d.name }
     ].filter((tag) => !overrides.includes(tag.property));
     return (React.createElement(Helmet, null,
         defaultTags.map((tag) => {

package/components/OpenGraph/OpenGraphProductData.js.map

@@ -1 +1 @@
-{"version":3,"file":"OpenGraphProductData.js","sourceRoot":"","sources":["OpenGraphProductData.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,cAAc,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAmB5C,yDAAyD;AACzD,MAAM,UAAU,QAAQ,CAAC,OAAgB;;IACvC,MAAM,KAAK,GAAQ,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,0CAAE,IAAI,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,GAAG,KAAK,OAAO,CAAC,CAAC;IAC7E,IAAI,KAAK,EAAE;QACT,OAAO,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,WAAW,CAAC;KAC3B;AACH,CAAC;AAED,MAAM,CAAC,MAAM,oBAAoB,GAAwC,CAAC,EACxE,OAAO,EACP,cAAc,EACd,cAAc,GAAG,EAAE,GACpB,EAAE,EAAE;;IACH,MAAM,EACJ,eAAe,EAAE,OAAO,GACzB,GAEG,kBAAkB,CAAC,OAAO,EAAE;QAC9B,cAAc;KACf,CAAC,CAAC;IACH,MAAM,EAAE,eAAe,EAAE,GAAG,KAAK,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;IAE7D,MAAM,IAAI,GAAG,OAAO,IAAI,OAAO,CAAC;IAChC,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC;IAEhC,MAAM,SAAS,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAE5D,oEAAoE;IACpE,MAAM,WAAW,GAAG;QAClB;YACE,QAAQ,EAAE,+BAA+B;YACzC,OAAO,EAAE,MAAA,IAAI,CAAC,aAAa,0CAAE,MAAM;SACpC;QACD,EAAE,QAAQ,EAAE,sBAAsB,EAAE,OAAO,EAAE,MAAA,IAAI,CAAC,KAAK,0CAAE,MAAM,EAAE;QACjE;YACE,QAAQ,EAAE,mBAAmB;YAC7B,OAAO,EAAE,eAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI;SAC9C;QACD,EAAE,QAAQ,EAAE,sBAAsB,EAAE,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE;QACvE,EAAE,QAAQ,EAAE,eAAe,EAAE,OAAO,EAAE,KAAK,EAAE;QAC7C,EAAE,QAAQ,EAAE,kBAAkB,EAAE,OAAO,EAAE,MAAA,OAAO,CAAC,iBAAiB,0CAAE,IAAI,EAAE;KAC3E,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC;IAErD,OAAO,CACL,oBAAC,MAAM;QACJ,WAAW,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YACvB,OAAO,CACL,GAAG,CAAC,OAAO,IAAI,CACb,8BACE,GAAG,EAAE,UAAU,GAAG,CAAC,QAAQ,EAAE,EAC7B,QAAQ,EAAE,GAAG,CAAC,QAAQ,EACtB,OAAO,EAAE,GAAG,CAAC,OAAO,GACpB,CACH,CACF,CAAC;QACJ,CAAC,CAAC;QACD,cAAc,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAC3B,8BACE,GAAG,EAAE,UAAU,GAAG,CAAC,QAAQ,EAAE,EAC7B,QAAQ,EAAE,GAAG,CAAC,QAAQ,EACtB,OAAO,EAAE,GAAG,CAAC,OAAO,GACpB,CACH,CAAC,CACK,CACV,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"OpenGraphProductData.js","sourceRoot":"","sources":["OpenGraphProductData.tsx"],"names":[],"mappings":"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"}