@jetshop/core 5.17.0-alpha.3f5cbd3a → 5.17.0-alpha.418dfcd7

package/boot/server/entrypoint.js

@@ -13,12 +13,12 @@ import http from 'http';
     const server = http.createServer(app);
     let currentApp = app;
     server.listen(process.env.PORT || 3000, () => {
-        console.log('🚀 started');
+        console.log('🚀 Started');
     });
     if (module.hot) {
-        console.log('✅  Server-side HMR Enabled!');
+        console.log('🟢 HMR Server-side enabled!');
         const reload = () => __awaiter(void 0, void 0, void 0, function* () {
-            console.log('🔁  HMR Reloading `./server`...');
+            console.log('📦 HMR Server-side reloaded');
             try {
                 app = yield require('src/server').default;
                 server.removeListener('request', currentApp);
@@ -26,11 +26,14 @@ import http from 'http';
                 currentApp = app;
             }
             catch (error) {
+                console.log('🔥 HMR Error: ', (error === null || error === void 0 ? void 0 : error.stack) || error);
                 console.error(error);
             }
         });
         // Reload on HMR
-        module.hot.accept('src/server', reload);
+        module.hot.accept('src/server', reload, (err) => {
+            console.log('🔥 HMR Error: ', err);
+        });
     }
 }))();
 //# sourceMappingURL=entrypoint.js.map

package/boot/server/entrypoint.js.map

@@ -1 +1 @@
-{"version":3,"file":"entrypoint.js","sourceRoot":"","sources":["entrypoint.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,CAAC,GAAS,EAAE;IACV,IAAI,GAAG,GAAG,MAAM,OAAO,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC;IAC9C,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IACtC,IAAI,UAAU,GAAG,GAAG,CAAC;IAErB,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,IAAI,EAAE,GAAG,EAAE;QAC3C,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;IAEH,IAAK,MAAc,CAAC,GAAG,EAAE;QACvB,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;QAE3C,MAAM,MAAM,GAAG,GAAS,EAAE;YACxB,OAAO,CAAC,GAAG,CAAC,iCAAiC,CAAC,CAAC;YAE/C,IAAI;gBACF,GAAG,GAAG,MAAM,OAAO,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC;gBAC1C,MAAM,CAAC,cAAc,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;gBAC7C,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;gBAC1B,UAAU,GAAG,GAAG,CAAC;aAClB;YAAC,OAAO,KAAK,EAAE;gBACd,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;aACtB;QACH,CAAC,CAAA,CAAC;QAEF,gBAAgB;QACf,MAAc,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;KAClD;AACH,CAAC,CAAA,CAAC,EAAE,CAAC"}
+{"version":3,"file":"entrypoint.js","sourceRoot":"","sources":["entrypoint.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,CAAC,GAAS,EAAE;IACV,IAAI,GAAG,GAAG,MAAM,OAAO,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC;IAC9C,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IACtC,IAAI,UAAU,GAAG,GAAG,CAAC;IAErB,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,IAAI,EAAE,GAAG,EAAE;QAC3C,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;IAEH,IAAK,MAAc,CAAC,GAAG,EAAE;QACvB,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;QAE3C,MAAM,MAAM,GAAG,GAAS,EAAE;YACxB,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;YAE3C,IAAI;gBACF,GAAG,GAAG,MAAM,OAAO,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC;gBAC1C,MAAM,CAAC,cAAc,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;gBAC7C,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;gBAC1B,UAAU,GAAG,GAAG,CAAC;aAClB;YAAC,OAAO,KAAK,EAAE;gBACd,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,KAAK,KAAI,KAAK,CAAC,CAAC;gBACrD,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;aACtB;QACH,CAAC,CAAA,CAAC;QAEF,gBAAgB;QACf,MAAc,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,EAAE,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE;YACvD,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC;QACrC,CAAC,CAAC,CAAC;KACJ;AACH,CAAC,CAAA,CAAC,EAAE,CAAC"}

package/boot/server/persistedQueries/__tests__/getPersistedQueriesForRequest.test.js

@@ -1,7 +1,7 @@
 import { getPersistedQueriesForRequest } from '../getPersistedQueriesForRequest';
 import aQuery from './mockQuery.gql';
 import nock from 'nock';
-import { ApolloError } from 'apollo-client';
+import { ApolloError } from '@apollo/client';
 import { ChannelHandler } from '../../../../ChannelHandler/ChannelHandler';
 
 beforeAll(() => {

package/boot/utils/queryLoggingMiddleware.d.ts

@@ -1,2 +1,2 @@
-import { ApolloLink } from 'apollo-link';
+import { ApolloLink } from '@apollo/client';
 export declare const logOperationTime: ApolloLink;

package/boot/utils/queryLoggingMiddleware.js

@@ -1,10 +1,10 @@
-import { ApolloLink } from 'apollo-link';
+import { ApolloLink } from '@apollo/client';
 const timeStartLink = new ApolloLink((operation, forward) => {
     operation.setContext({ start: Date.now() });
     return forward(operation);
 });
 const logTimeLink = new ApolloLink((operation, forward) => {
-    return forward(operation).map(data => {
+    return forward(operation).map((data) => {
         // data from a previous link
         const time = Date.now() - operation.getContext().start;
         console.log(new Date(), `operation ${operation.operationName} took ${time} to complete`);

package/boot/utils/queryLoggingMiddleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"queryLoggingMiddleware.js","sourceRoot":"","sources":["queryLoggingMiddleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,MAAM,aAAa,GAAG,IAAI,UAAU,CAAC,CAAC,SAAS,EAAE,OAAO,EAAE,EAAE;IAC1D,SAAS,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IAC5C,OAAO,OAAO,CAAC,SAAS,CAAC,CAAC;AAC5B,CAAC,CAAC,CAAC;AAEH,MAAM,WAAW,GAAG,IAAI,UAAU,CAAC,CAAC,SAAS,EAAE,OAAO,EAAE,EAAE;IACxD,OAAO,OAAO,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;QACnC,4BAA4B;QAC5B,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC;QACvD,OAAO,CAAC,GAAG,CACT,IAAI,IAAI,EAAE,EACV,aAAa,SAAS,CAAC,aAAa,SAAS,IAAI,cAAc,CAChE,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,gBAAgB,GAAG,aAAa,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC"}
+{"version":3,"file":"queryLoggingMiddleware.js","sourceRoot":"","sources":["queryLoggingMiddleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,MAAM,aAAa,GAAG,IAAI,UAAU,CAAC,CAAC,SAAS,EAAE,OAAO,EAAE,EAAE;IAC1D,SAAS,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IAC5C,OAAO,OAAO,CAAC,SAAS,CAAC,CAAC;AAC5B,CAAC,CAAC,CAAC;AAEH,MAAM,WAAW,GAAG,IAAI,UAAU,CAAC,CAAC,SAAS,EAAE,OAAO,EAAE,EAAE;IACxD,OAAO,OAAO,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACrC,4BAA4B;QAC5B,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC;QACvD,OAAO,CAAC,GAAG,CACT,IAAI,IAAI,EAAE,EACV,aAAa,SAAS,CAAC,aAAa,SAAS,IAAI,cAAc,CAChE,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,gBAAgB,GAAG,aAAa,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC"}

package/cart/AddToCartFormik.d.ts

@@ -2,7 +2,7 @@ import React from 'react';
 import { FormikProps } from 'formik';
 import { Price, Product, ProductVariant, ProductVariantOption } from '../types';
 import { DocumentNode } from 'graphql';
-import { ApolloError } from 'apollo-client';
+import { ApolloError } from '@apollo/client';
 type Comments = Record<string, string>;
 type Options = Record<string, string>;
 interface AddToCartFormikValues {
@@ -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

@@ -10,9 +10,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import React from 'react';
 import { useAddToCart } from './useAddToCart';
 import { FormikProvider } from 'formik';
-import { useApolloClient, useMutation } from '@apollo/react-hooks';
+import { useApolloClient, useMutation } from '@apollo/client';
 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,gBAAgB,CAAC;AAC9D,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/cart/useAddToCart.d.ts

@@ -70,7 +70,7 @@ export declare function useAddToCart({ product, variant, submit, commentValidato
         dirty: boolean;
         unregisterField: (name: string) => void;
         registerField: (name: string, { validate }: any) => void;
-        getFieldProps: (nameOrOptions: any) => import("formik").FieldInputProps<any>;
+        getFieldProps: (nameOrOptions: string | import("formik").FieldConfig<any>) => import("formik").FieldInputProps<any>;
         getFieldMeta: (name: string) => import("formik").FieldMetaProps<any>;
         getFieldHelpers: (name: string) => import("formik").FieldHelperProps<any>;
         validateOnBlur: boolean;

package/components/Auth/ForgotPasswordProvider.d.ts

@@ -26,7 +26,7 @@ export declare function useForgotPasswordData(): {
     setSubmitting: (isSubmitting: boolean) => void;
     setTouched: (touched: import("formik").FormikTouched<MutationRequestPasswordResetArgs>, shouldValidate?: boolean) => void;
     setValues: (values: React.SetStateAction<MutationRequestPasswordResetArgs>, shouldValidate?: boolean) => void;
-    setFieldValue: (field: string, value: any, shouldValidate?: boolean) => void;
+    setFieldValue: (field: string, value: any, shouldValidate?: boolean) => Promise<void | import("formik").FormikErrors<MutationRequestPasswordResetArgs>>;
     setFieldError: (field: string, message: string) => void;
     setFieldTouched: (field: string, isTouched?: boolean, shouldValidate?: boolean) => void;
     validateForm: (values?: any) => Promise<import("formik").FormikErrors<MutationRequestPasswordResetArgs>>;
@@ -44,7 +44,7 @@ export declare function useForgotPasswordData(): {
         (e: React.ChangeEvent<any>): void;
         <T_1 = string | React.ChangeEvent<any>>(field: T_1): T_1 extends React.ChangeEvent<any> ? void : (e: string | React.ChangeEvent<any>) => void;
     };
-    getFieldProps: <Value = any>(props: any) => import("formik").FieldInputProps<Value>;
+    getFieldProps: <Value = any>(props: string | import("formik").FieldConfig<Value>) => import("formik").FieldInputProps<Value>;
     getFieldMeta: <Value_1>(name: string) => import("formik").FieldMetaProps<Value_1>;
     getFieldHelpers: <Value_2 = any>(name: string) => import("formik").FieldHelperProps<Value_2>;
     dirty: boolean;
@@ -65,5 +65,5 @@ export declare function useForgotPasswordData(): {
         required: boolean;
     };
 };
-export declare function ForgotPasswordProvider(props: ForgotPasswordProps): JSX.Element;
+export declare function ForgotPasswordProvider(props: ForgotPasswordProps): React.JSX.Element;
 export {};

package/components/Auth/ForgotPasswordProvider.js

@@ -2,7 +2,7 @@ import { resetRequest } from '@jetshop/core/data/mutations/accountMutations.gql'
 import t from '@jetshop/intl';
 import { Form, Formik } from 'formik';
 import React from 'react';
-import { useMutation } from '@apollo/react-hooks';
+import { useMutation } from '@apollo/client';
 export const ForgotPasswordContext = React.createContext(undefined);
 export function useForgotPasswordData() {
     var _a, _b;

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,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"}
+{"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,gBAAgB,CAAC;AAQ7C,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<any, string | number | symbol>, any> & import("react-router").WithRouterStatics<(props: any) => 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;
@@ -38,7 +38,9 @@ export declare function useResetPasswordForm(): {
     setValues: (values: React.SetStateAction<{
         newPassword: string;
     }>, shouldValidate?: boolean) => void;
-    setFieldValue: (field: string, value: any, shouldValidate?: boolean) => void;
+    setFieldValue: (field: string, value: any, shouldValidate?: boolean) => Promise<void | import("formik").FormikErrors<{
+        newPassword: string;
+    }>>;
     setFieldError: (field: string, message: string) => void;
     setFieldTouched: (field: string, isTouched?: boolean, shouldValidate?: boolean) => void;
     validateForm: (values?: any) => Promise<import("formik").FormikErrors<{
@@ -66,7 +68,7 @@ export declare function useResetPasswordForm(): {
         (e: React.ChangeEvent<any>): void;
         <T_1 = string | React.ChangeEvent<any>>(field: T_1): T_1 extends React.ChangeEvent<any> ? void : (e: string | React.ChangeEvent<any>) => void;
     };
-    getFieldProps: <Value = any>(props: any) => import("formik").FieldInputProps<Value>;
+    getFieldProps: <Value = any>(props: string | import("formik").FieldConfig<Value>) => import("formik").FieldInputProps<Value>;
     getFieldMeta: <Value_1>(name: string) => import("formik").FieldMetaProps<Value_1>;
     getFieldHelpers: <Value_2 = any>(name: string) => import("formik").FieldHelperProps<Value_2>;
     dirty: boolean;

package/components/Auth/ResetPasswordProvider.js

@@ -2,7 +2,7 @@ import { resetPassword } from '@jetshop/core/data/mutations/accountMutations.gql
 import t from '@jetshop/intl';
 import { Form, Formik } from 'formik';
 import React, { useContext } from 'react';
-import { useMutation } from '@apollo/react-hooks';
+import { useMutation } from '@apollo/client';
 import { Redirect, withRouter } from 'react-router';
 import getErrorDetail from '../../helpers/getErrorDetail';
 import throwErrorInDev from '../../helpers/throwErrorInDev';

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":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,mDAAmD,CAAC;AAClF,OAAO,CAAC,MAAM,eAAe,CAAC;AAC9B,OAAO,EAAE,IAAI,EAAE,MAAM,EAAe,MAAM,QAAQ,CAAC;AACnD,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,cAAc,MAAM,8BAA8B,CAAC;AAC1D,OAAO,eAAe,MAAM,+BAA+B,CAAC;AAE5D,OAAO,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AACpE,OAAO,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAI1E,SAAS,qBAAqB;IAC5B,MAAM,EAAE,uBAAuB,EAAE,GAAG,kBAAkB,EAAE,CAAC;IAEzD,MAAM,kBAAkB,GACtB,CAAC,uBAAuB,IAAI;QAC1B,uBAAuB,CAAC,qBAAqB,CAAC,IAAI,CAChD,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,UAAU,CACrC;KACF,CAAC;QACF,EAAE,CAAC;IAEL,OAAO,wBAAwB,CAAC,kBAAkB,EAAE;QAClD,YAAY,EAAE,GAAG,EAAE,CAAC,aAAa;KAClC,CAAC,CAAC;AACL,CAAC;AAED,+BAA+B;AAC/B,MAAM,oBAAoB,GAAG,KAAK,CAAC,aAAa,CAE7C,SAAS,CAAC,CAAC;AAEd,MAAM,CAAC,MAAM,qBAAqB,GAAG,UAAU,CAAC,SAAS,qBAAqB,CAC5E,KAAK;IAEL,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC;IAClC,MAAM,EAAE,KAAK,EAAE,kBAAkB,EAAE,GAAG,MAAM,CAAC;IAE7C,MAAM,CAAC,qBAAqB,CAAC,GAAG,WAAW,CAGzC,aAAa,CAAC,CAAC;IAEjB,MAAM,SAAS,GAAG,qBAAqB,EAAE,CAAC;IAE1C,2DAA2D;IAC3D,IAAI,CAAC,kBAAkB,EAAE;QACvB,OAAO,oBAAC,QAAQ,IAAC,EAAE,EAAC,GAAG,GAAG,CAAC;KAC5B;IAED,OAAO,CACL,oBAAC,MAAM,IACL,aAAa,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,EAClC,QAAQ,EAAE,SAAS,EACnB,QAAQ,EAAE,CAAC,EAAE,WAAW,EAAE,EAAE,OAAO,EAAE,EAAE;YACrC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;YAE5B,qBAAqB,CAAC;gBACpB,SAAS,EAAE;oBACT,WAAW;oBACX,kBAAkB;iBACnB;aACF,CAAC;iBACC,IAAI,CAAC,GAAG,EAAE;gBACT,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;gBAC7B,OAAO,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;YACjC,CAAC,CAAC;iBACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gBACb,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;gBAC7B,OAAO,CAAC,SAAS,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC;YAC/C,CAAC,CAAC,CAAC;QACP,CAAC,IAEA,CAAC,MAAM,EAAE,EAAE,CAAC,CACX,oBAAC,IAAI;QACH,oBAAC,oBAAoB,CAAC,QAAQ,oBAAK,KAAK,IAAE,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,CAC1D,CACR,CACM,CACV,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,mFAAmF;AACnF,MAAM,UAAU,oBAAoB;IAClC,MAAM,OAAO,GAAG,UAAU,CAAC,oBAAoB,CAAC,CAAC;IAEjD,eAAe,CACb,CAAC,OAAO,EACR,2EAA2E,CAC5E,CAAC;IAEF,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAE3B,uDAAuD;IACvD,MAAM,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC;QAC9C,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;QACvC,CAAC,CAAC,SAAS,CAAC;IAEd,MAAM,kBAAkB,GAAG;QACzB,QAAQ,EAAE,IAAI;QACd,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,aAAa;QACnB,YAAY,EAAE,cAAc;KAC7B,CAAC;IAEF,uCACK,MAAM,KACT,kBAAkB,EAClB,SAAS,EAAE,MAAM,CAAC,MAAM,KAAK,WAAW,EACxC,WAAW,EAAE,WAAW,IACxB;AACJ,CAAC;AAED,qEAAqE;AACrE,SAAS,eAAe,CAAC,IAAY;IACnC,MAAM,iBAAiB,GAA8B;QACnD,yBAAyB,EAAE,CAAC,CAC1B,uDAAuD,CACxD;KACF,CAAC;IAEF,IAAI,iBAAiB,CAAC,IAAI,CAAC;QAAE,OAAO,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAE5D,WAAW;IACX,OAAO,CAAC,CAAC,0DAA0D,CAAC,CAAC;AACvE,CAAC"}

package/components/Auth/SSN.js

@@ -2,12 +2,12 @@ import getErrorDetail from '@jetshop/core/helpers/getErrorDetail';
 import t from '@jetshop/intl';
 import { Formik } from 'formik';
 import React, { useContext } from 'react';
-import { ApolloConsumer } from 'react-apollo';
+import { ApolloConsumer } from '@apollo/client';
 import { LookupDispatch } from './SSNLookupContainer';
 import PersonLookupQuery from '@jetshop/core/data/queries/PersonLookupQuery.gql';
 const SSNField = function SSNField(props) {
     const dispatch = useContext(LookupDispatch);
-    return (React.createElement(ApolloConsumer, null, client => {
+    return (React.createElement(ApolloConsumer, null, (client) => {
         return (React.createElement(Formik, { onSubmit: (values, formik) => {
                 client
                     .query({
@@ -20,7 +20,7 @@ const SSNField = function SSNField(props) {
                     formik.setSubmitting(false);
                     props.onSuccess();
                     dispatch({ type: 'set', payload: resp.data.personLookup });
-                }, error => {
+                }, (error) => {
                     const errorMessage = getErrorDetail(error).codes[0].includes('PersonLookupFailed')
                         ? t('Person lookup failed.')
                         : t('Something went wrong, please try again!');
@@ -28,7 +28,7 @@ const SSNField = function SSNField(props) {
                     dispatch({ type: 'reset' });
                     formik.setErrors({ ssn: errorMessage });
                 });
-            }, initialValues: { ssn: '' } }, formik => props.children({ formik })));
+            }, initialValues: { ssn: '' } }, (formik) => props.children({ formik })));
     }));
 };
 export default SSNField;

package/components/Auth/SSN.js.map

@@ -1 +1 @@
-{"version":3,"file":"SSN.js","sourceRoot":"","sources":["SSN.tsx"],"names":[],"mappings":"AAAA,OAAO,cAAc,MAAM,sCAAsC,CAAC;AAClE,OAAO,CAAC,MAAM,eAAe,CAAC;AAC9B,OAAO,EAAE,MAAM,EAAe,MAAM,QAAQ,CAAC;AAC7C,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAGtD,OAAO,iBAAiB,MAAM,kDAAkD,CAAC;AAOjF,MAAM,QAAQ,GAA4B,SAAS,QAAQ,CAAC,KAAK;IAC/D,MAAM,QAAQ,GAAG,UAAU,CAAC,cAAc,CAAC,CAAC;IAE5C,OAAO,CACL,oBAAC,cAAc,QACZ,MAAM,CAAC,EAAE;QACR,OAAO,CACL,oBAAC,MAAM,IACL,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE;gBAC3B,MAAM;qBACH,KAAK,CAAC;oBACL,KAAK,EAAE,iBAAiB;oBACxB,SAAS,EAAE;wBACT,GAAG,EAAE,MAAM,CAAC,GAAG;qBAChB;iBACF,CAAC;qBACD,IAAI,CACH,CAAC,IAAuD,EAAE,EAAE;oBAC1D,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;oBAC5B,KAAK,CAAC,SAAS,EAAE,CAAC;oBAClB,QAAQ,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;gBAC7D,CAAC,EACD,KAAK,CAAC,EAAE;oBACN,MAAM,YAAY,GAAG,cAAc,CACjC,KAAK,CACN,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,oBAAoB,CAAC;wBACvC,CAAC,CAAC,CAAC,CAAC,uBAAuB,CAAC;wBAC5B,CAAC,CAAC,CAAC,CAAC,yCAAyC,CAAC,CAAC;oBAEjD,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;oBAC5B,QAAQ,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;oBAC5B,MAAM,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,YAAY,EAAE,CAAC,CAAC;gBAC1C,CAAC,CACF,CAAC;YACN,CAAC,EACD,aAAa,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,IAEzB,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC,CAC9B,CACV,CAAC;IACJ,CAAC,CACc,CAClB,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,QAAQ,CAAC"}
+{"version":3,"file":"SSN.js","sourceRoot":"","sources":["SSN.tsx"],"names":[],"mappings":"AAAA,OAAO,cAAc,MAAM,sCAAsC,CAAC;AAClE,OAAO,CAAC,MAAM,eAAe,CAAC;AAC9B,OAAO,EAAE,MAAM,EAAe,MAAM,QAAQ,CAAC;AAC7C,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAGtD,OAAO,iBAAiB,MAAM,kDAAkD,CAAC;AAOjF,MAAM,QAAQ,GAA4B,SAAS,QAAQ,CAAC,KAAK;IAC/D,MAAM,QAAQ,GAAG,UAAU,CAAC,cAAc,CAAC,CAAC;IAE5C,OAAO,CACL,oBAAC,cAAc,QACZ,CAAC,MAAM,EAAE,EAAE;QACV,OAAO,CACL,oBAAC,MAAM,IACL,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE;gBAC3B,MAAM;qBACH,KAAK,CAAC;oBACL,KAAK,EAAE,iBAAiB;oBACxB,SAAS,EAAE;wBACT,GAAG,EAAE,MAAM,CAAC,GAAG;qBAChB;iBACF,CAAC;qBACD,IAAI,CACH,CAAC,IAAuD,EAAE,EAAE;oBAC1D,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;oBAC5B,KAAK,CAAC,SAAS,EAAE,CAAC;oBAClB,QAAQ,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;gBAC7D,CAAC,EACD,CAAC,KAAK,EAAE,EAAE;oBACR,MAAM,YAAY,GAAG,cAAc,CACjC,KAAK,CACN,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,oBAAoB,CAAC;wBACvC,CAAC,CAAC,CAAC,CAAC,uBAAuB,CAAC;wBAC5B,CAAC,CAAC,CAAC,CAAC,yCAAyC,CAAC,CAAC;oBAEjD,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;oBAC5B,QAAQ,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;oBAC5B,MAAM,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,YAAY,EAAE,CAAC,CAAC;gBAC1C,CAAC,CACF,CAAC;YACN,CAAC,EACD,aAAa,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,IAEzB,CAAC,MAAM,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC,CAChC,CACV,CAAC;IACJ,CAAC,CACc,CAClB,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,QAAQ,CAAC"}

package/components/Auth/SignupFormContainer.d.ts

@@ -1,5 +1,5 @@
-/// <reference types="react" />
 import { SignUpInput, MaskedProperty } from '@jetshop/core/types';
+import React from 'react';
 import { SignUpFormInput } from './formatSignupInput';
 type LookupData = {
     [key: string]: MaskedProperty;
@@ -12,5 +12,5 @@ interface SignupFormProps {
 }
 declare function SignupFormProvider({ LoadingComponent, ...props }: SignupFormProps & {
     LoadingComponent?: JSX.Element;
-}): JSX.Element;
+}): React.JSX.Element;
 export default SignupFormProvider;

package/components/Auth/UpdatePasswordForm.js

@@ -3,7 +3,7 @@ import logError from '@jetshop/core/helpers/logError';
 import t from '@jetshop/intl';
 import { Form, Formik } from 'formik';
 import React from 'react';
-import { useMutation } from '@apollo/react-hooks';
+import { useMutation } from '@apollo/client';
 import { createValidatorForFields } from './formFieldsFromSettings';
 import { useCustomerQuery } from './useCustomer';
 import GetCustomerCountryCode from '@jetshop/core/data/queries/GetCustomerCountryCode.gql';
@@ -35,14 +35,14 @@ export const UpdatePasswordProvider = ({ render, onSubmitSuccess }) => {
         query: GetCustomerCountryCode
     });
     const passwordField = countrySettings &&
-        countrySettings.privateCustomerFields.find(field => field.name === 'password');
+        countrySettings.privateCustomerFields.find((field) => field.name === 'password');
     // Combine validation from the API with our own validation
     const validator = createValidatorForFields([
         passwordField,
         { id: 'oldPassword', name: 'oldPassword', required: true },
         { id: 'newPasswordRepeat', name: 'newPasswordRepeat', required: true }
     ], {
-        getFieldName: name => {
+        getFieldName: (name) => {
             if (name === 'password') {
                 return 'newPassword';
             }
@@ -68,14 +68,14 @@ export const UpdatePasswordProvider = ({ render, onSubmitSuccess }) => {
                 typeof onSubmitSuccess === 'function' && onSubmitSuccess();
                 actions.setStatus({ success: true });
             })
-                .catch(err => {
+                .catch((err) => {
                 logError(true, err);
                 actions.setSubmitting(false);
                 actions.setStatus({
                     globalError: t('Something went wrong updating password. Is your old password correct?')
                 });
             });
-        }, render: props => {
+        }, render: (props) => {
             var _a, _b;
             return (React.createElement(Form, null, render(Object.assign(Object.assign({}, props), { inputProps, submitted: (_a = props === null || props === void 0 ? void 0 : props.status) === null || _a === void 0 ? void 0 : _a.success, globalError: (_b = props === null || props === void 0 ? void 0 : props.status) === null || _b === void 0 ? void 0 : _b.globalError }))));
         } }));
@@ -87,7 +87,7 @@ export function useUpdatePasswordMutation() {
             .then(() => mutate({
             variables
         }))
-            .then(res => {
+            .then((res) => {
             if (!res.data.updatePassword.success) {
                 // This should never happen as mutation itself fails
                 throw new Error('Something went wrong');

package/components/Auth/UpdatePasswordForm.js.map

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

package/components/Auth/signup-context.d.ts

@@ -6,7 +6,7 @@ export interface EnhancedCustomerField extends CustomerField {
     label: string;
     placeholder?: string;
 }
-type SignupContext = {
+type ISignupContext = {
     isUserTypeBusiness: boolean;
     billingAddressFields: EnhancedCustomerField[];
     loginFields: EnhancedCustomerField[];
@@ -27,7 +27,7 @@ export declare const SignupContext: React.Context<{
     loading: boolean;
 }>;
 declare const SignupProvider: React.FC<{
-    value?: SignupContext;
+    value?: ISignupContext;
     LoadingComponent?: JSX.Element;
 }>;
 export declare const SignupFormikContext: React.Context<{

package/components/Auth/signup-context.js

@@ -30,7 +30,7 @@ const SignupProvider = function SignupContextProvider(_a) {
     const [country, setCountry] = React.useState(selectedChannel.country);
     const { countrySettings, loading } = useCountrySettings();
     const selectedCountrySettings = countrySettings &&
-        countrySettings.find(c => c.countryCode === country.code);
+        countrySettings.find((c) => c.countryCode === country.code);
     // Get all the billing address fields from the country settings
     const { allFields, billingAddressFields, loginFields } = !loading
         ? formFieldsFromSettings(selectedCountrySettings, isUserTypeBusiness)
@@ -63,8 +63,7 @@ const SignupProvider = function SignupContextProvider(_a) {
     if (loading) {
         return LoadingComponent || null;
     }
-    else
-        return React.createElement(SignupContext.Provider, Object.assign({ value: value }, props));
+    return React.createElement(SignupContext.Provider, Object.assign({ value: value }, props));
 };
 // Holds formik state
 export const SignupFormikContext = React.createContext(undefined);

package/components/Auth/signup-context.js.map

@@ -1 +1 @@
-{"version":3,"file":"signup-context.js","sourceRoot":"","sources":["signup-context.tsx"],"names":[],"mappings":";;;;;;;;;;;AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,cAAc,MAAM,yCAAyC,CAAC;AACrE,OAAO,EAAE,sBAAsB,EAAE,MAAM,sDAAsD,CAAC;AAC9F,OAAO,eAAe,MAAM,uCAAuC,CAAC;AAEpE,OAAO,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAqB1E,kCAAkC;AAClC,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,CAAC,aAAa,CAAgB,SAAS,CAAC,CAAC;AAE3E,MAAM,cAAc,GAGf,SAAS,qBAAqB,CAAC,EAA8B;QAA9B,EAAE,gBAAgB,OAAY,EAAP,KAAK,cAA5B,oBAA8B,CAAF;IAC9D,mEAAmE;IACnE,8EAA8E;IAC9E,+BAA+B;IAC/B,MAAM,EAAE,eAAe,EAAE,GAAG,KAAK,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;IAE7D,MAAM,CAAC,kBAAkB,EAAE,qBAAqB,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAE1E,eAAe,CACb,CAAC,eAAe,EAChB,4CAA4C,CAC7C,CAAC;IAEF,4EAA4E;IAC5E,0EAA0E;IAC1E,wBAAwB;IACxB,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;IACtE,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,GAAG,kBAAkB,EAAE,CAAC;IAC1D,MAAM,uBAAuB,GAC3B,eAAe;QACf,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAE5D,+DAA+D;IAC/D,MAAM,EAAE,SAAS,EAAE,oBAAoB,EAAE,WAAW,EAAE,GAAG,CAAC,OAAO;QAC/D,CAAC,CAAC,sBAAsB,CAAC,uBAAuB,EAAE,kBAAkB,CAAC;QACrE,CAAC,CAAC;YACE,SAAS,EAAE,IAAI;YACf,oBAAoB,EAAE,IAAI;YAC1B,WAAW,EAAE,IAAI;SAClB,CAAC;IAEN,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE;QAC/B,OAAO;YACL,oBAAoB;YACpB,WAAW;YACX,SAAS;YACT,eAAe,EAAE,OAAO;YACxB,SAAS,EAAE,eAAe,CAAC,SAAS;YACpC,UAAU;YACV,OAAO;YACP,kBAAkB;YAClB,qBAAqB;SACtB,CAAC;IACJ,CAAC,EAAE;QACD,oBAAoB;QACpB,WAAW;QACX,SAAS;QACT,OAAO;QACP,eAAe,CAAC,SAAS;QACzB,OAAO;QACP,kBAAkB;KACnB,CAAC,CAAC;IAEH,IAAI,OAAO,EAAE;QACX,OAAO,gBAAgB,IAAI,IAAI,CAAC;KACjC;;QAAM,OAAO,oBAAC,aAAa,CAAC,QAAQ,kBAAC,KAAK,EAAE,KAAK,IAAM,KAAK,EAAI,CAAC;AACpE,CAAC,CAAC;AAEF,qBAAqB;AACrB,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,CAAC,aAAa,CAEnD,SAAS,CAAC,CAAC;AAEd,eAAe,cAAc,CAAC"}
+{"version":3,"file":"signup-context.js","sourceRoot":"","sources":["signup-context.tsx"],"names":[],"mappings":";;;;;;;;;;;AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,cAAc,MAAM,yCAAyC,CAAC;AACrE,OAAO,EAAE,sBAAsB,EAAE,MAAM,sDAAsD,CAAC;AAC9F,OAAO,eAAe,MAAM,uCAAuC,CAAC;AAEpE,OAAO,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAqB1E,kCAAkC;AAClC,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,CAAC,aAAa,CAAiB,SAAS,CAAC,CAAC;AAE5E,MAAM,cAAc,GAGf,SAAS,qBAAqB,CAAC,EAA8B;QAA9B,EAAE,gBAAgB,OAAY,EAAP,KAAK,cAA5B,oBAA8B,CAAF;IAC9D,mEAAmE;IACnE,8EAA8E;IAC9E,+BAA+B;IAC/B,MAAM,EAAE,eAAe,EAAE,GAAG,KAAK,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;IAE7D,MAAM,CAAC,kBAAkB,EAAE,qBAAqB,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAE1E,eAAe,CACb,CAAC,eAAe,EAChB,4CAA4C,CAC7C,CAAC;IAEF,4EAA4E;IAC5E,0EAA0E;IAC1E,wBAAwB;IACxB,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;IACtE,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,GAAG,kBAAkB,EAAE,CAAC;IAC1D,MAAM,uBAAuB,GAC3B,eAAe;QACf,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAE9D,+DAA+D;IAC/D,MAAM,EAAE,SAAS,EAAE,oBAAoB,EAAE,WAAW,EAAE,GAAG,CAAC,OAAO;QAC/D,CAAC,CAAC,sBAAsB,CAAC,uBAAuB,EAAE,kBAAkB,CAAC;QACrE,CAAC,CAAC;YACE,SAAS,EAAE,IAAI;YACf,oBAAoB,EAAE,IAAI;YAC1B,WAAW,EAAE,IAAI;SAClB,CAAC;IAEN,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE;QAC/B,OAAO;YACL,oBAAoB;YACpB,WAAW;YACX,SAAS;YACT,eAAe,EAAE,OAAO;YACxB,SAAS,EAAE,eAAe,CAAC,SAAS;YACpC,UAAU;YACV,OAAO;YACP,kBAAkB;YAClB,qBAAqB;SACtB,CAAC;IACJ,CAAC,EAAE;QACD,oBAAoB;QACpB,WAAW;QACX,SAAS;QACT,OAAO;QACP,eAAe,CAAC,SAAS;QACzB,OAAO;QACP,kBAAkB;KACnB,CAAC,CAAC;IAEH,IAAI,OAAO,EAAE;QACX,OAAO,gBAAgB,IAAI,IAAI,CAAC;KACjC;IACD,OAAO,oBAAC,aAAa,CAAC,QAAQ,kBAAC,KAAK,EAAE,KAAK,IAAM,KAAK,EAAI,CAAC;AAC7D,CAAC,CAAC;AAEF,qBAAqB;AACrB,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,CAAC,aAAa,CAEnD,SAAS,CAAC,CAAC;AAEd,eAAe,cAAc,CAAC"}

package/components/Auth/signupSubmit.js

@@ -2,7 +2,7 @@ import { formatSignupInput } from '@jetshop/core/components/Auth/formatSignupInp
 import useAuth from '@jetshop/core/components/AuthContext/useAuth';
 import SignupMutation from '@jetshop/core/data/mutations/signup.gql';
 import getErrorDetail from '@jetshop/core/helpers/getErrorDetail';
-import { useApolloClient, useMutation } from '@apollo/react-hooks';
+import { useApolloClient, useMutation } from '@apollo/client';
 import { useContext } from 'react';
 import { SignupContext } from './signup-context';
 import { trackRegisterEvent } from '../../analytics/tracking';
@@ -23,7 +23,7 @@ export function useSignupSubmit() {
                 })
             }
         })
-            .then(resp => {
+            .then((resp) => {
             // Submitting is done
             actions.setSubmitting(false);
             // Track user register in GTAG
@@ -33,7 +33,7 @@ export function useSignupSubmit() {
                 // Log the user in with the token from signup
                 logIn(resp.data.signUp.token.value);
             });
-        }, error => {
+        }, (error) => {
             const errorDetail = getErrorDetail(error);
             const validationDetails = getvalidationDetails(errorDetail);
             // Submitting is done
@@ -43,7 +43,7 @@ export function useSignupSubmit() {
                 isSignupError: true
             });
         })
-            .catch(err => {
+            .catch((err) => {
             console.log(err);
             actions.setSubmitting(false);
         });

package/components/Auth/signupSubmit.js.map

@@ -1 +1 @@
-{"version":3,"file":"signupSubmit.js","sourceRoot":"","sources":["signupSubmit.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EAElB,MAAM,iDAAiD,CAAC;AACzD,OAAO,OAAO,MAAM,8CAA8C,CAAC;AACnE,OAAO,cAAc,MAAM,yCAAyC,CAAC;AACrE,OAAO,cAEN,MAAM,sCAAsC,CAAC;AAE9C,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AACnC,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAEvD,MAAM,UAAU,eAAe;IAC7B,MAAM,CAAC,MAAM,CAAC,GAAG,WAAW,CAG1B,cAAc,CAAC,CAAC;IAClB,MAAM,MAAM,GAAG,eAAe,EAAE,CAAC;IACjC,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,EAAE,CAAC;IAC5B,MAAM,EAAE,kBAAkB,EAAE,GAAG,UAAU,CAAC,aAAa,CAAC,CAAC;IACzD,MAAM,KAAK,GAAG,UAAU,EAAE,CAAC;IAE3B,OAAO,SAAS,MAAM,CAAC,EACrB,MAAM,EACN,OAAO,EAIR;QACC,sCAAsC;QACtC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAE5B,MAAM,CAAC;YACL,SAAS,EAAE;gBACT,KAAK,EAAE,iBAAiB,CAAC,MAAM,EAAE;oBAC/B,QAAQ,EAAE,kBAAkB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;iBACrD,CAAC;aACH;SACF,CAAC;aACC,IAAI,CACH,IAAI,CAAC,EAAE;YACL,qBAAqB;YACrB,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;YAC7B,8BAA8B;YAC9B,KAAK,CAAC,kBAAkB,EAAE,CAAC,CAAC;YAC5B,yBAAyB;YACzB,MAAM,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;gBAC5B,6CAA6C;gBAC7C,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACtC,CAAC,CAAC,CAAC;QACL,CAAC,EACD,KAAK,CAAC,EAAE;YACN,MAAM,WAAW,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;YAC1C,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,WAAW,CAAC,CAAC;YAE5D,qBAAqB;YACrB,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;YAE7B,OAAO,CAAC,SAAS,CAAC;gBAChB,iBAAiB;gBACjB,aAAa,EAAE,IAAI;aACpB,CAAC,CAAC;QACL,CAAC,CACF;aACA,KAAK,CAAC,GAAG,CAAC,EAAE;YACX,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACjB,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAC/B,CAAC,CAAC,CAAC;IACP,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,oBAAoB,CAAC,WAAwB;IACpD,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IACjD,MAAM,CAAC,MAAM,CAAC,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IAE5C,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AACzB,CAAC"}
+{"version":3,"file":"signupSubmit.js","sourceRoot":"","sources":["signupSubmit.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EAElB,MAAM,iDAAiD,CAAC;AACzD,OAAO,OAAO,MAAM,8CAA8C,CAAC;AACnE,OAAO,cAAc,MAAM,yCAAyC,CAAC;AACrE,OAAO,cAEN,MAAM,sCAAsC,CAAC;AAE9C,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AACnC,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAEvD,MAAM,UAAU,eAAe;IAC7B,MAAM,CAAC,MAAM,CAAC,GAAG,WAAW,CAG1B,cAAc,CAAC,CAAC;IAClB,MAAM,MAAM,GAAG,eAAe,EAAE,CAAC;IACjC,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,EAAE,CAAC;IAC5B,MAAM,EAAE,kBAAkB,EAAE,GAAG,UAAU,CAAC,aAAa,CAAC,CAAC;IACzD,MAAM,KAAK,GAAG,UAAU,EAAE,CAAC;IAE3B,OAAO,SAAS,MAAM,CAAC,EACrB,MAAM,EACN,OAAO,EAIR;QACC,sCAAsC;QACtC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAE5B,MAAM,CAAC;YACL,SAAS,EAAE;gBACT,KAAK,EAAE,iBAAiB,CAAC,MAAM,EAAE;oBAC/B,QAAQ,EAAE,kBAAkB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;iBACrD,CAAC;aACH;SACF,CAAC;aACC,IAAI,CACH,CAAC,IAAI,EAAE,EAAE;YACP,qBAAqB;YACrB,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;YAC7B,8BAA8B;YAC9B,KAAK,CAAC,kBAAkB,EAAE,CAAC,CAAC;YAC5B,yBAAyB;YACzB,MAAM,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;gBAC5B,6CAA6C;gBAC7C,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACtC,CAAC,CAAC,CAAC;QACL,CAAC,EACD,CAAC,KAAK,EAAE,EAAE;YACR,MAAM,WAAW,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;YAC1C,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,WAAW,CAAC,CAAC;YAE5D,qBAAqB;YACrB,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;YAE7B,OAAO,CAAC,SAAS,CAAC;gBAChB,iBAAiB;gBACjB,aAAa,EAAE,IAAI;aACpB,CAAC,CAAC;QACL,CAAC,CACF;aACA,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACb,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACjB,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAC/B,CAAC,CAAC,CAAC;IACP,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,oBAAoB,CAAC,WAAwB;IACpD,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IACjD,MAAM,CAAC,MAAM,CAAC,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IAE5C,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AACzB,CAAC"}

package/components/Auth/useAddressFields.js

@@ -10,7 +10,7 @@ export default function useAddressFields() {
     // Change the selected country by country code
     // This will change the fields and validations based on that country's settings
     const setCountryByCode = React.useCallback((countryCode) => {
-        const country = countries.find(c => c.code === countryCode);
+        const country = countries.find((c) => c.code === countryCode);
         if (!country)
             return;
         setCountry(country);
@@ -18,8 +18,8 @@ export default function useAddressFields() {
     // Filter out the country field from the billing address fields, as it is handled separately
     // See: Countries.tsx
     const fields = billingAddressFields
-        .filter(f => f.name !== 'country')
-        .map(field => {
+        .filter((f) => f.name !== 'country')
+        .map((field) => {
         return Object.assign(Object.assign({}, field), { inputProps: {
                 key: field.id,
                 type: field.type,

package/components/Auth/useAddressFields.js.map

@@ -1 +1 @@
-{"version":3,"file":"useAddressFields.js","sourceRoot":"","sources":["useAddressFields.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,MAAM,uCAAuC,CAAC;AACpE,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,MAAM,CAAC,OAAO,UAAU,gBAAgB;IACtC,MAAM,OAAO,GAAG,KAAK,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;IAEhD,2EAA2E;IAC3E,iCAAiC;IACjC,eAAe,CACb,OAAO,OAAO,KAAK,WAAW,EAC9B,qEAAqE,CACtE,CAAC;IAEF,MAAM,EAAE,oBAAoB,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;IAEhE,8CAA8C;IAC9C,+EAA+E;IAC/E,MAAM,gBAAgB,GAAG,KAAK,CAAC,WAAW,CACxC,CAAC,WAAmB,EAAE,EAAE;QACtB,MAAM,OAAO,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC;QAE5D,IAAI,CAAC,OAAO;YAAE,OAAO;QAErB,UAAU,CAAC,OAAO,CAAC,CAAC;IACtB,CAAC,EACD,CAAC,SAAS,EAAE,UAAU,CAAC,CACxB,CAAC;IAEF,4FAA4F;IAC5F,qBAAqB;IACrB,MAAM,MAAM,GAAG,oBAAoB;SAChC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC;SACjC,GAAG,CAAC,KAAK,CAAC,EAAE;QACX,uCACK,KAAK,KACR,UAAU,EAAE;gBACV,GAAG,EAAE,KAAK,CAAC,EAAE;gBACb,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,KAAK,EAAE,KAAK,CAAC,KAAK;gBAClB,QAAQ,EAAE,KAAK,CAAC,QAAQ;aACzB,IACD;IACJ,CAAC,CAAC,CAAC;IAEL,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,gBAAgB,EAAE,CAAC;AACjD,CAAC"}
+{"version":3,"file":"useAddressFields.js","sourceRoot":"","sources":["useAddressFields.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,MAAM,uCAAuC,CAAC;AACpE,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,MAAM,CAAC,OAAO,UAAU,gBAAgB;IACtC,MAAM,OAAO,GAAG,KAAK,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;IAEhD,2EAA2E;IAC3E,iCAAiC;IACjC,eAAe,CACb,OAAO,OAAO,KAAK,WAAW,EAC9B,qEAAqE,CACtE,CAAC;IAEF,MAAM,EAAE,oBAAoB,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;IAEhE,8CAA8C;IAC9C,+EAA+E;IAC/E,MAAM,gBAAgB,GAAG,KAAK,CAAC,WAAW,CACxC,CAAC,WAAmB,EAAE,EAAE;QACtB,MAAM,OAAO,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC;QAE9D,IAAI,CAAC,OAAO;YAAE,OAAO;QAErB,UAAU,CAAC,OAAO,CAAC,CAAC;IACtB,CAAC,EACD,CAAC,SAAS,EAAE,UAAU,CAAC,CACxB,CAAC;IAEF,4FAA4F;IAC5F,qBAAqB;IACrB,MAAM,MAAM,GAAG,oBAAoB;SAChC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC;SACnC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QACb,uCACK,KAAK,KACR,UAAU,EAAE;gBACV,GAAG,EAAE,KAAK,CAAC,EAAE;gBACb,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,KAAK,EAAE,KAAK,CAAC,KAAK;gBAClB,QAAQ,EAAE,KAAK,CAAC,QAAQ;aACzB,IACD;IACJ,CAAC,CAAC,CAAC;IAEL,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,gBAAgB,EAAE,CAAC;AACjD,CAAC"}

package/components/Auth/useAddressFields.test.js

@@ -3,11 +3,13 @@ import { render, fireEvent, waitForElement } from '@testing-library/react';
 import useAddressFields from './useAddressFields';
 import ChannelContext from '@jetshop/core/components/ChannelContext';
 import SignupProvider from './signup-context';
-import { ApolloClient } from 'apollo-client';
-import { MockLink } from 'apollo-link-mock';
-import { ApolloProvider } from 'react-apollo';
-import { InMemoryCache } from 'apollo-cache-inmemory';
-import gql from 'graphql-tag';
+import {
+  ApolloClient,
+  ApolloProvider,
+  InMemoryCache,
+  gql
+} from '@apollo/client';
+import { MockLink } from '@apollo/client';
 
 const fields = [
   {
@@ -69,7 +71,7 @@ describe('useAddressFields', () => {
     const testFields = await waitForElement(() => getAllByTestId('field'));
 
     expect(testFields).toHaveLength(2);
-    testFields.map(field => expect(field.id).not.toBe('country'));
+    testFields.map((field) => expect(field.id).not.toBe('country'));
   });
 
   it('changes the form fields based on selected country', async () => {
@@ -270,7 +272,7 @@ function Wrapper() {
   return (
     <>
       <div>
-        {fields.map(field => (
+        {fields.map((field) => (
           <span data-testid="field" key={field.name}>
             {field.name}
           </span>
@@ -284,7 +286,7 @@ function Wrapper() {
         Set country from form
       </button>
 
-      {countries.map(country => (
+      {countries.map((country) => (
         <span data-testid="country" key={country.id}>
           {country.code}
         </span>

package/components/Auth/useCustomer.d.ts

@@ -77,13 +77,13 @@ export declare function useCustomerQuery({ query, deliveryAddressId }: {
     query: DocumentNode;
     deliveryAddressId?: number;
 }): {
-    refetch: (variables?: import("react-apollo").OperationVariables) => Promise<import("apollo-client").ApolloQueryResult<{
+    refetch: (variables?: Partial<import("@apollo/client").OperationVariables>) => Promise<import("@apollo/client").ApolloQueryResult<{
         customer: Query['customer'] & {
             __typename: 'BusinessCustomer' | 'PrivateCustomer';
         };
     }>>;
     loading: boolean;
-    error: import("apollo-client").ApolloError;
+    error: import("@apollo/client").ApolloError;
     customer: Customer & {
         __typename: 'BusinessCustomer' | 'PrivateCustomer';
     };

package/components/Auth/useCustomer.js

@@ -13,7 +13,7 @@ import ChannelContext from '@jetshop/core/components/ChannelContext';
 import UpdateCustomerMutation from '@jetshop/core/data/mutations/updateCustomer.gql';
 import logError from '@jetshop/core/helpers/logError';
 import { useCallback, useContext, useEffect, useMemo, useState } from 'react';
-import { useMutation, useQuery } from '@apollo/react-hooks';
+import { useMutation, useQuery } from '@apollo/client';
 import { translations } from './signup-field-translations';
 import { useCountrySettings } from '../ChannelContext/useCountrySettings';
 export function customerAddressToCustomerUpdateAddressInput({ address, isDeleteId = false, countryCode }) {

package/components/Auth/useCustomer.js.map

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