@jetshop/core 5.17.0-alpha.1fa8c1a3 → 5.17.0-alpha.2384b5c5
Sign up to get free protection for your applications and to get access to all the features.
- package/ChannelHandler/ChannelHandler.js.map +1 -1
- package/ChannelHandler/PreserveRedirectRouteQuery.gql +4 -4
- package/ChannelHandler/redirectUtils.d.ts +1 -1
- package/ChannelHandler/redirectUtils.js +5 -3
- package/ChannelHandler/redirectUtils.js.map +1 -1
- package/ChannelHandler/redirectUtils.test.js +5 -5
- package/ChannelHandler/redirectUtilsGroupedChannels.test.js +5 -5
- package/analytics/webVitals.js +5 -5
- package/analytics/webVitals.js.map +1 -1
- package/boot/SharedTree.d.ts +1 -1
- package/boot/SharedTree.js +1 -1
- package/boot/SharedTree.js.map +1 -1
- package/boot/apollo.d.ts +1 -2
- package/boot/apollo.js +12 -7
- package/boot/apollo.js.map +1 -1
- package/boot/client/startClient.js +8 -2
- package/boot/client/startClient.js.map +1 -1
- package/boot/server/IntervalQuery.d.ts +1 -1
- package/boot/server/IntervalQuery.js +2 -2
- package/boot/server/IntervalQuery.js.map +1 -1
- package/boot/server/IntervalQuery.test.js +9 -13
- package/boot/server/PersistedApolloClient.test.js +8 -7
- package/boot/server/createApolloServer.d.ts +2 -1
- package/boot/server/createApolloServer.js +5 -5
- package/boot/server/createApolloServer.js.map +1 -1
- package/boot/server/createRenderer.js +4 -2
- package/boot/server/createRenderer.js.map +1 -1
- package/boot/server/entrypoint.js +7 -4
- package/boot/server/entrypoint.js.map +1 -1
- package/boot/server/persistedQueries/__tests__/getPersistedQueriesForRequest.test.js +1 -1
- package/boot/utils/queryLoggingMiddleware.d.ts +1 -1
- package/boot/utils/queryLoggingMiddleware.js +2 -2
- package/boot/utils/queryLoggingMiddleware.js.map +1 -1
- package/cart/AddToCartFormik.d.ts +1 -1
- package/cart/AddToCartFormik.js +1 -1
- package/cart/AddToCartFormik.js.map +1 -1
- package/cart/useAddToCart.d.ts +1 -1
- package/components/Auth/ForgotPasswordProvider.d.ts +2 -2
- package/components/Auth/ForgotPasswordProvider.js +1 -1
- package/components/Auth/ForgotPasswordProvider.js.map +1 -1
- package/components/Auth/ResetPasswordProvider.d.ts +4 -2
- package/components/Auth/ResetPasswordProvider.js +1 -1
- package/components/Auth/ResetPasswordProvider.js.map +1 -1
- package/components/Auth/SSN.js +4 -4
- package/components/Auth/SSN.js.map +1 -1
- package/components/Auth/UpdatePasswordForm.js +6 -6
- package/components/Auth/UpdatePasswordForm.js.map +1 -1
- package/components/Auth/signup-context.d.ts +2 -2
- package/components/Auth/signup-context.js +2 -3
- package/components/Auth/signup-context.js.map +1 -1
- package/components/Auth/signupSubmit.js +4 -4
- package/components/Auth/signupSubmit.js.map +1 -1
- package/components/Auth/useAddressFields.js +3 -3
- package/components/Auth/useAddressFields.js.map +1 -1
- package/components/Auth/useAddressFields.test.js +10 -8
- package/components/Auth/useCustomer.d.ts +2 -2
- package/components/Auth/useCustomer.js +1 -1
- package/components/Auth/useCustomer.js.map +1 -1
- package/components/AuthContext/AuthProvider.js +2 -2
- package/components/AuthContext/AuthProvider.js.map +1 -1
- package/components/AuthContext/AuthProvider.test.js +1 -1
- package/components/ChannelContext/useCountrySettings.d.ts +1 -1
- package/components/ChannelContext/useCountrySettings.js +1 -1
- package/components/ChannelContext/useCountrySettings.js.map +1 -1
- package/components/DynamicRoute/ActiveFiltersQuery.gql +4 -4
- package/components/DynamicRoute/CategoryRoute.d.ts +1 -1
- package/components/DynamicRoute/CategoryRoute.js +6 -3
- package/components/DynamicRoute/CategoryRoute.js.map +1 -1
- package/components/DynamicRoute/ContentRoute.d.ts +1 -1
- package/components/DynamicRoute/GenericError.d.ts +1 -1
- package/components/DynamicRoute/PreviewRoute.js +1 -1
- package/components/DynamicRoute/PreviewRoute.js.map +1 -1
- package/components/DynamicRoute/ProductByArticlenumber.js +2 -2
- package/components/DynamicRoute/ProductByArticlenumber.js.map +1 -1
- package/components/DynamicRoute/ProductRoute.d.ts +1 -1
- package/components/DynamicRoute/RouteResolver.d.ts +1 -1
- package/components/DynamicRoute/RouteResolver.js +1 -0
- package/components/DynamicRoute/RouteResolver.js.map +1 -1
- package/components/DynamicRoute/Status.d.ts +1 -1
- package/components/DynamicRoute/index.js +14 -13
- package/components/DynamicRoute/index.js.map +1 -1
- package/components/Mutation/AddToCartFormik.js +1 -1
- package/components/Mutation/AddToCartFormik.js.map +1 -1
- package/components/Mutation/DecrementQuantity.js +1 -1
- package/components/Mutation/DecrementQuantity.js.map +1 -1
- package/components/Mutation/IncrementQuantity.js +1 -1
- package/components/Mutation/IncrementQuantity.js.map +1 -1
- package/components/Mutation/RemoveFromCart.js +1 -1
- package/components/Mutation/RemoveFromCart.js.map +1 -1
- package/components/Mutation/SetQuantity.js +1 -1
- package/components/Mutation/SetQuantity.js.map +1 -1
- package/components/Mutation/SubscribeToNewsletter.d.ts +1 -1
- package/components/Mutation/SubscribeToNewsletter.js +1 -1
- package/components/Mutation/SubscribeToNewsletter.js.map +1 -1
- package/components/Mutation/SubscribeToStockNotifications.d.ts +1 -1
- package/components/Mutation/SubscribeToStockNotifications.js +6 -2
- package/components/Mutation/SubscribeToStockNotifications.js.map +1 -1
- package/components/Mutation/cartMutationUtils.d.ts +1 -2
- package/components/Mutation/cartMutationUtils.js.map +1 -1
- package/components/Mutation/useDecrementQuantity.d.ts +1 -1
- package/components/Mutation/useDecrementQuantity.js +1 -1
- package/components/Mutation/useDecrementQuantity.js.map +1 -1
- package/components/Mutation/useIncrementQuantity.d.ts +1 -1
- package/components/Mutation/useIncrementQuantity.js +1 -1
- package/components/Mutation/useIncrementQuantity.js.map +1 -1
- package/components/Mutation/useRemoveFromCart.d.ts +1 -1
- package/components/Mutation/useRemoveFromCart.js +1 -1
- package/components/Mutation/useRemoveFromCart.js.map +1 -1
- package/components/Mutation/useSetQuantity.d.ts +1 -1
- package/components/Mutation/useSetQuantity.js +1 -1
- package/components/Mutation/useSetQuantity.js.map +1 -1
- package/components/ProductConfigurationProvider/ProductConfigurationProvider.js +1 -1
- package/components/ProductConfigurationProvider/ProductConfigurationProvider.js.map +1 -1
- package/components/Query/CartProvider.d.ts +1 -1
- package/components/Query/CartProvider.js +1 -1
- package/components/Query/CartProvider.js.map +1 -1
- package/data/cache.d.ts +1 -1
- package/data/cache.js +62 -12
- package/data/cache.js.map +1 -1
- package/data/fragments/ProductListsFragments.gql +8 -8
- package/data/fragments/StockStatusFragment.gql +1 -0
- package/global.d.ts +6 -0
- package/helpers/getErrorDetail.d.ts +1 -1
- package/helpers/getErrorDetail.js +2 -2
- package/helpers/getErrorDetail.js.map +1 -1
- package/hooks/Filters/useBooleanFilter.d.ts +1 -1
- package/hooks/Filters/useBooleanFilter.js +1 -2
- package/hooks/Filters/useBooleanFilter.js.map +1 -1
- package/hooks/Filters/useFilters.d.ts +1 -1
- package/hooks/Filters/useFilters.js +1 -2
- package/hooks/Filters/useFilters.js.map +1 -1
- package/hooks/Filters/useListFilter.d.ts +2 -2
- package/hooks/Filters/useListFilter.js +1 -2
- package/hooks/Filters/useListFilter.js.map +1 -1
- package/hooks/Filters/useMultiFilter.d.ts +3 -3
- package/hooks/Filters/useMultiFilter.js +1 -2
- package/hooks/Filters/useMultiFilter.js.map +1 -1
- package/hooks/Filters/useRangeFilter.d.ts +2 -2
- package/hooks/Filters/useRangeFilter.js +1 -2
- package/hooks/Filters/useRangeFilter.js.map +1 -1
- package/hooks/PackageProducts/usePackageProducts.js +1 -1
- package/hooks/PackageProducts/usePackageProducts.js.map +1 -1
- package/hooks/PackageProducts/usePackageProducts.test.js +1 -1
- package/hooks/ProductList/ProductListContext.js +1 -1
- package/hooks/ProductList/ProductListContext.js.map +1 -1
- package/hooks/ProductList/action-creators.d.ts +1 -1
- package/hooks/ProductList/index.d.ts +1 -1
- package/hooks/ProductList/useProductList.js +1 -1
- package/hooks/ProductList/useProductList.js.map +1 -1
- package/hooks/ProductList/useProductListItems.js +1 -1
- package/hooks/ProductList/useProductListItems.js.map +1 -1
- package/hooks/Subscriptions/useNewsletterSubscription.js +3 -3
- package/hooks/Subscriptions/useNewsletterSubscription.js.map +1 -1
- package/hooks/Subscriptions/useStockNotifications.d.ts +1 -1
- package/hooks/Subscriptions/useStockNotifications.js +3 -3
- package/hooks/Subscriptions/useStockNotifications.js.map +1 -1
- package/hooks/Subscriptions/useStoreSubscriptions.d.ts +1 -1
- package/hooks/Subscriptions/useStoreSubscriptions.js +3 -6
- package/hooks/Subscriptions/useStoreSubscriptions.js.map +1 -1
- package/hooks/Subscriptions/useStoresubscriptions.test.js +5 -7
- package/hooks/useAddMultipleToCart.d.ts +1 -1
- package/hooks/useAddMultipleToCart.js +1 -1
- package/hooks/useAddMultipleToCart.js.map +1 -1
- package/hooks/useAddMultipleToCart.test.js +1 -1
- package/hooks/useCustomerOrders.test.js +7 -5
- package/hooks/useCustomerOrdersQuery.d.ts +2 -2
- package/hooks/useCustomerOrdersQuery.js +1 -1
- package/hooks/useCustomerOrdersQuery.js.map +1 -1
- package/hooks/useDeleteAccountMutation.js +3 -3
- package/hooks/useDeleteAccountMutation.js.map +1 -1
- package/hooks/useInfinitePagination.d.ts +1 -1
- package/hooks/useInfinitePagination.js +4 -1
- package/hooks/useInfinitePagination.js.map +1 -1
- package/hooks/useLoginMutation.d.ts +3 -3
- package/hooks/useLoginMutation.js +2 -2
- package/hooks/useLoginMutation.js.map +1 -1
- package/hooks/useLoginRedirect.js +2 -2
- package/hooks/useLoginRedirect.js.map +1 -1
- package/hooks/useOrderDetailQuery.d.ts +3 -3
- package/hooks/useOrderDetailQuery.js +1 -1
- package/hooks/useOrderDetailQuery.js.map +1 -1
- package/hooks/useRoutePreload.js +1 -1
- package/hooks/useRoutePreload.js.map +1 -1
- package/integrations/sluggishSchemaExtension.js +1 -1
- package/integrations/sluggishSchemaExtension.js.map +1 -1
- package/package.json +18 -36
- package/resolvers/filters/boolFilter.js +19 -23
- package/resolvers/filters/boolFilter.js.map +1 -1
- package/resolvers/filters/filterParams.js +8 -8
- package/resolvers/filters/filterParams.js.map +1 -1
- package/resolvers/filters/filters.js +5 -5
- package/resolvers/filters/filters.js.map +1 -1
- package/resolvers/filters/index.d.ts +0 -4
- package/resolvers/filters/listFilter.js +19 -24
- package/resolvers/filters/listFilter.js.map +1 -1
- package/resolvers/filters/listFilterItem.js +20 -26
- package/resolvers/filters/listFilterItem.js.map +1 -1
- package/resolvers/filters/multiListFilter.js +21 -24
- package/resolvers/filters/multiListFilter.js.map +1 -1
- package/resolvers/filters/multiListFilterList.js +1 -1
- package/resolvers/filters/multiListFilterList.js.map +1 -1
- package/resolvers/filters/rangeFilter.js +18 -34
- package/resolvers/filters/rangeFilter.js.map +1 -1
- package/test-utils/ProviderPyramid.js +1 -1
- package/types.d.ts +1820 -1955
- package/components/Fonts/GoogleFont.d.ts +0 -10
- package/components/Fonts/GoogleFont.js +0 -35
- package/components/Fonts/GoogleFont.js.map +0 -1
- package/components/Fonts/TypekitFont.d.ts +0 -16
- package/components/Fonts/TypekitFont.js +0 -25
- package/components/Fonts/TypekitFont.js.map +0 -1
- package/integrations/addwishSchemaExtension.d.ts +0 -35
- package/integrations/addwishSchemaExtension.js +0 -141
- package/integrations/addwishSchemaExtension.js.map +0 -1
- package/integrations/nostoSchemaExtension.d.ts +0 -5
- package/integrations/nostoSchemaExtension.js +0 -77
- package/integrations/nostoSchemaExtension.js.map +0 -1
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"ChannelHandler.js","sourceRoot":"","sources":["ChannelHandler.ts"],"names":[],"mappings":"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
|
1
|
+
{"version":3,"file":"ChannelHandler.js","sourceRoot":"","sources":["ChannelHandler.ts"],"names":[],"mappings":"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"}
|
@@ -3,16 +3,16 @@ query preserveRedirectRouteQuery($path: String!) {
|
|
3
3
|
id
|
4
4
|
object {
|
5
5
|
... on Category {
|
6
|
-
id
|
6
|
+
_id: id
|
7
7
|
}
|
8
8
|
... on Product {
|
9
|
-
id
|
9
|
+
_id: id
|
10
10
|
}
|
11
11
|
... on Page {
|
12
|
-
id
|
12
|
+
_id: id
|
13
13
|
}
|
14
14
|
... on StartPage {
|
15
|
-
id
|
15
|
+
_id: id
|
16
16
|
}
|
17
17
|
}
|
18
18
|
}
|
@@ -1,4 +1,4 @@
|
|
1
|
-
import ApolloClient from 'apollo
|
1
|
+
import { ApolloClient } from '@apollo/client';
|
2
2
|
import { SelectedChannel } from '../components/ChannelContext/ChannelContext';
|
3
3
|
export type GetPrimaryRoutePath = (path: string, newChannel: SelectedChannel, setSelectedChannel: (selectedChannel: SelectedChannel) => void) => Promise<string>;
|
4
4
|
export declare function primaryRouteForPathFetcher(client: ApolloClient<any>): GetPrimaryRoutePath;
|
@@ -28,10 +28,11 @@ export function primaryRouteForPathFetcher(client) {
|
|
28
28
|
query: preserveRedirectRouteQuery,
|
29
29
|
variables: {
|
30
30
|
path
|
31
|
-
}
|
31
|
+
},
|
32
|
+
fetchPolicy: 'network-only'
|
32
33
|
});
|
33
|
-
const {
|
34
|
-
const idUesdForRedirect =
|
34
|
+
const { _id, __typename, pageId } = routeQueryResult.data.route.object;
|
35
|
+
const idUesdForRedirect = _id || pageId;
|
35
36
|
setSelectedChannel(newChannel);
|
36
37
|
const pathnameQueryResult = yield client.query({
|
37
38
|
fetchPolicy: 'network-only',
|
@@ -43,6 +44,7 @@ export function primaryRouteForPathFetcher(client) {
|
|
43
44
|
return pathnameQueryResult.data[__typename].primaryRoute.path;
|
44
45
|
}
|
45
46
|
catch (e) {
|
47
|
+
console.log('Error in PrimaryRouteForPathFetcher: ', e);
|
46
48
|
return '/';
|
47
49
|
}
|
48
50
|
});
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"redirectUtils.js","sourceRoot":"","sources":["redirectUtils.ts"],"names":[],"mappings":";;;;;;;;;AASA,OAAO,0BAA0B,MAAM,kCAAkC,CAAC;AAC1E,OAAO,4BAA4B,MAAM,oCAAoC,CAAC;AAC9E,OAAO,6BAA6B,MAAM,qCAAqC,CAAC;AAChF,OAAO,8BAA8B,MAAM,sCAAsC,CAAC;AAClF,OAAO,yBAAyB,MAAM,iCAAiC,CAAC;AAGxE,MAAM,wBAAwB,GAAG;IAC/B,OAAO,EAAE,4BAA4B;IACrC,QAAQ,EAAE,6BAA6B;IACvC,SAAS,EAAE,8BAA8B;IACzC,IAAI,EAAE,yBAAyB;CAChC,CAAC;AASF,MAAM,UAAU,0BAA0B,CACxC,MAAyB;IAEzB,OAAO,CAAO,IAAI,EAAE,UAAU,EAAE,kBAAkB,EAAE,EAAE;QACpD,IAAI;YACF,IAAI,CAAC,IAAI,EAAE;gBACT,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;aACzC;YAED,MAAM,gBAAgB,GAAG,MAAM,MAAM,CAAC,KAAK,CAQxC;gBACD,KAAK,EAAE,0BAA0B;gBACjC,SAAS,EAAE;oBACT,IAAI;iBACL;
|
1
|
+
{"version":3,"file":"redirectUtils.js","sourceRoot":"","sources":["redirectUtils.ts"],"names":[],"mappings":";;;;;;;;;AASA,OAAO,0BAA0B,MAAM,kCAAkC,CAAC;AAC1E,OAAO,4BAA4B,MAAM,oCAAoC,CAAC;AAC9E,OAAO,6BAA6B,MAAM,qCAAqC,CAAC;AAChF,OAAO,8BAA8B,MAAM,sCAAsC,CAAC;AAClF,OAAO,yBAAyB,MAAM,iCAAiC,CAAC;AAGxE,MAAM,wBAAwB,GAAG;IAC/B,OAAO,EAAE,4BAA4B;IACrC,QAAQ,EAAE,6BAA6B;IACvC,SAAS,EAAE,8BAA8B;IACzC,IAAI,EAAE,yBAAyB;CAChC,CAAC;AASF,MAAM,UAAU,0BAA0B,CACxC,MAAyB;IAEzB,OAAO,CAAO,IAAI,EAAE,UAAU,EAAE,kBAAkB,EAAE,EAAE;QACpD,IAAI;YACF,IAAI,CAAC,IAAI,EAAE;gBACT,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;aACzC;YAED,MAAM,gBAAgB,GAAG,MAAM,MAAM,CAAC,KAAK,CAQxC;gBACD,KAAK,EAAE,0BAA0B;gBACjC,SAAS,EAAE;oBACT,IAAI;iBACL;gBACD,WAAW,EAAE,cAAc;aAC5B,CAAC,CAAC;YAEH,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;YACvE,MAAM,iBAAiB,GAAG,GAAG,IAAI,MAAM,CAAC;YACxC,kBAAkB,CAAC,UAAU,CAAC,CAAC;YAE/B,MAAM,mBAAmB,GAAG,MAAM,MAAM,CAAC,KAAK,CAK3C;gBACD,WAAW,EAAE,cAAc;gBAC3B,KAAK,EAAE,wBAAwB,CAAC,UAAU,CAAC;gBAC3C,SAAS,EAAE;oBACT,EAAE,EAAE,iBAAiB;iBACtB;aACF,CAAC,CAAC;YACH,OAAO,mBAAmB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC;SAC/D;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,GAAG,CAAC,uCAAuC,EAAE,CAAC,CAAC,CAAC;YACxD,OAAO,GAAG,CAAC;SACZ;IACH,CAAC,CAAA,CAAC;AACJ,CAAC"}
|
@@ -2,13 +2,13 @@ import {
|
|
2
2
|
createSelectedChannel,
|
3
3
|
getSelectedAndRecommendedChannel
|
4
4
|
} from './channelUtils';
|
5
|
-
import { MockLink } from 'apollo
|
5
|
+
import { MockLink } from '@apollo/client';
|
6
6
|
import {
|
7
|
+
ApolloClient,
|
7
8
|
InMemoryCache,
|
8
|
-
IntrospectionFragmentMatcher
|
9
|
-
|
10
|
-
|
11
|
-
import gql from 'graphql-tag';
|
9
|
+
IntrospectionFragmentMatcher,
|
10
|
+
gql
|
11
|
+
} from '@apollo/client';
|
12
12
|
import { ChannelHandler } from './ChannelHandler';
|
13
13
|
import { channels, singleDomainChannels } from '../test-utils/variables';
|
14
14
|
import { Cookies } from 'react-cookie';
|
@@ -2,13 +2,13 @@ import {
|
|
2
2
|
createSelectedChannel,
|
3
3
|
getSelectedAndRecommendedChannel
|
4
4
|
} from './channelUtils';
|
5
|
-
import { MockLink } from 'apollo
|
5
|
+
import { MockLink } from '@apollo/client';
|
6
6
|
import {
|
7
|
+
ApolloClient,
|
7
8
|
InMemoryCache,
|
8
|
-
IntrospectionFragmentMatcher
|
9
|
-
|
10
|
-
|
11
|
-
import gql from 'graphql-tag';
|
9
|
+
IntrospectionFragmentMatcher,
|
10
|
+
gql
|
11
|
+
} from '@apollo/client';
|
12
12
|
import { ChannelHandler } from './ChannelHandler';
|
13
13
|
import {
|
14
14
|
groupedChannels as channels,
|
package/analytics/webVitals.js
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
import {
|
1
|
+
import { onCLS, onLCP, onFID } from 'web-vitals';
|
2
2
|
import { createApiReporter, getDeviceInfo } from 'web-vitals-reporter';
|
3
3
|
import { routeList } from '../boot/addMissingConfig';
|
4
4
|
let globalPageType = undefined;
|
@@ -11,7 +11,7 @@ export function webVitals({ shopId, apiUrl }) {
|
|
11
11
|
var _a;
|
12
12
|
// Init report callback with information about the browser.
|
13
13
|
const deviceInfo = getDeviceInfo();
|
14
|
-
Object.keys(routeList).forEach(route => {
|
14
|
+
Object.keys(routeList).forEach((route) => {
|
15
15
|
var _a;
|
16
16
|
if ((_a = deviceInfo === null || deviceInfo === void 0 ? void 0 : deviceInfo.url) === null || _a === void 0 ? void 0 : _a.includes(routeList[route])) {
|
17
17
|
globalPageType = route;
|
@@ -32,8 +32,8 @@ export function webVitals({ shopId, apiUrl }) {
|
|
32
32
|
}
|
33
33
|
});
|
34
34
|
// Setup web-vitals
|
35
|
-
|
36
|
-
|
37
|
-
|
35
|
+
onLCP(sendToAnalytics);
|
36
|
+
onFID(sendToAnalytics);
|
37
|
+
onCLS(sendToAnalytics);
|
38
38
|
}
|
39
39
|
//# sourceMappingURL=webVitals.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"webVitals.js","sourceRoot":"","sources":["webVitals.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
1
|
+
{"version":3,"file":"webVitals.js","sourceRoot":"","sources":["webVitals.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACvE,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAErD,IAAI,cAAc,GAAuB,SAAS,CAAC;AAEnD,MAAM,UAAU,WAAW,CAAC,IAAY;IACtC,IAAI,CAAC,cAAc,EAAE;QACnB,cAAc,GAAG,IAAI,CAAC;KACvB;AACH,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,EACxB,MAAM,EACN,MAAM,EAIP;;IACC,2DAA2D;IAC3D,MAAM,UAAU,GAAG,aAAa,EAAE,CAAC;IACnC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;;QACvC,IAAI,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,GAAG,0CAAE,QAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE;YAC/C,cAAc,GAAG,KAAK,CAAC;SACxB;IACH,CAAC,CAAC,CAAC;IACH,MAAM,eAAe,GAAG,iBAAiB,CAAC,GAAG,MAAM,mBAAmB,EAAE;QACtE,OAAO,EAAE;YACP,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,QAAQ;YACjB,QAAQ,EAAE,cAAc;YACxB,SAAS,EAAE,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,SAAS;YAChC,MAAM,EAAE,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,MAAM;YAC1B,IAAI,EAAE,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,IAAI;YACtB,UAAU,EAAE,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,UAAU,0CAAE,aAAa;SAClD;QACD,UAAU,EAAE,GAAG,EAAE;YACf,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,CAAC;QACtC,CAAC;KACF,CAAC,CAAC;IAEH,mBAAmB;IACnB,KAAK,CAAC,eAAe,CAAC,CAAC;IACvB,KAAK,CAAC,eAAe,CAAC,CAAC;IACvB,KAAK,CAAC,eAAe,CAAC,CAAC;AACzB,CAAC"}
|
package/boot/SharedTree.d.ts
CHANGED
@@ -1,5 +1,5 @@
|
|
1
1
|
import { AnalyticsConfig } from '@jetshop/core/analytics/AnalyticsProvider';
|
2
|
-
import ApolloClient from 'apollo
|
2
|
+
import { ApolloClient } from '@apollo/client';
|
3
3
|
import React, { ReactElement } from 'react';
|
4
4
|
import { Cookies } from 'react-cookie';
|
5
5
|
import { StaticRouterProps } from 'react-router';
|
package/boot/SharedTree.js
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
import AnalyticsProvider from '@jetshop/core/analytics/AnalyticsProvider';
|
2
2
|
import React from 'react';
|
3
|
-
import { ApolloProvider } from '
|
3
|
+
import { ApolloProvider } from '@apollo/client';
|
4
4
|
// Cookies
|
5
5
|
import { CookiesProvider } from 'react-cookie';
|
6
6
|
// Metadata
|
package/boot/SharedTree.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"SharedTree.js","sourceRoot":"","sources":["SharedTree.tsx"],"names":[],"mappings":"AAAA,OAAO,iBAEN,MAAM,2CAA2C,CAAC;AAEnD,OAAO,KAAuB,MAAM,OAAO,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,
|
1
|
+
{"version":3,"file":"SharedTree.js","sourceRoot":"","sources":["SharedTree.tsx"],"names":[],"mappings":"AAAA,OAAO,iBAEN,MAAM,2CAA2C,CAAC;AAEnD,OAAO,KAAuB,MAAM,OAAO,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,UAAU;AACV,OAAO,EAAW,eAAe,EAAE,MAAM,cAAc,CAAC;AACxD,WAAW;AACX,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAGpD,OAAO,YAAY,MAAM,wCAAwC,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AACtE,mBAAmB;AACnB,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAe,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAG3E,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAE/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AAgBpE,MAAM,UAAU,GAAG,CAAC,EAClB,gBAAgB,EAChB,OAAO,EACP,aAAa,EACb,QAAQ,EACR,MAAM,EACN,MAAM,EACN,WAAW,EACX,MAAM,EACN,WAAW,EACX,QAAQ,EACR,cAAc,EACd,cAAc,EACE,EAAgB,EAAE;IAClC,OAAO,CACL,oBAAC,cAAc,IAAC,MAAM,EAAE,MAAM;QAC5B,oBAAC,qBAAqB;YACpB,oBAAC,eAAe,IAAC,OAAO,EAAE,OAAO;gBAC/B,oBAAC,cAAc,IAAC,OAAO,EAAE,aAAa;oBACpC,oBAAC,kBAAkB,IAAC,KAAK,EAAE,gBAAgB;wBACzC,oBAAC,cAAc,IAAC,MAAM,EAAE,MAAM;4BAC5B,oBAAC,eAAe,IACd,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,cAAc;gCAE9B,oBAAC,iBAAiB,IAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO;oCACrD,oBAAC,eAAe,IAAC,cAAc,EAAE,cAAc;wCAC7C,oBAAC,MAAM,kBACL,QAAQ,EACN,cAAc,CAAC,kBAAkB,EAAE,IAAI,SAAS,IAE9C,WAAW;4CAEf,oBAAC,YAAY,IAAC,IAAI,EAAE,WAAW,IAC5B,QAAQ,CACI,CACR,CACO,CACA,CACJ,CACH,CACE,CACN,CACD,CACI,CACT,CAClB,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,UAAU,CAAC"}
|
package/boot/apollo.d.ts
CHANGED
@@ -1,5 +1,4 @@
|
|
1
|
-
import { NormalizedCacheObject } from 'apollo
|
2
|
-
import { ApolloClient } from 'apollo-client';
|
1
|
+
import { ApolloClient, NormalizedCacheObject } from '@apollo/client';
|
3
2
|
import { Request } from 'express';
|
4
3
|
import { GraphQLSchema } from 'graphql';
|
5
4
|
import { ApolloConfig } from '../components/ConfigProvider';
|
package/boot/apollo.js
CHANGED
@@ -9,12 +9,10 @@ var __rest = (this && this.__rest) || function (s, e) {
|
|
9
9
|
}
|
10
10
|
return t;
|
11
11
|
};
|
12
|
-
import { ApolloClient } from 'apollo
|
13
|
-
import {
|
14
|
-
import {
|
15
|
-
import {
|
16
|
-
import { createPersistedQueryLink } from 'apollo-link-persisted-queries';
|
17
|
-
import { SchemaLink } from 'apollo-link-schema';
|
12
|
+
import { ApolloClient, ApolloLink, createHttpLink } from '@apollo/client';
|
13
|
+
import { onError } from '@apollo/client/link/error';
|
14
|
+
import { createPersistedQueryLink } from '@apollo/client/link/persisted-queries';
|
15
|
+
import { SchemaLink } from '@apollo/client/link/schema';
|
18
16
|
import qs from 'qs';
|
19
17
|
import createCache from '../data/cache';
|
20
18
|
import report from '../errorReporting';
|
@@ -151,6 +149,7 @@ export const createClient = ({ apolloConfig: { token, shopid, enableGateway, gra
|
|
151
149
|
}
|
152
150
|
// 503
|
153
151
|
if (networkError) {
|
152
|
+
// This is a hack, does it work? Todo eli5
|
154
153
|
const errors = (_b = networkError === null || networkError === void 0 ? void 0 : networkError.result) === null || _b === void 0 ? void 0 : _b.Errors;
|
155
154
|
if (errors) {
|
156
155
|
errors.forEach((error) => {
|
@@ -179,12 +178,18 @@ export const createClient = ({ apolloConfig: { token, shopid, enableGateway, gra
|
|
179
178
|
links.unshift(logOperationTime);
|
180
179
|
}
|
181
180
|
if (enableGateway) {
|
182
|
-
links.unshift(createPersistedQueryLink({
|
181
|
+
links.unshift(createPersistedQueryLink({
|
182
|
+
useGETForHashedQueries: true,
|
183
|
+
generateHash: () => {
|
184
|
+
return '';
|
185
|
+
}
|
186
|
+
}));
|
183
187
|
}
|
184
188
|
const link = ApolloLink.from(links);
|
185
189
|
const cache = createCache();
|
186
190
|
const client = new ApolloClient({
|
187
191
|
link,
|
192
|
+
connectToDevTools: process.env.NODE_ENV !== 'production',
|
188
193
|
assumeImmutableResults: true,
|
189
194
|
cache: __IN_SERVER__
|
190
195
|
? cache
|
package/boot/apollo.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"apollo.js","sourceRoot":"","sources":["apollo.ts"],"names":[],"mappings":";;;;;;;;;;;
|
1
|
+
{"version":3,"file":"apollo.js","sourceRoot":"","sources":["apollo.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,EACL,YAAY,EAEZ,UAAU,EACV,cAAc,EACf,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AACpD,OAAO,EAAE,wBAAwB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAGxD,OAAO,EAAE,MAAM,IAAI,CAAC;AAEpB,OAAO,WAAW,MAAM,eAAe,CAAC;AACxC,OAAO,MAAM,MAAM,mBAAmB,CAAC;AACvC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,QAAQ,MAAM,qBAAqB,CAAC;AAE3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAElE,OAAO,EAAE,IAAI,IAAI,iBAAiB,EAAE,MAAM,0CAA0C,CAAC;AAiBrF,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,EAC3B,YAAY,EAAE,EACZ,KAAK,EACL,MAAM,EACN,aAAa,EACb,UAAU,EACV,qBAAqB,EACtB,EACD,MAAM,EACN,WAAW,EACX,cAAc,EACd,GAAG,EACH,cAAc,EACG,EAAE,EAAE;IACrB,IAAI,CAAC,KAAK,IAAI,CAAC,MAAM,EAAE;QACrB,MAAM,IAAI,KAAK,CAAC,WAAW,CAAC,KAAK,IAAI,OAAO,IAAI,CAAC,MAAM,IAAI,QAAQ,EAAE,CAAC,CAAC;KACxE;IAED,MAAM,WAAW,GAAG,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACpE,MAAM,cAAc,GAAG,cAAc;QACnC,CAAC,CAAC,cAAc,CAAC,iBAAiB,EAAE;QACpC,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,4BAA4B,GAAG,GAAG,EAAE,CACxC,aAAa;QACX,CAAC,CAAC,cAAc,CAAC;YACb,GAAG,EAAE,oBAAoB,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,IAAI,UAAU;YAC3D,OAAO,EAAE,EAAE;YACX,KAAK,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC,OAAO;SACrC,CAAC;QACJ,CAAC,CAAC,cAAc,CAAC;YACb,GAAG,EAAE,UAAU;YACf,OAAO,EAAE,EAAE;SACZ,CAAC,CAAC;IAET,MAAM,iBAAiB,GAAG,GAAG,EAAE,CAC7B,aAAa;QACX,CAAC,CAAC,MAAM;YACN,CAAC,CAAC,IAAI,UAAU,CAAC;gBACb,MAAM;gBACN,OAAO,EAAE;oBACP,OAAO,gDACF,CAAC,CAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,iBAAiB,EAAE,KAAI,EAAE,CAAC,GAC3C,WAAW,GACX,cAAc,CAClB;iBACF;aACF,CAAC;YACJ,CAAC,CAAC,cAAc,CAAC;gBACb,GAAG,EAAE,oBAAoB,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,IAAI,UAAU;gBAC3D,OAAO,EAAE,EAAE;gBAEX,KAAK,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC,OAAO;aACrC,CAAC;QACN,CAAC,CAAC,cAAc,CAAC;YACb,GAAG,EAAE,UAAU;YACf,OAAO,EAAE,EAAE;SACZ,CAAC,CAAC;IAET,MAAM,gBAAgB,GAAG,GAAG,EAAE;QAC5B,IAAI,aAAa,EAAE;YACjB,OAAO,cAAc,CAAC;gBACpB,GAAG,EAAE,UAAU;gBACf,OAAO,EAAE;oBACP,KAAK,EAAE,KAAK;oBACZ,MAAM,EAAE,MAAM;iBACf;gBACD,KAAK,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC,OAAO;gBACpC,YAAY,EAAE;oBACZ,KAAK,EACH,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC;wBAC/B,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC;4BAC3B,SAAS,EAAE,IAAI;yBAChB,CAAC;wBACJ,CAAC,CAAC,SAAS;iBAChB;aACF,CAAC,CAAC;SACJ;QACD,OAAO,cAAc,CAAC;YACpB,GAAG,EAAE,UAAU;YACf,OAAO,EAAE;gBACP,KAAK,EAAE,KAAK;gBACZ,MAAM,EAAE,MAAM;aACf;YACD,YAAY,EAAE;gBACZ,SAAS,EAAE,IAAI;aAChB;SACF,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,MAAM,OAAO,GAAG,qBAAqB;QACnC,CAAC,CAAC,4BAA4B,EAAE;QAChC,CAAC,CAAC,aAAa;YACf,CAAC,CAAC,iBAAiB,EAAE;YACrB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAEvB,MAAM,iBAAiB,GAAG,IAAI,UAAU,CAAC,CAAC,SAAS,EAAE,OAAO,EAAE,EAAE;QAC9D,gEAAgE;QAChE,SAAS,CAAC,UAAU,CAAC,CAAC,EAAE,OAAO,GAAG,EAAE,EAAe,EAAE,EAAE,CAAC,CAAC;YACvD,OAAO,kCACF,OAAO,GACP,CAAC,CAAA,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,iBAAiB,EAAE,KAAI,EAAE,CAAC,CAC/C;SACF,CAAC,CAAC,CAAC;QACJ,OAAO,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC7C,CAAC,CAAC,CAAC;IAEH,MAAM,cAAc,GAClB,WAAW;QACX,IAAI,UAAU,CAAC,CAAC,SAAS,EAAE,OAAO,EAAE,EAAE;YACpC,iDAAiD;YACjD,WAAW,CAAC,aAAa,EAAE,CAAC;YAE5B,SAAS,CAAC,UAAU,CAAC,CAAC,EAAE,OAAO,GAAG,EAAE,EAAe,EAAE,EAAE,CAAC,CAAC;gBACvD,OAAO,kCACF,OAAO,GACP,WAAW,CAAC,cAAc,EAAE,CAChC;aACF,CAAC,CAAC,CAAC;YACJ,OAAO,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAC7C,CAAC,CAAC,CAAC;IAEL,MAAM,iBAAiB,GACrB,cAAc;QACd,IAAI,UAAU,CAAC,CAAC,SAAS,EAAE,OAAO,EAAE,EAAE;YACpC,SAAS,CAAC,UAAU,CAAC,CAAC,EAAE,OAAO,GAAG,EAAE,EAAe,EAAE,EAAE,CAAC,CAAC;gBACvD,OAAO,kCACF,OAAO,GACP,cAAc,CAAC,iBAAiB,EAAE,CACtC;aACF,CAAC,CAAC,CAAC;YACJ,OAAO,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAC7C,CAAC,CAAC,CAAC;IAEL,MAAM,eAAe,GAAG,OAAO,CAC7B,CAAC,EAAmD,EAAE,EAAE;;YAAvD,EAAE,aAAa,EAAE,YAAY,EAAE,SAAS,OAAW,EAAN,IAAI,cAAjD,8CAAmD,CAAF;QAChD,IAAI,aAAa,EAAE;YACjB,aAAa,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;;gBAC9B,MAAM,IAAI,GAAG,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,UAAU,0CAAE,IAAI,CAAC;gBAErC,IAAI,IAAI,KAAK,YAAY,EAAE;oBACzB,OAAO,CAAC,GAAG,CAAC,iBAAiB,SAAS,CAAC,SAAS,CAAC,IAAI,GAAG,CAAC,CAAC;oBAC1D,MAAM,CACJ,IAAI,KAAK,CACP,qCAAqC,SAAS,CAAC,SAAS,CAAC,IAAI,EAAE,CAChE,CACF,CAAC;iBACH;qBAAM,IAAI,IAAI,KAAK,cAAc,IAAI,IAAI,KAAK,cAAc,EAAE;oBAC7D,WAAW,CAAC,cAAc,EAAE,CAAC;oBAC7B,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE;wBACjC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,GAAG,CAAC;qBAC5B;iBACF;qBAAM,IACL,IAAI,KAAK,4BAA4B;oBACrC,IAAI,KAAK,uBAAuB,EAChC;oBACA,8BAA8B;oBAC9B,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;iBACpB;qBAAM;oBACL,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;oBACnB,8CAA8C;oBAC9C,MAAM,CAAC,IAAI,KAAK,CAAC,GAAG,KAAK,CAAC,OAAO,IAAI,IAAI,EAAE,CAAC;wBAC1C,4CAA4C;wBAC5C,SAAS;wBACT,IAAI;wBACJ,KAAK;wBACL,aAAa;wBACb,YAAY,IACT,IAAI,EACP,CAAC;iBACJ;YACH,CAAC,CAAC,CAAC;SACJ;QAED,MAAM;QACN,IAAI,YAAY,EAAE;YAChB,0CAA0C;YAC1C,MAAM,MAAM,GAAG,MACb,YAOD,aAPC,YAAY,uBAAZ,YAAY,CAOX,MAAM,0CAAE,MAAM,CAAC;YAClB,IAAI,MAAM,EAAE;gBACV,MAAM,CAAC,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;oBAC5B,IAAI,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,MAAK,mBAAmB,EAAE;wBAC1C,WAAW,CAAC,cAAc,EAAE,CAAC;wBAC7B,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE;4BACjC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,GAAG,CAAC;yBAC5B;qBACF;gBACH,CAAC,CAAC,CAAC;aACJ;YACD,OAAO,CAAC,GAAG,CAAC,oBAAoB,YAAY,EAAE,CAAC,CAAC;YAChD,MAAM,CAAC,YAAY,CAAC,CAAC;SACtB;IACH,CAAC,CACF,CAAC;IAEF,MAAM,KAAK,GAAG;QACZ,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC;QAC7C,eAAe;QACf,0DAA0D;QAC1D,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACjD,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3C,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACjD,OAAO;KACR,CAAC;IAEF,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,KAAK,MAAM,EAAE;QACrC,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;KACjC;IAED,IAAI,aAAa,EAAE;QACjB,KAAK,CAAC,OAAO,CACX,wBAAwB,CAAC;YACvB,sBAAsB,EAAE,IAAI;YAC5B,YAAY,EAAE,GAAG,EAAE;gBACjB,OAAO,EAAE,CAAC;YACZ,CAAC;SACF,CAAC,CACH,CAAC;KACH;IACD,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAEpC,MAAM,KAAK,GAAG,WAAW,EAAE,CAAC;IAE5B,MAAM,MAAM,GAAwC,IAAI,YAAY,CAAC;QACnE,IAAI;QACJ,iBAAiB,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY;QACxD,sBAAsB,EAAE,IAAI;QAC5B,KAAK,EAAE,aAAa;YAClB,CAAC,CAAC,KAAK;YACP,CAAC,CAAC,KAAK,CAAC,OAAO,CAAE,MAAc,CAAC,gBAAgB,CAAC;QACnD,OAAO,EAAE,CAAC,CAAC,aAAa;QACxB,SAAS,EAAE,SAAS,CAClB,EAAE,CAAC,SAAS,CAAC,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC,CACnE;QACD,QAAQ;KACT,CAAC,CAAC;IAEH,OAAO,EAAE,MAAM,EAAE,CAAC;AACpB,CAAC,CAAC"}
|
@@ -28,10 +28,12 @@ import createIntlOptions from '../utils/createIntOptions';
|
|
28
28
|
import { setUID } from '../utils/uid';
|
29
29
|
import { webVitals } from '../../analytics/webVitals';
|
30
30
|
import { primaryRouteForPathFetcher } from '../../../core/ChannelHandler/redirectUtils';
|
31
|
+
import ActiveFiltersQuery from '@jetshop/core/components/DynamicRoute/ActiveFiltersQuery.gql';
|
31
32
|
// Instantiate this here, since we need to read cookies outside of React.
|
32
33
|
const cookies = new Cookies();
|
33
34
|
function getInitialCacheData() {
|
34
35
|
return {
|
36
|
+
query: ActiveFiltersQuery,
|
35
37
|
data: {
|
36
38
|
activeFilters: getActiveFiltersFromSearch(document.location.search)
|
37
39
|
}
|
@@ -72,9 +74,9 @@ const startClient = (tree, config) => {
|
|
72
74
|
channelHandler.setGetPrimaryRoutePath(primaryRouteForPathFetcher(client));
|
73
75
|
const initialCacheData = getInitialCacheData();
|
74
76
|
// Initialise cache with active filters from the search params
|
75
|
-
client.cache.
|
77
|
+
client.cache.writeQuery(initialCacheData);
|
76
78
|
// If cache is reseted, we reset the initial cache data
|
77
|
-
client.onResetStore(() => __awaiter(void 0, void 0, void 0, function* () { return client.cache.
|
79
|
+
client.onResetStore(() => __awaiter(void 0, void 0, void 0, function* () { return client.cache.writeQuery(initialCacheData); }));
|
78
80
|
client
|
79
81
|
.query({
|
80
82
|
query: config.apolloConfig.channelsQuery || channelsQuery
|
@@ -132,9 +134,13 @@ const startClient = (tree, config) => {
|
|
132
134
|
root.render(tree);
|
133
135
|
}
|
134
136
|
else {
|
137
|
+
// client.disableNetworkFetches = false;
|
135
138
|
root = hydrateRoot(document.getElementById('root'), tree);
|
136
139
|
}
|
137
140
|
});
|
141
|
+
})
|
142
|
+
.finally(() => {
|
143
|
+
client.disableNetworkFetches = false;
|
138
144
|
});
|
139
145
|
};
|
140
146
|
const main = (tree, config) => {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"startClient.js","sourceRoot":"","sources":["startClient.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,KAAK,MAAM,MAAM,qBAAqB,CAAC;AAC9C,OAAO,KAAuB,MAAM,OAAO,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,gCAAgC,EAAE,MAAM,mCAAmC,CAAC;AACrF,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AAErE,OAAO,eAAe,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,0BAA0B,EAAE,MAAM,sCAAsC,CAAC;AAClF,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,aAAa,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,UAAU,MAAM,eAAe,CAAC;AACvC,OAAO,iBAAiB,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACtD,OAAO,EAAE,0BAA0B,EAAE,MAAM,4CAA4C,CAAC;AAExF,yEAAyE;AACzE,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;AAE9B,SAAS,mBAAmB;IAC1B,OAAO;QACL,IAAI,EAAE;YACJ,aAAa,EAAE,0BAA0B,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC;SACpE;KACF,CAAC;AACJ,CAAC;AAED,IAAI,IAAoC,CAAC;AAEzC,MAAM,WAAW,GAAG,CAAC,IAAkB,EAAE,MAAmB,EAAE,EAAE;IAC9D,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,aAAa,EAAE;QACtC,eAAe,CACb,IAAI,EACJ;;;;qCAI+B,CAChC,CAAC;KACH;IAED,gFAAgF;IAC/E,MAAc,CAAC,MAAM,GAAG,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC;IAEpD,IAAI,OAAO,CAAC,GAAG,CAAC,2BAA2B,EAAE;QAC3C,SAAS,CAAC;YACR,MAAM,EAAE,MAAM,CAAC,YAAY,CAAC,MAAM;YAClC,MAAM,EAAE,MAAM,CAAC,YAAY,CAAC,UAAU;SACvC,CAAC,CAAC;KACJ;IAED,IAAI,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE;QAC5C,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;KACtC;IAED,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC;IAEhC,MAAM,WAAW,GAAG,IAAI,WAAW,CAAC;QAClC,OAAO;KACR,CAAC,CAAC;IAEH,MAAM,cAAc,GAAG,IAAI,cAAc,EAAE,CAAC;IAC5C,MAAM,cAAc,GAAG,IAAI,cAAc,EAAE,CAAC;IAE5C,MAAM,EAAE,MAAM,EAAE,GAAG,YAAY,CAAC;QAC9B,YAAY;QACZ,WAAW;QACX,cAAc;QACd,cAAc;KACf,CAAC,CAAC;IAEH,cAAc,CAAC,sBAAsB,CAAC,0BAA0B,CAAC,MAAM,CAAC,CAAC,CAAC;IAE1E,MAAM,gBAAgB,GAAG,mBAAmB,EAAE,CAAC;IAE/C,8DAA8D;IAC9D,MAAM,CAAC,KAAK,CAAC,
|
1
|
+
{"version":3,"file":"startClient.js","sourceRoot":"","sources":["startClient.tsx"],"names":[],"mappings":"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"}
|
@@ -1,5 +1,5 @@
|
|
1
|
+
import { OperationVariables } from '@apollo/client';
|
1
2
|
import { DocumentNode } from 'graphql';
|
2
|
-
import { OperationVariables } from 'react-apollo';
|
3
3
|
import { CreateClientOpts } from '../apollo';
|
4
4
|
import { ChannelHeaders } from './persistedQueries/PersistedClient';
|
5
5
|
export type ErrorCallback = (err: Error) => void;
|
@@ -42,7 +42,7 @@ export class IntervalQuery {
|
|
42
42
|
headers: this.channelHeaders
|
43
43
|
}
|
44
44
|
})
|
45
|
-
.then(resp => {
|
45
|
+
.then((resp) => {
|
46
46
|
const { data } = resp;
|
47
47
|
if (pendingResponse !== this.pendingResponse) {
|
48
48
|
// response expired
|
@@ -56,7 +56,7 @@ export class IntervalQuery {
|
|
56
56
|
this.client = client;
|
57
57
|
return data;
|
58
58
|
});
|
59
|
-
pendingResponse.catch(err => {
|
59
|
+
pendingResponse.catch((err) => {
|
60
60
|
if (pendingResponse !== this.pendingResponse) {
|
61
61
|
// response expired
|
62
62
|
return;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"IntervalQuery.js","sourceRoot":"","sources":["IntervalQuery.ts"],"names":[],"mappings":";;;;;;;;;
|
1
|
+
{"version":3,"file":"IntervalQuery.js","sourceRoot":"","sources":["IntervalQuery.ts"],"names":[],"mappings":"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"}
|
@@ -1,14 +1,12 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
import ApolloClient, { ApolloError } from 'apollo-client';
|
1
|
+
import {
|
2
|
+
ApolloClient,
|
3
|
+
ApolloError,
|
4
|
+
InMemoryCache,
|
5
|
+
HttpLink,
|
6
|
+
gql
|
7
|
+
} from '@apollo/client';
|
9
8
|
import { IntervalQuery } from './IntervalQuery';
|
10
9
|
import nock from 'nock';
|
11
|
-
import gql from 'graphql-tag';
|
12
10
|
beforeAll(() => {
|
13
11
|
jest.useFakeTimers();
|
14
12
|
nock.disableNetConnect();
|
@@ -46,16 +44,14 @@ function mockResponse({ channels = null, statusCode = 200, errors }) {
|
|
46
44
|
errors,
|
47
45
|
data: {
|
48
46
|
channels: Array.isArray(channels)
|
49
|
-
? channels.map(channel =>
|
47
|
+
? channels.map((channel) =>
|
50
48
|
Object.assign({ __typename: 'Channel' }, channel)
|
51
49
|
)
|
52
50
|
: null
|
53
51
|
}
|
54
52
|
};
|
55
53
|
const res = jest.fn(() => data);
|
56
|
-
nock('http://localhost')
|
57
|
-
.post('/graphql')
|
58
|
-
.reply(statusCode, res);
|
54
|
+
nock('http://localhost').post('/graphql').reply(statusCode, res);
|
59
55
|
return res;
|
60
56
|
}
|
61
57
|
test('does request on init', async () => {
|
@@ -3,11 +3,14 @@
|
|
3
3
|
// https://gitlab.jetshop.se/jetshop/flight/merge_requests/409/diffs?commit_id=d30490f833ec2d2eec94e5a75ed99de71e666377
|
4
4
|
// https://gitlab.jetshop.se/jetshop/flight/blob/94b6108017f6205e7d31f6bedb19c14f278d227a/packages/core/boot/server/PersistedApolloClient.test.ts
|
5
5
|
|
6
|
-
import
|
6
|
+
import {
|
7
|
+
ApolloClient,
|
8
|
+
ApolloError,
|
9
|
+
InMemoryCache,
|
10
|
+
HttpLink
|
11
|
+
} from '@apollo/client';
|
7
12
|
import { PersistedApolloClient } from './PersistedApolloClient';
|
8
13
|
import nock from 'nock';
|
9
|
-
import { HttpLink } from 'apollo-link-http';
|
10
|
-
import { InMemoryCache } from 'apollo-cache-inmemory';
|
11
14
|
import channelsQuery from '../ChannelsQuery.gql';
|
12
15
|
|
13
16
|
global.__IN_SERVER__ = true;
|
@@ -41,7 +44,7 @@ function mockResponse({ channels = null, statusCode = 200, errors }) {
|
|
41
44
|
errors,
|
42
45
|
data: {
|
43
46
|
channels: Array.isArray(channels)
|
44
|
-
? channels.map(channel =>
|
47
|
+
? channels.map((channel) =>
|
45
48
|
Object.assign(
|
46
49
|
{
|
47
50
|
__typename: 'Channel',
|
@@ -66,9 +69,7 @@ function mockResponse({ channels = null, statusCode = 200, errors }) {
|
|
66
69
|
}
|
67
70
|
};
|
68
71
|
const res = jest.fn(() => data);
|
69
|
-
nock('http://localhost')
|
70
|
-
.post('/graphql')
|
71
|
-
.reply(statusCode, res);
|
72
|
+
nock('http://localhost').post('/graphql').reply(statusCode, res);
|
72
73
|
return res;
|
73
74
|
}
|
74
75
|
test('does request on init', async () => {
|
@@ -1,4 +1,5 @@
|
|
1
|
-
import { ApolloServer
|
1
|
+
import { ApolloServer } from 'apollo-server-express';
|
2
|
+
import { IResolversParameter } from 'graphql-tools';
|
2
3
|
import { GraphQLSchema } from 'graphql';
|
3
4
|
import { ApolloConfig } from '../../components/ConfigProvider';
|
4
5
|
import { PluginDefinition } from 'apollo-server-core';
|
@@ -7,14 +7,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
7
7
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
8
8
|
});
|
9
9
|
};
|
10
|
-
import {
|
11
|
-
import {
|
12
|
-
import {
|
10
|
+
import { ApolloLink, HttpLink } from '@apollo/client';
|
11
|
+
import { ApolloServer } from 'apollo-server-express';
|
12
|
+
import { introspectSchema, makeRemoteExecutableSchema, mergeSchemas } from 'graphql-tools';
|
13
|
+
import { setContext } from '@apollo/client/link/context';
|
13
14
|
import fetch from 'node-fetch';
|
14
15
|
// import { specifiedRules } from 'graphql';
|
15
16
|
// import { OverlappingFieldsCanBeMerged } from 'graphql/validation/rules/OverlappingFieldsCanBeMerged';
|
16
17
|
import { InMemoryLRUCache } from 'apollo-server-caching';
|
17
|
-
import { ApolloLink } from 'apollo-link';
|
18
18
|
import https from 'https';
|
19
19
|
import dnscache from 'dnscache';
|
20
20
|
const pick = require('lodash.pick');
|
@@ -71,7 +71,7 @@ function getRemoteSchema({ apolloConfig: { graphQLURI, token, shopid } }) {
|
|
71
71
|
* @link https://github.com/apollographql/graphql-tools/issues/1046#issuecomment-457445794
|
72
72
|
*/
|
73
73
|
const errorLink = new ApolloLink((operation, forward) => {
|
74
|
-
return forward(operation).map(data => {
|
74
|
+
return forward(operation).map((data) => {
|
75
75
|
if (data.errors) {
|
76
76
|
for (const error of data.errors) {
|
77
77
|
if (!(error instanceof Error))
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"createApolloServer.js","sourceRoot":"","sources":["createApolloServer.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,
|
1
|
+
{"version":3,"file":"createApolloServer.js","sourceRoot":"","sources":["createApolloServer.ts"],"names":[],"mappings":"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"}
|
@@ -7,7 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
7
7
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
8
8
|
});
|
9
9
|
};
|
10
|
-
import { getDataFromTree } from '@apollo/react
|
10
|
+
import { getDataFromTree } from '@apollo/client/react/ssr';
|
11
11
|
import { getSelectedAndRecommendedChannel } from '@jetshop/core/ChannelHandler/channelUtils';
|
12
12
|
import { setupIntl } from '@jetshop/intl/config';
|
13
13
|
import IntlContext from '@jetshop/intl/context';
|
@@ -30,6 +30,7 @@ import _merge from 'lodash.merge';
|
|
30
30
|
import { salesSourceMiddleware } from './salesSource';
|
31
31
|
import { getPreloadLinkHeaderString } from './getPreloadAssets';
|
32
32
|
import { primaryRouteForPathFetcher } from '../../../core/ChannelHandler/redirectUtils';
|
33
|
+
import ActiveFiltersQuery from '@jetshop/core/components/DynamicRoute/ActiveFiltersQuery.gql';
|
33
34
|
const injectDataIntoSlots = (template, data) => Object.keys(data).reduce((output, key) => key !== 'htmlAttributes'
|
34
35
|
? output.replace(`<slot name="${key}"/>`, data[key])
|
35
36
|
: output.replace('<html lang="en">', `<html ${data[key]}>`), template);
|
@@ -160,7 +161,8 @@ const createRenderer = (template, tree, options) => {
|
|
160
161
|
const combinedCache = _merge({}, cachedChannels, persistedQueries);
|
161
162
|
client.cache.restore(combinedCache);
|
162
163
|
// Initialise cache with active filters from the search params
|
163
|
-
client.cache.
|
164
|
+
client.cache.writeQuery({
|
165
|
+
query: ActiveFiltersQuery,
|
164
166
|
data: {
|
165
167
|
activeFilters: getActiveFiltersFromSearch(req.query)
|
166
168
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"createRenderer.js","sourceRoot":"","sources":["createRenderer.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,
|
1
|
+
{"version":3,"file":"createRenderer.js","sourceRoot":"","sources":["createRenderer.tsx"],"names":[],"mappings":"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"}
|