@jetshop/core 5.17.0-alpha.1fa8c1a3 → 5.17.0-alpha.240f9d97

package/hooks/Subscriptions/useStoresubscriptions.test.js

@@ -1,12 +1,10 @@
 import { act, renderHook } from '@testing-library/react-hooks';
-import { InMemoryCache } from 'apollo-cache-inmemory';
-import { ApolloClient } from 'apollo-client';
-import { MockLink } from 'apollo-link-mock';
+import { ApolloClient, ApolloProvider, InMemoryCache } from '@apollo/client';
+import { MockLink } from '@apollo/client';
 import React from 'react';
-import { ApolloProvider } from 'react-apollo';
 import { useStoreSubscriptions } from './useStoreSubscriptions';
 
-const wrapper = props => <WithApolloProvider {...props} />;
+const wrapper = (props) => <WithApolloProvider {...props} />;
 
 const event = {
   preventDefault: () => null
@@ -113,7 +111,7 @@ describe('useStoreSubscriptions', () => {
           useStoreSubscriptions({
             ...subscriptionArgs,
             services: {
-              trySubmit: data => Promise.resolve(data)
+              trySubmit: (data) => Promise.resolve(data)
             }
           }),
         wrapper
@@ -145,7 +143,7 @@ describe('useStoreSubscriptions', () => {
           useStoreSubscriptions({
             ...subscriptionArgs,
             services: {
-              trySubmit: error => Promise.reject(error)
+              trySubmit: (error) => Promise.reject(error)
             }
           }),
         wrapper

package/hooks/useAddMultipleToCart.d.ts

@@ -1,4 +1,4 @@
-import { FetchResult, DocumentNode } from 'apollo-link';
+import { FetchResult, DocumentNode } from '@apollo/client';
 import { CartMutation, AddMultipleToCartInput, Product } from '../types';
 type AddMultipleToCartMutationResponse = FetchResult<{
     addMultipleToCart: CartMutation;

package/hooks/useAddMultipleToCart.js

@@ -1,4 +1,4 @@
-import { useApolloClient } from '@apollo/react-hooks';
+import { useApolloClient } from '@apollo/client';
 import { CartIdContext } from '@jetshop/core/components/Cart/CartIdContext';
 import { useContext, useState } from 'react';
 import throwErrorInDev from '../helpers/throwErrorInDev';

package/hooks/useAddMultipleToCart.js.map

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

package/hooks/useAddMultipleToCart.test.js

@@ -1,5 +1,5 @@
+import { gql } from '@apollo/client';
 import { act, renderHook } from '@testing-library/react-hooks';
-import gql from 'graphql-tag';
 import { ProviderPyramid } from 'ProviderPyramid';
 import React from 'react';
 import { CartIdProvider } from '../components/Cart/CartIdContext';

package/hooks/useCustomerOrders.test.js

@@ -1,9 +1,11 @@
-import { InMemoryCache } from 'apollo-cache-inmemory';
-import { ApolloClient } from 'apollo-client';
-import { MockLink } from 'apollo-link-mock';
-import gql from 'graphql-tag';
+import {
+  ApolloClient,
+  ApolloProvider,
+  InMemoryCache,
+  gql
+} from '@apollo/client';
+import { MockLink } from '@apollo/client';
 import * as React from 'react';
-import { ApolloProvider } from 'react-apollo';
 import { render, wait, cleanup } from '@testing-library/react';
 import useCustomerOrders from './useCustomerOrdersQuery';
 import throwErrorInDev from '../helpers/throwErrorInDev';

package/hooks/useCustomerOrdersQuery.d.ts

@@ -11,11 +11,11 @@ interface UseCustomerOrdersQuery {
 export default function useCustomerOrdersQuery({ query, variables }: UseCustomerOrdersQuery): {
     loading: boolean;
     orders: OrderHeader[];
-    result: import("react-apollo").QueryResult<{
+    result: import("@apollo/client").QueryResult<{
         customer: {
             orderHeaders: OrderHeaderResult;
         };
-    }, import("react-apollo").OperationVariables>;
+    }, import("@apollo/client").OperationVariables>;
     totalOrders: number;
 };
 export {};

package/hooks/useCustomerOrdersQuery.js

@@ -1,4 +1,4 @@
-import { useQuery } from '@apollo/react-hooks';
+import { useQuery } from '@apollo/client';
 import throwErrorInDev from '../helpers/throwErrorInDev';
 /**
  * Takes in the orderHeaders query and optional query variables, and returns

package/hooks/useCustomerOrdersQuery.js.map

@@ -1 +1 @@
-{"version":3,"file":"useCustomerOrdersQuery.js","sourceRoot":"","sources":["useCustomerOrdersQuery.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,eAAe,MAAM,4BAA4B,CAAC;AAYzD;;;GAGG;AACH,MAAM,CAAC,OAAO,UAAU,sBAAsB,CAAC,EAC7C,KAAK,EACL,SAAS,EACc;;IACvB,MAAM,MAAM,GAAG,QAAQ,CACrB,KAAK,EACL,EAAE,SAAS,EAAE,CACd,CAAC;IACF,eAAe,CACb,CAAC,MAAM,CAAC,OAAO,IAAI,CAAC,CAAA,MAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,0CAAE,QAAQ,0CAAE,YAAY,CAAA,EACxD,uEAAuE,CACxE,CAAC;IAEF,MAAM,MAAM,GACV,MAAA,MAAA,MAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,0CAAE,QAAQ,0CAAE,YAAY,0CAAE,MAAM,mCAAK,EAAoB,CAAC;IAExE,MAAM,WAAW,GAAG,MAAA,MAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,0CAAE,QAAQ,0CAAE,YAAY,0CAAE,YAE7C,CAAC;IAEd,OAAO;QACL,kCAAkC;QAClC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI;QACvC,MAAM;QACN,MAAM;QACN,WAAW;KACZ,CAAC;AACJ,CAAC"}
+{"version":3,"file":"useCustomerOrdersQuery.js","sourceRoot":"","sources":["useCustomerOrdersQuery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,OAAO,eAAe,MAAM,4BAA4B,CAAC;AAYzD;;;GAGG;AACH,MAAM,CAAC,OAAO,UAAU,sBAAsB,CAAC,EAC7C,KAAK,EACL,SAAS,EACc;;IACvB,MAAM,MAAM,GAAG,QAAQ,CACrB,KAAK,EACL,EAAE,SAAS,EAAE,CACd,CAAC;IACF,eAAe,CACb,CAAC,MAAM,CAAC,OAAO,IAAI,CAAC,CAAA,MAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,0CAAE,QAAQ,0CAAE,YAAY,CAAA,EACxD,uEAAuE,CACxE,CAAC;IAEF,MAAM,MAAM,GACV,MAAA,MAAA,MAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,0CAAE,QAAQ,0CAAE,YAAY,0CAAE,MAAM,mCAAK,EAAoB,CAAC;IAExE,MAAM,WAAW,GAAG,MAAA,MAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,0CAAE,QAAQ,0CAAE,YAAY,0CAAE,YAE7C,CAAC;IAEd,OAAO;QACL,kCAAkC;QAClC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI;QACvC,MAAM;QACN,MAAM;QACN,WAAW;KACZ,CAAC;AACJ,CAAC"}

package/hooks/useDeleteAccountMutation.js

@@ -1,5 +1,5 @@
+import { useMutation } from '@apollo/client';
 import { useState } from 'react';
-import { useMutation } from '@apollo/react-hooks';
 import useAuth from '../components/AuthContext/useAuth';
 import t from '@jetshop/intl';
 import { deleteAccount } from '@jetshop/core/data/mutations/accountMutations.gql';
@@ -17,7 +17,7 @@ const useDeleteAccountMutation = function useDeleteAccountMutation({ confirmatio
             return;
         }
         mutate()
-            .then(r => {
+            .then((r) => {
             // response is a boolean. If it is false, `something` went wrong… but we
             // don't have an error from the API to display
             if (r.data.deleteCustomer) {
@@ -28,7 +28,7 @@ const useDeleteAccountMutation = function useDeleteAccountMutation({ confirmatio
                 handleMutationError();
             }
         })
-            .catch(err => {
+            .catch((err) => {
             console.warn(err);
             handleMutationError();
         });

package/hooks/useDeleteAccountMutation.js.map

@@ -1 +1 @@
-{"version":3,"file":"useDeleteAccountMutation.js","sourceRoot":"","sources":["useDeleteAccountMutation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjC,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,OAAO,MAAM,mCAAmC,CAAC;AAExD,OAAO,CAAC,MAAM,eAAe,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,mDAAmD,CAAC;AAgBlF,MAAM,wBAAwB,GAA6B,SAAS,wBAAwB,CAAC,EAC3F,mBAAmB,EACpB;IACC,MAAM,CAAC,MAAM,CAAC,GAAG,WAAW,CAC1B,aAAa,CACd,CAAC;IAEF,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,EAAE,CAAC;IAC7B,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC9C,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,EAAE,CAAC;IAErC,SAAS,mBAAmB;QAC1B,QAAQ,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC;IACtC,CAAC;IAED,SAAS,eAAe;QACtB,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,CACjC,mBAAmB,IAAI,+CAA+C,CACvE,CAAC;QAEF,IAAI,CAAC,YAAY,EAAE;YACjB,OAAO;SACR;QAED,MAAM,EAAE;aACL,IAAI,CAAC,CAAC,CAAC,EAAE;YACR,wEAAwE;YACxE,8CAA8C;YAC9C,IAAI,CAAC,CAAC,IAAI,CAAC,cAAc,EAAE;gBACzB,UAAU,CAAC,IAAI,CAAC,CAAC;gBACjB,MAAM,EAAE,CAAC;aACV;iBAAM;gBACL,mBAAmB,EAAE,CAAC;aACvB;QACH,CAAC,CAAC;aACD,KAAK,CAAC,GAAG,CAAC,EAAE;YACX,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAClB,mBAAmB,EAAE,CAAC;QACxB,CAAC,CAAC,CAAC;IACP,CAAC;IAED,OAAO,EAAE,eAAe,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;AAC7C,CAAC,CAAC;AAEF,OAAO,EAAE,wBAAwB,EAAE,CAAC"}
+{"version":3,"file":"useDeleteAccountMutation.js","sourceRoot":"","sources":["useDeleteAccountMutation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjC,OAAO,OAAO,MAAM,mCAAmC,CAAC;AAExD,OAAO,CAAC,MAAM,eAAe,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,mDAAmD,CAAC;AAgBlF,MAAM,wBAAwB,GAC5B,SAAS,wBAAwB,CAAC,EAAE,mBAAmB,EAAE;IACvD,MAAM,CAAC,MAAM,CAAC,GAAG,WAAW,CAEzB,aAAa,CAAC,CAAC;IAElB,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,EAAE,CAAC;IAC7B,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC9C,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,EAAE,CAAC;IAErC,SAAS,mBAAmB;QAC1B,QAAQ,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC;IACtC,CAAC;IAED,SAAS,eAAe;QACtB,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,CACjC,mBAAmB,IAAI,+CAA+C,CACvE,CAAC;QAEF,IAAI,CAAC,YAAY,EAAE;YACjB,OAAO;SACR;QAED,MAAM,EAAE;aACL,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;YACV,wEAAwE;YACxE,8CAA8C;YAC9C,IAAI,CAAC,CAAC,IAAI,CAAC,cAAc,EAAE;gBACzB,UAAU,CAAC,IAAI,CAAC,CAAC;gBACjB,MAAM,EAAE,CAAC;aACV;iBAAM;gBACL,mBAAmB,EAAE,CAAC;aACvB;QACH,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACb,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAClB,mBAAmB,EAAE,CAAC;QACxB,CAAC,CAAC,CAAC;IACP,CAAC;IAED,OAAO,EAAE,eAAe,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;AAC7C,CAAC,CAAC;AAEJ,OAAO,EAAE,wBAAwB,EAAE,CAAC"}

package/hooks/useInfinitePagination.d.ts

@@ -1,6 +1,6 @@
-import { QueryResult } from 'react-apollo';
 import { DocumentNode } from 'graphql';
 import { Route, SearchResult, Category } from '../types';
+import { QueryResult } from '@apollo/client';
 interface QueryVariables {
     offset: number;
     first?: number;

package/hooks/useInfinitePagination.js

@@ -1,6 +1,6 @@
 import { useCallback, useContext, useEffect, useReducer, useMemo, useRef } from 'react';
 import PaginationContext from '@jetshop/core/components/Pagination/PaginationContext';
-import { useApolloClient } from 'react-apollo';
+import { useApolloClient } from '@apollo/client';
 function getProductsFromPreviousPages(products, client, query, variables) {
     var _a, _b, _c, _d, _e;
     const nextVariables = Object.assign(Object.assign({}, variables), { offset: variables.offset - (variables.first || variables.limit) });
@@ -23,6 +23,9 @@ function getProductsFromNextPages(products, client, query, variables) {
             query,
             variables: nextVariables
         });
+        if (!res) {
+            throw new Error('No data');
+        }
         return getProductsFromNextPages(products.concat(((_c = (_b = (_a = res === null || res === void 0 ? void 0 : res.route) === null || _a === void 0 ? void 0 : _a.object) === null || _b === void 0 ? void 0 : _b.products) === null || _c === void 0 ? void 0 : _c.result) || ((_e = (_d = res === null || res === void 0 ? void 0 : res.search) === null || _d === void 0 ? void 0 : _d.products) === null || _e === void 0 ? void 0 : _e.result)), client, query, nextVariables);
     }
     catch (e) {

package/hooks/useInfinitePagination.js.map

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

package/hooks/useLoginMutation.d.ts

@@ -1,12 +1,12 @@
 import { LoginResponse } from '../types';
 declare const useLoginMutation: () => {
-    loginMutation: (options?: import("react-apollo").MutationFunctionOptions<{
+    loginMutation: (options?: import("@apollo/client").MutationFunctionOptions<{
         login: LoginResponse;
     }, {
         email: string;
         password: string;
-    }>) => Promise<import("react-apollo").ExecutionResult<{
+    }, import("@apollo/client").DefaultContext, import("@apollo/client").ApolloCache<any>>) => Promise<import("@apollo/client").FetchResult<{
         login: LoginResponse;
-    }>>;
+    }, Record<string, any>, Record<string, any>>>;
 };
 export { useLoginMutation };

package/hooks/useLoginMutation.js

@@ -1,11 +1,11 @@
 import { useContext } from 'react';
-import { useMutation } from 'react-apollo';
+import { useMutation } from '@apollo/client';
 import { login } from '@jetshop/core/data/mutations/accountMutations.gql';
 import AuthContext from '../components/AuthContext/AuthContext';
 const useLoginMutation = () => {
     const { updateLoggedIn } = useContext(AuthContext);
     const [loginMutation] = useMutation(login, {
-        onCompleted: data => {
+        onCompleted: (data) => {
             updateLoggedIn(!!data.login.token, data.login.token.value);
         }
     });

package/hooks/useLoginMutation.js.map

@@ -1 +1 @@
-{"version":3,"file":"useLoginMutation.js","sourceRoot":"","sources":["useLoginMutation.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,KAAK,EAAE,MAAM,mDAAmD,CAAC;AAE1E,OAAO,WAAW,MAAM,uCAAuC,CAAC;AAEhE,MAAM,gBAAgB,GAAG,GAAG,EAAE;IAC5B,MAAM,EAAE,cAAc,EAAE,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC;IACnD,MAAM,CAAC,aAAa,CAAC,GAAG,WAAW,CAGjC,KAAK,EAAE;QACP,WAAW,EAAE,IAAI,CAAC,EAAE;YAClB,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC7D,CAAC;KACF,CAAC,CAAC;IAEH,OAAO,EAAE,aAAa,EAAE,CAAC;AAC3B,CAAC,CAAC;AAEF,OAAO,EAAE,gBAAgB,EAAE,CAAC"}
+{"version":3,"file":"useLoginMutation.js","sourceRoot":"","sources":["useLoginMutation.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,KAAK,EAAE,MAAM,mDAAmD,CAAC;AAE1E,OAAO,WAAW,MAAM,uCAAuC,CAAC;AAEhE,MAAM,gBAAgB,GAAG,GAAG,EAAE;IAC5B,MAAM,EAAE,cAAc,EAAE,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC;IACnD,MAAM,CAAC,aAAa,CAAC,GAAG,WAAW,CAGjC,KAAK,EAAE;QACP,WAAW,EAAE,CAAC,IAAI,EAAE,EAAE;YACpB,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC7D,CAAC;KACF,CAAC,CAAC;IAEH,OAAO,EAAE,aAAa,EAAE,CAAC;AAC3B,CAAC,CAAC;AAEF,OAAO,EAAE,gBAAgB,EAAE,CAAC"}

package/hooks/useLoginRedirect.js

@@ -2,7 +2,7 @@ import { useContext } from 'react';
 import qs from 'qs';
 import cartCheckoutQuery from './CartCheckoutQuery.gql';
 import { CartIdContext } from '../components/Cart/CartIdContext';
-import { useApolloClient } from 'react-apollo';
+import { useApolloClient } from '@apollo/client';
 function useLoginRedirect() {
     const { ReturnURL } = __IN_SERVER__
         ? { ReturnURL: null }
@@ -22,7 +22,7 @@ function useLoginRedirect() {
                     cartId
                 }
             })
-                .then(result => {
+                .then((result) => {
                 const externalCheckoutUrl = result.data.cart.externalCheckoutUrl;
                 return externalCheckoutUrl;
             });

package/hooks/useLoginRedirect.js.map

@@ -1 +1 @@
-{"version":3,"file":"useLoginRedirect.js","sourceRoot":"","sources":["useLoginRedirect.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AACnC,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,iBAAiB,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAG/C,SAAS,gBAAgB;IACvB,MAAM,EAAE,SAAS,EAAE,GAA0B,aAAa;QACxD,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE;QACrB,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE;YAC/B,iBAAiB,EAAE,IAAI;SACxB,CAAC,CAAC;IACP,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,aAAa,CAAC,CAAC;IAC7C,MAAM,MAAM,GAAG,eAAe,EAAE,CAAC;IACjC,SAAS,cAAc;QACrB,IAAI,CAAC,SAAS;YAAE,OAAO;QACvB,IAAI,SAAS,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE;YACrC,OAAO,MAAM;iBACV,KAAK,CAAiB;gBACrB,KAAK,EAAE,iBAAiB;gBACxB,SAAS,EAAE;oBACT,MAAM;iBACP;aACF,CAAC;iBACD,IAAI,CAAC,MAAM,CAAC,EAAE;gBACb,MAAM,mBAAmB,GACvB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC;gBACvC,OAAO,mBAAmB,CAAC;YAC7B,CAAC,CAAC,CAAC;SACN;aAAM;YACL,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;SACnC;IACH,CAAC;IACD,OAAO,EAAE,cAAc,EAAE,CAAC;AAC5B,CAAC;AAED,OAAO,EAAE,gBAAgB,EAAE,CAAC"}
+{"version":3,"file":"useLoginRedirect.js","sourceRoot":"","sources":["useLoginRedirect.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AACnC,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,iBAAiB,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAGjD,SAAS,gBAAgB;IACvB,MAAM,EAAE,SAAS,EAAE,GAA0B,aAAa;QACxD,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE;QACrB,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE;YAC/B,iBAAiB,EAAE,IAAI;SACxB,CAAC,CAAC;IACP,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,aAAa,CAAC,CAAC;IAC7C,MAAM,MAAM,GAAG,eAAe,EAAE,CAAC;IACjC,SAAS,cAAc;QACrB,IAAI,CAAC,SAAS;YAAE,OAAO;QACvB,IAAI,SAAS,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE;YACrC,OAAO,MAAM;iBACV,KAAK,CAAiB;gBACrB,KAAK,EAAE,iBAAiB;gBACxB,SAAS,EAAE;oBACT,MAAM;iBACP;aACF,CAAC;iBACD,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;gBACf,MAAM,mBAAmB,GACvB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC;gBACvC,OAAO,mBAAmB,CAAC;YAC7B,CAAC,CAAC,CAAC;SACN;aAAM;YACL,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;SACnC;IACH,CAAC;IACD,OAAO,EAAE,cAAc,EAAE,CAAC;AAC5B,CAAC;AAED,OAAO,EAAE,gBAAgB,EAAE,CAAC"}

package/hooks/useOrderDetailQuery.d.ts

@@ -11,10 +11,10 @@ interface UseOrderDetail {
  */
 export default function useOrderDetailQuery({ query, id }: UseOrderDetail): {
     loading: boolean;
-    error: import("apollo-client").ApolloError;
+    error: import("@apollo/client").ApolloError;
     order: Order;
-    result: import("react-apollo").QueryResult<{
+    result: import("@apollo/client").QueryResult<{
         order: Order;
-    }, import("react-apollo").OperationVariables>;
+    }, import("@apollo/client").OperationVariables>;
 };
 export {};

package/hooks/useOrderDetailQuery.js

@@ -1,4 +1,4 @@
-import { useQuery } from '@apollo/react-hooks';
+import { useQuery } from '@apollo/client';
 import throwErrorInDev from '../helpers/throwErrorInDev';
 import logWarningInDev from '../helpers/logWarningInDev';
 /**

package/hooks/useOrderDetailQuery.js.map

@@ -1 +1 @@
-{"version":3,"file":"useOrderDetailQuery.js","sourceRoot":"","sources":["useOrderDetailQuery.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,eAAe,MAAM,4BAA4B,CAAC;AACzD,OAAO,eAAe,MAAM,4BAA4B,CAAC;AASzD;;;GAGG;AACH,MAAM,CAAC,OAAO,UAAU,mBAAmB,CAAC,EAAE,KAAK,EAAE,EAAE,EAAkB;;IACvE,MAAM,qBAAqB;IACzB,aAAa;IACb,CAAA,MAAA,MAAA,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,0CAAE,mBAAmB,CAAC,CAAC,CAAC,0CAAE,QAAQ,CAAC,IAAI,CAAC,KAAK;QACjE,SAAS,CAAC;IAEZ,MAAM,MAAM,GAAG,QAAQ,CAAmB,KAAK,EAAE;QAC/C,SAAS,EAAE,qBAAqB,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE;KAChE,CAAC,CAAC;IAEH,eAAe,CACb,CAAC,CAAC,MAAM,CAAC,KAAK,EACd,yDAAyD,EAAE;MACzD,MAAM,CAAC,KAAK,EAAE,CACjB,CAAC;IAEF,eAAe,CACb,CAAC,qBAAqB,EACtB,gGAAgG,CACjG,CAAC;IAEF,eAAe,CACb,CAAC,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,EACnE,2GAA2G,CAC5G,CAAC;IAEF,OAAO;QACL,kCAAkC;QAClC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI;QACvC,KAAK,EAAE,MAAM,CAAC,KAAK;QACnB,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI;QAC7C,MAAM;KACP,CAAC;AACJ,CAAC"}
+{"version":3,"file":"useOrderDetailQuery.js","sourceRoot":"","sources":["useOrderDetailQuery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,OAAO,eAAe,MAAM,4BAA4B,CAAC;AACzD,OAAO,eAAe,MAAM,4BAA4B,CAAC;AASzD;;;GAGG;AACH,MAAM,CAAC,OAAO,UAAU,mBAAmB,CAAC,EAAE,KAAK,EAAE,EAAE,EAAkB;;IACvE,MAAM,qBAAqB;IACzB,aAAa;IACb,CAAA,MAAA,MAAA,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,0CAAE,mBAAmB,CAAC,CAAC,CAAC,0CAAE,QAAQ,CAAC,IAAI,CAAC,KAAK;QACjE,SAAS,CAAC;IAEZ,MAAM,MAAM,GAAG,QAAQ,CAAmB,KAAK,EAAE;QAC/C,SAAS,EAAE,qBAAqB,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE;KAChE,CAAC,CAAC;IAEH,eAAe,CACb,CAAC,CAAC,MAAM,CAAC,KAAK,EACd,yDAAyD,EAAE;MACzD,MAAM,CAAC,KAAK,EAAE,CACjB,CAAC;IAEF,eAAe,CACb,CAAC,qBAAqB,EACtB,gGAAgG,CACjG,CAAC;IAEF,eAAe,CACb,CAAC,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,EACnE,2GAA2G,CAC5G,CAAC;IAEF,OAAO;QACL,kCAAkC;QAClC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI;QACvC,KAAK,EAAE,MAAM,CAAC,KAAK;QACnB,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI;QAC7C,MAAM;KACP,CAAC;AACJ,CAAC"}

package/hooks/useRoutePreload.js

@@ -1,5 +1,5 @@
+import { useLazyQuery } from '@apollo/client';
 import { useContext } from 'react';
-import { useLazyQuery } from 'react-apollo';
 import { useShopConfig } from './useShopConfig';
 import { usePagination } from '../components/Pagination/PaginationProvider';
 import SortOrderContext from '../components/SortOrder/SortOrderContext';

package/hooks/useRoutePreload.js.map

@@ -1 +1 @@
-{"version":3,"file":"useRoutePreload.js","sourceRoot":"","sources":["useRoutePreload.ts"],"names":[],"mappings":"AAAA,OAAc,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAG5C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,6CAA6C,CAAC;AAC5E,OAAO,gBAAgB,MAAM,0CAA0C,CAAC;AAoBxE,MAAM,CAAC,MAAM,eAAe,GAAG,GAAG,EAAE;;IAClC,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAC/B,MAAM,UAAU,GAAG,MAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,0CAAE,UAAU,mCAAI,IAAI,CAAC;IACvD,MAAM,iBAAiB,GAAG,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,0CAAE,iBAAiB,CAAC;IAC7D,MAAM,UAAU,GAAG,aAAa,EAAE,CAAC;IACnC,MAAM,cAAc,GAAG,UAAU,CAAC,gBAAgB,CAAC,CAAC;IACpD,MAAM,CAAC,oBAAoB,CAAC,GAAG,YAAY,CAAC,UAAU,EAAE;QACtD,WAAW,EAAE,KAAK;QAClB,cAAc,EAAE,IAAI;QACpB,OAAO,EAAE,EAAE,sBAAsB,EAAE,KAAK,EAAE;KAC3C,CAAC,CAAC;IACH,MAAM,OAAO,GAAG,CAAC,EACf,QAAQ,EACR,YAAY,GAAG,IAAI,EACnB,SAAS,EACT,SAAS,GAAG,EAAE,EACF,EAAE,EAAE;QAChB,0DAA0D;QAC1D,IAAI,CAAC,YAAY,IAAI,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE;YAC/C,OAAO;SACR;QAED,UAAU;YACR,oBAAoB,CAAC;gBACnB,SAAS,kBACP,IAAI,EAAE,QAAQ,EACd,KAAK,EAAE,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,OAAO,KAAI,EAAE,EAChC,MAAM,EAAE,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,MAAM,KAAI,CAAC,EAC/B,OAAO,EAAE,CAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,SAAS,KAAI,IAAI,EAC1C,gBAAgB,EAAE,CAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,SAAS,KAAI,YAAY,EAC3D,OAAO,EAAE;wBACP,WAAW,EAAE,EAAE;wBACf,YAAY,EAAE,EAAE;wBAChB,cAAc,EAAE,EAAE;wBAClB,gBAAgB,EAAE,EAAE;qBACrB,IACE,SAAS,CACb;aACF,CAAC,CAAC;QAEL,iBAAiB;YACf,iBAAiB,CAAC,SAAS,CAAC;YAC5B,iBAAiB,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;gBACjD,SAAS,CAAC,OAAO,EAAE,CAAC;YACtB,CAAC,CAAC,CAAC;IACP,CAAC,CAAC;IAEF,OAAO,EAAE,OAAO,EAAE,CAAC;AACrB,CAAC,CAAC"}
+{"version":3,"file":"useRoutePreload.js","sourceRoot":"","sources":["useRoutePreload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAc,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAG1C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,6CAA6C,CAAC;AAC5E,OAAO,gBAAgB,MAAM,0CAA0C,CAAC;AAoBxE,MAAM,CAAC,MAAM,eAAe,GAAG,GAAG,EAAE;;IAClC,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAC/B,MAAM,UAAU,GAAG,MAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,0CAAE,UAAU,mCAAI,IAAI,CAAC;IACvD,MAAM,iBAAiB,GAAG,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,0CAAE,iBAAiB,CAAC;IAC7D,MAAM,UAAU,GAAG,aAAa,EAAE,CAAC;IACnC,MAAM,cAAc,GAAG,UAAU,CAAC,gBAAgB,CAAC,CAAC;IACpD,MAAM,CAAC,oBAAoB,CAAC,GAAG,YAAY,CAAC,UAAU,EAAE;QACtD,WAAW,EAAE,KAAK;QAClB,cAAc,EAAE,IAAI;QACpB,OAAO,EAAE,EAAE,sBAAsB,EAAE,KAAK,EAAE;KAC3C,CAAC,CAAC;IACH,MAAM,OAAO,GAAG,CAAC,EACf,QAAQ,EACR,YAAY,GAAG,IAAI,EACnB,SAAS,EACT,SAAS,GAAG,EAAE,EACF,EAAE,EAAE;QAChB,0DAA0D;QAC1D,IAAI,CAAC,YAAY,IAAI,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE;YAC/C,OAAO;SACR;QAED,UAAU;YACR,oBAAoB,CAAC;gBACnB,SAAS,kBACP,IAAI,EAAE,QAAQ,EACd,KAAK,EAAE,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,OAAO,KAAI,EAAE,EAChC,MAAM,EAAE,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,MAAM,KAAI,CAAC,EAC/B,OAAO,EAAE,CAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,SAAS,KAAI,IAAI,EAC1C,gBAAgB,EAAE,CAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,SAAS,KAAI,YAAY,EAC3D,OAAO,EAAE;wBACP,WAAW,EAAE,EAAE;wBACf,YAAY,EAAE,EAAE;wBAChB,cAAc,EAAE,EAAE;wBAClB,gBAAgB,EAAE,EAAE;qBACrB,IACE,SAAS,CACb;aACF,CAAC,CAAC;QAEL,iBAAiB;YACf,iBAAiB,CAAC,SAAS,CAAC;YAC5B,iBAAiB,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;gBACjD,SAAS,CAAC,OAAO,EAAE,CAAC;YACtB,CAAC,CAAC,CAAC;IACP,CAAC,CAAC;IAEF,OAAO,EAAE,OAAO,EAAE,CAAC;AACrB,CAAC,CAAC"}

package/integrations/addwishSchemaExtension.js

@@ -7,8 +7,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+import { gql } from '@apollo/client';
 import { print } from 'graphql';
-import gql from 'graphql-tag';
 import fetch from 'node-fetch';
 import qs from 'qs';
 const typeDefs = gql `
@@ -74,7 +74,7 @@ export function fetchAddwishRecommendations({ ids, url }) {
             url,
             ids: ids.join(',')
         })}`;
-        return fetch(addwishUrl).then(res => res.json());
+        return fetch(addwishUrl).then((res) => res.json());
     });
 }
 export const addwishSchemaExtension = ({ remoteSchema }) => {
@@ -120,7 +120,7 @@ export const addwishSchemaExtension = ({ remoteSchema }) => {
                         if (box.result.length <= 0) {
                             return [];
                         }
-                        const articleNumbers = box.result.map(item => item.productNumber);
+                        const articleNumbers = box.result.map((item) => item.productNumber);
                         return info.mergeInfo.delegateToSchema({
                             schema: remoteSchema,
                             operation: 'query',

package/integrations/addwishSchemaExtension.js.map

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

package/integrations/nostoSchemaExtension.js

@@ -7,10 +7,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { setContext } from 'apollo-link-context';
+import { HttpLink } from '@apollo/client';
+import { setContext } from '@apollo/client/link/context';
 import fetch from 'node-fetch';
 import { introspectSchema, makeRemoteExecutableSchema, transformSchema, RenameTypes, RenameRootFields } from 'graphql-tools';
-import { HttpLink } from 'apollo-link-http';
 function getNostoSchema({ nostoApiToken }) {
     return __awaiter(this, void 0, void 0, function* () {
         const http = new HttpLink({

package/integrations/nostoSchemaExtension.js.map

@@ -1 +1 @@
-{"version":3,"file":"nostoSchemaExtension.js","sourceRoot":"","sources":["nostoSchemaExtension.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,KAAK,MAAM,YAAY,CAAC;AAC/B,OAAO,EACL,gBAAgB,EAChB,0BAA0B,EAC1B,eAAe,EACf,WAAW,EACX,gBAAgB,EAEjB,MAAM,eAAe,CAAC;AAGvB,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,SAAe,cAAc,CAAC,EAC5B,aAAa,EAGd;;QACC,MAAM,IAAI,GAAG,IAAI,QAAQ,CAAC;YACxB,GAAG,EAAE,kCAAkC;YACvC,KAAK,EAAE,KAAY;SACpB,CAAC,CAAC;QAEH,2CAA2C;QAC3C,MAAM,cAAc,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,CAAC;YACvC,OAAO,EAAE;gBACP,aAAa,EAAE,SAAS,MAAM,CAAC,IAAI,CAAC,IAAI,aAAa,EAAE,CAAC,CAAC,QAAQ,CAC/D,QAAQ,CACT,EAAE;aACJ;SACF,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAEjB,gDAAgD;QAChD,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,cAAc,CAAC,CAAC;QACtD,MAAM,gBAAgB,GAAG,0BAA0B,CAAC;YAClD,MAAM;YACN,IAAI,EAAE,cAAc;SACrB,CAAC,CAAC;QAEH,MAAM,sBAAsB,GAAG,eAAe,CAAC,gBAAgB,EAAE;YAC/D,IAAI,WAAW,CAAC,CAAC,IAAY,EAAE,EAAE,CAAC,QAAQ,IAAI,EAAE,CAAC;YACjD,IAAI,gBAAgB,CAClB,CAAC,UAAU,EAAE,IAAI,EAAE,EAAE,CACnB,QAAQ,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CACnE;SACF,CAAC,CAAC;QAEH,OAAO,sBAAsB,CAAC;IAChC,CAAC;CAAA;AAED,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC,EACzC,aAAa,EAGd,EAAE,EAAE;IACH,MAAM,oBAAoB,GAAoB,CAAO,EAAE,YAAY,EAAE,EAAE,EAAE;QACvE,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,EAAE,aAAa,EAAE,CAAC,CAAC;QACvD,MAAM,SAAS,GAAyB;YACtC,uBAAuB,EAAE;gBACvB,OAAO,EAAE;oBACP,QAAQ,EAAE,yCAAyC;oBACnD,OAAO,CAAC,kBAAkB,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI;wBAC9C,OAAO,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC;4BACrC,MAAM,EAAE,YAAY;4BACpB,SAAS,EAAE,OAAO;4BAClB,SAAS,EAAE,SAAS;4BACpB,IAAI,EAAE;gCACJ,EAAE,EAAE,QAAQ,CAAC,kBAAkB,CAAC,SAAS,CAAC;6BAC3C;4BACD,OAAO;4BACP,IAAI;yBACL,CAAC,CAAC;oBACL,CAAC;iBACF;aACF;SACF,CAAC;QACF,OAAO;YACL,MAAM;YACN,SAAS;SACV,CAAC;IACJ,CAAC,CAAA,CAAC;IACF,OAAO,oBAAoB,CAAC;AAC9B,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,0BAA0B,GAAoB,GAAG,EAAE;IAC9D,OAAO;QACL,MAAM,EAAE;;;;GAIT;KACA,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"nostoSchemaExtension.js","sourceRoot":"","sources":["nostoSchemaExtension.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,KAAK,MAAM,YAAY,CAAC;AAC/B,OAAO,EACL,gBAAgB,EAChB,0BAA0B,EAC1B,eAAe,EACf,WAAW,EACX,gBAAgB,EAEjB,MAAM,eAAe,CAAC;AAIvB,SAAe,cAAc,CAAC,EAC5B,aAAa,EAGd;;QACC,MAAM,IAAI,GAAG,IAAI,QAAQ,CAAC;YACxB,GAAG,EAAE,kCAAkC;YACvC,KAAK,EAAE,KAAY;SACpB,CAAC,CAAC;QAEH,2CAA2C;QAC3C,MAAM,cAAc,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,CAAC;YACvC,OAAO,EAAE;gBACP,aAAa,EAAE,SAAS,MAAM,CAAC,IAAI,CAAC,IAAI,aAAa,EAAE,CAAC,CAAC,QAAQ,CAC/D,QAAQ,CACT,EAAE;aACJ;SACF,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAEjB,gDAAgD;QAChD,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,cAAc,CAAC,CAAC;QACtD,MAAM,gBAAgB,GAAG,0BAA0B,CAAC;YAClD,MAAM;YACN,IAAI,EAAE,cAAc;SACrB,CAAC,CAAC;QAEH,MAAM,sBAAsB,GAAG,eAAe,CAAC,gBAAgB,EAAE;YAC/D,IAAI,WAAW,CAAC,CAAC,IAAY,EAAE,EAAE,CAAC,QAAQ,IAAI,EAAE,CAAC;YACjD,IAAI,gBAAgB,CAClB,CAAC,UAAU,EAAE,IAAI,EAAE,EAAE,CACnB,QAAQ,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CACnE;SACF,CAAC,CAAC;QAEH,OAAO,sBAAsB,CAAC;IAChC,CAAC;CAAA;AAED,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC,EACzC,aAAa,EAGd,EAAE,EAAE;IACH,MAAM,oBAAoB,GAAoB,CAAO,EAAE,YAAY,EAAE,EAAE,EAAE;QACvE,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,EAAE,aAAa,EAAE,CAAC,CAAC;QACvD,MAAM,SAAS,GAAyB;YACtC,uBAAuB,EAAE;gBACvB,OAAO,EAAE;oBACP,QAAQ,EAAE,yCAAyC;oBACnD,OAAO,CAAC,kBAAkB,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI;wBAC9C,OAAO,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC;4BACrC,MAAM,EAAE,YAAY;4BACpB,SAAS,EAAE,OAAO;4BAClB,SAAS,EAAE,SAAS;4BACpB,IAAI,EAAE;gCACJ,EAAE,EAAE,QAAQ,CAAC,kBAAkB,CAAC,SAAS,CAAC;6BAC3C;4BACD,OAAO;4BACP,IAAI;yBACL,CAAC,CAAC;oBACL,CAAC;iBACF;aACF;SACF,CAAC;QACF,OAAO;YACL,MAAM;YACN,SAAS;SACV,CAAC;IACJ,CAAC,CAAA,CAAC;IACF,OAAO,oBAAoB,CAAC;AAC9B,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,0BAA0B,GAAoB,GAAG,EAAE;IAC9D,OAAO;QACL,MAAM,EAAE;;;;GAIT;KACA,CAAC;AACJ,CAAC,CAAC"}

package/integrations/sluggishSchemaExtension.js

@@ -1,5 +1,5 @@
+import { gql } from '@apollo/client';
 import { print } from 'graphql';
-import gql from 'graphql-tag';
 export const sluggishSchemaExtension = () => {
     const typeDefs = gql `
     extend type Page {

package/integrations/sluggishSchemaExtension.js.map

@@ -1 +1 @@
-{"version":3,"file":"sluggishSchemaExtension.js","sourceRoot":"","sources":["sluggishSchemaExtension.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,GAAG,MAAM,aAAa,CAAC;AAG9B,MAAM,CAAC,MAAM,uBAAuB,GAAoB,GAAG,EAAE;IAC3D,MAAM,QAAQ,GAAG,GAAG,CAAA;;;;GAInB,CAAC;IAEF,MAAM,SAAS,GAAwB;QACrC,IAAI,EAAE;YACJ,QAAQ,EAAE;gBACR;;mBAEG;gBACH,QAAQ,EAAE,0BAA0B;gBACpC,OAAO,CAAC,MAAiC;oBACvC,OAAO,GAAG,MAAM,CAAC,EAAE,IAAI,MAAM,CAAC,IAAI;yBAC/B,WAAW,EAAE;yBACb,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC;yBACvB,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,CAAC;gBAC3B,CAAC;aACF;SACF;KACF,CAAC;IAEF,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,QAAQ,CAAC,EAAE,SAAS,EAAE,CAAC;AAChD,CAAC,CAAC"}
+{"version":3,"file":"sluggishSchemaExtension.js","sourceRoot":"","sources":["sluggishSchemaExtension.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AASrC,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAGhC,MAAM,CAAC,MAAM,uBAAuB,GAAoB,GAAG,EAAE;IAC3D,MAAM,QAAQ,GAAG,GAAG,CAAA;;;;GAInB,CAAC;IAEF,MAAM,SAAS,GAAwB;QACrC,IAAI,EAAE;YACJ,QAAQ,EAAE;gBACR;;mBAEG;gBACH,QAAQ,EAAE,0BAA0B;gBACpC,OAAO,CAAC,MAAiC;oBACvC,OAAO,GAAG,MAAM,CAAC,EAAE,IAAI,MAAM,CAAC,IAAI;yBAC/B,WAAW,EAAE;yBACb,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC;yBACvB,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,CAAC;gBAC3B,CAAC;aACF;SACF;KACF,CAAC;IAEF,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,QAAQ,CAAC,EAAE,SAAS,EAAE,CAAC;AAChD,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetshop/core",
-  "version": "5.17.0-alpha.1fa8c1a3",
+  "version": "5.17.0-alpha.240f9d97",
   "license": "MIT",
   "files": [
     "**/*.js",
@@ -33,7 +33,7 @@
     }
   },
   "dependencies": {
-    "@apollo/react-ssr": "^3.1.5",
+    "@apollo/client": "^3.7.15",
     "@graphql-tools/delegate": "^7.1.2",
     "@graphql-tools/stitch": "^7.5.1",
     "@graphql-tools/wrap": "^7.0.5",
@@ -42,7 +42,7 @@
     "@sentry/browser": "^6.15.0",
     "@sentry/core": "^6.15.0",
     "@sentry/node": "^6.15.0",
-    "@tanem/react-nprogress": "^1.1.0",
+    "@tanem/react-nprogress": "^5.0.44",
     "@types/accept-language-parser": "^1.5.1",
     "@types/gtag.js": "^0.0.10",
     "@types/loadable__component": "^5.10.0",
@@ -50,19 +50,9 @@
     "@types/react-router-dom": "^5.1.8",
     "@xstate/react": "^0.8.1",
     "accept-language-parser": "^1.5.0",
-    "apollo-cache": "^1.3.2",
-    "apollo-cache-inmemory": "^1.6.5",
-    "apollo-client": "~2.6.8",
-    "apollo-link": "^1.2.14",
-    "apollo-link-context": "^1.0.20",
-    "apollo-link-error": "^1.1.13",
-    "apollo-link-http": "^1.5.17",
-    "apollo-link-persisted-queries": "^0.2.1",
-    "apollo-link-schema": "^1.2.5",
     "apollo-server": "~2.6.9",
     "apollo-server-caching": "^0.4.0",
     "apollo-server-express": "~2.6.9",
-    "apollo-utilities": "^1.3.2",
     "compression": "^1.7.2",
     "dnscache": "^1.0.2",
     "esm": "^3.0.84",
@@ -70,9 +60,8 @@
     "express": "^4.16.3",
     "express-graphql": "^0.12.0",
     "fontfaceobserver": "^2.1.0",
-    "format-message": "^6.2.3",
-    "graphql": "^14.5.8",
-    "graphql-tag": "^2.10.1",
+    "format-message": "^6.2.4",
+    "graphql": "^15.3.0",
     "immer": "^10.0.2",
     "intl": "^1.2.5",
     "isbot": "^2.2.1",
@@ -82,19 +71,15 @@
     "node-fetch": "^2.2.0",
     "prop-types": "^15.6.2",
     "qs": "^6.5.2",
-    "react-apollo": "^3.1.5",
-    "react-apollo-network-status": "^4.0.0",
+    "react-apollo-network-status": "^5.2.1",
     "react-cookie": "^4.1.1",
     "react-helmet-async": "^1.0.2",
     "react-media": "^1.10.0",
     "react-router-dom": "^5.2.1",
     "request-ip": "^2.1.3",
     "schema-dts": "^0.8.2",
-    "store-css": "^0.3.0",
-    "svg-react-loader": "^0.4.5",
     "ts-node": "^7.0.1",
     "typed-emitter": "^0.1.0",
-    "typescript": "^4.8.3",
     "universal-cookie-express": "^4.0.3",
     "uuid": "^8.3.2",
     "web-vitals": "^0.2.3",
@@ -102,7 +87,6 @@
     "xstate": "^4.13.0"
   },
   "devDependencies": {
-    "@apollo/react-testing": "^3.0.1",
     "@graphql-codegen/typescript": "^1.21.0",
     "@react-mock/localstorage": "^0.1.2",
     "@types/compression": "^0.0.36",
@@ -123,12 +107,12 @@
     "@types/react-router-dom": "^5.1.8",
     "@types/request-ip": "^0.0.36",
     "@types/uuid": "^8.3.0",
-    "apollo-link-mock": "^1.0.1",
     "chalk": "^4.1.2",
     "jest-dom": "^3.4.0",
     "lint-staged": "^8.1.5",
     "nock": "^10.0.6",
-    "prettier": "^2.3.2"
+    "prettier": "^2.3.2",
+    "typescript": "^4.8.3"
   },
   "peerDependencies": {
     "react": "^18",

package/resolvers/filters/boolFilter.js

@@ -1,7 +1,8 @@
+import { gql } from '@apollo/client';
 import { produce } from 'immer';
-import gql from 'graphql-tag';
 import { updateBooleanQueryString } from './updateQueryString';
 import { parse } from 'qs';
+import ActiveFiltersQuery from '@jetshop/core/components/DynamicRoute/ActiveFiltersQuery.gql';
 // QUERY
 export const boolFilterValue = function boolFilterValue(parent) {
     return (searchParams) => {
@@ -27,14 +28,15 @@ export const setBoolFilter = (_, { value, id }, { cache, getCacheKey }) => {
         id,
         __typename: 'BooleanFilter'
     });
+    const boolFilterFragment = gql `
+    fragment BoolFilterState on BooleanFilter {
+      id
+      default
+      value @client
+    }
+  `;
     const boolFilter = cache.readFragment({
-        fragment: gql `
-      fragment BoolFilterState on BooleanFilter {
-        id
-        default
-        value @client
-      }
-    `,
+        fragment: boolFilterFragment,
         id: fragmentId
     });
     const data = produce(boolFilter, (draft) => {
@@ -45,7 +47,8 @@ export const setBoolFilter = (_, { value, id }, { cache, getCacheKey }) => {
             draft.value = value === false ? null : value;
         }
     });
-    cache.writeData({
+    cache.writeFragment({
+        fragment: boolFilterFragment,
         id: fragmentId,
         data
     });
@@ -55,17 +58,7 @@ export const setBoolFilter = (_, { value, id }, { cache, getCacheKey }) => {
     return data;
 };
 function updateActiveFilters(cache, data) {
-    const activeBoolFilterQuery = gql `
-    query GetActiveBoolFilters {
-      activeFilters @client {
-        booleanFilters {
-          id
-          value @client
-        }
-      }
-    }
-  `;
-    const currentActiveFilters = cache.readQuery({ query: activeBoolFilterQuery });
+    const currentActiveFilters = cache.readQuery({ query: ActiveFiltersQuery });
     const { activeFilters } = produce(currentActiveFilters, (draft) => {
         // Clear this filter from active filters
         if (data.value === null) {
@@ -75,12 +68,15 @@ function updateActiveFilters(cache, data) {
         else {
             draft.activeFilters.booleanFilters.push({
                 id: data.id,
-                value: data.value,
-                __typename: 'BooleanFilterInput'
+                value: data.value
+                // __typename: 'BooleanFilterInput'
             });
         }
     });
-    cache.writeData({ data: { activeFilters } });
+    cache.writeQuery({
+        query: ActiveFiltersQuery,
+        data: { activeFilters }
+    });
     return activeFilters;
 }
 //# sourceMappingURL=boolFilter.js.map

package/resolvers/filters/boolFilter.js.map

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