chore: move analytics definitions to suite-common

Author: martykan

packages/suite-analytics/package.json

@@ -10,6 +10,6 @@
         "type-check": "yarn g:tsc --build"
     },
     "dependencies": {
-        "@trezor/analytics": "workspace:*"
+        "@suite-common/analytics": "workspace:*"
     }
 }

packages/suite-analytics/src/index.ts

@@ -1,14 +1 @@
-import { Analytics, getRandomId } from '@trezor/analytics';
-
-import type { SuiteAnalyticsEvent } from './types/events';
-
-const analytics = new Analytics<SuiteAnalyticsEvent>({
-    version: process.env.VERSION!,
-    app: 'suite',
-    useQueue: true,
-});
-
-export { analytics, getRandomId };
-export * from './types/definitions';
-export * from './types/events';
-export * from './constants';
+export * from '@suite-common/analytics/src/events/suite';

packages/suite-analytics/tsconfig.json

@@ -1,5 +1,7 @@
 {
     "extends": "../../tsconfig.base.json",
     "compilerOptions": { "outDir": "libDev" },
-    "references": [{ "path": "../analytics" }]
+    "references": [
+        { "path": "../../suite-common/analytics" }
+    ]
 }

suite-common/analytics/package.json

@@ -13,6 +13,9 @@
     "dependencies": {
         "@reduxjs/toolkit": "2.8.2",
         "@suite-common/redux-utils": "workspace:*",
+        "@trezor/analytics": "workspace:*",
+        "@trezor/connect": "workspace:*",
+        "@trezor/env-utils": "workspace:*",
         "react": "18.2.0"
     }
 }

suite-common/analytics/src/events/index.native.ts

@@ -0,0 +1 @@
+export * from './suite-native';

suite-common/analytics/src/events/index.ts

@@ -0,0 +1 @@
+export * from './suite';

suite-native/analytics/src/constants.ts renamed to suite-common/analytics/src/events/suite-native/constants.ts

@@ -1,14 +1,16 @@
-import { isDebugEnv } from '@suite-native/config';
-import { Analytics, Event } from '@trezor/analytics';
+import { Analytics, Event, getRandomId } from '@trezor/analytics';
 import { getSuiteVersion } from '@trezor/env-utils';
 
-import { SuiteNativeAnalyticsEvent } from './events';
+import { SuiteNativeAnalyticsEvent } from './types';
 
-export const analytics = new Analytics<SuiteNativeAnalyticsEvent>({
+const analytics = new Analytics<SuiteNativeAnalyticsEvent>({
     version: getSuiteVersion(),
     app: 'suite',
 });
 
+// Inlined to avoid native dependency
+const isDebugEnv = () => process.env.EXPO_PUBLIC_ENVIRONMENT === 'debug';
+
 if (isDebugEnv()) {
     // Do not send analytics in development
     analytics.report = (event: Event) => {
@@ -18,3 +20,8 @@ if (isDebugEnv()) {
         }
     };
 }
+
+export { analytics, getRandomId };
+export * from './definitions';
+export * from './types';
+export * from './constants';

suite-native/analytics/src/types.ts renamed to suite-common/analytics/src/events/suite-native/definitions.ts

@@ -13,7 +13,7 @@ import {
     FirmwareUpdatePayload,
     FirmwareUpdateStartType,
     FirmwareUpdateStuckedState,
-} from './types';
+} from './definitions';
 
 export type SuiteNativeAnalyticsEvent =
     | {

suite-native/analytics/src/analytics.ts renamed to suite-common/analytics/src/events/suite-native/index.ts

@@ -1,4 +1,4 @@
-import { AppUpdateEventStatus } from '../constants';
+import { AppUpdateEventStatus } from './constants';
 
 export type OnboardingAnalytics = {
     startTime: number;

suite-native/analytics/src/events.ts renamed to suite-common/analytics/src/events/suite-native/types.ts

@@ -0,0 +1,14 @@
+import { Analytics, getRandomId } from '@trezor/analytics';
+
+import type { SuiteAnalyticsEvent } from './types';
+
+const analytics = new Analytics<SuiteAnalyticsEvent>({
+    version: process.env.VERSION!,
+    app: 'suite',
+    useQueue: true,
+});
+
+export { analytics, getRandomId };
+export * from './definitions';
+export * from './types';
+export * from './constants';

packages/suite-analytics/src/constants.ts renamed to suite-common/analytics/src/events/suite/constants.ts

@@ -1,6 +1,6 @@
 import { NetworkSymbol } from '@suite-common/wallet-config';
 
-import { EventType } from '../constants';
+import { EventType } from './constants';
 import type { AppUpdateEvent, FirmwareSource, OnboardingAnalytics } from './definitions';
 
 export type SuiteAnalyticsEventSuiteReady = {

packages/suite-analytics/src/types/definitions.ts renamed to suite-common/analytics/src/events/suite/definitions.ts

@@ -1,2 +1,6 @@
-export * from './analyticsReducer';
-export * from './analyticsActions';
+export { analytics, getRandomId } from './events';
+
+export * from './events';
+
+export * from './redux/analyticsReducer';
+export * from './redux/analyticsActions';

suite-common/analytics/src/events/suite/index.ts

@@ -1,5 +1,10 @@
 {
     "extends": "../../tsconfig.base.json",
     "compilerOptions": { "outDir": "libDev" },
-    "references": [{ "path": "../redux-utils" }]
+    "references": [
+        { "path": "../redux-utils" },
+        { "path": "../../packages/analytics" },
+        { "path": "../../packages/connect" },
+        { "path": "../../packages/env-utils" }
+    ]
 }

packages/suite-analytics/src/types/events.ts renamed to suite-common/analytics/src/events/suite/types.ts

@@ -304,9 +304,9 @@ const getWalletTransaction = (t?: Partial<WalletAccountTransaction>): WalletAcco
     ...t,
 });
 
-// Mocked @trezor/suite-analytics package used in various tests
+// Mocked @suite-common/analytics package used in various tests
 const getAnalytics = () => {
-    const originalModule = jest.requireActual('@trezor/suite-analytics');
+    const originalModule = jest.requireActual('@suite-common/analytics');
 
     return {
         __esModule: true, // this property makes it work

suite-common/analytics/src/index.ts

@@ -17,7 +17,7 @@ const initStore = (state: any) =>
         preloadedState: { wallet: { settings: state } },
     });
 
-jest.doMock('@trezor/suite-analytics', () => testMocks.getAnalytics());
+jest.doMock('@suite-common/analytics', () => testMocks.getAnalytics());
 
 describe('walletSettings Actions', () => {
     walletSettingsFixtures.forEach(f => {

suite-common/analytics/src/analyticsActions.ts renamed to suite-common/analytics/src/redux/analyticsActions.ts

@@ -5,15 +5,13 @@ import {
     selectIsAnalyticsConfirmed,
     selectIsAnalyticsEnabled,
 } from '@suite-common/analytics';
+import { EventType, analytics } from '@suite-common/analytics/src/events/suite-native';
 import { createThunk } from '@suite-common/redux-utils';
 import { isDevelopEnv } from '@suite-native/config';
 import { allowSentryReport, setSentryUser } from '@suite-native/sentry';
 import { getTrackingRandomId } from '@trezor/analytics';
 import { getCommitHash } from '@trezor/env-utils';
 
-import { analytics } from './analytics';
-import { EventType } from './constants';
-
 const ACTION_PREFIX = '@suite-native/analytics';
 
 export const enableAnalyticsThunk = createThunk(

suite-common/analytics/src/analyticsReducer.ts renamed to suite-common/analytics/src/redux/analyticsReducer.ts

@@ -1,4 +1,2 @@
-export * from './analytics';
 export * from './analyticsThunks';
-export * from './constants';
-export * from './types';
+export * from '@suite-common/analytics/src/events/suite-native';

suite-common/analytics/src/tests/analyticsReducer.test.ts renamed to suite-common/analytics/src/redux/tests/analyticsReducer.test.ts

@@ -9202,6 +9202,9 @@ __metadata:
   dependencies:
     "@reduxjs/toolkit": "npm:2.8.2"
     "@suite-common/redux-utils": "workspace:*"
+    "@trezor/analytics": "workspace:*"
+    "@trezor/connect": "workspace:*"
+    "@trezor/env-utils": "workspace:*"
     react: "npm:18.2.0"
   languageName: unknown
   linkType: soft
@@ -12234,7 +12237,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@trezor/suite-analytics@workspace:packages/suite-analytics"
   dependencies:
-    "@trezor/analytics": "workspace:*"
+    "@suite-common/analytics": "workspace:*"
   languageName: unknown
   linkType: soft