@jetshop/core 5.13.1 → 5.13.3
Sign up to get free protection for your applications and to get access to all the features.
- package/ChannelHandler/PreserveRedirectRouteQuery.gql +1 -1
- package/ChannelHandler/redirectUtils.test.js +18 -32
- package/analytics/Analytics.js +4 -1
- package/analytics/Analytics.js.map +1 -1
- package/analytics/AnalyticsProvider.js +1 -1
- package/analytics/AnalyticsProvider.js.map +1 -1
- package/analytics/integrations/ga4.js +61 -62
- package/analytics/integrations/ga4.js.map +1 -1
- package/analytics/integrations/unslugify.js +0 -2
- package/analytics/integrations/unslugify.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 +2 -2
- package/components/ChannelContext/useCountrySettings.js +2 -2
- package/components/ChannelContext/useCountrySettings.js.map +1 -1
- package/components/ConfigProvider.d.ts +0 -1
- package/components/ConfigProvider.js.map +1 -1
- package/components/OpenGraph/OpenGraph.test.js +2 -2
- package/components/OpenGraph/OpenGraphGeneralPageData.js +6 -6
- package/components/OpenGraph/OpenGraphGeneralPageData.js.map +1 -1
- package/components/OpenGraph/OpenGraphProductData.js +1 -1
- package/components/OpenGraph/OpenGraphProductData.js.map +1 -1
- package/components/Pagination/PaginationProvider.test.js +29 -29
- package/components/SortOrder/SortOrderContainer.js +1 -1
- package/components/SortOrder/SortOrderContainer.js.map +1 -1
- package/experiments/ExperimentsProvider.test.js +12 -12
- package/experiments/integration.test.js +6 -6
- package/experiments/useExperiment.test.js +10 -10
- package/hooks/Channels/useChannelSettings.js +1 -1
- package/hooks/Channels/useChannelSettings.js.map +1 -1
- package/hooks/Channels/useChannelSettings.test.js +1 -1
- package/hooks/usePrice.test.js +2 -2
- package/hooks/useShopConfig.d.ts +1 -1
- package/hooks/useShopConfig.js +1 -1
- package/hooks/useShopConfig.js.map +1 -1
- package/package.json +2 -2
- package/test-utils/ProviderPyramid.js +4 -4
@@ -3,41 +3,18 @@ import {
|
|
3
3
|
getSelectedAndRecommendedChannel
|
4
4
|
} from './channelUtils';
|
5
5
|
import { MockLink } from 'apollo-link-mock';
|
6
|
-
import {
|
6
|
+
import {
|
7
|
+
InMemoryCache,
|
8
|
+
IntrospectionFragmentMatcher
|
9
|
+
} from 'apollo-cache-inmemory';
|
7
10
|
import ApolloClient from 'apollo-client';
|
8
11
|
import gql from 'graphql-tag';
|
9
12
|
import { ChannelHandler } from './ChannelHandler';
|
10
13
|
import { channels, singleDomainChannels } from '../test-utils/variables';
|
11
14
|
import { Cookies } from 'react-cookie';
|
12
15
|
import { primaryRouteForPathFetcher } from './redirectUtils';
|
13
|
-
|
14
|
-
|
15
|
-
query preserveRedirectRouteQuery($path: String!) {
|
16
|
-
route(path: $path) {
|
17
|
-
id
|
18
|
-
object {
|
19
|
-
... on Category {
|
20
|
-
id
|
21
|
-
__typename
|
22
|
-
}
|
23
|
-
... on Product {
|
24
|
-
id
|
25
|
-
__typename
|
26
|
-
}
|
27
|
-
... on Page {
|
28
|
-
id
|
29
|
-
__typename
|
30
|
-
}
|
31
|
-
... on StartPage {
|
32
|
-
id
|
33
|
-
__typename
|
34
|
-
}
|
35
|
-
__typename
|
36
|
-
}
|
37
|
-
__typename
|
38
|
-
}
|
39
|
-
}
|
40
|
-
`;
|
16
|
+
import PreserveRedirectRouteQuery from './PreserveRedirectRouteQuery.gql';
|
17
|
+
import fragmentTypes from '@jetshop/core/data/fragmentTypes';
|
41
18
|
|
42
19
|
const startPagePathnameRedirectQuery = gql`
|
43
20
|
query StartPagePathnameRedirectQuery($id: Int!) {
|
@@ -90,7 +67,7 @@ const productPathnameRedirectQuery = gql`
|
|
90
67
|
const redirectQueryMocks = [
|
91
68
|
{
|
92
69
|
request: {
|
93
|
-
query:
|
70
|
+
query: PreserveRedirectRouteQuery,
|
94
71
|
variables: {
|
95
72
|
path: '/'
|
96
73
|
}
|
@@ -115,7 +92,7 @@ const redirectQueryMocks = [
|
|
115
92
|
startPagePathnameRedirectRequest,
|
116
93
|
{
|
117
94
|
request: {
|
118
|
-
query:
|
95
|
+
query: PreserveRedirectRouteQuery,
|
119
96
|
variables: {
|
120
97
|
path: '/accessories/orchid-peach-bag'
|
121
98
|
}
|
@@ -175,7 +152,16 @@ const redirectQueryMocks = [
|
|
175
152
|
|
176
153
|
function createClient(mocks) {
|
177
154
|
return new ApolloClient({
|
178
|
-
cache: new InMemoryCache({
|
155
|
+
cache: new InMemoryCache({
|
156
|
+
addTypename: true,
|
157
|
+
fragmentMatcher: new IntrospectionFragmentMatcher({
|
158
|
+
introspectionQueryResultData: {
|
159
|
+
__schema: {
|
160
|
+
types: fragmentTypes
|
161
|
+
}
|
162
|
+
}
|
163
|
+
})
|
164
|
+
}),
|
179
165
|
link: new MockLink(mocks)
|
180
166
|
});
|
181
167
|
}
|
package/analytics/Analytics.js
CHANGED
@@ -30,8 +30,11 @@ function useTracker() {
|
|
30
30
|
if (typeof name !== 'string') {
|
31
31
|
throw new Error('"name" is required');
|
32
32
|
}
|
33
|
-
|
33
|
+
// Please fix me
|
34
|
+
if (!config.trackingAllowed) {
|
35
|
+
(payload === null || payload === void 0 ? void 0 : payload.callback) && (payload === null || payload === void 0 ? void 0 : payload.callback());
|
34
36
|
return null;
|
37
|
+
}
|
35
38
|
const context = {
|
36
39
|
trackerRegistry,
|
37
40
|
list: locationState.current ? locationState.current.list : null,
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"Analytics.js","sourceRoot":"","sources":["Analytics.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAE7E,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AACnE,OAAO,eAAe,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAe3C,SAAS,SAAS,CAAC,KAAqB;IACtC,MAAM,KAAK,GAAG,UAAU,EAAE,CAAC;IAE3B,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,KAAK,CAAC,KAAK,EAAE;YACf,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SACpB;QAED,mBAAmB;QACnB,wEAAwE;QACxE,sEAAsE;QACtE,2EAA2E;QAC3E,2EAA2E;QAC3E,yEAAyE;QACzE,6DAA6D;QAE7D,2BAA2B;IAC7B,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IAEZ,IAAI,CAAC,KAAK,CAAC,QAAQ;QAAE,OAAO,IAAI,CAAC;IAEjC,OAAO,KAAK,CAAC,QAAQ,CAAC;AACxB,CAAC;AAID,SAAS,UAAU;IACjB,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,gBAAgB,CAAC,CAAC;IACjE,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAE/B,MAAM,aAAa,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAE7C,OAAO,WAAW,CAChB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,EAAE;QACxB,IAAI;YACF,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;gBAC5B,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;aACvC;YAED,IAAI,CAAC,MAAM,CAAC,eAAe;
|
1
|
+
{"version":3,"file":"Analytics.js","sourceRoot":"","sources":["Analytics.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAE7E,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AACnE,OAAO,eAAe,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAe3C,SAAS,SAAS,CAAC,KAAqB;IACtC,MAAM,KAAK,GAAG,UAAU,EAAE,CAAC;IAE3B,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,KAAK,CAAC,KAAK,EAAE;YACf,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SACpB;QAED,mBAAmB;QACnB,wEAAwE;QACxE,sEAAsE;QACtE,2EAA2E;QAC3E,2EAA2E;QAC3E,yEAAyE;QACzE,6DAA6D;QAE7D,2BAA2B;IAC7B,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IAEZ,IAAI,CAAC,KAAK,CAAC,QAAQ;QAAE,OAAO,IAAI,CAAC;IAEjC,OAAO,KAAK,CAAC,QAAQ,CAAC;AACxB,CAAC;AAID,SAAS,UAAU;IACjB,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,gBAAgB,CAAC,CAAC;IACjE,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAE/B,MAAM,aAAa,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAE7C,OAAO,WAAW,CAChB,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,EAAE;QACxB,IAAI;YACF,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;gBAC5B,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;aACvC;YAED,gBAAgB;YAChB,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE;gBAC3B,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,MAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,EAAE,CAAA,CAAC;gBACzC,OAAO,IAAI,CAAC;aACb;YAED,MAAM,OAAO,GAA4B;gBACvC,eAAe;gBACf,IAAI,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI;gBAC/D,IAAI,EAAE,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE;oBACrB,eAAe,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC;gBAClD,CAAC;aACF,CAAC;YACF,eAAe,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC;SAClD;QAAC,OAAO,GAAG,EAAE;YACZ,eAAe,CAAC,IAAI,EAAE,uBAAuB,IAAI,UAAU,EAAE;gBAC3D,GAAG;gBACH,OAAO;aACR,CAAC,CAAC;SACJ;IACH,CAAC,EACD,CAAC,eAAe,EAAE,MAAM,CAAC,eAAe,CAAC,CAC1C,CAAC;AACJ,CAAC;AAED,eAAe,SAAS,CAAC;AACzB,OAAO,EAAE,UAAU,EAAE,CAAC"}
|
@@ -100,7 +100,7 @@ const AnalyticsProvider = function AnalyticsProvider(props) {
|
|
100
100
|
inServer: __IN_SERVER__
|
101
101
|
}), [analyticsConfig]);
|
102
102
|
if (gtag === null || gtag === void 0 ? void 0 : gtag.trackingId) {
|
103
|
-
if (
|
103
|
+
if (gtag === null || gtag === void 0 ? void 0 : gtag.trackingId.startsWith('G-')) {
|
104
104
|
registry.add(ga4Tracker({
|
105
105
|
currency: selectedChannel.currency.format.code,
|
106
106
|
trackingId: gtag.trackingId,
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"AnalyticsProvider.js","sourceRoot":"","sources":["AnalyticsProvider.tsx"],"names":[],"mappings":"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
|
1
|
+
{"version":3,"file":"AnalyticsProvider.js","sourceRoot":"","sources":["AnalyticsProvider.tsx"],"names":[],"mappings":"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"}
|
@@ -1,20 +1,16 @@
|
|
1
1
|
import { injectScript } from '../utils/script';
|
2
|
-
import { unSlugify } from './unslugify';
|
3
2
|
import { getBrand } from '../../../core/components/OpenGraph/OpenGraphProductData';
|
4
3
|
const gtag = () => window.gtag;
|
5
|
-
function productToItem(product, selectedVariation, useArticleNumberAsId = false, brandCustomField) {
|
6
|
-
var _a, _b, _c, _d
|
4
|
+
function productToItem(product, selectedVariation, useArticleNumberAsId = false, brandCustomField, category) {
|
5
|
+
var _a, _b, _c, _d;
|
7
6
|
return {
|
8
7
|
item_name: product === null || product === void 0 ? void 0 : product.name,
|
9
8
|
item_id: useArticleNumberAsId
|
10
9
|
? product === null || product === void 0 ? void 0 : product.articleNumber
|
11
10
|
: (_a = product === null || product === void 0 ? void 0 : product.id) === null || _a === void 0 ? void 0 : _a.toString(),
|
12
11
|
price: ((_b = selectedVariation === null || selectedVariation === void 0 ? void 0 : selectedVariation.price) === null || _b === void 0 ? void 0 : _b.incVat) || ((_c = product === null || product === void 0 ? void 0 : product.price) === null || _c === void 0 ? void 0 : _c.incVat),
|
13
|
-
item_category:
|
14
|
-
|
15
|
-
item_category3: unSlugify((product === null || product === void 0 ? void 0 : product.categories) && ((_j = (_h = product === null || product === void 0 ? void 0 : product.categories[2]) === null || _h === void 0 ? void 0 : _h.primaryRoute) === null || _j === void 0 ? void 0 : _j.path)),
|
16
|
-
item_category4: unSlugify((product === null || product === void 0 ? void 0 : product.categories) && ((_l = (_k = product === null || product === void 0 ? void 0 : product.categories[3]) === null || _k === void 0 ? void 0 : _k.primaryRoute) === null || _l === void 0 ? void 0 : _l.path)),
|
17
|
-
item_variant: (_m = selectedVariation === null || selectedVariation === void 0 ? void 0 : selectedVariation.values) === null || _m === void 0 ? void 0 : _m.join('_'),
|
12
|
+
item_category: category,
|
13
|
+
item_variant: (_d = selectedVariation === null || selectedVariation === void 0 ? void 0 : selectedVariation.values) === null || _d === void 0 ? void 0 : _d.join('_'),
|
18
14
|
item_brand: getBrand(product, brandCustomField)
|
19
15
|
};
|
20
16
|
}
|
@@ -38,52 +34,50 @@ export function ga4Tracker({ trackingId, additionalGtagTrackingIds = [], currenc
|
|
38
34
|
w.dataLayer.push(arguments);
|
39
35
|
};
|
40
36
|
w.gtag('js', new Date());
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
});
|
45
|
-
additionalGtagTrackingIds.forEach((id) => {
|
46
|
-
gtag()('config', id, {
|
47
|
-
currency,
|
48
|
-
send_page_view: false
|
37
|
+
if (process.env.REACT_APP_DEBUG_MODE === 'true') {
|
38
|
+
gtag()('config', trackingId, {
|
39
|
+
debug_mode: true
|
49
40
|
});
|
41
|
+
}
|
42
|
+
else {
|
43
|
+
gtag()('config', trackingId);
|
44
|
+
}
|
45
|
+
additionalGtagTrackingIds.forEach((id) => {
|
46
|
+
gtag()('config', id);
|
50
47
|
});
|
51
48
|
injectScript({ src: script });
|
52
49
|
gtag();
|
53
50
|
},
|
54
|
-
trackProduct({ quantity, action, product, selectedVariation, list, listName, index }, context
|
55
|
-
const productItem = Object.assign(Object.assign({}, productToItem(product, selectedVariation, useArticleNumberAsId, brandCustomField)), { quantity, item_list_name: list || listName || context.list, index: index });
|
51
|
+
trackProduct({ quantity, action, product, selectedVariation, list, listName, index, category }, context) {
|
52
|
+
const productItem = Object.assign(Object.assign({}, productToItem(product, selectedVariation, useArticleNumberAsId, brandCustomField, category)), { quantity, item_list_name: list || listName || context.list, index: index });
|
56
53
|
switch (action) {
|
57
54
|
case 'click':
|
58
55
|
gtag()('event', 'select_item', {
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
56
|
+
content_type: 'product',
|
57
|
+
currency,
|
58
|
+
value: product.price.incVat,
|
59
|
+
items: [productItem]
|
63
60
|
});
|
64
61
|
break;
|
65
62
|
case 'view':
|
66
63
|
gtag()('event', 'view_item', {
|
67
|
-
|
68
|
-
|
69
|
-
|
70
|
-
eventId
|
64
|
+
currency,
|
65
|
+
value: product.price.incVat,
|
66
|
+
items: [productItem]
|
71
67
|
});
|
72
68
|
break;
|
73
69
|
case 'add':
|
74
70
|
gtag()('event', 'add_to_cart', {
|
75
|
-
|
76
|
-
|
77
|
-
|
78
|
-
eventId
|
71
|
+
currency,
|
72
|
+
value: product.price.incVat,
|
73
|
+
items: [productItem]
|
79
74
|
});
|
80
75
|
break;
|
81
76
|
case 'remove':
|
82
77
|
gtag()('event', 'remove_from_cart', {
|
83
|
-
|
84
|
-
|
85
|
-
|
86
|
-
eventId
|
78
|
+
currency,
|
79
|
+
value: product.price.incVat,
|
80
|
+
items: [productItem]
|
87
81
|
});
|
88
82
|
break;
|
89
83
|
default:
|
@@ -91,54 +85,59 @@ export function ga4Tracker({ trackingId, additionalGtagTrackingIds = [], currenc
|
|
91
85
|
break;
|
92
86
|
}
|
93
87
|
},
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
|
98
|
-
|
99
|
-
|
100
|
-
|
101
|
-
|
102
|
-
|
88
|
+
// This event is disabled in GA4 so that the event fires on the Checkout Page instead using tag manager
|
89
|
+
// trackCartCheckout({ cart }, _context) {
|
90
|
+
// const items: GA4Item[] = cart.items.map((item) => ({
|
91
|
+
// ...productToItem(
|
92
|
+
// item.product as Product,
|
93
|
+
// item.variant,
|
94
|
+
// useArticleNumberAsId,
|
95
|
+
// brandCustomField
|
96
|
+
// ),
|
97
|
+
// quantity: item.quantity
|
98
|
+
// }));
|
99
|
+
// gtag()('event', 'begin_checkout', {
|
100
|
+
// currency: currency,
|
101
|
+
// value: cart.productTotal.incVat,
|
102
|
+
// items
|
103
|
+
// });
|
104
|
+
// },
|
105
|
+
trackPageView({ pathname, title }, _context) {
|
103
106
|
gtag()('event', 'page_view', {
|
104
107
|
currency,
|
105
108
|
page_path: pathname,
|
106
|
-
page_title: title
|
107
|
-
eventId
|
109
|
+
page_title: title
|
108
110
|
});
|
109
111
|
},
|
110
|
-
trackList({ listName, products }, _context
|
112
|
+
trackList({ listName, products, category }, _context) {
|
111
113
|
const items = products.map((product, i) => {
|
112
114
|
var _a;
|
113
115
|
return (Object.assign(Object.assign({}, productToItem(product, null, useArticleNumberAsId, brandCustomField)), { price: (_a = product.price) === null || _a === void 0 ? void 0 : _a.incVat, item_list_name: listName, index: i }));
|
114
116
|
});
|
115
117
|
gtag()('event', 'view_item_list', {
|
116
|
-
|
117
|
-
|
118
|
-
|
119
|
-
eventId
|
118
|
+
item_list_id: category,
|
119
|
+
item_list_name: listName,
|
120
|
+
items
|
120
121
|
});
|
121
122
|
},
|
122
|
-
trackExperiment({ id, variant }, _context
|
123
|
+
trackExperiment({ id, variant }, _context) {
|
123
124
|
gtag()('config', trackingId, {
|
124
|
-
experiments: [{ id, variant }]
|
125
|
-
eventId
|
125
|
+
experiments: [{ id, variant }]
|
126
126
|
});
|
127
127
|
},
|
128
|
-
trackUser({ userId }, _context
|
129
|
-
gtag()('event', 'authentication', { user_id: userId
|
128
|
+
trackUser({ userId }, _context) {
|
129
|
+
gtag()('event', 'authentication', { user_id: userId });
|
130
130
|
},
|
131
|
-
trackLogin(_props, _context
|
132
|
-
gtag()('event', 'login', { trackingId
|
131
|
+
trackLogin(_props, _context) {
|
132
|
+
gtag()('event', 'login', { trackingId });
|
133
133
|
},
|
134
|
-
trackRegister(_props, _context
|
135
|
-
gtag()('event', 'sign_up', { trackingId
|
134
|
+
trackRegister(_props, _context) {
|
135
|
+
gtag()('event', 'sign_up', { trackingId });
|
136
136
|
},
|
137
|
-
trackAddToWishList({ articleNumber, productName }, _context
|
137
|
+
trackAddToWishList({ articleNumber, productName }, _context) {
|
138
138
|
gtag()('event', 'add_to_wishlist', {
|
139
139
|
articleNumber,
|
140
|
-
productName
|
141
|
-
eventId
|
140
|
+
productName
|
142
141
|
});
|
143
142
|
}
|
144
143
|
};
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"ga4.js","sourceRoot":"","sources":["ga4.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,OAAO,EAAE,
|
1
|
+
{"version":3,"file":"ga4.js","sourceRoot":"","sources":["ga4.ts"],"names":[],"mappings":"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"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"unslugify.js","sourceRoot":"","sources":["unslugify.ts"],"names":[],"mappings":"AAAA,
|
1
|
+
{"version":3,"file":"unslugify.js","sourceRoot":"","sources":["unslugify.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,SAAS,CAAC,IAAa;IACrC,IAAI,IAAI,EAAE;QACR,IAAI,GAAG,IAAI;aACR,KAAK,CAAC,GAAG,CAAC;aACV,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACZ,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CACjE;aACA,IAAI,CAAC,GAAG,CAAC,CAAC;QACb,IAAI;YACF,GAAG;gBACH,IAAI;qBACD,KAAK,CAAC,GAAG,CAAC;qBACV,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACZ,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CACjE;qBACA,IAAI,CAAC,GAAG,CAAC,CAAC;KAChB;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}
|
@@ -3,7 +3,7 @@ import React, { useContext, useEffect } from 'react';
|
|
3
3
|
import AuthContext from './AuthContext';
|
4
4
|
import { withCookies } from 'react-cookie';
|
5
5
|
import { useLocation, useHistory } from 'react-router';
|
6
|
-
import ChannelContext from '
|
6
|
+
import ChannelContext from '@jetshop/core/components/ChannelContext';
|
7
7
|
import { useShopConfig } from '../../hooks/useShopConfig';
|
8
8
|
import { trackUserEvent } from '../../analytics/tracking';
|
9
9
|
import { useTracker } from '../../analytics/Analytics';
|
@@ -37,7 +37,7 @@ const AuthProvider = function AuthProvider(props) {
|
|
37
37
|
return;
|
38
38
|
if (loggedIn)
|
39
39
|
return;
|
40
|
-
const matches = pathsWithNoAuthRequired.filter(route => location.pathname.startsWith(route)).length > 0;
|
40
|
+
const matches = pathsWithNoAuthRequired.filter((route) => location.pathname.startsWith(route)).length > 0;
|
41
41
|
if (!matches) {
|
42
42
|
history.replace(loginPath);
|
43
43
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"AuthProvider.js","sourceRoot":"","sources":["AuthProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAErD,OAAO,WAAW,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAE3C,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,cAAc,MAAM,
|
1
|
+
{"version":3,"file":"AuthProvider.js","sourceRoot":"","sources":["AuthProvider.tsx"],"names":[],"mappings":"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"}
|
@@ -4,8 +4,8 @@ import { ChannelHandler } from '../../ChannelHandler/ChannelHandler';
|
|
4
4
|
import { createSelectedChannel } from '../../ChannelHandler/channelUtils';
|
5
5
|
import renderWithRouter from '../../test-utils/renderWithRouter';
|
6
6
|
import { channels } from '../../test-utils/variables';
|
7
|
-
import { ChannelProvider } from '
|
8
|
-
import { ConfigProvider } from '
|
7
|
+
import { ChannelProvider } from '@jetshop/core/components/ChannelContext';
|
8
|
+
import { ConfigProvider } from '@jetshop/core/components/ConfigProvider';
|
9
9
|
import AuthProvider from './AuthProvider';
|
10
10
|
|
11
11
|
describe('AuthProvider', () => {
|
@@ -1,5 +1,5 @@
|
|
1
1
|
import { useContext } from 'react';
|
2
|
-
import ChannelContext from '
|
2
|
+
import ChannelContext from '@jetshop/core/components/ChannelContext';
|
3
3
|
import { useQuery } from 'react-apollo';
|
4
4
|
import defaultCountrySettingsQuery from './CountrySettingsQuery.gql';
|
5
5
|
function useCountrySettings({ countrySettingsQuery } = {
|
@@ -11,7 +11,7 @@ function useCountrySettings({ countrySettingsQuery } = {
|
|
11
11
|
variables: { id: selectedChannel.id.toString() }
|
12
12
|
});
|
13
13
|
const { data, loading } = result;
|
14
|
-
const selectedCountrySettings = (_a = data === null || data === void 0 ? void 0 : data.channel) === null || _a === void 0 ? void 0 : _a.settings.countrySettings.find(countrySetting => {
|
14
|
+
const selectedCountrySettings = (_a = data === null || data === void 0 ? void 0 : data.channel) === null || _a === void 0 ? void 0 : _a.settings.countrySettings.find((countrySetting) => {
|
15
15
|
return countrySetting.countryCode === selectedChannel.country.code;
|
16
16
|
});
|
17
17
|
return {
|
@@ -1 +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,
|
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"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"ConfigProvider.js","sourceRoot":"","sources":["ConfigProvider.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAK,EAAE,EAAE,aAAa,EAAgB,MAAM,OAAO,CAAC;AAM3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;
|
1
|
+
{"version":3,"file":"ConfigProvider.js","sourceRoot":"","sources":["ConfigProvider.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAK,EAAE,EAAE,aAAa,EAAgB,MAAM,OAAO,CAAC;AAM3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAqG5D,MAAM,CAAC,MAAM,iBAAiB,GAAG,aAAa,CAC5C,SAAS,CACV,CAAC;AAEF,MAAM,UAAU,cAAc,CAAC,EAO9B;QAP8B,EAC7B,MAAM,EAAE,UAAU,EAClB,QAAQ,OAKT,EAJI,IAAI,cAHsB,sBAI9B,CADQ;IAKP,MAAM,MAAM,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAC;IAC5C,OAAO,CACL,oBAAC,iBAAiB,CAAC,QAAQ,kBAAC,KAAK,EAAE,MAAM,IAAM,IAAI,GAChD,QAAQ,CACkB,CAC9B,CAAC;AACJ,CAAC"}
|
@@ -4,9 +4,9 @@ import { selectedChannel, channels } from '@jetshop/core/test-utils/variables';
|
|
4
4
|
import { HelmetProvider } from 'react-helmet-async';
|
5
5
|
|
6
6
|
import { OpenGraphProductData, OpenGraphGeneralPageData } from './';
|
7
|
-
import { ChannelProvider } from '
|
7
|
+
import { ChannelProvider } from '@jetshop/core/components/ChannelContext';
|
8
8
|
import { ChannelHandler } from '../../ChannelHandler/ChannelHandler';
|
9
|
-
import { ConfigProvider } from '
|
9
|
+
import { ConfigProvider } from '@jetshop/core/components/ConfigProvider';
|
10
10
|
import mockShopConfig from '../../test-utils/mockShopConfig';
|
11
11
|
|
12
12
|
function getMetaProperty(propertyName) {
|
@@ -1,13 +1,13 @@
|
|
1
1
|
import React from 'react';
|
2
|
-
import ChannelContext from '
|
2
|
+
import ChannelContext from '@jetshop/core/components/ChannelContext';
|
3
3
|
import { Helmet } from 'react-helmet-async';
|
4
4
|
export const OpenGraphGeneralPageData = ({ data, route, optionalFields = [] }) => {
|
5
5
|
var _a, _b, _c, _d;
|
6
6
|
const { selectedChannel } = React.useContext(ChannelContext);
|
7
7
|
if (!data || data.__typename === 'Error')
|
8
8
|
return null;
|
9
|
-
const metaDescriptionTag = (_b = (_a = data.head) === null || _a === void 0 ? void 0 : _a.metaTags) === null || _b === void 0 ? void 0 : _b.filter(tag => tag.name === 'description')[0];
|
10
|
-
const overrides = optionalFields.map(tag => tag.property);
|
9
|
+
const metaDescriptionTag = (_b = (_a = data.head) === null || _a === void 0 ? void 0 : _a.metaTags) === null || _b === void 0 ? void 0 : _b.filter((tag) => tag.name === 'description')[0];
|
10
|
+
const overrides = optionalFields.map((tag) => tag.property);
|
11
11
|
const title = ((_c = data.head) === null || _c === void 0 ? void 0 : _c.title) ||
|
12
12
|
(data.__typename !== 'StartPage' && data.mainHeader) ||
|
13
13
|
data.name;
|
@@ -29,9 +29,9 @@ export const OpenGraphGeneralPageData = ({ data, route, optionalFields = [] }) =
|
|
29
29
|
? data.images[data.images.length - 1].url
|
30
30
|
: data.images[0].url)
|
31
31
|
}
|
32
|
-
].filter(tag => !overrides.includes(tag.property));
|
32
|
+
].filter((tag) => !overrides.includes(tag.property));
|
33
33
|
return (React.createElement(Helmet, null,
|
34
|
-
defaultTags.map(tag => tag.content && (React.createElement("meta", { key: `og-tag-${tag.property}`, property: tag.property, content: tag.content }))),
|
35
|
-
optionalFields.map(tag => (React.createElement("meta", { key: `og-tag-${tag.property}`, property: tag.property, content: tag.content })))));
|
34
|
+
defaultTags.map((tag) => tag.content && (React.createElement("meta", { key: `og-tag-${tag.property}`, property: tag.property, content: tag.content }))),
|
35
|
+
optionalFields.map((tag) => (React.createElement("meta", { key: `og-tag-${tag.property}`, property: tag.property, content: tag.content })))));
|
36
36
|
};
|
37
37
|
//# sourceMappingURL=OpenGraphGeneralPageData.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"OpenGraphGeneralPageData.js","sourceRoot":"","sources":["OpenGraphGeneralPageData.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,cAAc,MAAM,
|
1
|
+
{"version":3,"file":"OpenGraphGeneralPageData.js","sourceRoot":"","sources":["OpenGraphGeneralPageData.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,cAAc,MAAM,yCAAyC,CAAC;AACrE,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AA4B5C,MAAM,CAAC,MAAM,wBAAwB,GACnC,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,cAAc,GAAG,EAAE,EAAE,EAAE,EAAE;;IACvC,MAAM,EAAE,eAAe,EAAE,GAAG,KAAK,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;IAE7D,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,UAAU,KAAK,OAAO;QAAE,OAAO,IAAI,CAAC;IAEtD,MAAM,kBAAkB,GAAG,MAAA,MAAA,IAAI,CAAC,IAAI,0CAAE,QAAQ,0CAAE,MAAM,CACpD,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,aAAa,EACnC,CAAC,CAAC,CAAC;IAEL,MAAM,SAAS,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAE5D,MAAM,KAAK,GACT,CAAA,MAAA,IAAI,CAAC,IAAI,0CAAE,KAAK;QAChB,CAAC,IAAI,CAAC,UAAU,KAAK,WAAW,IAAI,IAAI,CAAC,UAAU,CAAC;QACpD,IAAI,CAAC,IAAI,CAAC;IAEZ,oEAAoE;IACpE,MAAM,WAAW,GAAuB;QACtC;YACE,QAAQ,EAAE,QAAQ;YAClB,OAAO,EACL,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,aAAa,KAAI,GAAG,eAAe,CAAC,GAAG,GAAG,KAAK,CAAC,aAAa,EAAE;SACzE;QACD,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,EAAE;QACxC;YACE,QAAQ,EAAE,gBAAgB;YAC1B,OAAO,EAAE,kBAAkB,aAAlB,kBAAkB,uBAAlB,kBAAkB,CAAE,OAAO;SACrC;QACD;YACE,QAAQ,EAAE,UAAU;YACpB,OAAO,EACL,CAAA,MAAA,IAAI,CAAC,MAAM,0CAAE,MAAM,IAAG,CAAC;gBACvB,CAAC,IAAI,CAAC,UAAU,KAAK,SAAS;oBAC5B,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,GAAG;oBACzC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;SAC1B;KACF,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC;IAErD,OAAO,CACL,oBAAC,MAAM;QACJ,WAAW,CAAC,GAAG,CACd,CAAC,GAAG,EAAE,EAAE,CACN,GAAG,CAAC,OAAO,IAAI,CACb,8BACE,GAAG,EAAE,UAAU,GAAG,CAAC,QAAQ,EAAE,EAC7B,QAAQ,EAAE,GAAG,CAAC,QAAQ,EACtB,OAAO,EAAE,GAAG,CAAC,OAAO,GACpB,CACH,CACJ;QACA,cAAc,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAC3B,8BACE,GAAG,EAAE,UAAU,GAAG,CAAC,QAAQ,EAAE,EAC7B,QAAQ,EAAE,GAAG,CAAC,QAAQ,EACtB,OAAO,EAAE,GAAG,CAAC,OAAO,GACpB,CACH,CAAC,CACK,CACV,CAAC;AACJ,CAAC,CAAC"}
|
@@ -1,7 +1,7 @@
|
|
1
1
|
import React from 'react';
|
2
2
|
import { useProductVariants } from '../../hooks/useProductVariants';
|
3
3
|
import { useShopConfig } from '@jetshop/core/hooks/useShopConfig';
|
4
|
-
import ChannelContext from '
|
4
|
+
import ChannelContext from '@jetshop/core/components/ChannelContext';
|
5
5
|
import { Helmet } from 'react-helmet-async';
|
6
6
|
/**
|
7
7
|
* Get the brand field from a product's customFields.
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"OpenGraphProductData.js","sourceRoot":"","sources":["OpenGraphProductData.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,cAAc,MAAM,
|
1
|
+
{"version":3,"file":"OpenGraphProductData.js","sourceRoot":"","sources":["OpenGraphProductData.tsx"],"names":[],"mappings":"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"}
|
@@ -3,7 +3,7 @@ import { render, cleanup, act } from '@testing-library/react';
|
|
3
3
|
import { StaticRouter, MemoryRouter, Route } from 'react-router';
|
4
4
|
import { CookiesProvider } from 'react-cookie';
|
5
5
|
import PaginationProvider, { usePagination } from './PaginationProvider';
|
6
|
-
import PaginationContext from '
|
6
|
+
import PaginationContext from '@jetshop/core/components/Pagination/PaginationContext';
|
7
7
|
import Cookies from 'universal-cookie';
|
8
8
|
|
9
9
|
jest.mock('../../helpers/logWarningInDev');
|
@@ -17,7 +17,7 @@ describe('PaginationProvider', () => {
|
|
17
17
|
location,
|
18
18
|
routerProps,
|
19
19
|
Router = StaticRouter,
|
20
|
-
cookies = new Cookies({})
|
20
|
+
cookies = new Cookies({})
|
21
21
|
}) {
|
22
22
|
return render(
|
23
23
|
<CookiesProvider cookies={cookies}>
|
@@ -42,7 +42,7 @@ describe('PaginationProvider', () => {
|
|
42
42
|
beforeEach(() => {
|
43
43
|
// Workaround changes in universal-cookie
|
44
44
|
Object.defineProperty(document, 'cookie', {
|
45
|
-
value: null
|
45
|
+
value: null
|
46
46
|
});
|
47
47
|
});
|
48
48
|
|
@@ -52,7 +52,7 @@ describe('PaginationProvider', () => {
|
|
52
52
|
setup({
|
53
53
|
collect: ({ currentPage }) => {
|
54
54
|
page = currentPage;
|
55
|
-
}
|
55
|
+
}
|
56
56
|
});
|
57
57
|
|
58
58
|
expect(page).toBe(1);
|
@@ -63,7 +63,7 @@ describe('PaginationProvider', () => {
|
|
63
63
|
setup({
|
64
64
|
collect: ({ perPage: contextPerPage }) => {
|
65
65
|
perPage = contextPerPage;
|
66
|
-
}
|
66
|
+
}
|
67
67
|
});
|
68
68
|
|
69
69
|
expect(perPage).toBe(16);
|
@@ -76,8 +76,8 @@ describe('PaginationProvider', () => {
|
|
76
76
|
page = currentPage;
|
77
77
|
},
|
78
78
|
location: {
|
79
|
-
search: '?page=2'
|
80
|
-
}
|
79
|
+
search: '?page=2'
|
80
|
+
}
|
81
81
|
});
|
82
82
|
|
83
83
|
expect(page).toBe(2);
|
@@ -87,8 +87,8 @@ describe('PaginationProvider', () => {
|
|
87
87
|
page = currentPage;
|
88
88
|
},
|
89
89
|
location: {
|
90
|
-
search: '?page=11'
|
91
|
-
}
|
90
|
+
search: '?page=11'
|
91
|
+
}
|
92
92
|
});
|
93
93
|
|
94
94
|
expect(page).toBe(11);
|
@@ -100,7 +100,7 @@ describe('PaginationProvider', () => {
|
|
100
100
|
collect: ({ perPage: contextPerPage }) => {
|
101
101
|
perPage = contextPerPage;
|
102
102
|
},
|
103
|
-
perPage: 4
|
103
|
+
perPage: 4
|
104
104
|
});
|
105
105
|
|
106
106
|
expect(perPage).toBe(4);
|
@@ -111,7 +111,7 @@ describe('PaginationProvider', () => {
|
|
111
111
|
setup({
|
112
112
|
collect: (context) => {
|
113
113
|
offset = context.offset;
|
114
|
-
}
|
114
|
+
}
|
115
115
|
});
|
116
116
|
|
117
117
|
expect(offset).toBe(0);
|
@@ -122,8 +122,8 @@ describe('PaginationProvider', () => {
|
|
122
122
|
},
|
123
123
|
perPage: 12,
|
124
124
|
location: {
|
125
|
-
search: '?page=2'
|
126
|
-
}
|
125
|
+
search: '?page=2'
|
126
|
+
}
|
127
127
|
});
|
128
128
|
|
129
129
|
expect(offset).toBe(12);
|
@@ -134,8 +134,8 @@ describe('PaginationProvider', () => {
|
|
134
134
|
},
|
135
135
|
perPage: 20,
|
136
136
|
location: {
|
137
|
-
search: '?page=4'
|
138
|
-
}
|
137
|
+
search: '?page=4'
|
138
|
+
}
|
139
139
|
});
|
140
140
|
|
141
141
|
expect(offset).toBe(60);
|
@@ -148,7 +148,7 @@ describe('PaginationProvider', () => {
|
|
148
148
|
collect: (context) => {
|
149
149
|
currentPage = context.currentPage;
|
150
150
|
goToPage = context.goToPage;
|
151
|
-
}
|
151
|
+
}
|
152
152
|
});
|
153
153
|
|
154
154
|
expect(currentPage).toBe(1);
|
@@ -172,10 +172,10 @@ describe('PaginationProvider', () => {
|
|
172
172
|
routerProps: {
|
173
173
|
initialEntries: [
|
174
174
|
{
|
175
|
-
search: '?page=1'
|
176
|
-
}
|
177
|
-
]
|
178
|
-
}
|
175
|
+
search: '?page=1'
|
176
|
+
}
|
177
|
+
]
|
178
|
+
}
|
179
179
|
});
|
180
180
|
|
181
181
|
expect(currentLocation.search).toBe('?page=1');
|
@@ -194,8 +194,8 @@ describe('PaginationProvider', () => {
|
|
194
194
|
perPage = context.perPage;
|
195
195
|
},
|
196
196
|
cookies: new Cookies({
|
197
|
-
perPage: 4
|
198
|
-
})
|
197
|
+
perPage: 4
|
198
|
+
})
|
199
199
|
});
|
200
200
|
|
201
201
|
expect(perPage).toBe(4);
|
@@ -211,7 +211,7 @@ describe('PaginationProvider', () => {
|
|
211
211
|
perPage = context.perPage;
|
212
212
|
setProductsPerPage = context.setProductsPerPage;
|
213
213
|
},
|
214
|
-
cookies
|
214
|
+
cookies
|
215
215
|
});
|
216
216
|
|
217
217
|
expect(perPage).toBe(16);
|
@@ -236,17 +236,17 @@ describe('PaginationProvider', () => {
|
|
236
236
|
routerProps: {
|
237
237
|
initialEntries: [
|
238
238
|
{
|
239
|
-
search: '?page=5'
|
240
|
-
}
|
241
|
-
]
|
242
|
-
}
|
239
|
+
search: '?page=5'
|
240
|
+
}
|
241
|
+
]
|
242
|
+
}
|
243
243
|
});
|
244
244
|
|
245
245
|
expect(currentPage).toBe(5);
|
246
246
|
|
247
247
|
act(() => {
|
248
248
|
history.push({
|
249
|
-
search: ''
|
249
|
+
search: ''
|
250
250
|
});
|
251
251
|
});
|
252
252
|
|
@@ -261,7 +261,7 @@ describe('usePagination', () => {
|
|
261
261
|
perPage: null,
|
262
262
|
offset: null,
|
263
263
|
goToPage: () => {},
|
264
|
-
setProductsPerPage: () => {}
|
264
|
+
setProductsPerPage: () => {}
|
265
265
|
};
|
266
266
|
|
267
267
|
let result = null;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"SortOrderContainer.js","sourceRoot":"","sources":["SortOrderContainer.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAuB,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEnE,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,gBAGN,MAAM,qDAAqD,CAAC;AAC7D,OAAO,CAAC,MAAM,eAAe,CAAC;AAC9B,OAAO,EAAE,WAAW,EAAE,MAAM,sDAAsD,CAAC;AAMnF,qDAAqD;AACrD,MAAM,CAAC,MAAM,SAAS,GAA8B;IAClD,IAAI,EAAE,QAAQ;IACd,cAAc,EAAE,QAAQ;IACxB,YAAY,EAAE,MAAM;IACpB,KAAK,EAAE,QAAQ;IACf,WAAW,EAAE,QAAQ;IACrB,UAAU,EAAE,QAAQ;IACpB,MAAM,EAAE,QAAQ;CACjB,CAAC;AAEF,MAAM,CAAC,MAAM,UAAU,GAKnB;IACF,MAAM,EAAE;QACN;YACE,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC;YACjB,SAAS,EAAE,WAAW;SACvB;QACD;YACE,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC;YACjB,SAAS,EAAE,YAAY;SACxB;KACF;IACD,MAAM,EAAE;QACN;YACE,IAAI,EAAE,CAAC,CAAC,aAAa,CAAC;YACtB,SAAS,EAAE,WAAW;SACvB;QACD;YACE,IAAI,EAAE,CAAC,CAAC,aAAa,CAAC;YACtB,SAAS,EAAE,YAAY;SACxB;KACF;IACD,IAAI,EAAE;QACJ;YACE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC;YACX,SAAS,EAAE,YAAY;SACxB;KACF;IACD,MAAM,EAAE;QACN;YACE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC;YACX,SAAS,EAAE,
|
1
|
+
{"version":3,"file":"SortOrderContainer.js","sourceRoot":"","sources":["SortOrderContainer.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAuB,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEnE,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,gBAGN,MAAM,qDAAqD,CAAC;AAC7D,OAAO,CAAC,MAAM,eAAe,CAAC;AAC9B,OAAO,EAAE,WAAW,EAAE,MAAM,sDAAsD,CAAC;AAMnF,qDAAqD;AACrD,MAAM,CAAC,MAAM,SAAS,GAA8B;IAClD,IAAI,EAAE,QAAQ;IACd,cAAc,EAAE,QAAQ;IACxB,YAAY,EAAE,MAAM;IACpB,KAAK,EAAE,QAAQ;IACf,WAAW,EAAE,QAAQ;IACrB,UAAU,EAAE,QAAQ;IACpB,MAAM,EAAE,QAAQ;CACjB,CAAC;AAEF,MAAM,CAAC,MAAM,UAAU,GAKnB;IACF,MAAM,EAAE;QACN;YACE,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC;YACjB,SAAS,EAAE,WAAW;SACvB;QACD;YACE,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC;YACjB,SAAS,EAAE,YAAY;SACxB;KACF;IACD,MAAM,EAAE;QACN;YACE,IAAI,EAAE,CAAC,CAAC,aAAa,CAAC;YACtB,SAAS,EAAE,WAAW;SACvB;QACD;YACE,IAAI,EAAE,CAAC,CAAC,aAAa,CAAC;YACtB,SAAS,EAAE,YAAY;SACxB;KACF;IACD,IAAI,EAAE;QACJ;YACE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC;YACX,SAAS,EAAE,YAAY;SACxB;KACF;IACD,MAAM,EAAE;QACN;YACE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC;YACX,SAAS,EAAE,WAAW;SACvB;KACF;CACF,CAAC;AAEF,MAAM,UAAU,2BAA2B,CAAC,MAA0B;IACpE,MAAM,YAAY,GAAG,EAAE,CAAC,KAAK,CAAC,MAAM,EAAE;QACpC,iBAAiB,EAAE,IAAI;KACxB,CAAC,CAAC;IAEH,IAAI,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;QACjD,OAAO;YACL,SAAS,EAAE,YAAY,CAAC,OAAO;YAC/B,SAAS,EAAE,YAAY,CAAC,SAAS;SAClC,CAAC;KACH;AACH,CAAC;AASD,MAAM,UAAU,sBAAsB,CAAC,EACrC,KAAK,EACL,SAAS,EACT,OAAO,EACP,QAAQ,EACQ;IAChB,MAAM,aAAa,GACjB,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,IAAI,EAAE,CAAC;IACtE,MAAM,SAAS,mCAAQ,aAAa,KAAE,OAAO,EAAE,KAAK,EAAE,SAAS,GAAE,CAAC;IAElE,WAAW,CAAC;QACV,OAAO;QACP,QAAQ,EAAE,QAAQ,CAAC,QAAQ;QAC3B,IAAI,EAAE,QAAQ,CAAC,IAAI;QACnB,MAAM,EAAE,SAAS;QACjB,SAAS,EAAE,IAAI;QACf,SAAS,EAAE,iBAAiB;KAC7B,CAAC,CAAC;AACL,CAAC;AAED,MAAM,kBAAmB,SAAQ,KAAK,CAAC,SAGtC;IAGC,YAAY,KAA8B;QACxC,KAAK,CAAC,KAAK,CAAC,CAAC;QAiBf,aAAQ,GAAG,CAAC,KAAa,EAAE,SAAoB,EAAE,EAAE;YACjD,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YACzC,sBAAsB,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;YAChE,IAAI,CAAC,QAAQ,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;YAC/C,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;QArBA,IAAI,CAAC,KAAK,GAAG;YACX,SAAS,EAAE,IAAI;YACf,SAAS,EAAE,YAAY;YACvB,eAAe,EAAE,IAAI,CAAC,QAAQ;SAC/B,CAAC;IACJ,CAAC;IAED,iBAAiB;QACf,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE;YAC9B,MAAM,SAAS,GAAG,2BAA2B,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YAC1E,IAAI,SAAS,EAAE;gBACb,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;aAC1B;SACF;IACH,CAAC;IASM,MAAM;QACX,OAAO,CACL,oBAAC,gBAAgB,CAAC,QAAQ,IAAC,KAAK,EAAE,IAAI,CAAC,KAAK,IACzC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CACN,CAC7B,CAAC;IACJ,CAAC;CACF;AAED,eAAe,UAAU,CAAC,kBAAkB,CAAC,CAAC"}
|
@@ -4,9 +4,9 @@ import { StaticRouter } from 'react-router';
|
|
4
4
|
import { CookiesProvider } from 'react-cookie';
|
5
5
|
import Cookies from 'universal-cookie';
|
6
6
|
import ExperimentsProvider, { ExperimentsContext } from './ExperimentsProvider';
|
7
|
-
import AnalyticsProvider from '
|
8
|
-
import { ConfigProvider } from '
|
9
|
-
import { ChannelProvider } from '
|
7
|
+
import AnalyticsProvider from '@jetshop/core/analytics/AnalyticsProvider';
|
8
|
+
import { ConfigProvider } from '@jetshop/core/components/ConfigProvider';
|
9
|
+
import { ChannelProvider } from '@jetshop/core/components/ChannelContext';
|
10
10
|
import { ChannelHandler } from '../ChannelHandler/ChannelHandler';
|
11
11
|
import { selectedChannel, channels } from '../test-utils/variables';
|
12
12
|
import { HelmetProvider } from 'react-helmet-async';
|
@@ -23,7 +23,7 @@ const setup = ({ cookies, shopConfig = {} }) => {
|
|
23
23
|
let data;
|
24
24
|
const channelHandler = new ChannelHandler({
|
25
25
|
selectedChannel,
|
26
|
-
channels
|
26
|
+
channels
|
27
27
|
});
|
28
28
|
|
29
29
|
render(
|
@@ -45,7 +45,7 @@ const setup = ({ cookies, shopConfig = {} }) => {
|
|
45
45
|
);
|
46
46
|
|
47
47
|
return {
|
48
|
-
data
|
48
|
+
data
|
49
49
|
};
|
50
50
|
};
|
51
51
|
|
@@ -53,13 +53,13 @@ describe('ExperimentsProvider', () => {
|
|
53
53
|
beforeEach(() => {
|
54
54
|
// Workaround changes in universal-cookie
|
55
55
|
Object.defineProperty(document, 'cookie', {
|
56
|
-
value: null
|
56
|
+
value: null
|
57
57
|
});
|
58
58
|
});
|
59
59
|
|
60
60
|
it('reads the current experiment and value from the optimizeExperiment cookie', () => {
|
61
61
|
const cookies = new Cookies({
|
62
|
-
optimizeExperiment: 'test.0'
|
62
|
+
optimizeExperiment: 'test.0'
|
63
63
|
});
|
64
64
|
|
65
65
|
const { data } = setup({ cookies });
|
@@ -78,16 +78,16 @@ describe('ExperimentsProvider', () => {
|
|
78
78
|
const trackExperiment = jest.fn();
|
79
79
|
|
80
80
|
const cookies = new Cookies({
|
81
|
-
optimizeExperiment: 'test.0'
|
81
|
+
optimizeExperiment: 'test.0'
|
82
82
|
});
|
83
83
|
|
84
84
|
const shopConfig = {
|
85
85
|
trackers: [
|
86
86
|
{
|
87
87
|
name: 'test',
|
88
|
-
trackExperiment
|
89
|
-
}
|
90
|
-
]
|
88
|
+
trackExperiment
|
89
|
+
}
|
90
|
+
]
|
91
91
|
};
|
92
92
|
|
93
93
|
setup({ cookies, shopConfig });
|
@@ -96,7 +96,7 @@ describe('ExperimentsProvider', () => {
|
|
96
96
|
expect(trackExperiment).toHaveBeenCalledWith(
|
97
97
|
{
|
98
98
|
id: 'test',
|
99
|
-
variant: 0
|
99
|
+
variant: 0
|
100
100
|
},
|
101
101
|
expect.anything(),
|
102
102
|
expect.anything()
|
@@ -5,9 +5,9 @@ import { StaticRouter } from 'react-router';
|
|
5
5
|
import { CookiesProvider } from 'react-cookie';
|
6
6
|
import Cookies from 'universal-cookie';
|
7
7
|
import ExperimentsProvider from './ExperimentsProvider';
|
8
|
-
import AnalyticsProvider from '
|
9
|
-
import { ConfigProvider } from '
|
10
|
-
import { ChannelProvider } from '
|
8
|
+
import AnalyticsProvider from '@jetshop/core//analytics/AnalyticsProvider';
|
9
|
+
import { ConfigProvider } from '@jetshop/core/components/ConfigProvider';
|
10
|
+
import { ChannelProvider } from '@jetshop/core/components/ChannelContext';
|
11
11
|
import { ChannelHandler } from '../ChannelHandler/ChannelHandler';
|
12
12
|
import { channels, selectedChannel } from '../test-utils/variables';
|
13
13
|
import { HelmetProvider } from 'react-helmet-async';
|
@@ -29,7 +29,7 @@ const Experiment = () => {
|
|
29
29
|
const setup = ({ cookies }) => {
|
30
30
|
const channelHandler = new ChannelHandler({
|
31
31
|
channels,
|
32
|
-
selectedChannel
|
32
|
+
selectedChannel
|
33
33
|
});
|
34
34
|
return render(
|
35
35
|
<StaticRouter>
|
@@ -55,7 +55,7 @@ describe('experiments', () => {
|
|
55
55
|
beforeEach(() => {
|
56
56
|
// Workaround changes in universal-cookie
|
57
57
|
Object.defineProperty(document, 'cookie', {
|
58
|
-
value: null
|
58
|
+
value: null
|
59
59
|
});
|
60
60
|
});
|
61
61
|
|
@@ -67,7 +67,7 @@ describe('experiments', () => {
|
|
67
67
|
|
68
68
|
it('renders a specific variant if that variant was selected', () => {
|
69
69
|
const cookies = new Cookies({
|
70
|
-
optimizeExperiment: 'test.2'
|
70
|
+
optimizeExperiment: 'test.2'
|
71
71
|
});
|
72
72
|
const { getByText } = setup({ cookies });
|
73
73
|
expect(getByText('Second')).toBeTruthy();
|
@@ -5,9 +5,9 @@ import { StaticRouter } from 'react-router';
|
|
5
5
|
import { CookiesProvider } from 'react-cookie';
|
6
6
|
import Cookies from 'universal-cookie';
|
7
7
|
import ExperimentsProvider from './ExperimentsProvider';
|
8
|
-
import AnalyticsProvider from '
|
9
|
-
import { ConfigProvider } from '
|
10
|
-
import { ChannelProvider } from '
|
8
|
+
import AnalyticsProvider from '@jetshop/core/analytics/AnalyticsProvider';
|
9
|
+
import { ConfigProvider } from '@jetshop/core/components/ConfigProvider';
|
10
|
+
import { ChannelProvider } from '@jetshop/core/components/ChannelContext';
|
11
11
|
import { ChannelHandler } from '../ChannelHandler/ChannelHandler';
|
12
12
|
import { selectedChannel, channels } from '../test-utils/variables';
|
13
13
|
import { HelmetProvider } from 'react-helmet-async';
|
@@ -22,7 +22,7 @@ const Collector = ({ report, id, variant }) => {
|
|
22
22
|
const setup = ({ report, id, variant, cookies }) => {
|
23
23
|
const channelHandler = new ChannelHandler({
|
24
24
|
selectedChannel,
|
25
|
-
channels
|
25
|
+
channels
|
26
26
|
});
|
27
27
|
return render(
|
28
28
|
<StaticRouter>
|
@@ -47,7 +47,7 @@ describe('useExperiment', () => {
|
|
47
47
|
beforeEach(() => {
|
48
48
|
// Workaround changes in universal-cookie
|
49
49
|
Object.defineProperty(document, 'cookie', {
|
50
|
-
value: null
|
50
|
+
value: null
|
51
51
|
});
|
52
52
|
});
|
53
53
|
|
@@ -59,7 +59,7 @@ describe('useExperiment', () => {
|
|
59
59
|
cookies,
|
60
60
|
report,
|
61
61
|
id: null,
|
62
|
-
variant: null
|
62
|
+
variant: null
|
63
63
|
});
|
64
64
|
|
65
65
|
expect(report).toHaveBeenCalledTimes(1);
|
@@ -68,14 +68,14 @@ describe('useExperiment', () => {
|
|
68
68
|
|
69
69
|
it('returns false if cookie does not match provided experiment and variant', () => {
|
70
70
|
const cookies = new Cookies({
|
71
|
-
optimizeExperiment: 'test.0'
|
71
|
+
optimizeExperiment: 'test.0'
|
72
72
|
});
|
73
73
|
const report = jest.fn();
|
74
74
|
setup({
|
75
75
|
cookies,
|
76
76
|
report,
|
77
77
|
id: 'test',
|
78
|
-
variant: 1
|
78
|
+
variant: 1
|
79
79
|
});
|
80
80
|
|
81
81
|
expect(report).toHaveBeenCalledTimes(1);
|
@@ -84,14 +84,14 @@ describe('useExperiment', () => {
|
|
84
84
|
|
85
85
|
it('returns true if cookie matches provided experiment and variant', () => {
|
86
86
|
const cookies = new Cookies({
|
87
|
-
optimizeExperiment: 'test.0'
|
87
|
+
optimizeExperiment: 'test.0'
|
88
88
|
});
|
89
89
|
const report = jest.fn();
|
90
90
|
setup({
|
91
91
|
cookies,
|
92
92
|
report,
|
93
93
|
id: 'test',
|
94
|
-
variant: 0
|
94
|
+
variant: 0
|
95
95
|
});
|
96
96
|
|
97
97
|
expect(report).toHaveBeenCalledTimes(1);
|
@@ -1,5 +1,5 @@
|
|
1
1
|
import { useContext } from 'react';
|
2
|
-
import ChannelContext from '
|
2
|
+
import ChannelContext from '@jetshop/core/components/ChannelContext';
|
3
3
|
export function useChannelSettings() {
|
4
4
|
const context = useContext(ChannelContext);
|
5
5
|
const selectedChannelSettings = Object.assign({}, context.selectedChannel.settings);
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"useChannelSettings.js","sourceRoot":"","sources":["useChannelSettings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AACnC,OAAO,cAAc,MAAM,
|
1
|
+
{"version":3,"file":"useChannelSettings.js","sourceRoot":"","sources":["useChannelSettings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AACnC,OAAO,cAAc,MAAM,yCAAyC,CAAC;AAErE,MAAM,UAAU,kBAAkB;IAChC,MAAM,OAAO,GAAG,UAAU,CAAC,cAAc,CAAC,CAAC;IAE3C,MAAM,uBAAuB,qBAAQ,OAAO,CAAC,eAAe,CAAC,QAAQ,CAAE,CAAC;IAExE,yBAAyB;IACzB,IAAI,OAAO,uBAAuB,CAAC,YAAY,KAAK,WAAW,EAAE;QAC/D,uBAAuB,CAAC,YAAY,GAAG,IAAI,CAAC;KAC7C;IAED,OAAO,uBAAuB,CAAC;AACjC,CAAC"}
|
@@ -1,7 +1,7 @@
|
|
1
1
|
import React from 'react';
|
2
2
|
import { useChannelSettings } from './useChannelSettings';
|
3
3
|
import { renderHook } from '@testing-library/react-hooks';
|
4
|
-
import { ProviderPyramid } from 'ProviderPyramid';
|
4
|
+
import { ProviderPyramid } from '@jetshop/core/test-utils/ProviderPyramid';
|
5
5
|
import { selectedChannel } from 'variables';
|
6
6
|
|
7
7
|
describe('useChannelSettings', () => {
|
package/hooks/usePrice.test.js
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
import { selectPriceType, usePrice } from './usePrice';
|
2
2
|
import { render } from '@testing-library/react';
|
3
|
-
import ChannelContext from '
|
3
|
+
import ChannelContext from '@jetshop/core/components/ChannelContext';
|
4
4
|
import React from 'react';
|
5
5
|
|
6
6
|
describe('selectPriceType', () => {
|
@@ -67,7 +67,7 @@ describe('usePrice', () => {
|
|
67
67
|
it('renders using a custom formatter if provided', () => {
|
68
68
|
const { getByText } = setup({
|
69
69
|
...defaultOpts,
|
70
|
-
formatter: price => (
|
70
|
+
formatter: (price) => (
|
71
71
|
<div>
|
72
72
|
<span>{price}</span>
|
73
73
|
<span>hi</span>
|
package/hooks/useShopConfig.d.ts
CHANGED
@@ -1 +1 @@
|
|
1
|
-
export declare function useShopConfig(): import("
|
1
|
+
export declare function useShopConfig(): import("@jetshop/core/components/ConfigProvider").BootOptions;
|
package/hooks/useShopConfig.js
CHANGED
@@ -1,5 +1,5 @@
|
|
1
1
|
import { useContext, useMemo } from 'react';
|
2
|
-
import { ShopConfigContext } from '
|
2
|
+
import { ShopConfigContext } from '@jetshop/core/components/ConfigProvider';
|
3
3
|
import throwErrorInDev from '../helpers/throwErrorInDev';
|
4
4
|
export function useShopConfig() {
|
5
5
|
const config = useContext(ShopConfigContext);
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"useShopConfig.js","sourceRoot":"","sources":["useShopConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,
|
1
|
+
{"version":3,"file":"useShopConfig.js","sourceRoot":"","sources":["useShopConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAC5E,OAAO,eAAe,MAAM,4BAA4B,CAAC;AAEzD,MAAM,UAAU,aAAa;IAC3B,MAAM,MAAM,GAAG,UAAU,CAAC,iBAAiB,CAAC,CAAC;IAE7C,IAAI,CAAC,MAAM,EAAE;QACX,eAAe,CACb,IAAI,EACJ,iEAAiE,CAClE,CAAC;KACH;IAED,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;AACzC,CAAC"}
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@jetshop/core",
|
3
|
-
"version": "5.13.
|
3
|
+
"version": "5.13.3",
|
4
4
|
"license": "MIT",
|
5
5
|
"files": [
|
6
6
|
"**/*.js",
|
@@ -44,7 +44,7 @@
|
|
44
44
|
"@sentry/node": "^6.15.0",
|
45
45
|
"@tanem/react-nprogress": "^1.1.0",
|
46
46
|
"@types/accept-language-parser": "^1.5.1",
|
47
|
-
"@types/gtag.js": "^0.0.
|
47
|
+
"@types/gtag.js": "^0.0.10",
|
48
48
|
"@types/loadable__component": "^5.10.0",
|
49
49
|
"@types/loadable__server": "^5.9.1",
|
50
50
|
"@types/react-router-dom": "^5.1.8",
|
@@ -1,14 +1,14 @@
|
|
1
1
|
import React from 'react';
|
2
2
|
import { StaticRouter } from 'react-router-dom';
|
3
3
|
import { HelmetProvider } from 'react-helmet-async';
|
4
|
-
import { ChannelProvider } from '
|
5
|
-
import { ConfigProvider } from '
|
6
|
-
import AnalyticsProvider from '
|
4
|
+
import { ChannelProvider } from '@jetshop/core/components/ChannelContext';
|
5
|
+
import { ConfigProvider } from '@jetshop/core/components/ConfigProvider';
|
6
|
+
import AnalyticsProvider from '@jetshop/core/analytics/AnalyticsProvider';
|
7
7
|
import { ChannelHandler } from '../ChannelHandler/ChannelHandler';
|
8
8
|
import {
|
9
9
|
selectedChannel as defaultSelectedChannel,
|
10
10
|
channels as defaultChannels
|
11
|
-
} from 'variables';
|
11
|
+
} from './variables';
|
12
12
|
import { MockedProvider } from '@apollo/react-testing';
|
13
13
|
import { CartIdProvider } from '../components/Cart/CartIdContext';
|
14
14
|
import mockShopConfig from './mockShopConfig';
|