@vrplatform/log 2.0.54 → 2.0.55
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -20,7 +20,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
20
20
|
exports.useTracking = void 0;
|
|
21
21
|
const graphql_1 = require("@finalytic/graphql");
|
|
22
22
|
const intercom_client_1 = require("intercom-client");
|
|
23
|
-
const
|
|
23
|
+
const mixpanel_browser_1 = __importDefault(require("mixpanel-browser"));
|
|
24
24
|
const log_1 = require("../log");
|
|
25
25
|
const utils_1 = require("../utils");
|
|
26
26
|
const convertValuesToString_1 = require("../utils/convertValuesToString");
|
|
@@ -38,7 +38,11 @@ const useTracking = ({ dataset, env, name }, isDev) => {
|
|
|
38
38
|
? new intercom_client_1.Intercom({ accessToken: env.INTERCOM_TOKEN })
|
|
39
39
|
: undefined;
|
|
40
40
|
if (env.MIXPANEL_TOKEN)
|
|
41
|
-
|
|
41
|
+
mixpanel_browser_1.default.init(env.MIXPANEL_TOKEN, {
|
|
42
|
+
debug: true,
|
|
43
|
+
track_pageview: true,
|
|
44
|
+
persistence: 'localStorage',
|
|
45
|
+
});
|
|
42
46
|
return {
|
|
43
47
|
// General
|
|
44
48
|
track: async ({ userId, anonymousId, groupId, event, packageName, properties,
|
|
@@ -57,8 +61,8 @@ const useTracking = ({ dataset, env, name }, isDev) => {
|
|
|
57
61
|
}).id);
|
|
58
62
|
// track mixpanel event
|
|
59
63
|
if (env.MIXPANEL_TOKEN)
|
|
60
|
-
|
|
61
|
-
|
|
64
|
+
mixpanel_browser_1.default.track(event, {
|
|
65
|
+
tenant: [groupId], // assign to group
|
|
62
66
|
tenantId: groupId,
|
|
63
67
|
userId: userId,
|
|
64
68
|
packageName,
|
|
@@ -88,12 +92,14 @@ const useTracking = ({ dataset, env, name }, isDev) => {
|
|
|
88
92
|
? `${traits.firstName} ${traits.lastName}`
|
|
89
93
|
: traits?.lastName);
|
|
90
94
|
// upsert mixpanel user
|
|
91
|
-
if (env.MIXPANEL_TOKEN)
|
|
92
|
-
|
|
95
|
+
if (env.MIXPANEL_TOKEN) {
|
|
96
|
+
mixpanel_browser_1.default.identify(userId);
|
|
97
|
+
mixpanel_browser_1.default.people.set({
|
|
93
98
|
$name: name,
|
|
94
99
|
$email: traits?.email,
|
|
95
100
|
...traits,
|
|
96
101
|
});
|
|
102
|
+
}
|
|
97
103
|
// upsert intercom user
|
|
98
104
|
try {
|
|
99
105
|
const data = {
|
|
@@ -135,10 +141,7 @@ const useTracking = ({ dataset, env, name }, isDev) => {
|
|
|
135
141
|
traits.teamId = groupId;
|
|
136
142
|
// upsert mixpanel group
|
|
137
143
|
if (env.MIXPANEL_TOKEN)
|
|
138
|
-
|
|
139
|
-
$name: traits?.name,
|
|
140
|
-
...traits,
|
|
141
|
-
});
|
|
144
|
+
mixpanel_browser_1.default.set_group('tenant', groupId);
|
|
142
145
|
let intercomCompany;
|
|
143
146
|
try {
|
|
144
147
|
const cid = traits?.billingCustomerId || traits?.hyperlineCustomerId;
|
|
@@ -207,7 +210,10 @@ const useTracking = ({ dataset, env, name }, isDev) => {
|
|
|
207
210
|
}
|
|
208
211
|
}
|
|
209
212
|
},
|
|
210
|
-
shutdown: async () =>
|
|
213
|
+
shutdown: async () => {
|
|
214
|
+
log?.flush();
|
|
215
|
+
mixpanel_browser_1.default.reset();
|
|
216
|
+
},
|
|
211
217
|
// export dependencies
|
|
212
218
|
intercom,
|
|
213
219
|
log,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"src/","sources":["tracking/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAoGA,gDAAqD;AACrD,qDAA2C;AAC3C,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"src/","sources":["tracking/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { useHasuraClient } from '@finalytic/graphql';
|
|
2
2
|
import { Intercom } from 'intercom-client';
|
|
3
|
-
import mixpanel from 'mixpanel';
|
|
3
|
+
import mixpanel from 'mixpanel-browser';
|
|
4
4
|
import { useLog } from '../log';
|
|
5
5
|
import { isTest } from '../utils';
|
|
6
6
|
import { convertValuesToString } from '../utils/convertValuesToString';
|
|
@@ -18,7 +18,11 @@ export const useTracking = ({ dataset, env, name }, isDev) => {
|
|
|
18
18
|
? new Intercom({ accessToken: env.INTERCOM_TOKEN })
|
|
19
19
|
: undefined;
|
|
20
20
|
if (env.MIXPANEL_TOKEN)
|
|
21
|
-
mixpanel.init(env.MIXPANEL_TOKEN
|
|
21
|
+
mixpanel.init(env.MIXPANEL_TOKEN, {
|
|
22
|
+
debug: true,
|
|
23
|
+
track_pageview: true,
|
|
24
|
+
persistence: 'localStorage',
|
|
25
|
+
});
|
|
22
26
|
return {
|
|
23
27
|
// General
|
|
24
28
|
track: async ({ userId, anonymousId, groupId, event, packageName, properties,
|
|
@@ -38,7 +42,7 @@ export const useTracking = ({ dataset, env, name }, isDev) => {
|
|
|
38
42
|
// track mixpanel event
|
|
39
43
|
if (env.MIXPANEL_TOKEN)
|
|
40
44
|
mixpanel.track(event, {
|
|
41
|
-
|
|
45
|
+
tenant: [groupId], // assign to group
|
|
42
46
|
tenantId: groupId,
|
|
43
47
|
userId: userId,
|
|
44
48
|
packageName,
|
|
@@ -68,12 +72,14 @@ export const useTracking = ({ dataset, env, name }, isDev) => {
|
|
|
68
72
|
? `${traits.firstName} ${traits.lastName}`
|
|
69
73
|
: traits?.lastName);
|
|
70
74
|
// upsert mixpanel user
|
|
71
|
-
if (env.MIXPANEL_TOKEN)
|
|
72
|
-
mixpanel.
|
|
75
|
+
if (env.MIXPANEL_TOKEN) {
|
|
76
|
+
mixpanel.identify(userId);
|
|
77
|
+
mixpanel.people.set({
|
|
73
78
|
$name: name,
|
|
74
79
|
$email: traits?.email,
|
|
75
80
|
...traits,
|
|
76
81
|
});
|
|
82
|
+
}
|
|
77
83
|
// upsert intercom user
|
|
78
84
|
try {
|
|
79
85
|
const data = {
|
|
@@ -115,10 +121,7 @@ export const useTracking = ({ dataset, env, name }, isDev) => {
|
|
|
115
121
|
traits.teamId = groupId;
|
|
116
122
|
// upsert mixpanel group
|
|
117
123
|
if (env.MIXPANEL_TOKEN)
|
|
118
|
-
mixpanel.
|
|
119
|
-
$name: traits?.name,
|
|
120
|
-
...traits,
|
|
121
|
-
});
|
|
124
|
+
mixpanel.set_group('tenant', groupId);
|
|
122
125
|
let intercomCompany;
|
|
123
126
|
try {
|
|
124
127
|
const cid = traits?.billingCustomerId || traits?.hyperlineCustomerId;
|
|
@@ -187,7 +190,10 @@ export const useTracking = ({ dataset, env, name }, isDev) => {
|
|
|
187
190
|
}
|
|
188
191
|
}
|
|
189
192
|
},
|
|
190
|
-
shutdown: async () =>
|
|
193
|
+
shutdown: async () => {
|
|
194
|
+
log?.flush();
|
|
195
|
+
mixpanel.reset();
|
|
196
|
+
},
|
|
191
197
|
// export dependencies
|
|
192
198
|
intercom,
|
|
193
199
|
log,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"src/","sources":["tracking/index.ts"],"names":[],"mappings":"AAoGA,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,QAAQ,MAAM,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"src/","sources":["tracking/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@vrplatform/log",
|
|
3
|
-
"version": "2.0.
|
|
3
|
+
"version": "2.0.55",
|
|
4
4
|
"main": "build/main/index.js",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public"
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
"@axiomhq/js": "1.3.0",
|
|
21
21
|
"@finalytic/graphql": "1.14.3",
|
|
22
22
|
"intercom-client": "6.0.0-beta.3",
|
|
23
|
-
"mixpanel": "^
|
|
23
|
+
"mixpanel-browser": "^2.56.0",
|
|
24
24
|
"serialize-error": "11.0.3"
|
|
25
25
|
},
|
|
26
26
|
"devDependencies": {
|
package/src/tracking/index.ts
CHANGED
|
@@ -100,7 +100,7 @@ declare module 'intercom-client' {
|
|
|
100
100
|
|
|
101
101
|
import { useHasuraClient } from '@finalytic/graphql';
|
|
102
102
|
import { Intercom } from 'intercom-client';
|
|
103
|
-
import mixpanel from 'mixpanel';
|
|
103
|
+
import mixpanel from 'mixpanel-browser';
|
|
104
104
|
import { type LogBindings, type WorkerLog, useLog } from '../log';
|
|
105
105
|
import { isTest } from '../utils';
|
|
106
106
|
import { convertValuesToString } from '../utils/convertValuesToString';
|
|
@@ -150,7 +150,12 @@ export const useTracking = (
|
|
|
150
150
|
? new Intercom({ accessToken: env.INTERCOM_TOKEN })
|
|
151
151
|
: undefined;
|
|
152
152
|
|
|
153
|
-
if (env.MIXPANEL_TOKEN)
|
|
153
|
+
if (env.MIXPANEL_TOKEN)
|
|
154
|
+
mixpanel.init(env.MIXPANEL_TOKEN, {
|
|
155
|
+
debug: true,
|
|
156
|
+
track_pageview: true,
|
|
157
|
+
persistence: 'localStorage',
|
|
158
|
+
});
|
|
154
159
|
|
|
155
160
|
return {
|
|
156
161
|
// General
|
|
@@ -181,7 +186,7 @@ export const useTracking = (
|
|
|
181
186
|
// track mixpanel event
|
|
182
187
|
if (env.MIXPANEL_TOKEN)
|
|
183
188
|
mixpanel.track(event, {
|
|
184
|
-
|
|
189
|
+
tenant: [groupId], // assign to group
|
|
185
190
|
tenantId: groupId,
|
|
186
191
|
userId: userId,
|
|
187
192
|
packageName,
|
|
@@ -213,12 +218,15 @@ export const useTracking = (
|
|
|
213
218
|
: traits?.lastName);
|
|
214
219
|
|
|
215
220
|
// upsert mixpanel user
|
|
216
|
-
if (env.MIXPANEL_TOKEN)
|
|
217
|
-
mixpanel.
|
|
221
|
+
if (env.MIXPANEL_TOKEN) {
|
|
222
|
+
mixpanel.identify(userId);
|
|
223
|
+
|
|
224
|
+
mixpanel.people.set({
|
|
218
225
|
$name: name,
|
|
219
226
|
$email: traits?.email,
|
|
220
227
|
...traits,
|
|
221
228
|
});
|
|
229
|
+
}
|
|
222
230
|
|
|
223
231
|
// upsert intercom user
|
|
224
232
|
try {
|
|
@@ -266,11 +274,7 @@ export const useTracking = (
|
|
|
266
274
|
if (!traits?.teamId) traits.teamId = groupId;
|
|
267
275
|
|
|
268
276
|
// upsert mixpanel group
|
|
269
|
-
if (env.MIXPANEL_TOKEN)
|
|
270
|
-
mixpanel.groups.set('tenant', groupId, {
|
|
271
|
-
$name: traits?.name,
|
|
272
|
-
...traits,
|
|
273
|
-
});
|
|
277
|
+
if (env.MIXPANEL_TOKEN) mixpanel.set_group('tenant', groupId);
|
|
274
278
|
|
|
275
279
|
let intercomCompany: Intercom.Company | undefined;
|
|
276
280
|
try {
|
|
@@ -340,7 +344,10 @@ export const useTracking = (
|
|
|
340
344
|
}
|
|
341
345
|
}
|
|
342
346
|
},
|
|
343
|
-
shutdown: async () =>
|
|
347
|
+
shutdown: async () => {
|
|
348
|
+
log?.flush();
|
|
349
|
+
mixpanel.reset();
|
|
350
|
+
},
|
|
344
351
|
// export dependencies
|
|
345
352
|
intercom,
|
|
346
353
|
log,
|