@jetshop/core 5.13.11-0 → 5.14.0-alpha.abd04298

package/hooks/useLoginRedirect.js

@@ -1,37 +1,37 @@
-import { useContext } from 'react';
-import qs from 'qs';
-import cartCheckoutQuery from './CartCheckoutQuery.gql';
-import { CartIdContext } from '../components/Cart/CartIdContext';
-import { useApolloClient } from 'react-apollo';
-function useLoginRedirect() {
-    const { ReturnURL } = __IN_SERVER__
-        ? { ReturnURL: null }
-        : qs.parse(window.location.search, {
-            ignoreQueryPrefix: true
-        });
-    const { cartId } = useContext(CartIdContext);
-    const client = useApolloClient();
-    function getRedirectUrl() {
-        if (!ReturnURL)
-            return;
-        if (ReturnURL.startsWith('/checkout')) {
-            return client
-                .query({
-                query: cartCheckoutQuery,
-                variables: {
-                    cartId
-                }
-            })
-                .then(result => {
-                const externalCheckoutUrl = result.data.cart.externalCheckoutUrl;
-                return externalCheckoutUrl;
-            });
-        }
-        else {
-            return Promise.resolve(ReturnURL);
-        }
-    }
-    return { getRedirectUrl };
-}
-export { useLoginRedirect };
+import { useContext } from 'react';
+import qs from 'qs';
+import cartCheckoutQuery from './CartCheckoutQuery.gql';
+import { CartIdContext } from '../components/Cart/CartIdContext';
+import { useApolloClient } from 'react-apollo';
+function useLoginRedirect() {
+    const { ReturnURL } = __IN_SERVER__
+        ? { ReturnURL: null }
+        : qs.parse(window.location.search, {
+            ignoreQueryPrefix: true
+        });
+    const { cartId } = useContext(CartIdContext);
+    const client = useApolloClient();
+    function getRedirectUrl() {
+        if (!ReturnURL)
+            return;
+        if (ReturnURL.startsWith('/checkout')) {
+            return client
+                .query({
+                query: cartCheckoutQuery,
+                variables: {
+                    cartId
+                }
+            })
+                .then(result => {
+                const externalCheckoutUrl = result.data.cart.externalCheckoutUrl;
+                return externalCheckoutUrl;
+            });
+        }
+        else {
+            return Promise.resolve(ReturnURL);
+        }
+    }
+    return { getRedirectUrl };
+}
+export { useLoginRedirect };
 //# sourceMappingURL=useLoginRedirect.js.map

package/hooks/useOrderDetailQuery.d.ts

@@ -1,20 +1,20 @@
-import { DocumentNode } from 'graphql';
-import { Order } from '../types';
-interface UseOrderDetail {
-    query: DocumentNode;
-    orderId: string;
-    id: number;
-}
-/**
- * Takes in the orderDetails query and order id, and returns the result and
- * some helpers
- */
-export default function useOrderDetailQuery({ query, id }: UseOrderDetail): {
-    loading: boolean;
-    error: import("apollo-client").ApolloError;
-    order: Order;
-    result: import("react-apollo").QueryResult<{
-        order: Order;
-    }, import("react-apollo").OperationVariables>;
-};
-export {};
+import { DocumentNode } from 'graphql';
+import { Order } from '../types';
+interface UseOrderDetail {
+    query: DocumentNode;
+    orderId: string;
+    id: number;
+}
+/**
+ * Takes in the orderDetails query and order id, and returns the result and
+ * some helpers
+ */
+export default function useOrderDetailQuery({ query, id }: UseOrderDetail): {
+    loading: boolean;
+    error: import("apollo-client").ApolloError;
+    order: Order;
+    result: import("react-apollo").QueryResult<{
+        order: Order;
+    }, import("react-apollo").OperationVariables>;
+};
+export {};

package/hooks/useOrderDetailQuery.js

@@ -1,29 +1,29 @@
-import { useQuery } from '@apollo/react-hooks';
-import throwErrorInDev from '../helpers/throwErrorInDev';
-import logWarningInDev from '../helpers/logWarningInDev';
-/**
- * Takes in the orderDetails query and order id, and returns the result and
- * some helpers
- */
-export default function useOrderDetailQuery({ query, id }) {
-    var _a, _b;
-    const queryUsesOrderIdParam = 
-    // @ts-ignore
-    ((_b = (_a = query.definitions[0]) === null || _a === void 0 ? void 0 : _a.variableDefinitions[0]) === null || _b === void 0 ? void 0 : _b.variable.name.value) ===
-        'orderId';
-    const result = useQuery(query, {
-        variables: queryUsesOrderIdParam ? { orderId: id } : { id: id }
-    });
-    throwErrorInDev(!!result.error, `The API returned an error for the Order query with id ${id}.
-    ${result.error}`);
-    logWarningInDev(!queryUsesOrderIdParam, 'order(id: Int) has been deprecated. Please update OrderDetail.gql to use the orderId variable.');
-    throwErrorInDev(!result.loading && result.data && !result.data.order ? true : false, 'No order field was found in the response. Double-check that your query includes `{ order(orderId: ID!) }`');
-    return {
-        // Default loading to true for SSR
-        loading: result ? result.loading : true,
-        error: result.error,
-        order: result.data ? result.data.order : null,
-        result
-    };
-}
+import { useQuery } from '@apollo/react-hooks';
+import throwErrorInDev from '../helpers/throwErrorInDev';
+import logWarningInDev from '../helpers/logWarningInDev';
+/**
+ * Takes in the orderDetails query and order id, and returns the result and
+ * some helpers
+ */
+export default function useOrderDetailQuery({ query, id }) {
+    var _a, _b;
+    const queryUsesOrderIdParam = 
+    // @ts-ignore
+    ((_b = (_a = query.definitions[0]) === null || _a === void 0 ? void 0 : _a.variableDefinitions[0]) === null || _b === void 0 ? void 0 : _b.variable.name.value) ===
+        'orderId';
+    const result = useQuery(query, {
+        variables: queryUsesOrderIdParam ? { orderId: id } : { id: id }
+    });
+    throwErrorInDev(!!result.error, `The API returned an error for the Order query with id ${id}.
+    ${result.error}`);
+    logWarningInDev(!queryUsesOrderIdParam, 'order(id: Int) has been deprecated. Please update OrderDetail.gql to use the orderId variable.');
+    throwErrorInDev(!result.loading && result.data && !result.data.order ? true : false, 'No order field was found in the response. Double-check that your query includes `{ order(orderId: ID!) }`');
+    return {
+        // Default loading to true for SSR
+        loading: result ? result.loading : true,
+        error: result.error,
+        order: result.data ? result.data.order : null,
+        result
+    };
+}
 //# sourceMappingURL=useOrderDetailQuery.js.map

package/hooks/usePreconnectLinks.d.ts

@@ -1,10 +1,10 @@
-interface PreconnectLinkOptions {
-    ga?: boolean;
-    gtm?: boolean;
-}
-interface PreconnectLink {
-    href: string;
-    crossOrigin: string;
-}
-export declare function usePreconnectLinks({ ga, gtm }?: PreconnectLinkOptions): PreconnectLink[];
-export {};
+interface PreconnectLinkOptions {
+    ga?: boolean;
+    gtm?: boolean;
+}
+interface PreconnectLink {
+    href: string;
+    crossOrigin: string;
+}
+export declare function usePreconnectLinks({ ga, gtm }?: PreconnectLinkOptions): PreconnectLink[];
+export {};

package/hooks/usePreconnectLinks.js

@@ -1,30 +1,30 @@
-import { useShopConfig } from './useShopConfig';
-export function usePreconnectLinks({ ga = false, gtm = false } = {}) {
-    const { apolloConfig } = useShopConfig();
-    // These links are used with every store
-    const staticLinks = [
-        {
-            href: 'https://cdn.polyfill.io',
-            crossOrigin: null
-        },
-        (apolloConfig === null || apolloConfig === void 0 ? void 0 : apolloConfig.graphQLURI) && {
-            href: apolloConfig === null || apolloConfig === void 0 ? void 0 : apolloConfig.graphQLURI,
-            crossOrigin: null
-        }
-    ].filter(Boolean);
-    // Only preconnect to these urls if Google Analytics is enabled
-    const gaLinks = ga
-        ? [
-            'https://www.google-analytics.com',
-            'https://www.google.com',
-            'https://stats.g.doubleclick.net'
-        ]
-        : [];
-    // Only preconnect to these if GTM is enabled
-    const gtmLinks = gtm ? ['https://www.googletagmanager.com'] : [];
-    return [
-        ...staticLinks,
-        ...gaLinks.concat(gtmLinks).map(href => ({ href, crossOrigin: null }))
-    ];
-}
+import { useShopConfig } from './useShopConfig';
+export function usePreconnectLinks({ ga = false, gtm = false } = {}) {
+    const { apolloConfig } = useShopConfig();
+    // These links are used with every store
+    const staticLinks = [
+        {
+            href: 'https://cdn.polyfill.io',
+            crossOrigin: null
+        },
+        (apolloConfig === null || apolloConfig === void 0 ? void 0 : apolloConfig.graphQLURI) && {
+            href: apolloConfig === null || apolloConfig === void 0 ? void 0 : apolloConfig.graphQLURI,
+            crossOrigin: null
+        }
+    ].filter(Boolean);
+    // Only preconnect to these urls if Google Analytics is enabled
+    const gaLinks = ga
+        ? [
+            'https://www.google-analytics.com',
+            'https://www.google.com',
+            'https://stats.g.doubleclick.net'
+        ]
+        : [];
+    // Only preconnect to these if GTM is enabled
+    const gtmLinks = gtm ? ['https://www.googletagmanager.com'] : [];
+    return [
+        ...staticLinks,
+        ...gaLinks.concat(gtmLinks).map(href => ({ href, crossOrigin: null }))
+    ];
+}
 //# sourceMappingURL=usePreconnectLinks.js.map

package/hooks/usePreconnectLinks.test.js

@@ -1,95 +1,95 @@
-import React from 'react';
-import { render } from '@testing-library/react';
-import { usePreconnectLinks } from './usePreconnectLinks';
-import { ConfigProvider } from '@jetshop/core/components/ConfigProvider';
-
-const apolloConfig = {
-  graphQLURI: 'http://wow.com'
-};
-
-function expectStaticLinks() {
-  return [
-    expect.objectContaining({
-      href: apolloConfig.graphQLURI,
-      crossOrigin: null
-    }),
-    expect.objectContaining({
-      href: 'https://cdn.polyfill.io',
-      crossOrigin: null
-    })
-  ];
-}
-
-describe('usePreconnectLinks', () => {
-  test('by default returns only the base required links', () => {
-    const { links } = setup();
-
-    expect(links).toEqual(expect.arrayContaining([...expectStaticLinks()]));
-    expect(links.length).toBe(2);
-  });
-  test('if ga or gtm args are false, return base required linked', () => {
-    const { links } = setup({
-      opts: { config: Object.assign(apolloConfig, { gtm: false, ga: false }) }
-    });
-
-    expect(links).toEqual(expect.arrayContaining([...expectStaticLinks()]));
-    expect(links.length).toBe(2);
-  });
-  test('if ga is true, include ga links', () => {
-    const { links } = setup({
-      opts: { ga: true, gtm: false }
-    });
-
-    expect(links).toEqual(
-      expect.arrayContaining([
-        ...expectStaticLinks(),
-        expect.objectContaining({ href: 'https://www.google.com' })
-      ])
-    );
-    expect(links.length).toBe(5);
-  });
-  test('if gtm is true, include gtm links', () => {
-    const { links } = setup({
-      opts: { ga: false, gtm: true }
-    });
-
-    expect(links).toEqual(
-      expect.arrayContaining([
-        ...expectStaticLinks(),
-        expect.objectContaining({ href: 'https://www.googletagmanager.com' })
-      ])
-    );
-    expect(links.length).toBe(3);
-  });
-});
-
-function setup(opts = {}) {
-  let returnedLinks;
-  const utils = render(
-    <Providers config={opts.config}>
-      <TestComponent {...opts}>
-        {links => {
-          returnedLinks = links;
-
-          return null;
-        }}
-      </TestComponent>
-    </Providers>
-  );
-
-  return { ...utils, links: returnedLinks };
-}
-
-function TestComponent({ opts, children }) {
-  const links = usePreconnectLinks(opts);
-
-  return children(links);
-}
-
-function Providers(props) {
-  return (
-    <ConfigProvider config={props.config || { apolloConfig }}>
-      {props.children}
-    </ConfigProvider>
-  );
-}
+import React from 'react';
+import { render } from '@testing-library/react';
+import { usePreconnectLinks } from './usePreconnectLinks';
+import { ConfigProvider } from '@jetshop/core/components/ConfigProvider';
+
+const apolloConfig = {
+  graphQLURI: 'http://wow.com'
+};
+
+function expectStaticLinks() {
+  return [
+    expect.objectContaining({
+      href: apolloConfig.graphQLURI,
+      crossOrigin: null
+    }),
+    expect.objectContaining({
+      href: 'https://cdn.polyfill.io',
+      crossOrigin: null
+    })
+  ];
+}
+
+describe('usePreconnectLinks', () => {
+  test('by default returns only the base required links', () => {
+    const { links } = setup();
+
+    expect(links).toEqual(expect.arrayContaining([...expectStaticLinks()]));
+    expect(links.length).toBe(2);
+  });
+  test('if ga or gtm args are false, return base required linked', () => {
+    const { links } = setup({
+      opts: { config: Object.assign(apolloConfig, { gtm: false, ga: false }) }
+    });
+
+    expect(links).toEqual(expect.arrayContaining([...expectStaticLinks()]));
+    expect(links.length).toBe(2);
+  });
+  test('if ga is true, include ga links', () => {
+    const { links } = setup({
+      opts: { ga: true, gtm: false }
+    });
+
+    expect(links).toEqual(
+      expect.arrayContaining([
+        ...expectStaticLinks(),
+        expect.objectContaining({ href: 'https://www.google.com' })
+      ])
+    );
+    expect(links.length).toBe(5);
+  });
+  test('if gtm is true, include gtm links', () => {
+    const { links } = setup({
+      opts: { ga: false, gtm: true }
+    });
+
+    expect(links).toEqual(
+      expect.arrayContaining([
+        ...expectStaticLinks(),
+        expect.objectContaining({ href: 'https://www.googletagmanager.com' })
+      ])
+    );
+    expect(links.length).toBe(3);
+  });
+});
+
+function setup(opts = {}) {
+  let returnedLinks;
+  const utils = render(
+    <Providers config={opts.config}>
+      <TestComponent {...opts}>
+        {links => {
+          returnedLinks = links;
+
+          return null;
+        }}
+      </TestComponent>
+    </Providers>
+  );
+
+  return { ...utils, links: returnedLinks };
+}
+
+function TestComponent({ opts, children }) {
+  const links = usePreconnectLinks(opts);
+
+  return children(links);
+}
+
+function Providers(props) {
+  return (
+    <ConfigProvider config={props.config || { apolloConfig }}>
+      {props.children}
+    </ConfigProvider>
+  );
+}

package/hooks/usePrice.d.ts

@@ -1,39 +1,39 @@
-import { ReactNode } from 'react';
-import { Price } from '@jetshop/core/types';
-export interface UsePrice {
-    price: Price;
-    previousPrice?: Price;
-    currencyOverride?: {
-        code: string;
-        culture: string;
-    };
-    /**Optional formatter to format currency */
-    formatter?(price: number, currencyCode?: string, culture?: string): string;
-    /** Override the channel settings for includeVat */
-    includeVat?: boolean;
-}
-export declare function usePrice({ currencyOverride, price, previousPrice, includeVat, formatter: defaultFormatter }: UsePrice): {
-    hasDiscount: boolean;
-    includesVat: boolean;
-    currencyLocale: {
-        code: string;
-        culture: string;
-    };
-    pricing: {
-        [k: string]: {
-            vat: number;
-            value: number;
-        };
-    };
-    formattedPricing: {
-        price: ReactNode;
-        previousPrice: ReactNode;
-    };
-};
-/**
- * Normalise the price to an object with keys `value` and `vat`
- */
-export declare function selectPriceType(includeVat: boolean, priceObj: Price): {
-    vat: number;
-    value: number;
-} | null;
+import { ReactNode } from 'react';
+import { Price } from '@jetshop/core/types';
+export interface UsePrice {
+    price: Price;
+    previousPrice?: Price;
+    currencyOverride?: {
+        code: string;
+        culture: string;
+    };
+    /**Optional formatter to format currency */
+    formatter?(price: number, currencyCode?: string, culture?: string): string;
+    /** Override the channel settings for includeVat */
+    includeVat?: boolean;
+}
+export declare function usePrice({ currencyOverride, price, previousPrice, includeVat, formatter: defaultFormatter }: UsePrice): {
+    hasDiscount: boolean;
+    includesVat: boolean;
+    currencyLocale: {
+        code: string;
+        culture: string;
+    };
+    pricing: {
+        [k: string]: {
+            vat: number;
+            value: number;
+        };
+    };
+    formattedPricing: {
+        price: ReactNode;
+        previousPrice: ReactNode;
+    };
+};
+/**
+ * Normalise the price to an object with keys `value` and `vat`
+ */
+export declare function selectPriceType(includeVat: boolean, priceObj: Price): {
+    vat: number;
+    value: number;
+} | null;

package/hooks/usePrice.js

@@ -1,72 +1,72 @@
-import ChannelContext from '@jetshop/core/components/ChannelContext';
-import { useContext } from 'react';
-import { useIntl } from '@jetshop/intl';
-// #endregion Interfaces
-// #region
-export function usePrice({ currencyOverride, price, previousPrice, includeVat, formatter: defaultFormatter }) {
-    var _a;
-    const context = useContext(ChannelContext);
-    const t = useIntl();
-    if (!context || !context.selectedChannel)
-        return null;
-    let formatter = defaultFormatter;
-    if (!formatter) {
-        formatter = t.number;
-    }
-    const { selectedChannel: { settings, currency, language } } = context;
-    /** Get the locale to be passed to the t.price formatter */
-    const currencyLocale = currencyOverride
-        ? { code: currencyOverride.code, culture: currencyOverride.culture }
-        : {
-            code: currency.name,
-            culture: language.culture
-        };
-    /** Allow incVat to be overriden */
-    const incVat = typeof includeVat !== 'undefined'
-        ? includeVat
-        : (_a = settings === null || settings === void 0 ? void 0 : settings.pricesIncVat) !== null && _a !== void 0 ? _a : true;
-    /** Convert the pricing to {value: number} */
-    const pricing = {
-        price: selectPriceType(incVat, price),
-        previousPrice: previousPrice
-            ? selectPriceType(incVat, previousPrice)
-            : { value: 0, vat: 0 }
-    };
-    const formattedPricing = {
-        previousPrice: null,
-        price: null
-    };
-    for (const val in pricing) {
-        if (pricing.hasOwnProperty(val) && pricing[val]) {
-            formattedPricing[val] = formatter(pricing[val].value, currencyLocale.code, currencyLocale.culture);
-        }
-    }
-    return {
-        hasDiscount: pricing.previousPrice && pricing.previousPrice.value
-            ? pricing.price.value < pricing.previousPrice.value
-            : false,
-        includesVat: incVat,
-        currencyLocale,
-        pricing,
-        formattedPricing
-    };
-}
-// #endregion Container Component
-// #region Utilities
-/**
- * Normalise the price to an object with keys `value` and `vat`
- */
-export function selectPriceType(includeVat, priceObj) {
-    if (!priceObj)
-        return null;
-    const { vat, exVat, incVat } = priceObj;
-    if (includeVat) {
-        return { vat, value: incVat };
-    }
-    return {
-        vat,
-        value: exVat
-    };
-}
-// #endregion Utilities
+import ChannelContext from '@jetshop/core/components/ChannelContext';
+import { useContext } from 'react';
+import { useIntl } from '@jetshop/intl';
+// #endregion Interfaces
+// #region
+export function usePrice({ currencyOverride, price, previousPrice, includeVat, formatter: defaultFormatter }) {
+    var _a;
+    const context = useContext(ChannelContext);
+    const t = useIntl();
+    if (!context || !context.selectedChannel)
+        return null;
+    let formatter = defaultFormatter;
+    if (!formatter) {
+        formatter = t.number;
+    }
+    const { selectedChannel: { settings, currency, language } } = context;
+    /** Get the locale to be passed to the t.price formatter */
+    const currencyLocale = currencyOverride
+        ? { code: currencyOverride.code, culture: currencyOverride.culture }
+        : {
+            code: currency.name,
+            culture: language.culture
+        };
+    /** Allow incVat to be overriden */
+    const incVat = typeof includeVat !== 'undefined'
+        ? includeVat
+        : (_a = settings === null || settings === void 0 ? void 0 : settings.pricesIncVat) !== null && _a !== void 0 ? _a : true;
+    /** Convert the pricing to {value: number} */
+    const pricing = {
+        price: selectPriceType(incVat, price),
+        previousPrice: previousPrice
+            ? selectPriceType(incVat, previousPrice)
+            : { value: 0, vat: 0 }
+    };
+    const formattedPricing = {
+        previousPrice: null,
+        price: null
+    };
+    for (const val in pricing) {
+        if (pricing.hasOwnProperty(val) && pricing[val]) {
+            formattedPricing[val] = formatter(pricing[val].value, currencyLocale.code, currencyLocale.culture);
+        }
+    }
+    return {
+        hasDiscount: pricing.previousPrice && pricing.previousPrice.value
+            ? pricing.price.value < pricing.previousPrice.value
+            : false,
+        includesVat: incVat,
+        currencyLocale,
+        pricing,
+        formattedPricing
+    };
+}
+// #endregion Container Component
+// #region Utilities
+/**
+ * Normalise the price to an object with keys `value` and `vat`
+ */
+export function selectPriceType(includeVat, priceObj) {
+    if (!priceObj)
+        return null;
+    const { vat, exVat, incVat } = priceObj;
+    if (includeVat) {
+        return { vat, value: incVat };
+    }
+    return {
+        vat,
+        value: exVat
+    };
+}
+// #endregion Utilities
 //# sourceMappingURL=usePrice.js.map