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

package/components/AuthContext/AuthProvider.js

@@ -1,4 +1,4 @@
-import { useApolloClient } from 'react-apollo';
+import { useApolloClient } from '@apollo/client';
 import React, { useContext, useEffect } from 'react';
 import AuthContext from './AuthContext';
 import { withCookies } from 'react-cookie';
@@ -7,7 +7,7 @@ import ChannelContext from '@jetshop/core/components/ChannelContext';
 import { useShopConfig } from '../../hooks/useShopConfig';
 import { trackUserEvent } from '../../analytics/tracking';
 import { useTracker } from '../../analytics/Analytics';
-import { useQuery } from '@apollo/react-hooks';
+import { useQuery } from '@apollo/client';
 import googleUserIdQuery from './googleUserIdQuery.gql';
 const AuthProvider = function AuthProvider(props) {
     var _a, _b;

package/components/AuthContext/AuthProvider.js.map

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

package/components/AuthContext/AuthProvider.test.js

@@ -1,4 +1,4 @@
-import { MockedProvider } from '@apollo/react-testing';
+import { MockedProvider } from '@apollo/client/testing';
 import React from 'react';
 import { ChannelHandler } from '../../ChannelHandler/ChannelHandler';
 import { createSelectedChannel } from '../../ChannelHandler/channelUtils';

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/ChannelContext/useCountrySettings.d.ts

@@ -1,5 +1,5 @@
 declare function useCountrySettings({ countrySettingsQuery }?: {
-    countrySettingsQuery: import("graphql").DocumentNode;
+    countrySettingsQuery: import("@apollo/client").DocumentNode;
 }): {
     selectedCountrySettings: import("../../types").CountrySettings;
     countrySettings: import("../../types").CountrySettings[];

package/components/ChannelContext/useCountrySettings.js

@@ -1,6 +1,6 @@
+import { useQuery } from '@apollo/client';
 import { useContext } from 'react';
 import ChannelContext from '@jetshop/core/components/ChannelContext';
-import { useQuery } from 'react-apollo';
 import defaultCountrySettingsQuery from './CountrySettingsQuery.gql';
 function useCountrySettings({ countrySettingsQuery } = {
     countrySettingsQuery: defaultCountrySettingsQuery

package/components/ChannelContext/useCountrySettings.js.map

@@ -1 +1 @@
-{"version":3,"file":"useCountrySettings.js","sourceRoot":"","sources":["useCountrySettings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AACnC,OAAO,cAAc,MAAM,yCAAyC,CAAC;AACrE,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,2BAA2B,MAAM,4BAA4B,CAAC;AAGrE,SAAS,kBAAkB,CACzB,EAAE,oBAAoB,EAAE,GAAG;IACzB,oBAAoB,EAAE,2BAA2B;CAClD;;IAED,MAAM,EAAE,eAAe,EAAE,GAAG,UAAU,CAAC,cAAc,CAAC,CAAC;IACvD,MAAM,MAAM,GAAG,QAAQ,CAAuB,oBAAoB,EAAE;QAClE,SAAS,EAAE,EAAE,EAAE,EAAE,eAAe,CAAC,EAAE,CAAC,QAAQ,EAAE,EAAE;KACjD,CAAC,CAAC;IACH,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;IAEjC,MAAM,uBAAuB,GAAG,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,0CAAE,QAAQ,CAAC,eAAe,CAAC,IAAI,CAC1E,CAAC,cAAc,EAAE,EAAE;QACjB,OAAO,cAAc,CAAC,WAAW,KAAK,eAAe,CAAC,OAAO,CAAC,IAAI,CAAC;IACrE,CAAC,CACF,CAAC;IACF,OAAO;QACL,uBAAuB;QACvB,eAAe,EAAE,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,0CAAE,QAAQ,CAAC,eAAe;QACxD,OAAO;KACR,CAAC;AACJ,CAAC;AAED,OAAO,EAAE,kBAAkB,EAAE,CAAC"}
+{"version":3,"file":"useCountrySettings.js","sourceRoot":"","sources":["useCountrySettings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AACnC,OAAO,cAAc,MAAM,yCAAyC,CAAC;AACrE,OAAO,2BAA2B,MAAM,4BAA4B,CAAC;AAGrE,SAAS,kBAAkB,CACzB,EAAE,oBAAoB,EAAE,GAAG;IACzB,oBAAoB,EAAE,2BAA2B;CAClD;;IAED,MAAM,EAAE,eAAe,EAAE,GAAG,UAAU,CAAC,cAAc,CAAC,CAAC;IACvD,MAAM,MAAM,GAAG,QAAQ,CAAuB,oBAAoB,EAAE;QAClE,SAAS,EAAE,EAAE,EAAE,EAAE,eAAe,CAAC,EAAE,CAAC,QAAQ,EAAE,EAAE;KACjD,CAAC,CAAC;IACH,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;IAEjC,MAAM,uBAAuB,GAAG,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,0CAAE,QAAQ,CAAC,eAAe,CAAC,IAAI,CAC1E,CAAC,cAAc,EAAE,EAAE;QACjB,OAAO,cAAc,CAAC,WAAW,KAAK,eAAe,CAAC,OAAO,CAAC,IAAI,CAAC;IACrE,CAAC,CACF,CAAC;IACF,OAAO;QACL,uBAAuB;QACvB,eAAe,EAAE,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,0CAAE,QAAQ,CAAC,eAAe;QACxD,OAAO;KACR,CAAC;AACJ,CAAC;AAED,OAAO,EAAE,kBAAkB,EAAE,CAAC"}

package/components/DynamicRoute/ActiveFiltersQuery.gql

@@ -1,19 +1,19 @@
 query ActiveFilters {
   activeFilters @client @export {
-    listFilters @export {
+    listFilters @client @export {
       id
       values
     }
-    rangeFilters @export {
+    rangeFilters @client @export {
       id
       min
       max
     }
-    booleanFilters @export {
+    booleanFilters @client @export {
       id
       value
     }
-    multiListFilters @export {
+    multiListFilters @client @export {
       id
       values
     }

package/components/DynamicRoute/CategoryRoute.d.ts

@@ -1,6 +1,6 @@
 import { Category } from '@jetshop/core/types';
-import { ComponentType } from 'react';
-import { QueryResult } from 'react-apollo';
+import React, { ComponentType } from 'react';
+import { QueryResult } from '@apollo/client';
 export interface CategoryProps {
     result: QueryResult;
     category: Category;
@@ -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/CategoryRoute.js

@@ -11,16 +11,18 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 import { useShopConfig } from '@jetshop/core/hooks/useShopConfig';
 import React, { useEffect } from 'react';
-import { useApolloClient } from 'react-apollo';
+import { useApolloClient } from '@apollo/client';
 import { useHistory } from 'react-router';
 import { getActiveFiltersFromSearch } from '../../resolvers/filters/filterParams';
 import { StructuredCategoryData } from '../StructuredData';
+import ActiveFiltersQuery from '@jetshop/core/components/DynamicRoute/ActiveFiltersQuery.gql';
 function useFiltersOnHistoryPop() {
     const client = useApolloClient();
     useEffect(() => {
         function getSearchFilters() {
             // Write the active filters from search
-            client.writeData({
+            client.writeQuery({
+                query: ActiveFiltersQuery,
                 data: {
                     activeFilters: getActiveFiltersFromSearch(window.location.search)
                 }
@@ -33,7 +35,8 @@ function useFiltersOnHistoryPop() {
 const CategoryRoute = (props) => {
     var _a, _b, _c;
     const { component: CategoryPage } = props, rest = __rest(props, ["component"]);
-    const category = ((_b = (_a = props.result.data) === null || _a === void 0 ? void 0 : _a.route) === null || _b === void 0 ? void 0 : _b.object) || ((_c = props.result.data) === null || _c === void 0 ? void 0 : _c.category);
+    const category = ((_b = (_a = (props.result.data || props.result.previousData)) === null || _a === void 0 ? void 0 : _a.route) === null || _b === void 0 ? void 0 : _b.object) ||
+        ((_c = (props.result.data || props.result.previousData)) === null || _c === void 0 ? void 0 : _c.category);
     const { structuredData } = useShopConfig();
     const disableDefaultCategoryData = structuredData
         ? !!structuredData.disableDefaultCategoryData

package/components/DynamicRoute/CategoryRoute.js.map

@@ -1 +1 @@
-{"version":3,"file":"CategoryRoute.js","sourceRoot":"","sources":["CategoryRoute.tsx"],"names":[],"mappings":";;;;;;;;;;;AACA,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,KAAK,EAAE,EAAiB,SAAS,EAAE,MAAM,OAAO,CAAC;AACxD,OAAO,EAAe,eAAe,EAAE,MAAM,cAAc,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,0BAA0B,EAAE,MAAM,sCAAsC,CAAC;AAClF,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAW3D,SAAS,sBAAsB;IAC7B,MAAM,MAAM,GAAG,eAAe,EAAE,CAAC;IAEjC,SAAS,CAAC,GAAG,EAAE;QACb,SAAS,gBAAgB;YACvB,uCAAuC;YACvC,MAAM,CAAC,SAAS,CAAC;gBACf,IAAI,EAAE;oBACJ,aAAa,EAAE,0BAA0B,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC;iBAClE;aACF,CAAC,CAAC;QACL,CAAC;QAED,MAAM,CAAC,gBAAgB,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;QAEtD,OAAO,GAAG,EAAE,CAAC,MAAM,CAAC,mBAAmB,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;IACxE,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;AACf,CAAC;AAED,MAAM,aAAa,GAAG,CAAC,KAAyB,EAAE,EAAE;;IAClD,MAAM,EAAE,SAAS,EAAE,YAAY,KAAc,KAAK,EAAd,IAAI,UAAK,KAAK,EAA5C,aAAoC,CAAQ,CAAC;IAEnD,MAAM,QAAQ,GACZ,CAAA,MAAA,MAAA,KAAK,CAAC,MAAM,CAAC,IAAI,0CAAE,KAAK,0CAAE,MAAM,MAAI,MAAA,KAAK,CAAC,MAAM,CAAC,IAAI,0CAAE,QAAQ,CAAA,CAAC;IAElE,MAAM,EAAE,cAAc,EAAE,GAAG,aAAa,EAAE,CAAC;IAE3C,MAAM,0BAA0B,GAAG,cAAc;QAC/C,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,0BAA0B;QAC7C,CAAC,CAAC,KAAK,CAAC;IAEV,MAAM,OAAO,GAAG,UAAU,EAAiB,CAAC;IAC5C,sBAAsB,EAAE,CAAC;IACzB,SAAS,CAAC,GAAG,EAAE;;QACb,IAAI,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,CAAC,MAAM,IAAG,CAAC,IAAI,CAAC,CAAA,MAAA,OAAO,CAAC,QAAQ,CAAC,KAAK,0CAAE,IAAI,CAAA,EAAE;YAC9D,OAAO,CAAC,OAAO,CACb,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;gBACvB,OAAO,CAAC,QAAQ,CAAC,IAAI,kBAErB,IAAI,EAAE,QAAQ,CAAC,IAAI,IAChB,OAAO,CAAC,QAAQ,CAAC,KAAK,EAE5B,CAAC;SACH;IACH,CAAC,EAAE,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC;IAExB,OAAO,CACL;QACG,QAAQ,IAAI,CACX,0CACG,CAAC,0BAA0B,IAAI,CAC9B,oBAAC,sBAAsB,IAAC,QAAQ,EAAE,QAAQ,GAAI,CAC/C,CACA,CACJ;QACD,oBAAC,YAAY,oBAAK,IAAI,IAAE,QAAQ,EAAE,QAAQ,IAAI,CAC7C,CACJ,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,aAAa,CAAC"}
+{"version":3,"file":"CategoryRoute.js","sourceRoot":"","sources":["CategoryRoute.tsx"],"names":[],"mappings":";;;;;;;;;;;AACA,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,KAAK,EAAE,EAAiB,SAAS,EAAE,MAAM,OAAO,CAAC;AACxD,OAAO,EAAe,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,0BAA0B,EAAE,MAAM,sCAAsC,CAAC;AAClF,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAE3D,OAAO,kBAAkB,MAAM,8DAA8D,CAAC;AAU9F,SAAS,sBAAsB;IAC7B,MAAM,MAAM,GAAG,eAAe,EAAE,CAAC;IAEjC,SAAS,CAAC,GAAG,EAAE;QACb,SAAS,gBAAgB;YACvB,uCAAuC;YACvC,MAAM,CAAC,UAAU,CAAC;gBAChB,KAAK,EAAE,kBAAkB;gBACzB,IAAI,EAAE;oBACJ,aAAa,EAAE,0BAA0B,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC;iBAClE;aACF,CAAC,CAAC;QACL,CAAC;QAED,MAAM,CAAC,gBAAgB,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;QAEtD,OAAO,GAAG,EAAE,CAAC,MAAM,CAAC,mBAAmB,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;IACxE,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;AACf,CAAC;AAED,MAAM,aAAa,GAAG,CAAC,KAAyB,EAAE,EAAE;;IAClD,MAAM,EAAE,SAAS,EAAE,YAAY,KAAc,KAAK,EAAd,IAAI,UAAK,KAAK,EAA5C,aAAoC,CAAQ,CAAC;IAEnD,MAAM,QAAQ,GACZ,CAAA,MAAA,MAAA,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,IAAI,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC,0CAAE,KAAK,0CAAE,MAAM;SAC/D,MAAA,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,IAAI,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC,0CAAE,QAAQ,CAAA,CAAC;IAE7D,MAAM,EAAE,cAAc,EAAE,GAAG,aAAa,EAAE,CAAC;IAE3C,MAAM,0BAA0B,GAAG,cAAc;QAC/C,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,0BAA0B;QAC7C,CAAC,CAAC,KAAK,CAAC;IAEV,MAAM,OAAO,GAAG,UAAU,EAAiB,CAAC;IAC5C,sBAAsB,EAAE,CAAC;IACzB,SAAS,CAAC,GAAG,EAAE;;QACb,IAAI,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,CAAC,MAAM,IAAG,CAAC,IAAI,CAAC,CAAA,MAAA,OAAO,CAAC,QAAQ,CAAC,KAAK,0CAAE,IAAI,CAAA,EAAE;YAC9D,OAAO,CAAC,OAAO,CACb,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;gBACvB,OAAO,CAAC,QAAQ,CAAC,IAAI,kBAErB,IAAI,EAAE,QAAQ,CAAC,IAAI,IAChB,OAAO,CAAC,QAAQ,CAAC,KAAK,EAE5B,CAAC;SACH;IACH,CAAC,EAAE,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC;IAExB,OAAO,CACL;QACG,QAAQ,IAAI,CACX,0CACG,CAAC,0BAA0B,IAAI,CAC9B,oBAAC,sBAAsB,IAAC,QAAQ,EAAE,QAAQ,GAAI,CAC/C,CACA,CACJ;QACD,oBAAC,YAAY,oBAAK,IAAI,IAAE,QAAQ,EAAE,QAAQ,IAAI,CAC7C,CACJ,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,aAAa,CAAC"}

package/components/DynamicRoute/ContentRoute.d.ts

@@ -1,5 +1,5 @@
 import React, { ComponentType } from 'react';
-import { QueryResult } from 'react-apollo';
+import { QueryResult } from '@apollo/client';
 import { Page } from '@jetshop/core/types';
 export interface ContentProps {
     result: QueryResult;

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 | Iterable<React.ReactNode>;
+}
+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/PreviewRoute.js

@@ -1,6 +1,6 @@
 import qs from 'qs';
 import React, { useContext } from 'react';
-import { Query } from 'react-apollo';
+import { Query } from '@apollo/client/react/components';
 import SortOrderContainer from '../SortOrder/SortOrderContainer';
 import CategoryRoute from './CategoryRoute';
 import ProductRoute from './ProductRoute';

package/components/DynamicRoute/PreviewRoute.js.map

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

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/ProductByArticlenumber.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { useQuery } from 'react-apollo';
+import { useQuery } from '@apollo/client';
 import { Redirect } from 'react-router';
 import productByArticlenumberQuery from './ProductByArticlenumber.gql';
 import encodeVariantValues from '@jetshop/core/helpers/encodeVariant';
@@ -14,7 +14,7 @@ const ProductByArticlenumber = ({ articleNumber }) => {
     }
     const product = data === null || data === void 0 ? void 0 : data.product;
     const variant = (product === null || product === void 0 ? void 0 : product.hasVariants) &&
-        product.variants.values.find(variant => variant.articleNumber === articleNumber);
+        product.variants.values.find((variant) => variant.articleNumber === articleNumber);
     const encoding = variant ? encodeVariantValues(variant) : '';
     return (data === null || data === void 0 ? void 0 : data.product) ? (React.createElement(Redirect, { to: `${((_b = (_a = data === null || data === void 0 ? void 0 : data.product) === null || _a === void 0 ? void 0 : _a.primaryRoute) === null || _b === void 0 ? void 0 : _b.path) + encoding}` })) : (React.createElement(Redirect, { to: "/" }));
 };

package/components/DynamicRoute/ProductByArticlenumber.js.map

@@ -1 +1 @@
-{"version":3,"file":"ProductByArticlenumber.js","sourceRoot":"","sources":["ProductByArticlenumber.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,2BAA2B,MAAM,8BAA8B,CAAC;AACvE,OAAO,mBAAmB,MAAM,qCAAqC,CAAC;AAGtE,MAAM,sBAAsB,GAAG,CAAC,EAC9B,aAAa,EAGd,EAAE,EAAE;;IACH,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,QAAQ,CAAC,2BAA2B,EAAE;QAC9D,SAAS,EAAE,EAAE,aAAa,EAAE;QAC5B,WAAW,EAAE,KAAK;KACnB,CAAC,CAAC;IAEH,IAAI,OAAO,EAAE;QACX,OAAO,IAAI,CAAC;KACb;IAED,MAAM,OAAO,GAAY,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,CAAC;IAEvC,MAAM,OAAO,GACX,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW;QACpB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAC1B,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,aAAa,KAAK,aAAa,CACnD,CAAC;IAEJ,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAE7D,OAAO,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,EAAC,CAAC,CAAC,CACrB,oBAAC,QAAQ,IAAC,EAAE,EAAE,GAAG,CAAA,MAAA,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,0CAAE,YAAY,0CAAE,IAAI,IAAG,QAAQ,EAAE,GAAI,CACpE,CAAC,CAAC,CAAC,CACF,oBAAC,QAAQ,IAAC,EAAE,EAAC,GAAG,GAAG,CACpB,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,sBAAsB,CAAC"}
+{"version":3,"file":"ProductByArticlenumber.js","sourceRoot":"","sources":["ProductByArticlenumber.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,2BAA2B,MAAM,8BAA8B,CAAC;AACvE,OAAO,mBAAmB,MAAM,qCAAqC,CAAC;AAGtE,MAAM,sBAAsB,GAAG,CAAC,EAC9B,aAAa,EAGd,EAAE,EAAE;;IACH,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,QAAQ,CAAC,2BAA2B,EAAE;QAC9D,SAAS,EAAE,EAAE,aAAa,EAAE;QAC5B,WAAW,EAAE,KAAK;KACnB,CAAC,CAAC;IAEH,IAAI,OAAO,EAAE;QACX,OAAO,IAAI,CAAC;KACb;IAED,MAAM,OAAO,GAAY,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,CAAC;IAEvC,MAAM,OAAO,GACX,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW;QACpB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAC1B,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,aAAa,KAAK,aAAa,CACrD,CAAC;IAEJ,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAE7D,OAAO,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,EAAC,CAAC,CAAC,CACrB,oBAAC,QAAQ,IAAC,EAAE,EAAE,GAAG,CAAA,MAAA,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,0CAAE,YAAY,0CAAE,IAAI,IAAG,QAAQ,EAAE,GAAI,CACpE,CAAC,CAAC,CAAC,CACF,oBAAC,QAAQ,IAAC,EAAE,EAAC,GAAG,GAAG,CACpB,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,sBAAsB,CAAC"}

package/components/DynamicRoute/ProductRoute.d.ts

@@ -1,6 +1,6 @@
 import { Product } from '@jetshop/core/types';
-import { ComponentType } from 'react';
-import { QueryResult } from 'react-apollo';
+import React, { ComponentType } from 'react';
+import { QueryResult } from '@apollo/client';
 export interface ProductProps {
     result: QueryResult;
     product: Product;
@@ -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

@@ -2,7 +2,7 @@ import React, { ComponentType } from 'react';
 import { ProductProps } from './ProductRoute';
 import { CategoryProps } from './CategoryRoute';
 import { ContentProps } from './ContentRoute';
-import { QueryResult } from 'react-apollo';
+import { QueryResult } from '@apollo/client';
 import { Route } from '../../types';
 declare const RouteResolver: ({ productPage, categoryPage, contentPage, notFoundPage: NotFoundPage, ErrorPage, LoadingPage, result, pathname, state, search }: {
     productPage: ComponentType<ProductProps>;
@@ -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) {
@@ -33,6 +33,7 @@ const Loading = (LoadingPage) => LoadingPage ? React.createElement(LoadingPage,
 const RouteResolver = ({ productPage, categoryPage, contentPage, notFoundPage: NotFoundPage, ErrorPage, LoadingPage, result, pathname, state, search }) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     setPageType((_c = (_b = (_a = result === null || result === void 0 ? void 0 : result.data) === null || _a === void 0 ? void 0 : _a.route) === null || _b === void 0 ? void 0 : _b.object) === null || _c === void 0 ? void 0 : _c.__typename);
+    result.error && console.error(result.error);
     if (((_f = (_e = (_d = result === null || result === void 0 ? void 0 : result.data) === null || _d === void 0 ? void 0 : _d.route) === null || _e === void 0 ? void 0 : _e.path) !== null && _f !== void 0 ? _f : pathname) !== pathname) {
         return (React.createElement(Status, { code: 301 },
             React.createElement(Redirect, { to: {

package/components/DynamicRoute/RouteResolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"RouteResolver.js","sourceRoot":"","sources":["RouteResolver.tsx"],"names":[],"mappings":"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"}
+{"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,oDAAoD,CAAC;AAElF,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,MAAM,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAE5C,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"}

package/components/DynamicRoute/Status.d.ts

@@ -1,13 +1,13 @@
 import * as React from 'react';
 import { RouteComponentProps } from 'react-router-dom';
-import { ApolloError } from 'apollo-client';
+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, "children" | "code" | "error"> & {
     wrappedComponentRef?: React.Ref<Status>;

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,9 +1,9 @@
 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';
+import { useQuery, useApolloClient } from '@apollo/client';
+import { useLocation } from 'react-router';
 import throwErrorInDev from '../../helpers/throwErrorInDev';
 import Head from '../Head';
 import ActiveFiltersQuery from './ActiveFiltersQuery.gql';
@@ -13,16 +13,57 @@ import { getActiveFiltersFromSearch } from '../../resolvers/filters/filterParams
 import ProductByArticlenumber from './ProductByArticlenumber';
 // Make sure filters get applied or cleared when navigating to a new category page.
 function useFiltersOnRouteChange() {
-    const history = useHistory();
     const client = useApolloClient();
     useEffect(() => {
-        client.writeData({
+        client.writeQuery({
+            query: ActiveFiltersQuery,
             data: {
                 activeFilters: getActiveFiltersFromSearch(window.location.search)
             }
         });
-    }, [client, history]);
+    }, [client]);
 }
+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, {
+        fetchPolicy: 'cache-only'
+    });
+    const variables = {
+        path: location.pathname,
+        first: perPage,
+        offset,
+        orderBy: sortOrder,
+        orderByDirection: direction,
+        filters: Object.assign({}, (_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',
+        initialFetchPolicy: 'cache-and-network',
+        partialRefetch: true
+    });
+    const route = (_b = (result.previousData || result.data)) === null || _b === void 0 ? void 0 : _b.route;
+    const data = (_d = (_c = (result.previousData || result.data)) === null || _c === void 0 ? void 0 : _c.route) === null || _d === void 0 ? void 0 : _d.object;
+    const resultWithFallbackData = Object.assign(Object.assign({}, result), { 
+        // We want to show the previous data to avoid unnecessary loading states
+        data: result.data || result.previousData });
+    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: resultWithFallbackData, 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 +97,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

package/components/DynamicRoute/index.js.map

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

package/components/Filters/utils/replaceInSearch.d.ts

@@ -1,5 +1,5 @@
-import { routeType } from '@jetshop/ui/ScrollRestorationHandler/ScrollRestorationHandler';
 import { History, Location } from 'history';
+export type routeType = 'sortOrderChange' | 'filterChange' | 'paginationChange' | 'Product' | 'Category' | 'Page';
 interface ReplaceInSearch {
     history: History;
     location: Location;

package/components/Filters/utils/replaceInSearch.js.map

@@ -1 +1 @@
-{"version":3,"file":"replaceInSearch.js","sourceRoot":"","sources":["replaceInSearch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,sDAAsD,CAAC;AAGnF,OAAO,EAAE,MAAM,IAAI,CAAC;AAUpB,MAAM,UAAU,eAAe,CAAC,EAC9B,OAAO,EACP,QAAQ,EACR,WAAW,EACX,WAAW,EACX,SAAS,EACO;IAChB,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,QAAQ,CAAC;IACpC,MAAM,aAAa,GAAG,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC;IAC7E,MAAM,YAAY,GAAG,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IAC3C,MAAM,CAAC,UAAU,EAAE,YAAY,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;IAEnE,MAAM,SAAS,mCACV,aAAa,KAChB,CAAC,UAAU,CAAC,EAAE,WAAW;YACvB,CAAC,CAAC,YAAY;YACd,CAAC,iCAAM,aAAa,CAAC,UAAU,CAAC,GAAM,YAAoB,CAAE,GAC/D,CAAC;IAEF,IAAI,YAAY,KAAK,EAAE,IAAI,WAAW,EAAE;QACtC,OAAO,SAAS,CAAC,UAAU,CAAC,CAAC;KAC9B;IAED,OAAO,WAAW,CAAC;QACjB,OAAO;QACP,QAAQ;QACR,IAAI;QACJ,MAAM,EAAE,SAAS;QACjB,SAAS,EAAE,IAAI;QACf,SAAS;KACV,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"replaceInSearch.js","sourceRoot":"","sources":["replaceInSearch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,sDAAsD,CAAC;AAEnF,OAAO,EAAE,MAAM,IAAI,CAAC;AAkBpB,MAAM,UAAU,eAAe,CAAC,EAC9B,OAAO,EACP,QAAQ,EACR,WAAW,EACX,WAAW,EACX,SAAS,EACO;IAChB,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,QAAQ,CAAC;IACpC,MAAM,aAAa,GAAG,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC;IAC7E,MAAM,YAAY,GAAG,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IAC3C,MAAM,CAAC,UAAU,EAAE,YAAY,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;IAEnE,MAAM,SAAS,mCACV,aAAa,KAChB,CAAC,UAAU,CAAC,EAAE,WAAW;YACvB,CAAC,CAAC,YAAY;YACd,CAAC,iCAAM,aAAa,CAAC,UAAU,CAAC,GAAM,YAAoB,CAAE,GAC/D,CAAC;IAEF,IAAI,YAAY,KAAK,EAAE,IAAI,WAAW,EAAE;QACtC,OAAO,SAAS,CAAC,UAAU,CAAC,CAAC;KAC9B;IAED,OAAO,WAAW,CAAC;QACjB,OAAO;QACP,QAAQ;QACR,IAAI;QACJ,MAAM,EAAE,SAAS;QACjB,SAAS,EAAE,IAAI;QACf,SAAS;KACV,CAAC,CAAC;AACL,CAAC"}

package/components/Mutation/AddToCartFormik.d.ts

@@ -49,5 +49,5 @@ export interface AddToCartFormProps {
         }) => string;
     };
 }
-declare const AddToCartFormik: ({ children, onAddToCartInit, onAddToCartError, onAddToCartSuccess, cartQuery, cartMutation, initialValues, variant, product, commentValidators, getMissingOptions, ...props }: AddToCartFormProps & FormikConfig<AddToCartFormikValues>) => JSX.Element;
+declare const AddToCartFormik: ({ children, onAddToCartInit, onAddToCartError, onAddToCartSuccess, cartQuery, cartMutation, initialValues, variant, product, commentValidators, getMissingOptions, ...props }: AddToCartFormProps & FormikConfig<AddToCartFormikValues>) => React.JSX.Element;
 export default AddToCartFormik;

package/components/Mutation/AddToCartFormik.js

@@ -12,11 +12,11 @@ var __rest = (this && this.__rest) || function (s, e) {
 import React, { useContext } from 'react';
 import { Formik } from 'formik';
 import { CartIdContext } from '@jetshop/core/components/Cart/CartIdContext';
-import { useMutation, useApolloClient } from '@apollo/react-hooks';
+import { useMutation, useApolloClient } from '@apollo/client';
 import { getAddToCartOptimisticResponse } from '@jetshop/core/components/Mutation/cartMutationUtils';
 import t from '@jetshop/intl';
 import uniqueId from '@jetshop/core/helpers/uniqueId';
-import { useStockStatus } from '@jetshop/ui/Stock/StockStatusContainer';
+import { useStockStatus } from '@jetshop/core/hooks/useStockStatus';
 import { useTrackProductAdd, getCommentsFromFormikValues, addToCartSuccess, addToCartError, getArticleNumber } from './AddToCart/addToCartUtils';
 import throwErrorInDev from '../../helpers/throwErrorInDev';
 import { useDynamicPrice } from '@jetshop/core/hooks/useDynamicPrice';