@jetshop/core 5.8.2 → 5.10.0
Sign up to get free protection for your applications and to get access to all the features.
- package/ChannelHandler/ChannelHandler.js +32 -27
- package/ChannelHandler/ChannelHandler.js.map +1 -1
- package/analytics/AnalyticsProvider.js +11 -3
- package/analytics/AnalyticsProvider.js.map +1 -1
- package/analytics/integrations/ga4.d.ts +2 -1
- package/analytics/integrations/ga4.js +16 -9
- package/analytics/integrations/ga4.js.map +1 -1
- package/analytics/integrations/gtag/gtag.d.ts +2 -1
- package/analytics/integrations/gtag/gtag.js +20 -10
- package/analytics/integrations/gtag/gtag.js.map +1 -1
- package/analytics/integrations/gtm/index.d.ts +10 -1
- package/analytics/integrations/gtm/index.js +175 -2
- package/analytics/integrations/gtm/index.js.map +1 -1
- package/analytics/trackerRegistry.d.ts +2 -1
- package/analytics/trackerRegistry.js +22 -50
- package/analytics/trackerRegistry.js.map +1 -1
- package/boot/apollo.d.ts +0 -1
- package/boot/apollo.js +9 -5
- package/boot/apollo.js.map +1 -1
- package/boot/client/startClient.js +2 -6
- package/boot/client/startClient.js.map +1 -1
- package/boot/server/createRenderer.js +2 -2
- package/boot/server/createRenderer.js.map +1 -1
- package/cart/useAddToCart.d.ts +2 -2
- package/cart/useAddToCart.js +13 -12
- package/cart/useAddToCart.js.map +1 -1
- package/ci/.gitlab-ci.yml +1 -1
- package/components/Auth/CustomerUpdateForm.js +5 -2
- package/components/Auth/CustomerUpdateForm.js.map +1 -1
- package/components/Cart/CartIdContext.js +18 -18
- package/components/Cart/CartIdContext.js.map +1 -1
- package/components/ConfigProvider.d.ts +1 -0
- package/components/ConfigProvider.js.map +1 -1
- package/components/DynamicRoute/ContentRoute.d.ts +1 -1
- package/components/DynamicRoute/ProductRoute.d.ts +1 -0
- package/components/DynamicRoute/ProductRoute.js +4 -2
- package/components/DynamicRoute/ProductRoute.js.map +1 -1
- package/components/DynamicRoute/RouteResolver.js +4 -2
- package/components/DynamicRoute/RouteResolver.js.map +1 -1
- package/components/Mutation/AddToCart/addToCartUtils.js +3 -2
- package/components/Mutation/AddToCart/addToCartUtils.js.map +1 -1
- package/components/Mutation/RemoveFromCart.d.ts +1 -1
- package/components/OpenGraph/OpenGraph.test.js +32 -5
- package/components/OpenGraph/OpenGraphProductData.d.ts +6 -1
- package/components/OpenGraph/OpenGraphProductData.js +18 -12
- package/components/OpenGraph/OpenGraphProductData.js.map +1 -1
- package/components/Query/CartProvider.js +3 -3
- package/components/Query/CartProvider.js.map +1 -1
- package/hooks/PackageProducts/packagePriceQuery.gql +1 -1
- package/hooks/ProductList/action-creators.js +15 -15
- package/hooks/ProductList/action-creators.js.map +1 -1
- package/hooks/ProductList/list-transforms.d.ts +1 -0
- package/hooks/ProductList/useProductList.d.ts +3 -3
- package/hooks/ProductList/useProductList.js +10 -10
- package/hooks/ProductList/useProductList.js.map +1 -1
- package/hooks/useInfinitePagination.js +2 -2
- package/hooks/useInfinitePagination.js.map +1 -1
- package/hooks/useRoutePreload.js +2 -2
- package/hooks/useRoutePreload.js.map +1 -1
- package/package.json +5 -5
- package/sentry/client.js +9 -4
- package/sentry/client.js.map +1 -1
- package/sentry/common.d.ts +1 -0
- package/sentry/common.js +5 -0
- package/sentry/common.js.map +1 -0
- package/sentry/server.js +11 -2
- package/sentry/server.js.map +1 -1
- package/server/tracking/facebook.js +12 -5
- package/server/tracking/facebook.js.map +1 -1
- package/server/tracking/middleware.js +1 -1
- package/server/tracking/middleware.js.map +1 -1
- package/server/tracking/types.d.ts +1 -0
- package/types.d.ts +37 -12
|
@@ -1,5 +1,57 @@
|
|
|
1
1
|
import { injectScript } from '../../utils/script';
|
|
2
|
-
|
|
2
|
+
import { getBrand } from '@jetshop/core/components/OpenGraph/OpenGraphProductData';
|
|
3
|
+
function push(event) {
|
|
4
|
+
if (window.dataLayer) {
|
|
5
|
+
if (event.ecommerce) {
|
|
6
|
+
window.dataLayer.push({ ecommerce: null });
|
|
7
|
+
}
|
|
8
|
+
window.dataLayer.push(event);
|
|
9
|
+
}
|
|
10
|
+
}
|
|
11
|
+
export function unSlugify(slug) {
|
|
12
|
+
if (slug) {
|
|
13
|
+
slug = slug
|
|
14
|
+
.split('-')
|
|
15
|
+
.map((part) => part.length > 0 ? part[0].toUpperCase() + part.substring(1) : '')
|
|
16
|
+
.join(' ');
|
|
17
|
+
slug = slug
|
|
18
|
+
.split('/')
|
|
19
|
+
.map((part) => part.length > 0 ? part[0].toUpperCase() + part.substring(1) : '')
|
|
20
|
+
.join('/');
|
|
21
|
+
}
|
|
22
|
+
return slug;
|
|
23
|
+
}
|
|
24
|
+
function getProductData(product, selectedVariation, useArticleNumberAsId = false, brandCustomField) {
|
|
25
|
+
var _a, _b, _c, _d;
|
|
26
|
+
if (useArticleNumberAsId) {
|
|
27
|
+
return {
|
|
28
|
+
id: product.articleNumber,
|
|
29
|
+
productId: product.id,
|
|
30
|
+
productSKU: product.articleNumber,
|
|
31
|
+
variant: selectedVariation === null || selectedVariation === void 0 ? void 0 : selectedVariation.values.join('_'),
|
|
32
|
+
variantSKU: selectedVariation === null || selectedVariation === void 0 ? void 0 : selectedVariation.articleNumber,
|
|
33
|
+
name: product.name,
|
|
34
|
+
base_product: product.articleNumber,
|
|
35
|
+
category: unSlugify((_b = (_a = product === null || product === void 0 ? void 0 : product.canonicalCategory) === null || _a === void 0 ? void 0 : _a.primaryRoute) === null || _b === void 0 ? void 0 : _b.path),
|
|
36
|
+
brand: getBrand(product, brandCustomField)
|
|
37
|
+
};
|
|
38
|
+
}
|
|
39
|
+
else {
|
|
40
|
+
// This is kept as backwards compatibility. Some shops rely on the product id being the internal Jetshop id, instead of the article number.
|
|
41
|
+
// Changing this could affect the statistics in Google Ads/Merchant/Analytics, so we want the new behaviour to be opt-in.
|
|
42
|
+
return {
|
|
43
|
+
id: product.id,
|
|
44
|
+
variant: selectedVariation
|
|
45
|
+
? selectedVariation.articleNumber
|
|
46
|
+
: product.articleNumber,
|
|
47
|
+
name: product.name,
|
|
48
|
+
base_product: product.articleNumber,
|
|
49
|
+
category: unSlugify((_d = (_c = product === null || product === void 0 ? void 0 : product.canonicalCategory) === null || _c === void 0 ? void 0 : _c.primaryRoute) === null || _d === void 0 ? void 0 : _d.path),
|
|
50
|
+
brand: getBrand(product, brandCustomField)
|
|
51
|
+
};
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
export const gtmTracker = ({ containerId, currency, useArticleNumberAsId = false, brandCustomField }) => ({
|
|
3
55
|
name: 'gtm',
|
|
4
56
|
initBrowser() {
|
|
5
57
|
const script = `https://www.googletagmanager.com/gtm.js?id=${containerId}`;
|
|
@@ -7,9 +59,130 @@ export const gtmTracker = ({ containerId }) => ({
|
|
|
7
59
|
w.dataLayer = w.dataLayer || [];
|
|
8
60
|
w.dataLayer.push({
|
|
9
61
|
'gtm.start': new Date().getTime(),
|
|
10
|
-
event: 'gtm.js'
|
|
62
|
+
event: 'gtm.js',
|
|
63
|
+
originalLocation: document.location.protocol +
|
|
64
|
+
'//' +
|
|
65
|
+
document.location.hostname +
|
|
66
|
+
document.location.pathname +
|
|
67
|
+
document.location.search
|
|
11
68
|
});
|
|
12
69
|
injectScript({ src: script });
|
|
70
|
+
},
|
|
71
|
+
trackProduct({ quantity, action, product, selectedVariation, list, listName, index }, context) {
|
|
72
|
+
const productData = Object.assign(Object.assign({}, getProductData(product, selectedVariation, useArticleNumberAsId, brandCustomField)), { price: (selectedVariation && selectedVariation.price.incVat) ||
|
|
73
|
+
(product.price && product.price.incVat), quantity, position: index });
|
|
74
|
+
switch (action) {
|
|
75
|
+
case 'click':
|
|
76
|
+
push({
|
|
77
|
+
event: 'productClick',
|
|
78
|
+
productIds: product.articleNumber,
|
|
79
|
+
ecommerce: {
|
|
80
|
+
click: {
|
|
81
|
+
actionField: { list: list || listName || context.list },
|
|
82
|
+
products: [productData]
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
});
|
|
86
|
+
break;
|
|
87
|
+
case 'view':
|
|
88
|
+
push({
|
|
89
|
+
event: 'productDetails',
|
|
90
|
+
ecommerce: {
|
|
91
|
+
currencyCode: currency,
|
|
92
|
+
detail: {
|
|
93
|
+
products: [productData]
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
});
|
|
97
|
+
break;
|
|
98
|
+
case 'add':
|
|
99
|
+
push({
|
|
100
|
+
event: 'addToCart',
|
|
101
|
+
productIds: product.articleNumber,
|
|
102
|
+
ecommerce: {
|
|
103
|
+
actionField: {
|
|
104
|
+
list: list || listName || context.list
|
|
105
|
+
},
|
|
106
|
+
currencyCode: currency,
|
|
107
|
+
add: {
|
|
108
|
+
products: [productData]
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
});
|
|
112
|
+
break;
|
|
113
|
+
case 'remove':
|
|
114
|
+
push({
|
|
115
|
+
event: 'removeFromCart',
|
|
116
|
+
productIds: product.articleNumber,
|
|
117
|
+
pageType: 'cart',
|
|
118
|
+
ecommerce: {
|
|
119
|
+
currencyCode: currency,
|
|
120
|
+
remove: {
|
|
121
|
+
products: [productData]
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
});
|
|
125
|
+
break;
|
|
126
|
+
default:
|
|
127
|
+
console.log('Error: Gtag can not track action ' + action);
|
|
128
|
+
break;
|
|
129
|
+
}
|
|
130
|
+
},
|
|
131
|
+
trackCartCheckout({ cart }) {
|
|
132
|
+
const items = cart.items.map((item) => (Object.assign(Object.assign({}, getProductData(item.product, item.variant, useArticleNumberAsId, brandCustomField)), { price: item.total.incVat, quantity: item.quantity })));
|
|
133
|
+
push({
|
|
134
|
+
event: 'checkout',
|
|
135
|
+
ecommerce: {
|
|
136
|
+
products: items
|
|
137
|
+
}
|
|
138
|
+
});
|
|
139
|
+
},
|
|
140
|
+
trackPageView({ pathname, title }) {
|
|
141
|
+
push({
|
|
142
|
+
event: 'pageView',
|
|
143
|
+
pagePath: pathname,
|
|
144
|
+
pageTitle: title
|
|
145
|
+
});
|
|
146
|
+
},
|
|
147
|
+
trackList({ listName, products }) {
|
|
148
|
+
const productData = products.map((product, i) => {
|
|
149
|
+
var _a;
|
|
150
|
+
return (Object.assign(Object.assign({}, getProductData(product, null, useArticleNumberAsId, brandCustomField)), { price: (_a = product.price) === null || _a === void 0 ? void 0 : _a.incVat, position: i, list: listName }));
|
|
151
|
+
});
|
|
152
|
+
push({
|
|
153
|
+
event: 'productList',
|
|
154
|
+
ecommerce: {
|
|
155
|
+
currencyCode: currency,
|
|
156
|
+
impressions: productData
|
|
157
|
+
}
|
|
158
|
+
});
|
|
159
|
+
},
|
|
160
|
+
trackExperiment({ id, variant }) {
|
|
161
|
+
push({
|
|
162
|
+
experiment: `${id}.${variant}`
|
|
163
|
+
});
|
|
164
|
+
},
|
|
165
|
+
trackUser({ userId }) {
|
|
166
|
+
push({
|
|
167
|
+
userId
|
|
168
|
+
});
|
|
169
|
+
},
|
|
170
|
+
trackLogin() {
|
|
171
|
+
push({
|
|
172
|
+
event: 'login'
|
|
173
|
+
});
|
|
174
|
+
},
|
|
175
|
+
trackRegister() {
|
|
176
|
+
push({
|
|
177
|
+
event: 'register'
|
|
178
|
+
});
|
|
179
|
+
},
|
|
180
|
+
trackAddToWishList({ articleNumber, productName }) {
|
|
181
|
+
push({
|
|
182
|
+
event: 'addToWishlist',
|
|
183
|
+
articleNumber,
|
|
184
|
+
productName
|
|
185
|
+
});
|
|
13
186
|
}
|
|
14
187
|
});
|
|
15
188
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,EACzB,WAAW,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"}
|
|
@@ -86,8 +86,9 @@ export interface TrackerRegistry {
|
|
|
86
86
|
*/
|
|
87
87
|
add: (tracker: Tracker) => void;
|
|
88
88
|
}
|
|
89
|
-
export declare function createServerTracker({ currency }: {
|
|
89
|
+
export declare function createServerTracker({ currency, useArticleNumberAsId }: {
|
|
90
90
|
currency: string;
|
|
91
|
+
useArticleNumberAsId: boolean;
|
|
91
92
|
}): Tracker;
|
|
92
93
|
export declare function trackerRegistry({ config, inServer }: {
|
|
93
94
|
config: AnalyticsConfig;
|
|
@@ -11,7 +11,11 @@ export const trackingEvents = [
|
|
|
11
11
|
'trackRegister',
|
|
12
12
|
'trackAddToWishList'
|
|
13
13
|
];
|
|
14
|
-
export function createServerTracker({ currency }) {
|
|
14
|
+
export function createServerTracker({ currency, useArticleNumberAsId }) {
|
|
15
|
+
const defaults = {
|
|
16
|
+
useArticleNumberAsId,
|
|
17
|
+
currency
|
|
18
|
+
};
|
|
15
19
|
const serverTracker = {
|
|
16
20
|
name: 'server',
|
|
17
21
|
trackProduct(props, context, eventId) {
|
|
@@ -20,13 +24,9 @@ export function createServerTracker({ currency }) {
|
|
|
20
24
|
headers: {
|
|
21
25
|
'Content-Type': 'application/json'
|
|
22
26
|
},
|
|
23
|
-
body: JSON.stringify({
|
|
24
|
-
eventId,
|
|
27
|
+
body: JSON.stringify(Object.assign(Object.assign({}, defaults), { eventId,
|
|
25
28
|
props,
|
|
26
|
-
|
|
27
|
-
context,
|
|
28
|
-
location: window.location.href
|
|
29
|
-
})
|
|
29
|
+
context, location: window.location.href }))
|
|
30
30
|
});
|
|
31
31
|
},
|
|
32
32
|
trackCartCheckout(props, context, eventId) {
|
|
@@ -35,13 +35,9 @@ export function createServerTracker({ currency }) {
|
|
|
35
35
|
headers: {
|
|
36
36
|
'Content-Type': 'application/json'
|
|
37
37
|
},
|
|
38
|
-
body: JSON.stringify({
|
|
39
|
-
eventId,
|
|
38
|
+
body: JSON.stringify(Object.assign(Object.assign({}, defaults), { eventId,
|
|
40
39
|
props,
|
|
41
|
-
|
|
42
|
-
context,
|
|
43
|
-
location: window.location.href
|
|
44
|
-
})
|
|
40
|
+
context, location: window.location.href }))
|
|
45
41
|
});
|
|
46
42
|
},
|
|
47
43
|
trackCart(props, context, eventId) {
|
|
@@ -50,13 +46,9 @@ export function createServerTracker({ currency }) {
|
|
|
50
46
|
headers: {
|
|
51
47
|
'Content-Type': 'application/json'
|
|
52
48
|
},
|
|
53
|
-
body: JSON.stringify({
|
|
54
|
-
eventId,
|
|
49
|
+
body: JSON.stringify(Object.assign(Object.assign({}, defaults), { eventId,
|
|
55
50
|
props,
|
|
56
|
-
|
|
57
|
-
context,
|
|
58
|
-
location: window.location.href
|
|
59
|
-
})
|
|
51
|
+
context, location: window.location.href }))
|
|
60
52
|
});
|
|
61
53
|
},
|
|
62
54
|
trackList(props, context, eventId) {
|
|
@@ -65,13 +57,9 @@ export function createServerTracker({ currency }) {
|
|
|
65
57
|
headers: {
|
|
66
58
|
'Content-Type': 'application/json'
|
|
67
59
|
},
|
|
68
|
-
body: JSON.stringify({
|
|
69
|
-
eventId,
|
|
60
|
+
body: JSON.stringify(Object.assign(Object.assign({}, defaults), { eventId,
|
|
70
61
|
props,
|
|
71
|
-
|
|
72
|
-
context,
|
|
73
|
-
location: window.location.href
|
|
74
|
-
})
|
|
62
|
+
context, location: window.location.href }))
|
|
75
63
|
});
|
|
76
64
|
},
|
|
77
65
|
trackPageView(props, context, eventId) {
|
|
@@ -80,13 +68,9 @@ export function createServerTracker({ currency }) {
|
|
|
80
68
|
headers: {
|
|
81
69
|
'Content-Type': 'application/json'
|
|
82
70
|
},
|
|
83
|
-
body: JSON.stringify({
|
|
84
|
-
eventId,
|
|
71
|
+
body: JSON.stringify(Object.assign(Object.assign({}, defaults), { eventId,
|
|
85
72
|
props,
|
|
86
|
-
|
|
87
|
-
context,
|
|
88
|
-
location: window.location.href
|
|
89
|
-
})
|
|
73
|
+
context, location: window.location.href }))
|
|
90
74
|
});
|
|
91
75
|
},
|
|
92
76
|
trackExperiment(props, context, eventId) {
|
|
@@ -95,13 +79,9 @@ export function createServerTracker({ currency }) {
|
|
|
95
79
|
headers: {
|
|
96
80
|
'Content-Type': 'application/json'
|
|
97
81
|
},
|
|
98
|
-
body: JSON.stringify({
|
|
99
|
-
eventId,
|
|
82
|
+
body: JSON.stringify(Object.assign(Object.assign({}, defaults), { eventId,
|
|
100
83
|
props,
|
|
101
|
-
|
|
102
|
-
context,
|
|
103
|
-
location: window.location.href
|
|
104
|
-
})
|
|
84
|
+
context, location: window.location.href }))
|
|
105
85
|
});
|
|
106
86
|
},
|
|
107
87
|
trackUser(props, context, eventId) {
|
|
@@ -110,13 +90,9 @@ export function createServerTracker({ currency }) {
|
|
|
110
90
|
headers: {
|
|
111
91
|
'Content-Type': 'application/json'
|
|
112
92
|
},
|
|
113
|
-
body: JSON.stringify({
|
|
114
|
-
eventId,
|
|
93
|
+
body: JSON.stringify(Object.assign(Object.assign({}, defaults), { eventId,
|
|
115
94
|
props,
|
|
116
|
-
|
|
117
|
-
context,
|
|
118
|
-
location: window.location.href
|
|
119
|
-
})
|
|
95
|
+
context, location: window.location.href }))
|
|
120
96
|
});
|
|
121
97
|
},
|
|
122
98
|
trackLogin(_props, context, eventId) {
|
|
@@ -153,13 +129,9 @@ export function createServerTracker({ currency }) {
|
|
|
153
129
|
headers: {
|
|
154
130
|
'Content-Type': 'application/json'
|
|
155
131
|
},
|
|
156
|
-
body: JSON.stringify({
|
|
157
|
-
eventId,
|
|
132
|
+
body: JSON.stringify(Object.assign(Object.assign({}, defaults), { eventId,
|
|
158
133
|
props,
|
|
159
|
-
|
|
160
|
-
context,
|
|
161
|
-
location: window.location.href
|
|
162
|
-
})
|
|
134
|
+
context, location: window.location.href }))
|
|
163
135
|
});
|
|
164
136
|
}
|
|
165
137
|
};
|
|
@@ -194,7 +166,7 @@ export function trackerRegistry({ config, inServer }) {
|
|
|
194
166
|
}
|
|
195
167
|
trackers.push(tracker);
|
|
196
168
|
// Auto-bind built-in events
|
|
197
|
-
trackingEvents.forEach(method => {
|
|
169
|
+
trackingEvents.forEach((method) => {
|
|
198
170
|
if (tracker[method]) {
|
|
199
171
|
registry.on(method, tracker[method], { name: tracker.name });
|
|
200
172
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trackerRegistry.js","sourceRoot":"","sources":["trackerRegistry.ts"],"names":[],"mappings":"AAEA,OAAO,aAAa,MAAM,eAAe,CAAC;AA+H1C,MAAM,CAAC,MAAM,cAAc,GAAiC;IAC1D,cAAc;IACd,mBAAmB;IACnB,WAAW;IACX,WAAW;IACX,eAAe;IACf,iBAAiB;IACjB,WAAW;IACX,YAAY;IACZ,eAAe;IACf,oBAAoB;CACrB,CAAC;AA4BF,MAAM,UAAU,mBAAmB,CAAC,
|
|
1
|
+
{"version":3,"file":"trackerRegistry.js","sourceRoot":"","sources":["trackerRegistry.ts"],"names":[],"mappings":"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"}
|
package/boot/apollo.d.ts
CHANGED
|
@@ -16,5 +16,4 @@ export interface CreateClientOpts {
|
|
|
16
16
|
}
|
|
17
17
|
export declare const createClient: ({ apolloConfig: { token, shopid, enableGateway, graphQLURI, useGraphQLProxyServer }, schema, authHandler, channelHandler, previewHandler, req }: CreateClientOpts) => {
|
|
18
18
|
client: ApolloClient<NormalizedCacheObject>;
|
|
19
|
-
NetworkStatusNotifier: any;
|
|
20
19
|
};
|
package/boot/apollo.js
CHANGED
|
@@ -16,12 +16,12 @@ import { createHttpLink } from 'apollo-link-http';
|
|
|
16
16
|
import { createPersistedQueryLink } from 'apollo-link-persisted-queries';
|
|
17
17
|
import { SchemaLink } from 'apollo-link-schema';
|
|
18
18
|
import qs from 'qs';
|
|
19
|
-
import { createNetworkStatusNotifier } from 'react-apollo-network-status';
|
|
20
19
|
import createCache from '../data/cache';
|
|
21
20
|
import report from '../errorReporting';
|
|
22
21
|
import { resolvers } from '../resolvers';
|
|
23
22
|
import typeDefs from './client-schema.gql';
|
|
24
23
|
import { logOperationTime } from './utils/queryLoggingMiddleware';
|
|
24
|
+
import { link as networkStatusLink } from '@jetshop/ui/Loading/NetworkStatusNotifier';
|
|
25
25
|
export const createClient = ({ apolloConfig: { token, shopid, enableGateway, graphQLURI, useGraphQLProxyServer }, schema, authHandler, channelHandler, previewHandler, req }) => {
|
|
26
26
|
if (!token || !shopid) {
|
|
27
27
|
throw new Error(`Missing ${!token && `token`} ${!shopid && `shopid`}`);
|
|
@@ -122,7 +122,7 @@ export const createClient = ({ apolloConfig: { token, shopid, enableGateway, gra
|
|
|
122
122
|
var _b, _c;
|
|
123
123
|
var { graphQLErrors, networkError, operation } = _a, rest = __rest(_a, ["graphQLErrors", "networkError", "operation"]);
|
|
124
124
|
if (graphQLErrors) {
|
|
125
|
-
graphQLErrors.forEach(error => {
|
|
125
|
+
graphQLErrors.forEach((error) => {
|
|
126
126
|
var _a;
|
|
127
127
|
const code = (_a = error === null || error === void 0 ? void 0 : error.extensions) === null || _a === void 0 ? void 0 : _a.code;
|
|
128
128
|
if (code === 'EmptyRoute') {
|
|
@@ -135,6 +135,11 @@ export const createClient = ({ apolloConfig: { token, shopid, enableGateway, gra
|
|
|
135
135
|
window.location.href = '/';
|
|
136
136
|
}
|
|
137
137
|
}
|
|
138
|
+
else if (code === 'InvalidCreateCustomerInput' ||
|
|
139
|
+
code === 'UnableToLoginCustomer') {
|
|
140
|
+
// Don't report this to Sentry
|
|
141
|
+
console.log(error);
|
|
142
|
+
}
|
|
138
143
|
else {
|
|
139
144
|
console.log(error);
|
|
140
145
|
// Other graph errors will be logged to Sentry
|
|
@@ -165,14 +170,13 @@ export const createClient = ({ apolloConfig: { token, shopid, enableGateway, gra
|
|
|
165
170
|
report(networkError);
|
|
166
171
|
}
|
|
167
172
|
});
|
|
168
|
-
const { link: networkStatusNotifierLink, NetworkStatusNotifier } = createNetworkStatusNotifier();
|
|
169
173
|
const links = [
|
|
174
|
+
...(__IN_SERVER__ ? [] : [networkStatusLink]),
|
|
170
175
|
errorMiddleware,
|
|
171
176
|
// Only add the middleware to the links array if the exist
|
|
172
177
|
...(channelMiddleware ? [channelMiddleware] : []),
|
|
173
178
|
...(authMiddleware ? [authMiddleware] : []),
|
|
174
179
|
...(previewMiddleware ? [previewMiddleware] : []),
|
|
175
|
-
networkStatusNotifierLink,
|
|
176
180
|
apiLink
|
|
177
181
|
];
|
|
178
182
|
if (process.env.DEBUG_MODE === 'true') {
|
|
@@ -193,6 +197,6 @@ export const createClient = ({ apolloConfig: { token, shopid, enableGateway, gra
|
|
|
193
197
|
resolvers: resolvers(qs.stringify(req === null || req === void 0 ? void 0 : req.query, { encode: true, encodeValuesOnly: true })),
|
|
194
198
|
typeDefs
|
|
195
199
|
});
|
|
196
|
-
return { client
|
|
200
|
+
return { client };
|
|
197
201
|
};
|
|
198
202
|
//# sourceMappingURL=apollo.js.map
|
package/boot/apollo.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apollo.js","sourceRoot":"","sources":["apollo.ts"],"names":[],"mappings":";;;;;;;;;;;AACA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAGhD,OAAO,EAAE,MAAM,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"apollo.js","sourceRoot":"","sources":["apollo.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
};
|
|
10
10
|
// Intl
|
|
11
11
|
import { setupIntl } from '@jetshop/intl/config';
|
|
12
|
-
import { NetworkStatusProvider } from '@jetshop/ui/Loading/NetworkStatusContext';
|
|
13
12
|
import * as Sentry from '../../sentry/client';
|
|
14
13
|
import React from 'react';
|
|
15
14
|
// Cookies
|
|
@@ -69,7 +68,7 @@ const startClient = (tree, config) => {
|
|
|
69
68
|
});
|
|
70
69
|
const previewHandler = new PreviewHandler();
|
|
71
70
|
// Read locale from cookie and make sure we've loaded translations before we start rendering
|
|
72
|
-
const { client
|
|
71
|
+
const { client } = createClient({
|
|
73
72
|
apolloConfig,
|
|
74
73
|
channelHandler,
|
|
75
74
|
authHandler,
|
|
@@ -124,10 +123,7 @@ const startClient = (tree, config) => {
|
|
|
124
123
|
// immediately after hydration
|
|
125
124
|
client.disableNetworkFetches = true;
|
|
126
125
|
const wrappedTree = (React.createElement(SharedTree, { activeBreakpoint: activeBreakpoint, config: config, cookies: cookies, releware: releware, client: client, Router: BrowserRouter, authHandler: authHandler, channelHandler: channelHandler, previewHandler: previewHandler },
|
|
127
|
-
React.createElement(
|
|
128
|
-
return (React.createElement(CartIdProvider, null,
|
|
129
|
-
React.createElement(NetworkStatusProvider, { value: value }, tree)));
|
|
130
|
-
} })));
|
|
126
|
+
React.createElement(CartIdProvider, null, tree)));
|
|
131
127
|
return wrappedTree;
|
|
132
128
|
});
|
|
133
129
|
})
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"startClient.js","sourceRoot":"","sources":["startClient.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO;AACP,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,
|
|
1
|
+
{"version":3,"file":"startClient.js","sourceRoot":"","sources":["startClient.tsx"],"names":[],"mappings":"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"}
|
|
@@ -56,8 +56,8 @@ const wrapTree = (tree, req, renderOptions, client, channelHandler, authHandler,
|
|
|
56
56
|
((_a = e.networkError) === null || _a === void 0 ? void 0 : _a.statusCode) === 401) {
|
|
57
57
|
const base = channelHandler.getChannelBasename() || '';
|
|
58
58
|
const loginPathWithBase = base + config.loginPath;
|
|
59
|
-
const routesAllowedWithoutAuth = config.pathsWithNoAuthRequired.map(path => base + path);
|
|
60
|
-
const matches = routesAllowedWithoutAuth.filter(route => req.path.startsWith(route))
|
|
59
|
+
const routesAllowedWithoutAuth = config.pathsWithNoAuthRequired.map((path) => base + path);
|
|
60
|
+
const matches = routesAllowedWithoutAuth.filter((route) => req.path.startsWith(route))
|
|
61
61
|
.length > 0;
|
|
62
62
|
// Redirect to login page on all other routes
|
|
63
63
|
if (!matches) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createRenderer.js","sourceRoot":"","sources":["createRenderer.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"createRenderer.js","sourceRoot":"","sources":["createRenderer.tsx"],"names":[],"mappings":"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"}
|
package/cart/useAddToCart.d.ts
CHANGED
|
@@ -16,7 +16,7 @@ interface AddToCartOptions {
|
|
|
16
16
|
product?: Product;
|
|
17
17
|
variant?: ProductVariant;
|
|
18
18
|
commentValidators?: {
|
|
19
|
-
[commentName: string]: ({ name, value
|
|
19
|
+
[commentName: string]: ({ name, value }: {
|
|
20
20
|
name?: string;
|
|
21
21
|
value: string;
|
|
22
22
|
}) => string;
|
|
@@ -37,7 +37,7 @@ export interface AddToCartFormikErrors {
|
|
|
37
37
|
options?: Options;
|
|
38
38
|
[otherValues: string]: any;
|
|
39
39
|
}
|
|
40
|
-
export declare function useAddToCart({ product, variant, submit, commentValidators, getMissingOptions, initialValues
|
|
40
|
+
export declare function useAddToCart({ product, variant, submit, commentValidators, getMissingOptions, initialValues }: AddToCartOptions): {
|
|
41
41
|
form: {
|
|
42
42
|
initialValues: AddToCartFormikValues;
|
|
43
43
|
initialErrors: import("formik").FormikErrors<unknown>;
|