@jetshop/core 5.12.1 → 5.12.4

package/ChannelHandler/ChannelHandler.js

@@ -42,10 +42,7 @@ export class ChannelHandler {
                 return Promise.resolve(path);
             }
             if (path) {
-                // Make sure we set the selected channel so any queries in
-                // getPrimaryRoutePath will pick up the selected channel
-                this.setSelectedChannel(newChannel);
-                return this.getPrimaryRoutePath(path);
+                return this.getPrimaryRoutePath(path, newChannel, this.setSelectedChannel);
             }
             else {
                 return Promise.resolve('/');

package/ChannelHandler/ChannelHandler.js.map

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

package/ChannelHandler/PreserveRedirectRouteQuery.gql

@@ -9,7 +9,7 @@ query preserveRedirectRouteQuery($path: String!) {
         id
       }
       ... on Page {
-        id
+        pageId: id
       }
       ... on StartPage {
         id

package/ChannelHandler/redirectUtils.d.ts

@@ -1,3 +1,4 @@
 import ApolloClient from 'apollo-client';
-export declare type GetPrimaryRoutePath = (path: string) => Promise<string>;
+import { SelectedChannel } from '../components/ChannelContext/ChannelContext';
+export declare type GetPrimaryRoutePath = (path: string, newChannel: SelectedChannel, setSelectedChannel: (selectedChannel: SelectedChannel) => void) => Promise<string>;
 export declare function primaryRouteForPathFetcher(client: ApolloClient<any>): GetPrimaryRoutePath;

package/ChannelHandler/redirectUtils.js

@@ -19,7 +19,7 @@ const PathnameRedirectQueryMap = {
     Page: PagePathnameRedirectQuery
 };
 export function primaryRouteForPathFetcher(client) {
-    return (path) => __awaiter(this, void 0, void 0, function* () {
+    return (path, newChannel, setSelectedChannel) => __awaiter(this, void 0, void 0, function* () {
         try {
             if (!path) {
                 throw new Error('No path was provided');
@@ -30,12 +30,14 @@ export function primaryRouteForPathFetcher(client) {
                     path
                 }
             });
-            const { id, __typename } = routeQueryResult.data.route.object;
+            const { id, __typename, pageId } = routeQueryResult.data.route.object;
+            const idUesdForRedirect = id || pageId;
+            setSelectedChannel(newChannel);
             const pathnameQueryResult = yield client.query({
                 fetchPolicy: 'network-only',
                 query: PathnameRedirectQueryMap[__typename],
                 variables: {
-                    id
+                    id: idUesdForRedirect
                 }
             });
             return pathnameQueryResult.data[__typename].primaryRoute.path;

package/ChannelHandler/redirectUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"redirectUtils.js","sourceRoot":"","sources":["redirectUtils.ts"],"names":[],"mappings":";;;;;;;;;AASA,OAAO,0BAA0B,MAAM,kCAAkC,CAAC;AAC1E,OAAO,4BAA4B,MAAM,oCAAoC,CAAC;AAC9E,OAAO,6BAA6B,MAAM,qCAAqC,CAAC;AAChF,OAAO,8BAA8B,MAAM,sCAAsC,CAAC;AAClF,OAAO,yBAAyB,MAAM,iCAAiC,CAAC;AAExE,MAAM,wBAAwB,GAAG;IAC/B,OAAO,EAAE,4BAA4B;IACrC,QAAQ,EAAE,6BAA6B;IACvC,SAAS,EAAE,8BAA8B;IACzC,IAAI,EAAE,yBAAyB;CAChC,CAAC;AAKF,MAAM,UAAU,0BAA0B,CACxC,MAAyB;IAEzB,OAAO,CAAO,IAAI,EAAE,EAAE;QACpB,IAAI;YACF,IAAI,CAAC,IAAI,EAAE;gBACT,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;aACzC;YAED,MAAM,gBAAgB,GAAG,MAAM,MAAM,CAAC,KAAK,CAOxC;gBACD,KAAK,EAAE,0BAA0B;gBACjC,SAAS,EAAE;oBACT,IAAI;iBACL;aACF,CAAC,CAAC;YAEH,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,GAAG,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;YAE9D,MAAM,mBAAmB,GAAG,MAAM,MAAM,CAAC,KAAK,CAK3C;gBACD,WAAW,EAAE,cAAc;gBAC3B,KAAK,EAAE,wBAAwB,CAAC,UAAU,CAAC;gBAC3C,SAAS,EAAE;oBACT,EAAE;iBACH;aACF,CAAC,CAAC;YAEH,OAAO,mBAAmB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC;SAC/D;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,GAAG,CAAC;SACZ;IACH,CAAC,CAAA,CAAC;AACJ,CAAC"}
+{"version":3,"file":"redirectUtils.js","sourceRoot":"","sources":["redirectUtils.ts"],"names":[],"mappings":";;;;;;;;;AASA,OAAO,0BAA0B,MAAM,kCAAkC,CAAC;AAC1E,OAAO,4BAA4B,MAAM,oCAAoC,CAAC;AAC9E,OAAO,6BAA6B,MAAM,qCAAqC,CAAC;AAChF,OAAO,8BAA8B,MAAM,sCAAsC,CAAC;AAClF,OAAO,yBAAyB,MAAM,iCAAiC,CAAC;AAGxE,MAAM,wBAAwB,GAAG;IAC/B,OAAO,EAAE,4BAA4B;IACrC,QAAQ,EAAE,6BAA6B;IACvC,SAAS,EAAE,8BAA8B;IACzC,IAAI,EAAE,yBAAyB;CAChC,CAAC;AASF,MAAM,UAAU,0BAA0B,CACxC,MAAyB;IAEzB,OAAO,CAAO,IAAI,EAAE,UAAU,EAAE,kBAAkB,EAAE,EAAE;QACpD,IAAI;YACF,IAAI,CAAC,IAAI,EAAE;gBACT,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;aACzC;YAED,MAAM,gBAAgB,GAAG,MAAM,MAAM,CAAC,KAAK,CAQxC;gBACD,KAAK,EAAE,0BAA0B;gBACjC,SAAS,EAAE;oBACT,IAAI;iBACL;aACF,CAAC,CAAC;YAEH,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;YACtE,MAAM,iBAAiB,GAAG,EAAE,IAAI,MAAM,CAAC;YACvC,kBAAkB,CAAC,UAAU,CAAC,CAAC;YAE/B,MAAM,mBAAmB,GAAG,MAAM,MAAM,CAAC,KAAK,CAK3C;gBACD,WAAW,EAAE,cAAc;gBAC3B,KAAK,EAAE,wBAAwB,CAAC,UAAU,CAAC;gBAC3C,SAAS,EAAE;oBACT,EAAE,EAAE,iBAAiB;iBACtB;aACF,CAAC,CAAC;YACH,OAAO,mBAAmB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC;SAC/D;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,GAAG,CAAC;SACZ;IACH,CAAC,CAAA,CAAC;AACJ,CAAC"}

package/boot/server/index.js

@@ -24,6 +24,7 @@ import { PersistedApolloClient } from './PersistedApolloClient';
 import { addMissingConfig } from '../addMissingConfig';
 import { createGraphqlServer, storeapiExtension } from '../../server/graphql';
 import trackingMiddleware from '../../server/tracking/middleware';
+import { getHeaders } from '../../helpers/getHeaders';
 // This is used to insure parity between client and server when doing internationalization as node only comes with the english locale by default
 require('./overwriteServerIntl.js');
 http.globalAgent.maxSockets = https.globalAgent.maxSockets = Infinity;
@@ -88,6 +89,10 @@ export const createApp = (Component, userConfig) => __awaiter(void 0, void 0, vo
         path: '/_event',
         handler: trackingMiddleware(serverTrackers || [])
     });
+    middlewares.push({
+        path: '/debug/headers',
+        handler: getHeaders
+    });
     // Legacy graphql schema stitching implementation
     let apolloServer = null;
     let schema = null;

package/boot/server/index.js.map

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

package/components/Auth/ResetPasswordProvider.js

@@ -10,10 +10,12 @@ import { createValidatorForFields } from './formFieldsFromSettings';
 import { useCountrySettings } from '../ChannelContext/useCountrySettings';
 function usePasswordValidation() {
     const { selectedCountrySettings } = useCountrySettings();
-    const passwordField = selectedCountrySettings &&
-        selectedCountrySettings.privateCustomerFields.find((field) => field.name === 'password');
-    return createValidatorForFields([passwordField], {
-        getFieldName: () => 'newPassword',
+    const passwordFieldArray = (selectedCountrySettings && [
+        selectedCountrySettings.privateCustomerFields.find((field) => field.name === 'password')
+    ]) ||
+        [];
+    return createValidatorForFields(passwordFieldArray, {
+        getFieldName: () => 'newPassword'
     });
 }
 // Context to hold formik state
@@ -32,8 +34,8 @@ export const ResetPasswordProvider = withRouter(function ResetPasswordProvider(p
             resetPasswordMutation({
                 variables: {
                     newPassword,
-                    resetPasswordToken,
-                },
+                    resetPasswordToken
+                }
             })
                 .then(() => {
                 actions.setSubmitting(false);
@@ -59,14 +61,14 @@ export function useResetPasswordForm() {
         required: true,
         type: 'password',
         name: 'newPassword',
-        autoComplete: 'new-password',
+        autoComplete: 'new-password'
     };
     return Object.assign(Object.assign({}, formik), { passwordInputProps, submitted: formik.status === 'submitted', globalError: globalError });
 }
 // Takes an error code from the API and converts to a friendly string
 function getErrorMessage(code) {
     const errorTranslations = {
-        InvalidResetPasswordToken: t('Your password reset token has expired, or is invalid.'),
+        InvalidResetPasswordToken: t('Your password reset token has expired, or is invalid.')
     };
     if (errorTranslations[code])
         return errorTranslations[code];

package/components/Auth/ResetPasswordProvider.js.map

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

package/components/Auth/formFieldsFromSettings.js

@@ -17,22 +17,22 @@ export function formFieldsFromSettings(selectedCountrySettings, isUserTypeBusine
         ? 'privateCustomerFields'
         : 'businessCustomerFields';
     const billingAddress = selectedCountrySettings &&
-        selectedCountrySettings[customerFieldsKey].find(field => field.name === 'billingAddress');
+        selectedCountrySettings[customerFieldsKey].find((field) => field.name === 'billingAddress');
     const deliveryAddress = selectedCountrySettings &&
-        selectedCountrySettings[customerFieldsKey].find(field => field.name === 'deliveryAddress');
+        selectedCountrySettings[customerFieldsKey].find((field) => field.name === 'deliveryAddress');
     const billingAddressFields = billingAddress
-        ? billingAddress.fields.map(field => (Object.assign(Object.assign({}, field), { label: translations[field.name], placeholder: `${translations[field.name]}_placeholder`, type: getFieldType(field.name) })))
+        ? billingAddress.fields.map((field) => (Object.assign(Object.assign({}, field), { label: translations[field.name], placeholder: `${translations[field.name]}_placeholder`, type: getFieldType(field.name) })))
         : [];
     const deliveryAddressFields = deliveryAddress
-        ? deliveryAddress.fields.map(field => (Object.assign(Object.assign({}, field), { label: translations[field.name], placeholder: `${translations[field.name]}_placeholder`, type: getFieldType(field.name) })))
+        ? deliveryAddress.fields.map((field) => (Object.assign(Object.assign({}, field), { label: translations[field.name], placeholder: `${translations[field.name]}_placeholder`, type: getFieldType(field.name) })))
         : [];
     const emailField = selectedCountrySettings
-        ? selectedCountrySettings[customerFieldsKey].find(field => field.name === 'emailAddress')
+        ? selectedCountrySettings[customerFieldsKey].find((field) => field.name === 'emailAddress')
         : null;
     const passwordField = selectedCountrySettings
-        ? selectedCountrySettings[customerFieldsKey].find(field => field.name === 'password')
+        ? selectedCountrySettings[customerFieldsKey].find((field) => field.name === 'password')
         : null;
-    const pid = selectedCountrySettings === null || selectedCountrySettings === void 0 ? void 0 : selectedCountrySettings[customerFieldsKey].find(field => field.name === 'pid' || field.name === 'organizationNumber');
+    const pid = selectedCountrySettings === null || selectedCountrySettings === void 0 ? void 0 : selectedCountrySettings[customerFieldsKey].find((field) => field.name === 'pid' || field.name === 'organizationNumber');
     const pidField = Object.assign(Object.assign({}, pid), { type: 'text', id: 'pid', name: isUserTypeBusiness ? 'organizationNumber' : 'pid', label: isUserTypeBusiness
             ? translations['company_pid']
             : translations['pid'] });
@@ -56,18 +56,20 @@ export function formFieldsFromSettings(selectedCountrySettings, isUserTypeBusine
 export function createValidatorForFields(fields, { getFieldName = (name) => name, getFieldValue = (values, fieldName) => values[fieldName], customValidation } = {}) {
     return function validate(values) {
         const errors = {};
-        fields.forEach(field => {
-            const pattern = field.pattern && new RegExp(unescape(field.pattern));
-            const fieldName = getFieldName(field.name);
-            const value = getFieldValue(values, fieldName);
-            // make sure that pattern is actually a valid regex
-            if (pattern && !pattern.test(value)) {
-                errors[fieldName] = t('Field does not match required format');
+        fields.forEach((field) => {
+            if (field && field.pattern) {
+                const pattern = field.pattern && new RegExp(unescape(field.pattern));
+                const fieldName = getFieldName(field.name);
+                const value = getFieldValue(values, fieldName);
+                // make sure that pattern is actually a valid regex
+                if (pattern && !pattern.test(value)) {
+                    errors[fieldName] = t('Field does not match required format');
+                }
+                if (field.required && !value) {
+                    errors[fieldName] = t('This field is required');
+                }
+                customValidation && customValidation(errors, values);
             }
-            if (field.required && !value) {
-                errors[fieldName] = t('This field is required');
-            }
-            customValidation && customValidation(errors, values);
         });
         return errors;
     };

package/components/Auth/formFieldsFromSettings.js.map

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

package/components/Auth/formatSignupInput.js

@@ -12,7 +12,7 @@ var __rest = (this && this.__rest) || function (s, e) {
 // Map forms to { valuename: { value: "value" } } format required for input
 // e.g. { country: { value: "Sweden" } }
 export function formatSignupInput(values, { userType }) {
-    const { emailAddress, password, pid, organizationNumber, country, externalId = '' } = values, rest = __rest(values, ["emailAddress", "password", "pid", "organizationNumber", "country", "externalId"]);
+    const { emailAddress, password, pid, organizationNumber, country, externalId = '', priceListAccessCode = undefined, consents = [] } = values, rest = __rest(values, ["emailAddress", "password", "pid", "organizationNumber", "country", "externalId", "priceListAccessCode", "consents"]);
     // Currently passing through country.code:country.name for the country
     // selector. This is a hack for now to get the code and name separately.
     const [countryCode, countryName] = country.split(':');
@@ -32,8 +32,9 @@ export function formatSignupInput(values, { userType }) {
         password,
         pid,
         organizationNumber,
+        priceListAccessCode,
         externalId,
-        consents: []
+        consents
     };
 }
 //# sourceMappingURL=formatSignupInput.js.map

package/components/Auth/formatSignupInput.js.map

@@ -1 +1 @@
-{"version":3,"file":"formatSignupInput.js","sourceRoot":"","sources":["formatSignupInput.ts"],"names":[],"mappings":";;;;;;;;;;;AAOA,2EAA2E;AAC3E,wCAAwC;AACxC,MAAM,UAAU,iBAAiB,CAC/B,MAAuB,EACvB,EAAE,QAAQ,EAAuC;IAEjD,MAAM,EACJ,YAAY,EACZ,QAAQ,EACR,GAAG,EACH,kBAAkB,EAClB,OAAO,EACP,UAAU,GAAG,EAAE,KAEb,MAAM,EADL,IAAI,UACL,MAAM,EARJ,kFAQL,CAAS,CAAC;IAEX,sEAAsE;IACtE,wEAAwE;IACxE,MAAM,CAAC,WAAW,EAAE,WAAW,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAEtD,MAAM,YAAY,GAEd;QACF,WAAW,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE;KACpC,CAAC;IAEF,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAEvC,KAAK,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,SAAS,EAAE;QACtC,YAAY,CAAC,KAAK,CAAC,GAAG;YACpB,KAAK,EAAE,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK;SACjD,CAAC;KACH;IAED,OAAO;QACL,IAAI,EAAE,QAAwB;QAC9B,cAAc,EAAE,YAAY;QAC5B,YAAY;QACZ,QAAQ;QACR,GAAG;QACH,kBAAkB;QAClB,UAAU;QACV,QAAQ,EAAE,EAAE;KACb,CAAC;AACJ,CAAC"}
+{"version":3,"file":"formatSignupInput.js","sourceRoot":"","sources":["formatSignupInput.ts"],"names":[],"mappings":";;;;;;;;;;;AAOA,2EAA2E;AAC3E,wCAAwC;AACxC,MAAM,UAAU,iBAAiB,CAC/B,MAAuB,EACvB,EAAE,QAAQ,EAAuC;IAEjD,MAAM,EACJ,YAAY,EACZ,QAAQ,EACR,GAAG,EACH,kBAAkB,EAClB,OAAO,EACP,UAAU,GAAG,EAAE,EACf,mBAAmB,GAAG,SAAS,EAC/B,QAAQ,GAAG,EAAE,KAEX,MAAM,EADL,IAAI,UACL,MAAM,EAVJ,qHAUL,CAAS,CAAC;IAEX,sEAAsE;IACtE,wEAAwE;IACxE,MAAM,CAAC,WAAW,EAAE,WAAW,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAEtD,MAAM,YAAY,GAEd;QACF,WAAW,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE;KACpC,CAAC;IAEF,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAEvC,KAAK,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,SAAS,EAAE;QACtC,YAAY,CAAC,KAAK,CAAC,GAAG;YACpB,KAAK,EAAE,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK;SACjD,CAAC;KACH;IAED,OAAO;QACL,IAAI,EAAE,QAAwB;QAC9B,cAAc,EAAE,YAAY;QAC5B,YAAY;QACZ,QAAQ;QACR,GAAG;QACH,kBAAkB;QAClB,mBAAmB;QACnB,UAAU;QACV,QAAQ;KACT,CAAC;AACJ,CAAC"}

package/components/ConfigProvider.d.ts

@@ -82,6 +82,7 @@ export interface BootOptions {
     /** Server specific configuration */
     server?: Server;
     ga4?: boolean;
+    usePrimaryRouteForProducts?: boolean;
 }
 interface Sentry {
     /** DSN used to track client side errors */

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;AAqG5D,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;AAsG5D,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/ProductRoute.d.ts

@@ -4,6 +4,7 @@ import { QueryResult } from 'react-apollo';
 export interface ProductProps {
     result: QueryResult;
     product: Product;
+    partialProduct: Partial<Product>;
 }
 export interface ProductRouteProps {
     component: ComponentType<ProductProps>;

package/components/DynamicRoute/ProductRoute.js

@@ -22,9 +22,7 @@ import { breadcrumbsWithoutProduct } from '@jetshop/core/analytics/utils/breadcr
 const ProductRoute = (props) => {
     var _a, _b, _c;
     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 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 { structuredData, openGraph } = useShopConfig();
     const location = useLocation();
     const track = useTracker();
@@ -54,7 +52,7 @@ const ProductRoute = (props) => {
             !disableStructuredProductData && (React.createElement(StructuredProductData, { product: product })),
             !disableOpenGraphProductData && (React.createElement(OpenGraphProductData, { product: product })))),
         React.createElement(ProductConfigurationProvider, { product: product },
-            React.createElement(ProductPage, Object.assign({}, rest, { product: product })))));
+            React.createElement(ProductPage, Object.assign({}, rest, { product: product, partialProduct: partialProduct })))));
 };
 export default ProductRoute;
 //# sourceMappingURL=ProductRoute.js.map

package/components/DynamicRoute/ProductRoute.js.map

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

package/components/Head.js

@@ -15,18 +15,16 @@ function renderAlternateRoutes(alternateRoute, channelsById) {
     const url = channel.url;
     const route = alternateRoute.route;
     let languageBasename = '';
-    let query = '';
     if (channel.defaultLanguage.culture !== alternateRoute.culture) {
-        query = `?culture=${alternateRoute.culture}`;
         languageBasename = `/${getLanguageFromCulture(alternateRoute.culture)}`;
     }
-    const href = `${url}${languageBasename}${route}${query}`;
+    const href = `${url}${languageBasename}${route}`;
     return (React.createElement("link", { key: href + alternateRoute.culture, rel: "alternate", href: href, hrefLang: alternateRoute.alias || alternateRoute.culture }));
 }
 const queryParamsWhitelist = ['page'];
 const Head = ({ data, route }) => {
     var _a;
-    const { search } = useLocation();
+    const { search, pathname } = useLocation();
     const queryStringObject = qs.parse(search, { ignoreQueryPrefix: true });
     Object.keys(queryStringObject).forEach((key) => {
         !queryParamsWhitelist.includes(key) && delete queryStringObject[key];
@@ -37,8 +35,14 @@ const Head = ({ data, route }) => {
     const { selectedChannel, channelsById } = useContext(ChannelContext);
     const lang = selectedChannel.language.culture.split('-')[0];
     const metaTags = ((_a = data === null || data === void 0 ? void 0 : data.head) === null || _a === void 0 ? void 0 : _a.metaTags) || [];
+    let languageBasename = '';
+    if (!selectedChannel.language.isDefault) {
+        languageBasename = `/${getLanguageFromCulture(selectedChannel.language.culture)}`;
+    }
+    const fullPath = `${languageBasename}${(route === null || route === void 0 ? void 0 : route.canonicalPath) || ''}`;
     const href = (route === null || route === void 0 ? void 0 : route.canonicalPath) &&
-        `${selectedChannel.url}${route.canonicalPath}${whiteListedSearch}`;
+        `${selectedChannel.url}${fullPath}${whiteListedSearch}`;
+    const isCurrentRouteCanonical = pathname === (route === null || route === void 0 ? void 0 : route.canonicalPath);
     useWarningInDev(route && !route.alternateRoutes, `You must include the RouteMetaFragment in your RouteQuery.gql
     Please see https://gitlab.jetshop.se/jetshop/flight/blob/master/packages/template-trend/src/components/RouteQuery.gql for an example
     `);
@@ -60,6 +64,7 @@ const Head = ({ data, route }) => {
             (data === null || data === void 0 ? void 0 : data.head) && React.createElement("title", null, data.head.title),
             metaTags.map((tag) => (React.createElement("meta", { name: tag.name, content: tag.content, key: tag.name }))),
             route &&
+                isCurrentRouteCanonical &&
                 route.alternateRoutes &&
                 route.alternateRoutes.map((alternateRoute) => renderAlternateRoutes(alternateRoute, channelsById)),
             href && React.createElement("link", { rel: "canonical", href: href })),

package/components/Head.js.map

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

package/components/Pagination/PaginationProvider.d.ts

@@ -8,10 +8,12 @@ export declare type IPaginationProps = {
     defaultProductsPerPage?: number;
     /** The query param to use for pagination. @default 'page' */
     queryParam?: string;
+    errorReportingEnabled?: boolean;
 } & ReactCookieProps;
 export declare function usePagination(): import("@jetshop/core/components/Pagination/PaginationContext").PaginationState;
 declare const _default: React.ComponentType<{
     defaultProductsPerPage?: number;
     queryParam?: string;
+    errorReportingEnabled?: boolean;
 }>;
 export default _default;

package/components/Pagination/PaginationProvider.js

@@ -46,7 +46,7 @@ const calculateOffset = (page, perPage) => {
         return 0;
     }
 };
-const PaginationProvider = ({ cookies, defaultProductsPerPage = 16, children, queryParam = 'page' }) => {
+const PaginationProvider = ({ cookies, defaultProductsPerPage = 16, children, queryParam = 'page', errorReportingEnabled = true }) => {
     const history = useHistory();
     const location = useLocation();
     const [currentPage, setCurrentPage] = useState(getPageFromSearch(location, queryParam) || 1);
@@ -70,7 +70,7 @@ const PaginationProvider = ({ cookies, defaultProductsPerPage = 16, children, qu
     }, [cookies]);
     const cookieProductsPerPage = parseInt(cookies.get('perPage'), 10);
     const perPage = cookieProductsPerPage || defaultProductsPerPage;
-    if (currentPage >= 1000) {
+    if (errorReportingEnabled && currentPage >= 1000) {
         report(new Error('Page number is too nigh'), {
             currentPage,
             perPage,

package/components/Pagination/PaginationProvider.js.map

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

package/components/SortOrder/SortOrderContainer.d.ts

@@ -1,6 +1,7 @@
 import * as React from 'react';
 import { RouteComponentProps } from 'react-router-dom';
-import { ISortOrderContext } from '@jetshop/core/components/SortOrder/SortOrderContext';
+import type { History, Location } from 'history';
+import { Direction, ISortOrderContext } from '@jetshop/core/components/SortOrder/SortOrderContext';
 export interface SortOrderContainerProps extends RouteComponentProps<{}> {
     children(context: ISortOrderContext): React.ReactNode;
 }
@@ -10,16 +11,27 @@ export declare const sortTypes: {
 export declare const sortValues: {
     [key: string]: {
         text: () => {
-            text: React.SFC;
+            text: React.FunctionComponent;
         };
         direction: string;
     }[];
 };
+export declare function getSortOrderFromQueryString(search: Location['search']): {
+    sortOrder: any;
+    direction: any;
+};
+interface SortOrderUpdate {
+    value: string;
+    direction: Direction;
+    history: History;
+    location: Location;
+}
+export declare function updateSortOrderHistory({ value, direction, history, location }: SortOrderUpdate): void;
 declare class SortOrderContainer extends React.Component<SortOrderContainerProps, ISortOrderContext> {
     state: ISortOrderContext;
     constructor(props: SortOrderContainerProps);
     componentDidMount(): void;
-    onSelect: (value: string, direction: 'ASCENDING' | 'DESCENDING') => boolean;
+    onSelect: (value: string, direction: Direction) => boolean;
     render(): JSX.Element;
 }
 declare const _default: React.ComponentClass<Pick<SortOrderContainerProps, "children"> & {

package/components/SortOrder/SortOrderContainer.js

@@ -48,21 +48,35 @@ export const sortValues = {
         }
     ]
 };
+export function getSortOrderFromQueryString(search) {
+    const parsedSearch = qs.parse(search, {
+        ignoreQueryPrefix: true
+    });
+    if (Object.keys(parsedSearch).includes('orderBy')) {
+        return {
+            sortOrder: parsedSearch.orderBy,
+            direction: parsedSearch.direction
+        };
+    }
+}
+export function updateSortOrderHistory({ value, direction, history, location }) {
+    const currentSearch = qs.parse(window.location.search, { ignoreQueryPrefix: true }) || {};
+    const newSearch = Object.assign(Object.assign({}, currentSearch), { orderBy: value, direction });
+    pushHistory({
+        history,
+        pathname: location.pathname,
+        hash: location.hash,
+        search: newSearch,
+        resetPage: true,
+        routeType: 'sortOrderChange'
+    });
+}
 class SortOrderContainer extends React.Component {
     constructor(props) {
         super(props);
         this.onSelect = (value, direction) => {
             const { location, history } = this.props;
-            const currentSearch = qs.parse(window.location.search, { ignoreQueryPrefix: true }) || {};
-            const newSearch = Object.assign(Object.assign({}, currentSearch), { orderBy: value, direction });
-            pushHistory({
-                history,
-                pathname: location.pathname,
-                hash: location.hash,
-                search: newSearch,
-                resetPage: true,
-                routeType: 'sortOrderChange'
-            });
+            updateSortOrderHistory({ location, history, value, direction });
             this.setState({ sortOrder: value, direction });
             return true;
         };
@@ -74,14 +88,9 @@ class SortOrderContainer extends React.Component {
     }
     componentDidMount() {
         if (this.props.location.search) {
-            const search = qs.parse(this.props.location.search, {
-                ignoreQueryPrefix: true
-            });
-            if (Object.keys(search).includes('orderBy')) {
-                this.setState({
-                    sortOrder: search.orderBy,
-                    direction: search.direction
-                });
+            const sortOrder = getSortOrderFromQueryString(this.props.location.search);
+            if (sortOrder) {
+                this.setState(sortOrder);
             }
         }
     }

package/components/SortOrder/SortOrderContainer.js.map

@@ -1 +1 @@
-{"version":3,"file":"SortOrderContainer.js","sourceRoot":"","sources":["SortOrderContainer.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"SortOrderContainer.js","sourceRoot":"","sources":["SortOrderContainer.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAuB,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEnE,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,gBAGN,MAAM,qDAAqD,CAAC;AAC7D,OAAO,CAAC,MAAM,eAAe,CAAC;AAC9B,OAAO,EAAE,WAAW,EAAE,MAAM,sDAAsD,CAAC;AAMnF,qDAAqD;AACrD,MAAM,CAAC,MAAM,SAAS,GAA8B;IAClD,IAAI,EAAE,QAAQ;IACd,cAAc,EAAE,QAAQ;IACxB,YAAY,EAAE,MAAM;IACpB,KAAK,EAAE,QAAQ;IACf,WAAW,EAAE,QAAQ;IACrB,UAAU,EAAE,QAAQ;IACpB,MAAM,EAAE,QAAQ;CACjB,CAAC;AAEF,MAAM,CAAC,MAAM,UAAU,GAKnB;IACF,MAAM,EAAE;QACN;YACE,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC;YACjB,SAAS,EAAE,WAAW;SACvB;QACD;YACE,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC;YACjB,SAAS,EAAE,YAAY;SACxB;KACF;IACD,MAAM,EAAE;QACN;YACE,IAAI,EAAE,CAAC,CAAC,aAAa,CAAC;YACtB,SAAS,EAAE,WAAW;SACvB;QACD;YACE,IAAI,EAAE,CAAC,CAAC,aAAa,CAAC;YACtB,SAAS,EAAE,YAAY;SACxB;KACF;IACD,IAAI,EAAE;QACJ;YACE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC;YACX,SAAS,EAAE,YAAY;SACxB;KACF;IACD,MAAM,EAAE;QACN;YACE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC;YACX,SAAS,EAAE,YAAY;SACxB;KACF;CACF,CAAC;AAEF,MAAM,UAAU,2BAA2B,CAAC,MAA0B;IACpE,MAAM,YAAY,GAAG,EAAE,CAAC,KAAK,CAAC,MAAM,EAAE;QACpC,iBAAiB,EAAE,IAAI;KACxB,CAAC,CAAC;IAEH,IAAI,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;QACjD,OAAO;YACL,SAAS,EAAE,YAAY,CAAC,OAAO;YAC/B,SAAS,EAAE,YAAY,CAAC,SAAS;SAClC,CAAC;KACH;AACH,CAAC;AASD,MAAM,UAAU,sBAAsB,CAAC,EACrC,KAAK,EACL,SAAS,EACT,OAAO,EACP,QAAQ,EACQ;IAChB,MAAM,aAAa,GACjB,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,IAAI,EAAE,CAAC;IACtE,MAAM,SAAS,mCAAQ,aAAa,KAAE,OAAO,EAAE,KAAK,EAAE,SAAS,GAAE,CAAC;IAElE,WAAW,CAAC;QACV,OAAO;QACP,QAAQ,EAAE,QAAQ,CAAC,QAAQ;QAC3B,IAAI,EAAE,QAAQ,CAAC,IAAI;QACnB,MAAM,EAAE,SAAS;QACjB,SAAS,EAAE,IAAI;QACf,SAAS,EAAE,iBAAiB;KAC7B,CAAC,CAAC;AACL,CAAC;AAED,MAAM,kBAAmB,SAAQ,KAAK,CAAC,SAGtC;IAGC,YAAY,KAA8B;QACxC,KAAK,CAAC,KAAK,CAAC,CAAC;QAiBf,aAAQ,GAAG,CAAC,KAAa,EAAE,SAAoB,EAAE,EAAE;YACjD,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YACzC,sBAAsB,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;YAChE,IAAI,CAAC,QAAQ,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;YAC/C,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;QArBA,IAAI,CAAC,KAAK,GAAG;YACX,SAAS,EAAE,IAAI;YACf,SAAS,EAAE,YAAY;YACvB,eAAe,EAAE,IAAI,CAAC,QAAQ;SAC/B,CAAC;IACJ,CAAC;IAED,iBAAiB;QACf,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE;YAC9B,MAAM,SAAS,GAAG,2BAA2B,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YAC1E,IAAI,SAAS,EAAE;gBACb,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;aAC1B;SACF;IACH,CAAC;IASM,MAAM;QACX,OAAO,CACL,oBAAC,gBAAgB,CAAC,QAAQ,IAAC,KAAK,EAAE,IAAI,CAAC,KAAK,IACzC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CACN,CAC7B,CAAC;IACJ,CAAC;CACF;AAED,eAAe,UAAU,CAAC,kBAAkB,CAAC,CAAC"}

package/errorReporting.d.ts

@@ -1,3 +1,3 @@
-import { Report } from './errorReporting.shared';
-declare let report: Report;
-export default report;
+import { Extras } from './errorReporting.shared';
+declare function errorReporting(error: Error, extra?: Extras): void;
+export default errorReporting;

package/errorReporting.js

@@ -6,12 +6,15 @@
   When using `process.env.*` this is evaluated at compile time & only one
   of the lines will  transpiled into the final code.
 */
-let report;
-if (__IN_SERVER__) {
-    report = require('./errorReporting.server').default;
+function errorReporting(error, extra) {
+    let report;
+    if (__IN_SERVER__) {
+        report = require('./errorReporting.server').default;
+    }
+    else {
+        report = require('./errorReporting.browser').default;
+    }
+    return report(error, extra);
 }
-else {
-    report = require('./errorReporting.browser').default;
-}
-export default report;
+export default errorReporting;
 //# sourceMappingURL=errorReporting.js.map

package/errorReporting.js.map

@@ -1 +1 @@
-{"version":3,"file":"errorReporting.js","sourceRoot":"","sources":["errorReporting.ts"],"names":[],"mappings":"AAEA;;;;;;;EAOE;AACF,IAAI,MAAc,CAAC;AACnB,IAAI,aAAa,EAAE;IACjB,MAAM,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAC,OAAO,CAAC;CACrD;KAAM;IACL,MAAM,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAC,OAAO,CAAC;CACtD;AAED,eAAe,MAAM,CAAC"}
+{"version":3,"file":"errorReporting.js","sourceRoot":"","sources":["errorReporting.ts"],"names":[],"mappings":"AAEA;;;;;;;EAOE;AACF,SAAS,cAAc,CAAC,KAAY,EAAE,KAAc;IAClD,IAAI,MAAc,CAAC;IACnB,IAAI,aAAa,EAAE;QACjB,MAAM,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAC,OAAO,CAAC;KACrD;SAAM;QACL,MAAM,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAC,OAAO,CAAC;KACtD;IACD,OAAO,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;AAC9B,CAAC;AAED,eAAe,cAAc,CAAC"}

package/helpers/getHeaders.d.ts

@@ -0,0 +1,6 @@
+import { Response, Request } from 'express';
+import { Cookies } from 'react-cookie';
+export declare function getHeaders(req: Request & {
+    universalCookies: Cookies;
+    breakpoint: string;
+}, res: Response): import("express-serve-static-core").Response;

package/helpers/getHeaders.js

@@ -0,0 +1,4 @@
+export function getHeaders(req, res) {
+    return res.send(req.headers);
+}
+//# sourceMappingURL=getHeaders.js.map

package/helpers/getHeaders.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getHeaders.js","sourceRoot":"","sources":["getHeaders.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,UAAU,CACxB,GAAgE,EAChE,GAAa;IAEb,OAAO,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AAC/B,CAAC"}

package/hooks/Filters/useSortOrder.d.ts

@@ -8,3 +8,4 @@ export declare function useSortOrder({ sortOrders }: {
     sortOrder: string;
     mappedSortOrder: MappedSortOrder[];
 };
+export declare function getMappedSortOrder(sortOrders: ProductSortOrder[]): MappedSortOrder[];

package/hooks/Filters/useSortOrder.js

@@ -5,8 +5,12 @@ export function useSortOrder({ sortOrders }) {
     // Mutate sort order obj to include asc/desc & appropriate text
     // eg { text: 'Price low to high', direction: 'ASCENDING' }
     const { changeSortOrder, direction, sortOrder } = React.useContext(SortOrderContext);
-    const mappedSortOrder = sortOrders.reduce((sorts, curr) => {
-        const mutatedSorts = sortValues[sortTypes[curr.value]].map(type => {
+    const mappedSortOrder = getMappedSortOrder(sortOrders);
+    return { changeSortOrder, direction, sortOrder, mappedSortOrder };
+}
+export function getMappedSortOrder(sortOrders) {
+    return sortOrders.reduce((sorts, curr) => {
+        const mutatedSorts = sortValues[sortTypes[curr.value]].map((type) => {
             return Object.assign(Object.assign({}, curr), { text: (React.createElement("span", null,
                     curr['text'],
                     " ",
@@ -14,6 +18,5 @@ export function useSortOrder({ sortOrders }) {
         });
         return [...sorts, ...mutatedSorts];
     }, []);
-    return { changeSortOrder, direction, sortOrder, mappedSortOrder };
 }
 //# sourceMappingURL=useSortOrder.js.map

package/hooks/Filters/useSortOrder.js.map

@@ -1 +1 @@
-{"version":3,"file":"useSortOrder.js","sourceRoot":"","sources":["useSortOrder.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,UAAU,EACX,MAAM,uDAAuD,CAAC;AAC/D,OAAO,gBAAgB,MAAM,qDAAqD,CAAC;AAEnF,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,MAAM,UAAU,YAAY,CAAC,EAC3B,UAAU,EAGX;IACC,+DAA+D;IAC/D,2DAA2D;IAC3D,MAAM,EAAE,eAAe,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC,UAAU,CAChE,gBAAgB,CACjB,CAAC;IACF,MAAM,eAAe,GAAsB,UAAU,CAAC,MAAM,CAC1D,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QACd,MAAM,YAAY,GAAG,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;YAChE,uCACK,IAAI,KACP,IAAI,EAAE,CACJ;oBACG,IAAI,CAAC,MAAM,CAAC;;oBAAG,IAAI,CAAC,IAAI,CACpB,CACR,EACD,SAAS,EAAE,IAAI,CAAC,SAAS,IACzB;QACJ,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,GAAG,KAAK,EAAE,GAAG,YAAY,CAAC,CAAC;IACrC,CAAC,EACD,EAAE,CACH,CAAC;IAEF,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,SAAS,EAAE,eAAe,EAAE,CAAC;AACpE,CAAC"}
+{"version":3,"file":"useSortOrder.js","sourceRoot":"","sources":["useSortOrder.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,UAAU,EACX,MAAM,uDAAuD,CAAC;AAC/D,OAAO,gBAAgB,MAAM,qDAAqD,CAAC;AAEnF,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,MAAM,UAAU,YAAY,CAAC,EAC3B,UAAU,EAGX;IACC,+DAA+D;IAC/D,2DAA2D;IAC3D,MAAM,EAAE,eAAe,EAAE,SAAS,EAAE,SAAS,EAAE,GAC7C,KAAK,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;IACrC,MAAM,eAAe,GAAG,kBAAkB,CAAC,UAAU,CAAC,CAAC;IACvD,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,SAAS,EAAE,eAAe,EAAE,CAAC;AACpE,CAAC;AAED,MAAM,UAAU,kBAAkB,CAChC,UAA8B;IAE9B,OAAO,UAAU,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QACvC,MAAM,YAAY,GAAG,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YAClE,uCACK,IAAI,KACP,IAAI,EAAE,CACJ;oBACG,IAAI,CAAC,MAAM,CAAC;;oBAAG,IAAI,CAAC,IAAI,CACpB,CACR,EACD,SAAS,EAAE,IAAI,CAAC,SAAS,IACzB;QACJ,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,GAAG,KAAK,EAAE,GAAG,YAAY,CAAC,CAAC;IACrC,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC"}

package/hooks/ProductList/list-transforms.d.ts

@@ -56,6 +56,7 @@ productQueryResult: ProductsQuery): {
     barcode?: string;
     configurations?: import("../../types").ProductConfiguration[];
     hasConfigurations: boolean;
+    hasFamilyMembers: boolean;
     configurationPrice?: import("../../types").ProductConfigurationPrice;
     quantitySuffix?: string;
     isPreOrder?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetshop/core",
-  "version": "5.12.1",
+  "version": "5.12.4",
   "license": "MIT",
   "files": [
     "**/*.js",

package/resolvers/filters/updateQueryString.d.ts

@@ -8,5 +8,5 @@ import { ActiveFilters } from '.';
  */
 export declare function updateListFilterQueryString(activeFilters: ActiveFilters, history?: History): void;
 export declare function updateBooleanQueryString(activeFilters: ActiveFilters, history?: History): void;
-export declare function updateRangeQueryString(activeFilters: ActiveFilters): void;
+export declare function updateRangeQueryString(activeFilters: ActiveFilters, history?: History): void;
 export declare function updateMultiListQueryString(activeFilters: ActiveFilters): void;

package/resolvers/filters/updateQueryString.js

@@ -61,8 +61,10 @@ export function updateBooleanQueryString(activeFilters, history) {
         routeType: 'filterChange'
     });
 }
-export function updateRangeQueryString(activeFilters) {
-    const history = createBrowserHistory();
+export function updateRangeQueryString(activeFilters, history) {
+    if (history === undefined) {
+        history = createBrowserHistory();
+    }
     const activeRangeFilters = activeFilters.rangeFilters;
     let queryString = '';
     if (activeRangeFilters.length === 0) {

package/resolvers/filters/updateQueryString.js.map

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

package/server/tracking/facebook.js

@@ -11,10 +11,11 @@ import fetch from 'node-fetch';
 import requestIp from 'request-ip';
 function getUserData(req) {
     return {
-        client_ip_address: requestIp.getClientIp(req),
+        client_ip_address: req.header('true-client-ip') || requestIp.getClientIp(req),
         client_user_agent: req.headers['user-agent'],
         fbc: req.universalCookies.get('_fbc') || '',
-        fbp: req.universalCookies.get('_fbp') || ''
+        fbp: req.universalCookies.get('_fbp') || '',
+        country: req.header('x-geoip-country')
     };
 }
 function createTrackFacebookEvent({ pixelId, token }) {
@@ -39,7 +40,7 @@ export default function createFacebookTracker(config) {
         var _a, _b, _c, _d;
         try {
             const user_data = getUserData(request);
-            const event_time = Math.floor(Date.now() / 1000);
+            const event_time = Math.floor(Date.now() / 1000) - 60 * 5; // subtract 5 minutes to account for time difference between server and client
             const useArticleNumberAsId = data.useArticleNumberAsId;
             const defaults = {
                 user_data,

package/server/tracking/facebook.js.map

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

package/types.d.ts

@@ -207,6 +207,7 @@ export type Category = Document & {
   mainHeader?: Maybe<Scalars['String']>;
   content?: Maybe<Scalars['String']>;
   externalId?: Maybe<Scalars['String']>;
+  externalDiscountId?: Maybe<Scalars['String']>;
   images?: Maybe<Array<Maybe<CategoryImage>>>;
   /** NB: Carries a performance cost, as asking for this will result in a separate API call in the backend. */
   products?: Maybe<PagedResult>;
@@ -736,6 +737,7 @@ export type DeleteCustomerProductListResult = {
 
 export type Discount = {
   __typename?: 'Discount';
+  externalId?: Maybe<Scalars['ID']>;
   name?: Maybe<Scalars['String']>;
   value?: Maybe<Price>;
   description?: Maybe<Scalars['String']>;
@@ -928,6 +930,12 @@ export type MultiListFilterList = {
   hasActiveItems: Scalars['Boolean'];
 };
 
+export type MultipleContent = {
+  __typename?: 'MultipleContent';
+  notFoundIds: Array<Maybe<Scalars['ID']>>;
+  content: Array<Maybe<Content>>;
+};
+
 export type Mutation = {
   __typename?: 'Mutation';
   subscribeToStockNotifications?: Maybe<Scalars['Boolean']>;
@@ -1335,6 +1343,7 @@ export type Order = {
   orderDate?: Maybe<Scalars['DateTime']>;
   currency?: Maybe<Currency>;
   attachments?: Maybe<Array<Maybe<OrderAttachment>>>;
+  orderPurchaseLocation?: Maybe<Scalars['String']>;
 };
 
 
@@ -1700,6 +1709,7 @@ export type Product = Document & {
    */
   configurations?: Maybe<Array<Maybe<ProductConfiguration>>>;
   hasConfigurations: Scalars['Boolean'];
+  hasFamilyMembers: Scalars['Boolean'];
   /**
    * Calculates the price of the product based on the configuration choices that's
    * been made. NB: Carries a performance cost, as asking for this will result in a
@@ -1989,6 +1999,8 @@ export type Query = {
   externalCustomerLookup?: Maybe<ExternalCustomerResult>;
   /** Get information on person by Key(personal id number or phone number) */
   personLookup?: Maybe<PersonLookup>;
+  /** Returns Content found by list of its IDs. Also not found Content IDs are listed. */
+  content?: Maybe<MultipleContent>;
   /** get channel by id, null gets default channel */
   channel?: Maybe<Channel>;
   /** get all channels */
@@ -2072,6 +2084,11 @@ export type QueryPersonLookupArgs = {
 };
 
 
+export type QueryContentArgs = {
+  ids: Array<Maybe<Scalars['String']>>;
+};
+
+
 export type QueryChannelArgs = {
   id?: Maybe<Scalars['String']>;
 };