@jetshop/core 5.17.0-alpha.18426899 → 5.17.0-alpha.1fa8c1a3

package/boot/NetworkStatusNotifier.d.ts

@@ -0,0 +1,2 @@
+declare const link: any, useApolloNetworkStatus: any;
+export { link, useApolloNetworkStatus };

package/boot/NetworkStatusNotifier.js

@@ -0,0 +1,4 @@
+import { createNetworkStatusNotifier } from 'react-apollo-network-status';
+const { link, useApolloNetworkStatus } = createNetworkStatusNotifier();
+export { link, useApolloNetworkStatus };
+//# sourceMappingURL=NetworkStatusNotifier.js.map

package/boot/NetworkStatusNotifier.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"NetworkStatusNotifier.js","sourceRoot":"","sources":["NetworkStatusNotifier.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,6BAA6B,CAAC;AAE1E,MAAM,EAAE,IAAI,EAAE,sBAAsB,EAAE,GAAG,2BAA2B,EAAE,CAAC;AAEvE,OAAO,EAAE,IAAI,EAAE,sBAAsB,EAAE,CAAC"}

package/boot/apollo.js

@@ -21,7 +21,7 @@ import report from '../errorReporting';
 import { resolvers } from '../resolvers';
 import typeDefs from './client-schema.gql';
 import { logOperationTime } from './utils/queryLoggingMiddleware';
-import { link as networkStatusLink } from '@jetshop/ui/Loading/NetworkStatusNotifier';
+import { link as networkStatusLink } from '@jetshop/core/boot/NetworkStatusNotifier';
 export const createClient = ({ apolloConfig: { token, shopid, enableGateway, graphQLURI, useGraphQLProxyServer }, schema, authHandler, previewHandler, req, channelHandler }) => {
     if (!token || !shopid) {
         throw new Error(`Missing ${!token && `token`} ${!shopid && `shopid`}`);

package/boot/apollo.js.map

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

package/boot/client/startClient.js

@@ -11,7 +11,7 @@ import { setupIntl } from '@jetshop/intl/config';
 import * as Sentry from '../../sentry/client';
 import React from 'react';
 import { Cookies } from 'react-cookie';
-import { hydrate as renderToDOM } from 'react-dom';
+import { hydrateRoot } from 'react-dom/client';
 import { loadableReady } from '@loadable/component';
 import { BrowserRouter } from 'react-router-dom';
 import { ChannelHandler } from '../../ChannelHandler/ChannelHandler';
@@ -37,6 +37,7 @@ function getInitialCacheData() {
         }
     };
 }
+let root;
 const startClient = (tree, config) => {
     if (!config.apolloConfig.channelsQuery) {
         logWarningInDev(true, `No channelsQuery was provided in the apolloConfig, which is a
@@ -125,8 +126,14 @@ const startClient = (tree, config) => {
     })
         .then((tree) => {
         return loadableReady(() => {
-            const root = document.getElementById('root');
-            renderToDOM(tree, root, () => void (client.disableNetworkFetches = false));
+            if (root) {
+                // If the root is already set,
+                // we know that we are in a hot reload and we want to render the new tree into the existing root.
+                root.render(tree);
+            }
+            else {
+                root = hydrateRoot(document.getElementById('root'), tree);
+            }
         });
     });
 };

package/boot/client/startClient.js.map

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

package/cart/AddToCartFormik.d.ts

@@ -38,5 +38,5 @@ interface AddToCartFormikProps {
     }) => void;
     children: (props: FormikProps<AddToCartFormikValues>) => React.ReactNode;
 }
-export declare function AddToCartFormik({ product, variant, commentValidators, getMissingOptions, initialValues, onAddToCartInit, onAddToCartError, onAddToCartSuccess, cartQuery, cartMutation, children }: AddToCartFormikProps): JSX.Element;
+export declare function AddToCartFormik({ product, variant, commentValidators, getMissingOptions, initialValues, onAddToCartInit, onAddToCartError, onAddToCartSuccess, cartQuery, cartMutation, children }: AddToCartFormikProps): React.JSX.Element;
 export default AddToCartFormik;

package/cart/AddToCartFormik.js

@@ -12,7 +12,7 @@ import { useAddToCart } from './useAddToCart';
 import { FormikProvider } from 'formik';
 import { useApolloClient, useMutation } from '@apollo/react-hooks';
 import { addToCartError, addToCartSuccess, useTrackProductAdd } from '../components/Mutation/AddToCart/addToCartUtils';
-import { uniqueId } from 'lodash';
+import uniqueId from '@jetshop/core/helpers/uniqueId';
 import { getAddToCartOptimisticResponse } from '../components/Mutation/cartMutationUtils';
 import { useCartId } from '../components/Cart/CartIdContext';
 export function AddToCartFormik({ product, variant, commentValidators = {}, getMissingOptions, initialValues, 

package/cart/AddToCartFormik.js.map

@@ -1 +1 @@
-{"version":3,"file":"AddToCartFormik.js","sourceRoot":"","sources":["AddToCartFormik.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAmB,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAe,MAAM,QAAQ,CAAC;AAWrD,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,EACL,cAAc,EACd,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,iDAAiD,CAAC;AACzD,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAClC,OAAO,EAAE,8BAA8B,EAAE,MAAM,0CAA0C,CAAC;AAC1F,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AA6C7D,MAAM,UAAU,eAAe,CAAC,EAC9B,OAAO,EACP,OAAO,EACP,iBAAiB,GAAG,EAAE,EACtB,iBAAiB,EACjB,aAAa;AACb,wBAAwB;AACxB,eAAe,EACf,gBAAgB,EAChB,kBAAkB,EAClB,SAAS,EACT,YAAY;AACZ,4CAA4C;AAC5C,QAAQ,EACa;IACrB,MAAM,MAAM,GAAG,eAAe,EAAE,CAAC;IAEjC,MAAM,CAAC,iBAAiB,CAAC,GAAG,WAAW,CAGrC,YAAY,EAAE;QACd,WAAW,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,YAAY,EAAE,GAAG,CAAC;KAC3D,CAAC,CAAC;IAEH,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,SAAS,EAAE,CAAC;IAC1C,MAAM,sBAAsB,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC;IAE3D,SAAe,MAAM,CAAC,EAAE,KAAK,EAAE,UAAU,EAAmB;;YAC1D,sBAAsB,CAAC,OAAO,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;YAChD,MAAM,UAAU,GAAG,QAAQ,EAAE,CAAC;YAE9B,MAAM,eAAe,GAAG;gBACtB,OAAO,EAAE,UAAU,CAAC,OAAO;gBAC3B,KAAK,EAAE,UAAU,CAAC,KAAK;gBACvB,QAAQ,EAAE,KAAK,CAAC,QAAQ;gBACxB,iBAAiB,EAAE,OAAO;gBAC1B,UAAU;aACX,CAAC;YAEF,IAAI,eAAe,EAAE;gBACnB,eAAe,CAAC,eAAe,CAAC,CAAC;aAClC;YAED,OAAO,iBAAiB,CAAC;gBACvB,SAAS,EAAE;oBACT,KAAK;iBACN;gBACD,kBAAkB,EAAE;oBAClB,SAAS,EAAE;wBACT,IAAI,EAAE,8BAA8B,CAClC,UAAU,CAAC,OAAO,EAClB,KAAK,CAAC,QAAQ,EACd,MAAM,EACN,MAAM,EACN,SAAS,CACV;wBACD,UAAU,EAAE,cAAc;qBAC3B;iBACF;aACF,CAAC;iBACC,IAAI,CACH,gBAAgB,CAAC;gBACf,kBAAkB;gBAClB,eAAe;gBACf,MAAM;gBACN,SAAS;aACV,CAAC,CACH;iBACA,KAAK,CACJ,cAAc,CAAC;gBACb,gBAAgB;gBAChB,eAAe;aAChB,CAAC,CACH,CAAC;QACN,CAAC;KAAA;IAED,MAAM,EAAE,IAAI,EAAE,GAAG,YAAY,CAAC;QAC5B,OAAO;QACP,OAAO;QACP,iBAAiB;QACjB,iBAAiB;QACjB,aAAa;QACb,MAAM;KACP,CAAC,CAAC;IAEH,OAAO,oBAAC,cAAc,IAAC,KAAK,EAAE,IAAI,IAAG,QAAQ,CAAC,IAAI,CAAC,CAAkB,CAAC;AACxE,CAAC;AAED,eAAe,eAAe,CAAC"}
+{"version":3,"file":"AddToCartFormik.js","sourceRoot":"","sources":["AddToCartFormik.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAmB,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAe,MAAM,QAAQ,CAAC;AAWrD,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,EACL,cAAc,EACd,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,iDAAiD,CAAC;AACzD,OAAO,QAAQ,MAAM,gCAAgC,CAAC;AACtD,OAAO,EAAE,8BAA8B,EAAE,MAAM,0CAA0C,CAAC;AAC1F,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AA6C7D,MAAM,UAAU,eAAe,CAAC,EAC9B,OAAO,EACP,OAAO,EACP,iBAAiB,GAAG,EAAE,EACtB,iBAAiB,EACjB,aAAa;AACb,wBAAwB;AACxB,eAAe,EACf,gBAAgB,EAChB,kBAAkB,EAClB,SAAS,EACT,YAAY;AACZ,4CAA4C;AAC5C,QAAQ,EACa;IACrB,MAAM,MAAM,GAAG,eAAe,EAAE,CAAC;IAEjC,MAAM,CAAC,iBAAiB,CAAC,GAAG,WAAW,CAGrC,YAAY,EAAE;QACd,WAAW,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,YAAY,EAAE,GAAG,CAAC;KAC3D,CAAC,CAAC;IAEH,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,SAAS,EAAE,CAAC;IAC1C,MAAM,sBAAsB,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC;IAE3D,SAAe,MAAM,CAAC,EAAE,KAAK,EAAE,UAAU,EAAmB;;YAC1D,sBAAsB,CAAC,OAAO,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;YAChD,MAAM,UAAU,GAAG,QAAQ,EAAE,CAAC;YAE9B,MAAM,eAAe,GAAG;gBACtB,OAAO,EAAE,UAAU,CAAC,OAAO;gBAC3B,KAAK,EAAE,UAAU,CAAC,KAAK;gBACvB,QAAQ,EAAE,KAAK,CAAC,QAAQ;gBACxB,iBAAiB,EAAE,OAAO;gBAC1B,UAAU;aACX,CAAC;YAEF,IAAI,eAAe,EAAE;gBACnB,eAAe,CAAC,eAAe,CAAC,CAAC;aAClC;YAED,OAAO,iBAAiB,CAAC;gBACvB,SAAS,EAAE;oBACT,KAAK;iBACN;gBACD,kBAAkB,EAAE;oBAClB,SAAS,EAAE;wBACT,IAAI,EAAE,8BAA8B,CAClC,UAAU,CAAC,OAAO,EAClB,KAAK,CAAC,QAAQ,EACd,MAAM,EACN,MAAM,EACN,SAAS,CACV;wBACD,UAAU,EAAE,cAAc;qBAC3B;iBACF;aACF,CAAC;iBACC,IAAI,CACH,gBAAgB,CAAC;gBACf,kBAAkB;gBAClB,eAAe;gBACf,MAAM;gBACN,SAAS;aACV,CAAC,CACH;iBACA,KAAK,CACJ,cAAc,CAAC;gBACb,gBAAgB;gBAChB,eAAe;aAChB,CAAC,CACH,CAAC;QACN,CAAC;KAAA;IAED,MAAM,EAAE,IAAI,EAAE,GAAG,YAAY,CAAC;QAC5B,OAAO;QACP,OAAO;QACP,iBAAiB;QACjB,iBAAiB;QACjB,aAAa;QACb,MAAM;KACP,CAAC,CAAC;IAEH,OAAO,oBAAC,cAAc,IAAC,KAAK,EAAE,IAAI,IAAG,QAAQ,CAAC,IAAI,CAAC,CAAkB,CAAC;AACxE,CAAC;AAED,eAAe,eAAe,CAAC"}

package/components/Auth/ForgotPasswordProvider.d.ts

@@ -3,11 +3,8 @@ import { FormikProps } from 'formik';
 import React from 'react';
 type ForgotPasswordFormik = FormikProps<MutationRequestPasswordResetArgs>;
 interface ForgotPasswordProps {
-    children(args: {
-        formik: ForgotPasswordFormik;
-    }): React.ReactChild;
+    children: any;
 }
-export declare function ForgotPasswordProvider(props: ForgotPasswordProps): JSX.Element;
 export declare const ForgotPasswordContext: React.Context<{
     formik: ForgotPasswordFormik;
 }>;
@@ -68,4 +65,5 @@ export declare function useForgotPasswordData(): {
         required: boolean;
     };
 };
+export declare function ForgotPasswordProvider(props: ForgotPasswordProps): React.JSX.Element;
 export {};

package/components/Auth/ForgotPasswordProvider.js

@@ -3,8 +3,23 @@ import t from '@jetshop/intl';
 import { Form, Formik } from 'formik';
 import React from 'react';
 import { useMutation } from '@apollo/react-hooks';
+export const ForgotPasswordContext = React.createContext(undefined);
+export function useForgotPasswordData() {
+    var _a, _b;
+    const { formik } = React.useContext(ForgotPasswordContext);
+    const submitted = (_a = formik === null || formik === void 0 ? void 0 : formik.status) === null || _a === void 0 ? void 0 : _a.success;
+    const globalError = (_b = formik === null || formik === void 0 ? void 0 : formik.status) === null || _b === void 0 ? void 0 : _b.globalError;
+    const emailInputProps = {
+        type: 'email',
+        name: 'email',
+        required: true
+    };
+    return Object.assign({ submitted,
+        globalError,
+        emailInputProps }, formik);
+}
 function validate(values) {
-    let errors = {};
+    const errors = {};
     if (!values.email) {
         errors['email'] = t('This field is required');
     }
@@ -15,7 +30,7 @@ function validate(values) {
 }
 function handleMutationError(actions) {
     actions.setStatus({
-        globalError: t('Something went wrong. Please check your input, or try again later.'),
+        globalError: t('Something went wrong. Please check your input, or try again later.')
     });
     actions.setSubmitting(false);
 }
@@ -39,19 +54,4 @@ export function ForgotPasswordProvider(props) {
         } }, (formik) => (React.createElement(Form, null,
         React.createElement(ForgotPasswordContext.Provider, Object.assign({ value: { formik } }, props))))));
 }
-export const ForgotPasswordContext = React.createContext(undefined);
-export function useForgotPasswordData() {
-    var _a, _b;
-    const { formik } = React.useContext(ForgotPasswordContext);
-    const submitted = (_a = formik === null || formik === void 0 ? void 0 : formik.status) === null || _a === void 0 ? void 0 : _a.success;
-    const globalError = (_b = formik === null || formik === void 0 ? void 0 : formik.status) === null || _b === void 0 ? void 0 : _b.globalError;
-    const emailInputProps = {
-        type: 'email',
-        name: 'email',
-        required: true,
-    };
-    return Object.assign({ submitted,
-        globalError,
-        emailInputProps }, formik);
-}
 //# sourceMappingURL=ForgotPasswordProvider.js.map

package/components/Auth/ForgotPasswordProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"ForgotPasswordProvider.js","sourceRoot":"","sources":["ForgotPasswordProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,mDAAmD,CAAC;AAKjF,OAAO,CAAC,MAAM,eAAe,CAAC;AAC9B,OAAO,EAAE,IAAI,EAAE,MAAM,EAA8B,MAAM,QAAQ,CAAC;AAClE,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAQlD,SAAS,QAAQ,CAAC,MAAyB;IACzC,IAAI,MAAM,GAAuB,EAAE,CAAC;IAEpC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;QACjB,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,wBAAwB,CAAC,CAAC;KAC/C;IAED,IAAI,CAAC,2CAA2C,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;QACnE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,uBAAuB,CAAC,CAAC;KAC9C;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,mBAAmB,CAAC,OAAyC;IACpE,OAAO,CAAC,SAAS,CAAC;QAChB,WAAW,EAAE,CAAC,CACZ,oEAAoE,CACrE;KACF,CAAC,CAAC;IACH,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;AAC/B,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,KAA0B;IAC/D,MAAM,CAAC,MAAM,CAAC,GAAG,WAAW,CAEzB,YAAY,CAAC,CAAC;IAEjB,OAAO,CACL,oBAAC,MAAM,IACL,aAAa,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,EAC5B,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE;YAC5B,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;YAE5B,MAAM,CAAC,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC;iBAC3C,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;gBACb,IAAI,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,OAAO,EAAE;oBAC1C,OAAO,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;oBACrC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;iBAC9B;qBAAM;oBACL,mBAAmB,CAAC,OAAO,CAAC,CAAC;iBAC9B;YACH,CAAC,CAAC;iBACD,KAAK,CAAC,GAAG,EAAE;gBACV,mBAAmB,CAAC,OAAO,CAAC,CAAC;YAC/B,CAAC,CAAC,CAAC;QACP,CAAC,IAEA,CAAC,MAAM,EAAE,EAAE,CAAC,CACX,oBAAC,IAAI;QACH,oBAAC,qBAAqB,CAAC,QAAQ,kBAAC,KAAK,EAAE,EAAE,MAAM,EAAE,IAAM,KAAK,EAAI,CAC3D,CACR,CACM,CACV,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,qBAAqB,GAAG,KAAK,CAAC,aAAa,CAErD,SAAS,CAAC,CAAC;AAEd,MAAM,UAAU,qBAAqB;;IACnC,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC,UAAU,CAAC,qBAAqB,CAAC,CAAC;IAE3D,MAAM,SAAS,GAAG,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,0CAAE,OAAO,CAAC;IAC1C,MAAM,WAAW,GAAG,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,0CAAE,WAAW,CAAC;IAEhD,MAAM,eAAe,GAAG;QACtB,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,OAAO;QACb,QAAQ,EAAE,IAAI;KACf,CAAC;IAEF,uBACE,SAAS;QACT,WAAW;QACX,eAAe,IACZ,MAAM,EACT;AACJ,CAAC"}
+{"version":3,"file":"ForgotPasswordProvider.js","sourceRoot":"","sources":["ForgotPasswordProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,mDAAmD,CAAC;AAKjF,OAAO,CAAC,MAAM,eAAe,CAAC;AAC9B,OAAO,EAAE,IAAI,EAAE,MAAM,EAA8B,MAAM,QAAQ,CAAC;AAClE,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAQlD,MAAM,CAAC,MAAM,qBAAqB,GAAG,KAAK,CAAC,aAAa,CAErD,SAAS,CAAC,CAAC;AAEd,MAAM,UAAU,qBAAqB;;IACnC,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC,UAAU,CAAC,qBAAqB,CAAC,CAAC;IAE3D,MAAM,SAAS,GAAG,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,0CAAE,OAAO,CAAC;IAC1C,MAAM,WAAW,GAAG,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,0CAAE,WAAW,CAAC;IAEhD,MAAM,eAAe,GAAG;QACtB,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,OAAO;QACb,QAAQ,EAAE,IAAI;KACf,CAAC;IAEF,uBACE,SAAS;QACT,WAAW;QACX,eAAe,IACZ,MAAM,EACT;AACJ,CAAC;AAED,SAAS,QAAQ,CAAC,MAAyB;IACzC,MAAM,MAAM,GAAuB,EAAE,CAAC;IAEtC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;QACjB,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,wBAAwB,CAAC,CAAC;KAC/C;IAED,IAAI,CAAC,2CAA2C,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;QACnE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,uBAAuB,CAAC,CAAC;KAC9C;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,mBAAmB,CAAC,OAAyC;IACpE,OAAO,CAAC,SAAS,CAAC;QAChB,WAAW,EAAE,CAAC,CACZ,oEAAoE,CACrE;KACF,CAAC,CAAC;IACH,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;AAC/B,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,KAA0B;IAC/D,MAAM,CAAC,MAAM,CAAC,GAAG,WAAW,CAEzB,YAAY,CAAC,CAAC;IAEjB,OAAO,CACL,oBAAC,MAAM,IACL,aAAa,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,EAC5B,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE;YAC5B,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;YAE5B,MAAM,CAAC,EAAE,SAAS,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC;iBAC3C,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;gBACb,IAAI,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,OAAO,EAAE;oBAC1C,OAAO,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;oBACrC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;iBAC9B;qBAAM;oBACL,mBAAmB,CAAC,OAAO,CAAC,CAAC;iBAC9B;YACH,CAAC,CAAC;iBACD,KAAK,CAAC,GAAG,EAAE;gBACV,mBAAmB,CAAC,OAAO,CAAC,CAAC;YAC/B,CAAC,CAAC,CAAC;QACP,CAAC,IAEA,CAAC,MAAM,EAAE,EAAE,CAAC,CACX,oBAAC,IAAI;QACH,oBAAC,qBAAqB,CAAC,QAAQ,kBAAC,KAAK,EAAE,EAAE,MAAM,EAAE,IAAM,KAAK,EAAI,CAC3D,CACR,CACM,CACV,CAAC;AACJ,CAAC"}

package/components/Auth/ResetPasswordProvider.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-export declare const ResetPasswordProvider: React.ComponentClass<Pick<import("react-router").RouteComponentProps<any, import("react-router").StaticContext, H.LocationState>, never>, any> & import("react-router").WithRouterStatics<(props: React.PropsWithChildren<import("react-router").RouteComponentProps<any, import("react-router").StaticContext, H.LocationState>>) => JSX.Element>;
+export declare const ResetPasswordProvider: React.ComponentClass<Pick<any, string | number | symbol>, any> & import("react-router").WithRouterStatics<(props: any) => React.JSX.Element>;
 export declare function useResetPasswordForm(): {
     passwordInputProps: {
         required: boolean;

package/components/Auth/SignupFormContainer.d.ts

@@ -1,19 +1,16 @@
 import { SignUpInput, MaskedProperty } from '@jetshop/core/types';
-import { FormikProps } from 'formik';
 import React from 'react';
 import { SignUpFormInput } from './formatSignupInput';
 type LookupData = {
     [key: string]: MaskedProperty;
 };
 interface SignupFormProps {
-    children(args: {
-        formik: FormikProps<SignUpInput>;
-    }): React.ReactChild;
+    children: any;
     lookupData: LookupData;
     additionalFormatter?: (values: SignUpFormInput) => SignUpInput;
     additionalInitialValues?: Partial<SignUpFormInput>;
 }
 declare function SignupFormProvider({ LoadingComponent, ...props }: SignupFormProps & {
     LoadingComponent?: JSX.Element;
-}): JSX.Element;
+}): React.JSX.Element;
 export default SignupFormProvider;

package/components/Auth/SignupFormContainer.js.map

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

package/components/AuthContext/LogOut.d.ts

@@ -1,5 +1,5 @@
-/// <reference types="react" />
+import React from 'react';
 declare function LogOut({ logOutRedirectPath }: {
     logOutRedirectPath: string;
-}): JSX.Element;
+}): React.JSX.Element;
 export default LogOut;

package/components/ChannelContext/ChannelProvider.d.ts

@@ -6,5 +6,5 @@ export interface ChannelProviderProps {
     children?: React.ReactNode;
     config: BootOptions;
 }
-declare const ChannelProvider: ({ channelHandler, children, config }: ChannelProviderProps) => JSX.Element;
+declare const ChannelProvider: ({ channelHandler, children, config }: ChannelProviderProps) => React.JSX.Element;
 export default ChannelProvider;

package/components/DynamicRoute/CategoryRoute.d.ts

@@ -1,5 +1,5 @@
 import { Category } from '@jetshop/core/types';
-import { ComponentType } from 'react';
+import React, { ComponentType } from 'react';
 import { QueryResult } from 'react-apollo';
 export interface CategoryProps {
     result: QueryResult;
@@ -9,5 +9,5 @@ export interface CategoryRouteProps {
     component: ComponentType<CategoryProps>;
     result: QueryResult;
 }
-declare const CategoryRoute: (props: CategoryRouteProps) => JSX.Element;
+declare const CategoryRoute: (props: CategoryRouteProps) => React.JSX.Element;
 export default CategoryRoute;

package/components/DynamicRoute/GenericError.d.ts

@@ -0,0 +1,18 @@
+import * as React from 'react';
+export interface BoundaryErrorState {
+    error?: Error;
+    info?: React.ErrorInfo;
+}
+export interface BoundaryErrorProps {
+    component?: React.FC<BoundaryErrorState>;
+    extraInfo?: any;
+    children: React.ReactNode;
+}
+export declare const DefaultError: ({ error, info }: BoundaryErrorState) => React.JSX.Element;
+declare class ErrorBoundary extends React.Component<BoundaryErrorProps, BoundaryErrorState> {
+    state: BoundaryErrorState;
+    static defaultProps: Partial<BoundaryErrorProps>;
+    componentDidCatch(error: Error, info: React.ErrorInfo): void;
+    render(): string | number | boolean | React.JSX.Element | React.ReactFragment;
+}
+export default ErrorBoundary;

package/components/DynamicRoute/GenericError.js

@@ -0,0 +1,61 @@
+import * as React from 'react';
+import report from '@jetshop/core/errorReporting';
+export const DefaultError = ({ error, info }) => (React.createElement("section", { style: {
+        width: '57ch',
+        maxWidth: '100%',
+        margin: '4rem auto',
+        padding: '1rem'
+    } },
+    React.createElement("h1", { style: {
+            fontSize: '1.5rem',
+            marginBottom: '2rem'
+        } }, "Something went wrong!"),
+    React.createElement("p", null, "Sorry! Our developers have been notified."),
+    React.createElement("div", null,
+        React.createElement("a", { href: "/", style: {
+                display: 'inline-block',
+                margin: '1rem 0 3rem 0',
+                borderRadius: '3px',
+                padding: '0.5rem',
+                textDecoration: 'none',
+                fontWeight: 600,
+                background: '#e2e2e2',
+                border: '1px solid #c3c3c3',
+                color: '#000'
+            } }, "Go back to the start page")),
+    process.env.NODE_ENV !== 'production' && (React.createElement("div", null,
+        error && React.createElement("p", null,
+            "Error: ",
+            error.message),
+        info && (React.createElement("pre", { style: {
+                fontSize: '0.875rem',
+                lineHeight: 1.5,
+                color: '#585858'
+            } }, info.componentStack))))));
+class ErrorBoundary extends React.Component {
+    constructor() {
+        super(...arguments);
+        this.state = {
+            error: undefined,
+            info: undefined
+        };
+    }
+    componentDidCatch(error, info) {
+        const { extraInfo = {} } = this.props;
+        // Report to Sentry
+        report(error, Object.assign(Object.assign({}, extraInfo), { reactInfo: info }));
+        this.setState({ error, info });
+    }
+    render() {
+        const Comp = this.props.component;
+        if (!this.state.error) {
+            return this.props.children;
+        }
+        return React.createElement(Comp, Object.assign({}, this.state));
+    }
+}
+ErrorBoundary.defaultProps = {
+    component: DefaultError
+};
+export default ErrorBoundary;
+//# sourceMappingURL=GenericError.js.map

package/components/DynamicRoute/GenericError.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"GenericError.js","sourceRoot":"","sources":["GenericError.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,MAAM,MAAM,8BAA8B,CAAC;AAalD,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,EAAE,KAAK,EAAE,IAAI,EAAsB,EAAE,EAAE,CAAC,CACnE,iCACE,KAAK,EAAE;QACL,KAAK,EAAE,MAAM;QACb,QAAQ,EAAE,MAAM;QAChB,MAAM,EAAE,WAAW;QACnB,OAAO,EAAE,MAAM;KAChB;IAED,4BACE,KAAK,EAAE;YACL,QAAQ,EAAE,QAAQ;YAClB,YAAY,EAAE,MAAM;SACrB,4BAGE;IACL,2EAAgD;IAChD;QACE,2BACE,IAAI,EAAC,GAAG,EACR,KAAK,EAAE;gBACL,OAAO,EAAE,cAAc;gBACvB,MAAM,EAAE,eAAe;gBACvB,YAAY,EAAE,KAAK;gBACnB,OAAO,EAAE,QAAQ;gBACjB,cAAc,EAAE,MAAM;gBACtB,UAAU,EAAE,GAAG;gBACf,UAAU,EAAE,SAAS;gBACrB,MAAM,EAAE,mBAAmB;gBAC3B,KAAK,EAAE,MAAM;aACd,gCAGC,CACA;IACL,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,IAAI,CACxC;QACG,KAAK,IAAI;;YAAW,KAAK,CAAC,OAAO,CAAK;QACtC,IAAI,IAAI,CACP,6BACE,KAAK,EAAE;gBACL,QAAQ,EAAE,UAAU;gBACpB,UAAU,EAAE,GAAG;gBACf,KAAK,EAAE,SAAS;aACjB,IAEA,IAAI,CAAC,cAAc,CAChB,CACP,CACG,CACP,CACO,CACX,CAAC;AAEF,MAAM,aAAc,SAAQ,KAAK,CAAC,SAGjC;IAHD;;QAIE,UAAK,GAAuB;YAC1B,KAAK,EAAE,SAAS;YAChB,IAAI,EAAE,SAAS;SAChB,CAAC;IAsBJ,CAAC;IAhBC,iBAAiB,CAAC,KAAY,EAAE,IAAqB;QACnD,MAAM,EAAE,SAAS,GAAG,EAAE,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QACtC,mBAAmB;QACnB,MAAM,CAAC,KAAK,kCAAO,SAAS,KAAE,SAAS,EAAE,IAAI,IAAG,CAAC;QACjD,IAAI,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACjC,CAAC;IAED,MAAM;QACJ,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,SAAyC,CAAC;QAElE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE;YACrB,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC;SAC5B;QAED,OAAO,oBAAC,IAAI,oBAAK,IAAI,CAAC,KAAK,EAAI,CAAC;IAClC,CAAC;;AAnBM,0BAAY,GAAgC;IACjD,SAAS,EAAE,YAAY;CACxB,CAAC;AAoBJ,eAAe,aAAa,CAAC"}

package/components/DynamicRoute/PreviewRoute.d.ts

@@ -13,5 +13,5 @@ declare const PreviewRoute: ({ productPage, categoryPage, contentPage, productQu
     pageQuery: DocumentNode;
     location: Location;
     StartPage?: React.FC<any>;
-}) => JSX.Element;
+}) => React.JSX.Element;
 export default PreviewRoute;

package/components/DynamicRoute/ProductByArticlenumber.d.ts

@@ -1,5 +1,5 @@
-/// <reference types="react" />
+import React from 'react';
 declare const ProductByArticlenumber: ({ articleNumber }: {
     articleNumber: string;
-}) => JSX.Element;
+}) => React.JSX.Element;
 export default ProductByArticlenumber;

package/components/DynamicRoute/ProductRoute.d.ts

@@ -1,5 +1,5 @@
 import { Product } from '@jetshop/core/types';
-import { ComponentType } from 'react';
+import React, { ComponentType } from 'react';
 import { QueryResult } from 'react-apollo';
 export interface ProductProps {
     result: QueryResult;
@@ -11,5 +11,5 @@ export interface ProductRouteProps {
     result: QueryResult;
     partialProduct?: Partial<Product>;
 }
-declare const ProductRoute: (props: ProductRouteProps) => JSX.Element;
+declare const ProductRoute: (props: ProductRouteProps) => React.JSX.Element;
 export default ProductRoute;

package/components/DynamicRoute/RouteResolver.d.ts

@@ -18,5 +18,5 @@ declare const RouteResolver: ({ productPage, categoryPage, contentPage, notFound
     pathname: string;
     state: any;
     search: string;
-}) => JSX.Element;
+}) => React.JSX.Element;
 export default RouteResolver;

package/components/DynamicRoute/RouteResolver.js

@@ -5,7 +5,7 @@ import ContentRoute from './ContentRoute';
 import Status from './Status';
 import { Redirect } from 'react-router';
 import { setPageType } from '../../analytics/webVitals';
-import { DefaultError } from '@jetshop/ui/ErrorBoundary/Generic';
+import { DefaultError } from '@jetshop/core/components/DynamicRoute/GenericError';
 const isRouteType = (state, result, type) => {
     var _a, _b, _c;
     if (result.error) {

package/components/DynamicRoute/RouteResolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"RouteResolver.js","sourceRoot":"","sources":["RouteResolver.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAwB,MAAM,OAAO,CAAC;AAC7C,OAAO,YAA8B,MAAM,gBAAgB,CAAC;AAC5D,OAAO,aAAgC,MAAM,iBAAiB,CAAC;AAC/D,OAAO,YAA8B,MAAM,gBAAgB,CAAC;AAE5D,OAAO,MAAM,MAAM,UAAU,CAAC;AAE9B,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AAEjE,MAAM,WAAW,GAAG,CAAC,KAAU,EAAE,MAAmB,EAAE,IAAY,EAAE,EAAE;;IACpE,IAAI,MAAM,CAAC,KAAK,EAAE;QAChB,OAAO,KAAK,CAAC;KACd;IACD,MAAM,SAAS,GAAG,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,CAAC;IAC9B,MAAM,SAAS,GAAG,MAAA,MAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,0CAAE,KAAK,0CAAE,MAAM,0CAAE,UAAU,CAAC;IAC1D,MAAM,UAAU,GAAG,CAAC,MAAM,CAAC,OAAO,IAAI,CAAC,SAAS,CAAC;IACjD,IAAI,UAAU,EAAE;QACd,OAAO,KAAK,CAAC;KACd;SAAM;QACL,OAAO,SAAS,KAAK,IAAI,IAAI,SAAS,KAAK,IAAI,CAAC;KACjD;AACH,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,CAAC,MAAqC,EAAE,EAAE;;IAC7D,MAAM,SAAS,GACb,MAAA,MAAA,MAAA,MAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,0CAAE,aAAa,0CAAG,CAAC,CAAC,0CAAE,UAAU,0CAAE,IAAI,mCAAI,EAAE,CAAC;IAE5D,MAAM,KAAK,GAAG,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,0CAAE,KAAK,CAAC;IAElC,OAAO,CACL,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC;QAChC,CAAC,KAAK;QACN,CAAC,OAAO,MAAM,KAAK,WAAW,IAAK,MAAc,CAAC,eAAe,KAAK,KAAK,CAAC,CAC7E,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,OAAO,GAAG,CAAC,WAAsB,EAAE,EAAE,CACzC,WAAW,CAAC,CAAC,CAAC,oBAAC,WAAW,OAAG,CAAC,CAAC,CAAC,8CAAqB,CAAC;AAExD,MAAM,aAAa,GAAG,CAAC,EACrB,WAAW,EACX,YAAY,EACZ,WAAW,EACX,YAAY,EAAE,YAAY,EAC1B,SAAS,EACT,WAAW,EACX,MAAM,EACN,QAAQ,EACR,KAAK,EACL,MAAM,EAaP,EAAE,EAAE;;IACH,WAAW,CAAC,MAAC,MAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,0CAAE,KAAK,0CAAE,MAAc,0CAAE,UAAU,CAAC,CAAC;IAE9D,IAAI,CAAC,MAAA,MAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,0CAAE,KAAK,0CAAE,IAAI,mCAAI,QAAQ,CAAC,KAAK,QAAQ,EAAE;QACxD,OAAO,CACL,oBAAC,MAAM,IAAC,IAAI,EAAE,GAAG;YACf,oBAAC,QAAQ,IACP,EAAE,EAAE;oBACF,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI;oBAChC,KAAK,kCACA,KAAK,KACR,IAAI,EAAE,MAAC,MAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,0CAAE,KAAK,0CAAE,MAAc,0CAAE,UAAU,GACvD;oBACD,MAAM;iBACP,GACD,CACK,CACV,CAAC;KACH;SAAM,IAAI,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE;QAChD,OAAO,CACL,oBAAC,YAAY,IACX,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,EAC9B,SAAS,EAAE,WAAW,GACtB,CACH,CAAC;KACH;SAAM,IAAI,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE;QACjD,OAAO,oBAAC,aAAa,IAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,YAAY,GAAI,CAAC;KACnE;SAAM,IAAI,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE;QAC7C,OAAO,CACL,oBAAC,YAAY,IACX,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,WAAW,GACtB,CACH,CAAC;KACH;SAAM,IAAI,MAAM,CAAC,OAAO,EAAE;QACzB,OAAO,OAAO,CAAC,WAAW,CAAC,CAAC;KAC7B;SAAM;QACL,IAAI,YAAY,CAAC,MAAM,CAAC,EAAE;YACxB,OAAO,CACL,oBAAC,MAAM,IAAC,IAAI,EAAE,GAAG;gBACf,oBAAC,YAAY,OAAG,CACT,CACV,CAAC;SACH;QAED,OAAO,CACL,oBAAC,MAAM,IAAC,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,IACnC,SAAS,CAAC,CAAC,CAAC,CACX,oBAAC,SAAS,IAAC,KAAK,EAAE,MAAM,CAAC,KAAK,GAAI,CACnC,CAAC,CAAC,CAAC,CACF,oBAAC,YAAY,IAAC,KAAK,EAAE,MAAM,CAAC,KAAK,GAAI,CACtC,CACM,CACV,CAAC;KACH;AACH,CAAC,CAAC;AAEF,eAAe,aAAa,CAAC"}
+{"version":3,"file":"RouteResolver.js","sourceRoot":"","sources":["RouteResolver.tsx"],"names":[],"mappings":"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"}

package/components/DynamicRoute/Status.d.ts

@@ -4,11 +4,12 @@ import { ApolloError } from 'apollo-client';
 export interface StatusProps extends RouteComponentProps<{}> {
     code: number;
     error?: ApolloError;
+    children?: React.ReactNode;
 }
 declare class Status extends React.Component<StatusProps, any> {
-    render(): JSX.Element;
+    render(): React.JSX.Element;
 }
-declare const _default: React.ComponentClass<Pick<StatusProps, "code" | "error"> & {
+declare const _default: React.ComponentClass<Pick<StatusProps, "children" | "code" | "error"> & {
     wrappedComponentRef?: React.Ref<Status>;
 }, any> & import("react-router").WithRouterStatics<typeof Status>;
 export default _default;

package/components/DynamicRoute/Status.js.map

@@ -1 +1 @@
-{"version":3,"file":"Status.js","sourceRoot":"","sources":["Status.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,UAAU,EAAuB,MAAM,kBAAkB,CAAC;AAEnE,OAAO,IAAI,MAAM,SAAS,CAAC;AAO3B,MAAM,MAAO,SAAQ,KAAK,CAAC,SAA2B;IAC7C,MAAM;QACX,MAAM,EACJ,IAAI,EACJ,OAAO,EAAE,EACP,QAAQ,EAAE,EAAE,QAAQ,EAAE,EACvB,EACD,QAAQ,EACR,aAAa,EACd,GAAG,IAAI,CAAC,KAAK,CAAC;QACf,IAAI,aAAa;YAAE,aAAa,CAAC,UAAU,GAAG,IAAI,CAAC;QACnD,OAAO,CACL;YACG,QAAQ,IAAI,IAAI,IAAI,GAAG,IAAI,IAAI,GAAG,GAAG,IAAI,CACxC,oBAAC,IAAI,IACH,IAAI,EAAE;oBACJ,IAAI,EAAE;wBACJ,KAAK,EAAE,SAAS,IAAI,EAAE;qBACvB;oBACD,UAAU,EAAE,OAAO;iBACpB,GACD,CACH;YACA,QAAQ,CACR,CACJ,CAAC;IACJ,CAAC;CACF;AAED,eAAe,UAAU,CAAC,MAAM,CAAC,CAAC"}
+{"version":3,"file":"Status.js","sourceRoot":"","sources":["Status.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,UAAU,EAAuB,MAAM,kBAAkB,CAAC;AAEnE,OAAO,IAAI,MAAM,SAAS,CAAC;AAQ3B,MAAM,MAAO,SAAQ,KAAK,CAAC,SAA2B;IAC7C,MAAM;QACX,MAAM,EACJ,IAAI,EACJ,OAAO,EAAE,EACP,QAAQ,EAAE,EAAE,QAAQ,EAAE,EACvB,EACD,QAAQ,EACR,aAAa,EACd,GAAG,IAAI,CAAC,KAAK,CAAC;QACf,IAAI,aAAa;YAAE,aAAa,CAAC,UAAU,GAAG,IAAI,CAAC;QACnD,OAAO,CACL;YACG,QAAQ,IAAI,IAAI,IAAI,GAAG,IAAI,IAAI,GAAG,GAAG,IAAI,CACxC,oBAAC,IAAI,IACH,IAAI,EAAE;oBACJ,IAAI,EAAE;wBACJ,KAAK,EAAE,SAAS,IAAI,EAAE;qBACvB;oBACD,UAAU,EAAE,OAAO;iBACpB,GACD,CACH;YACA,QAAQ,CACR,CACJ,CAAC;IACJ,CAAC;CACF;AAED,eAAe,UAAU,CAAC,MAAM,CAAC,CAAC"}

package/components/DynamicRoute/index.d.ts

@@ -8,10 +8,10 @@ export type DynamicRouteProps = {
     productPage: ComponentType<ProductProps>;
     categoryPage: ComponentType<CategoryProps>;
     contentPage: ComponentType<ContentProps>;
-    notFoundPage: React.SFC<any>;
-    LoadingPage?: React.SFC<any>;
-    ErrorPage?: React.SFC<any>;
+    notFoundPage: React.FC<any>;
+    LoadingPage?: React.FC<any>;
+    ErrorPage?: React.FC<any>;
     routeQuery: DocumentNode;
 } & RouteComponentProps<any>;
-declare const DynamicRoute: (props: DynamicRouteProps) => JSX.Element;
+declare const DynamicRoute: (props: DynamicRouteProps) => React.JSX.Element;
 export default DynamicRoute;

package/components/DynamicRoute/index.js

@@ -1,6 +1,6 @@
 import PaginationProvider, { usePagination } from '@jetshop/core/components/Pagination/PaginationProvider';
 import SortOrderContainer from '@jetshop/core/components/SortOrder/SortOrderContainer';
-import GenericError from '@jetshop/ui/ErrorBoundary/Generic';
+import GenericError from '@jetshop/core/components/DynamicRoute/GenericError';
 import { default as React, useEffect } from 'react';
 import { useQuery, useApolloClient } from 'react-apollo';
 import { useHistory, useLocation } from 'react-router';
@@ -16,6 +16,7 @@ function useFiltersOnRouteChange() {
     const history = useHistory();
     const client = useApolloClient();
     useEffect(() => {
+        console.log('run effect');
         client.writeData({
             data: {
                 activeFilters: getActiveFiltersFromSearch(window.location.search)
@@ -23,6 +24,45 @@ function useFiltersOnRouteChange() {
         });
     }, [client, history]);
 }
+const RouteQuery = ({ pagination, sortOrder, direction, routeQuery, productPage, categoryPage, contentPage, notFoundPage, LoadingPage, ErrorPage }) => {
+    var _a, _b, _c, _d, _e;
+    const location = useLocation();
+    const { perPage, offset } = pagination;
+    useFiltersOnRouteChange();
+    const activeFilterQuery = useQuery(ActiveFiltersQuery, {
+        fetchPolicy: 'cache-only'
+    });
+    console.log((_a = activeFilterQuery.data) === null || _a === void 0 ? void 0 : _a.activeFilters);
+    const variables = {
+        path: location.pathname,
+        first: perPage,
+        offset,
+        orderBy: sortOrder,
+        orderByDirection: direction,
+        filters: ((_b = activeFilterQuery.data) === null || _b === void 0 ? void 0 : _b.activeFilters) || Object.assign({}, defaultActiveFilters)
+    };
+    // defaultActiveFilters includes a __typename key,
+    // but we don't want it for the variable input
+    delete variables.filters.__typename;
+    const result = useQuery(routeQuery, {
+        variables,
+        errorPolicy: 'all',
+        fetchPolicy: 'cache-and-network',
+        partialRefetch: true
+    });
+    const route = (_c = result.data) === null || _c === void 0 ? void 0 : _c.route;
+    const data = (_e = (_d = result.data) === null || _d === void 0 ? void 0 : _d.route) === null || _e === void 0 ? void 0 : _e.object;
+    return (React.createElement(GenericError
+    //  Catch routing exceptions and log the graphql result
+    , { 
+        //  Catch routing exceptions and log the graphql result
+        extraInfo: {
+            variables: result.variables,
+            data: result.data
+        } },
+        data && React.createElement(Head, { data: data, route: route }),
+        React.createElement(RouteResolver, { productPage: productPage, categoryPage: categoryPage, contentPage: contentPage, notFoundPage: notFoundPage, LoadingPage: LoadingPage, ErrorPage: ErrorPage, result: result, pathname: location.pathname, state: location.state, search: location.search })));
+};
 const DynamicRoute = (props) => {
     throwErrorInDev(!props.routeQuery, `You forgot to pass 'routeQuery' to DynamicRoute`);
     const pagination = usePagination();
@@ -56,41 +96,5 @@ const DynamicRoute = (props) => {
         })))));
     }
 };
-const RouteQuery = ({ pagination, sortOrder, direction, routeQuery, productPage, categoryPage, contentPage, notFoundPage, LoadingPage, ErrorPage }) => {
-    var _a, _b, _c, _d;
-    const location = useLocation();
-    const { perPage, offset } = pagination;
-    useFiltersOnRouteChange();
-    const activeFilterQuery = useQuery(ActiveFiltersQuery);
-    const variables = {
-        path: location.pathname,
-        first: perPage,
-        offset,
-        orderBy: sortOrder,
-        orderByDirection: direction,
-        filters: ((_a = activeFilterQuery.data) === null || _a === void 0 ? void 0 : _a.activeFilters) || Object.assign({}, defaultActiveFilters)
-    };
-    // defaultActiveFilters includes a __typename key,
-    // but we don't want it for the variable input
-    delete variables.filters.__typename;
-    const result = useQuery(routeQuery, {
-        variables,
-        errorPolicy: 'all',
-        fetchPolicy: 'cache-and-network',
-        partialRefetch: true
-    });
-    const route = (_b = result.data) === null || _b === void 0 ? void 0 : _b.route;
-    const data = (_d = (_c = result.data) === null || _c === void 0 ? void 0 : _c.route) === null || _d === void 0 ? void 0 : _d.object;
-    return (React.createElement(GenericError
-    //  Catch routing exceptions and log the graphql result
-    , { 
-        //  Catch routing exceptions and log the graphql result
-        extraInfo: {
-            variables: result.variables,
-            data: result.data
-        } },
-        data && React.createElement(Head, { data: data, route: route }),
-        React.createElement(RouteResolver, { productPage: productPage, categoryPage: categoryPage, contentPage: contentPage, notFoundPage: notFoundPage, LoadingPage: LoadingPage, ErrorPage: ErrorPage, result: result, pathname: location.pathname, state: location.state, search: location.search })));
-};
 export default DynamicRoute;
 //# sourceMappingURL=index.js.map