From 9c6b9086249564b3e9e87b174268dc25869c3015 Mon Sep 17 00:00:00 2001 From: Ahmed Mahmoud Date: Tue, 28 Feb 2023 15:47:49 +0200 Subject: [PATCH 1/3] Restructure Native Directory --- src/models/Report.ts | 2 +- src/models/Trace.ts | 2 +- src/modules/APM.ts | 3 +- src/modules/BugReporting.ts | 2 +- src/modules/CrashReporting.ts | 4 +-- src/modules/FeatureRequests.ts | 2 +- src/modules/Instabug.ts | 2 +- src/modules/NetworkLogger.ts | 3 +- src/modules/Replies.ts | 2 +- src/modules/Surveys.ts | 4 +-- .../{ApmNativeModule.ts => NativeAPM.ts} | 3 ++ ...gNativeModule.ts => NativeBugReporting.ts} | 3 ++ ...ativeModule.ts => NativeCrashReporting.ts} | 4 +++ ...tiveModule.ts => NativeFeatureRequests.ts} | 3 ++ ...tabugNativeModule.ts => NativeInstabug.ts} | 3 ++ src/native/NativePackage.ts | 28 ++++++++++++++++++ ...epliesNativeModule.ts => NativeReplies.ts} | 4 +++ ...urveysNativeModule.ts => NativeSurveys.ts} | 4 +++ src/native/index.ts | 29 ------------------- src/utils/ArgsRegistry.ts | 2 +- src/utils/Enums.ts | 2 +- src/utils/InstabugUtils.ts | 4 +-- test/models/Report.spec.ts | 2 +- test/models/Trace.spec.ts | 2 +- test/modules/APM.spec.ts | 3 +- test/modules/BugReporting.spec.ts | 2 +- test/modules/CrashReporting.spec.ts | 2 +- test/modules/FeatureRequests.spec.ts | 2 +- test/modules/Instabug.spec.ts | 2 +- test/modules/NetworkLogger.spec.ts | 3 +- test/modules/Replies.spec.ts | 2 +- test/modules/Surveys.spec.ts | 2 +- test/utils/InstabugUtils.spec.ts | 2 +- 33 files changed, 83 insertions(+), 56 deletions(-) rename src/native/{ApmNativeModule.ts => NativeAPM.ts} (89%) rename src/native/{BugReportingNativeModule.ts => NativeBugReporting.ts} (94%) rename src/native/{CrashReportingNativeModule.ts => NativeCrashReporting.ts} (81%) rename src/native/{FeatureRequestsNativeModule.ts => NativeFeatureRequests.ts} (77%) rename src/native/{InstabugNativeModule.ts => NativeInstabug.ts} (97%) create mode 100644 src/native/NativePackage.ts rename src/native/{RepliesNativeModule.ts => NativeReplies.ts} (89%) rename src/native/{SurveysNativeModule.ts => NativeSurveys.ts} (88%) delete mode 100644 src/native/index.ts diff --git a/src/models/Report.ts b/src/models/Report.ts index b61da4dc9f..4af0a8458d 100644 --- a/src/models/Report.ts +++ b/src/models/Report.ts @@ -1,6 +1,6 @@ import { Platform } from 'react-native'; -import { NativeInstabug } from '../native'; +import { NativeInstabug } from '../native/NativeInstabug'; interface LogInfo { log: string; diff --git a/src/models/Trace.ts b/src/models/Trace.ts index ab86ba05fd..6baa5aec29 100644 --- a/src/models/Trace.ts +++ b/src/models/Trace.ts @@ -1,4 +1,4 @@ -import { NativeAPM } from '../native'; +import { NativeAPM } from '../native/NativeAPM'; export default class Trace { constructor( diff --git a/src/modules/APM.ts b/src/modules/APM.ts index a9df302f01..26170375a0 100644 --- a/src/modules/APM.ts +++ b/src/modules/APM.ts @@ -1,7 +1,8 @@ import { Platform } from 'react-native'; import Trace from '../models/Trace'; -import { NativeAPM, NativeInstabug } from '../native'; +import { NativeAPM } from '../native/NativeAPM'; +import { NativeInstabug } from '../native/NativeInstabug'; import { logLevel } from '../utils/ArgsRegistry'; export { logLevel }; diff --git a/src/modules/BugReporting.ts b/src/modules/BugReporting.ts index 0efee28da4..2708ff622f 100644 --- a/src/modules/BugReporting.ts +++ b/src/modules/BugReporting.ts @@ -1,6 +1,6 @@ import { Platform } from 'react-native'; -import { NativeBugReporting } from '../native'; +import { NativeBugReporting } from '../native/NativeBugReporting'; import { dismissType, extendedBugReportMode, diff --git a/src/modules/CrashReporting.ts b/src/modules/CrashReporting.ts index c9b827eeac..5687b2f537 100644 --- a/src/modules/CrashReporting.ts +++ b/src/modules/CrashReporting.ts @@ -1,8 +1,8 @@ import { Platform } from 'react-native'; import type { ExtendedError } from 'react-native/Libraries/Core/Devtools/parseErrorStack'; -import { NativeCrashReporting } from '../native'; -import type { CrashData } from '../native/CrashReportingNativeModule'; +import type { CrashData } from '../native/NativeCrashReporting'; +import { NativeCrashReporting } from '../native/NativeCrashReporting'; import InstabugUtils from '../utils/InstabugUtils'; /** diff --git a/src/modules/FeatureRequests.ts b/src/modules/FeatureRequests.ts index 08453a7eec..aa5d2596dd 100644 --- a/src/modules/FeatureRequests.ts +++ b/src/modules/FeatureRequests.ts @@ -1,4 +1,4 @@ -import { NativeFeatureRequests } from '../native'; +import { NativeFeatureRequests } from '../native/NativeFeatureRequests'; import { actionTypes } from '../utils/ArgsRegistry'; import type { ActionType } from '../utils/Enums'; diff --git a/src/modules/Instabug.ts b/src/modules/Instabug.ts index dd569ebb91..77c0821712 100644 --- a/src/modules/Instabug.ts +++ b/src/modules/Instabug.ts @@ -7,7 +7,7 @@ import type { NavigationAction, NavigationState as NavigationStateV4 } from 'rea import type { InstabugConfig } from '../models/InstabugConfig'; import Report from '../models/Report'; -import { NativeInstabug } from '../native'; +import { NativeInstabug } from '../native/NativeInstabug'; import { IBGPosition, actionTypes, diff --git a/src/modules/NetworkLogger.ts b/src/modules/NetworkLogger.ts index 3ec57c7052..7d9d162df9 100644 --- a/src/modules/NetworkLogger.ts +++ b/src/modules/NetworkLogger.ts @@ -2,7 +2,8 @@ import { Platform } from 'react-native'; import type { RequestHandler } from '@apollo/client'; -import { NativeAPM, NativeInstabug } from '../native'; +import { NativeAPM } from '../native/NativeAPM'; +import { NativeInstabug } from '../native/NativeInstabug'; import IBGEventEmitter from '../utils/IBGEventEmitter'; import InstabugConstants from '../utils/InstabugConstants'; import xhr, { NetworkData, ProgressCallback } from '../utils/XhrNetworkInterceptor'; diff --git a/src/modules/Replies.ts b/src/modules/Replies.ts index 5d2317a608..dfd21fddac 100644 --- a/src/modules/Replies.ts +++ b/src/modules/Replies.ts @@ -1,6 +1,6 @@ import { Platform } from 'react-native'; -import { NativeReplies } from '../native'; +import { NativeReplies } from '../native/NativeReplies'; import IBGEventEmitter from '../utils/IBGEventEmitter'; import InstabugConstants from '../utils/InstabugConstants'; diff --git a/src/modules/Surveys.ts b/src/modules/Surveys.ts index b66fdbff0b..41386a38e9 100644 --- a/src/modules/Surveys.ts +++ b/src/modules/Surveys.ts @@ -1,7 +1,7 @@ import { Platform } from 'react-native'; -import { NativeSurveys } from '../native'; -import type { Survey } from '../native/SurveysNativeModule'; +import { NativeSurveys } from '../native/NativeSurveys'; +import type { Survey } from '../native/NativeSurveys'; import IBGEventEmitter from '../utils/IBGEventEmitter'; import InstabugConstants from '../utils/InstabugConstants'; diff --git a/src/native/ApmNativeModule.ts b/src/native/NativeAPM.ts similarity index 89% rename from src/native/ApmNativeModule.ts rename to src/native/NativeAPM.ts index f398509ea9..30067b7794 100644 --- a/src/native/ApmNativeModule.ts +++ b/src/native/NativeAPM.ts @@ -1,6 +1,7 @@ import type { NativeModule } from 'react-native'; import type { logLevel } from '../utils/ArgsRegistry'; +import { NativeModules } from './NativePackage'; export interface ApmNativeModule extends NativeModule { // Essential APIs // @@ -28,3 +29,5 @@ export interface ApmNativeModule extends NativeModule { /** @deprecated */ setLogLevel(level: logLevel): void; } + +export const NativeAPM = NativeModules.IBGAPM; diff --git a/src/native/BugReportingNativeModule.ts b/src/native/NativeBugReporting.ts similarity index 94% rename from src/native/BugReportingNativeModule.ts rename to src/native/NativeBugReporting.ts index cc4dbe59d1..70eebfacdd 100644 --- a/src/native/BugReportingNativeModule.ts +++ b/src/native/NativeBugReporting.ts @@ -18,6 +18,7 @@ import type { RecordingButtonPosition, ReportType, } from '../utils/Enums'; +import { NativeModules } from './NativePackage'; export interface BugReportingNativeModule extends NativeModule { // Essential APIs // @@ -57,3 +58,5 @@ export interface BugReportingNativeModule extends NativeModule { handler: (dismissType: dismissType | DismissType, reportType: reportType | ReportType) => void, ): void; } + +export const NativeBugReporting = NativeModules.IBGBugReporting; diff --git a/src/native/CrashReportingNativeModule.ts b/src/native/NativeCrashReporting.ts similarity index 81% rename from src/native/CrashReportingNativeModule.ts rename to src/native/NativeCrashReporting.ts index 8124c2a0f2..b10d9674ba 100644 --- a/src/native/CrashReportingNativeModule.ts +++ b/src/native/NativeCrashReporting.ts @@ -1,6 +1,8 @@ import type { NativeModule, Platform } from 'react-native'; import type { StackFrame } from 'react-native/Libraries/Core/Devtools/parseErrorStack'; +import { NativeModules } from './NativePackage'; + export interface CrashData { message: string; e_message: string; @@ -15,3 +17,5 @@ export interface CrashReportingNativeModule extends NativeModule { sendJSCrash(data: CrashData | string): void; sendHandledJSCrash(data: CrashData | string): void; } + +export const NativeCrashReporting = NativeModules.IBGCrashReporting; diff --git a/src/native/FeatureRequestsNativeModule.ts b/src/native/NativeFeatureRequests.ts similarity index 77% rename from src/native/FeatureRequestsNativeModule.ts rename to src/native/NativeFeatureRequests.ts index 6fc8d65291..dc74690d65 100644 --- a/src/native/FeatureRequestsNativeModule.ts +++ b/src/native/NativeFeatureRequests.ts @@ -2,6 +2,7 @@ import type { NativeModule } from 'react-native'; import type { actionTypes } from '../utils/ArgsRegistry'; import type { ActionType } from '../utils/Enums'; +import { NativeModules } from './NativePackage'; export interface FeatureRequestsNativeModule extends NativeModule { setEnabled(isEnabled: boolean): void; @@ -11,3 +12,5 @@ export interface FeatureRequestsNativeModule extends NativeModule { types: actionTypes[] | ActionType[], ): void; } + +export const NativeFeatureRequests = NativeModules.IBGFeatureRequests; diff --git a/src/native/InstabugNativeModule.ts b/src/native/NativeInstabug.ts similarity index 97% rename from src/native/InstabugNativeModule.ts rename to src/native/NativeInstabug.ts index ab37e9c6bc..dc241fc049 100644 --- a/src/native/InstabugNativeModule.ts +++ b/src/native/NativeInstabug.ts @@ -21,6 +21,7 @@ import type { } from '../utils/Enums'; import type { NetworkData } from '../utils/XhrNetworkInterceptor'; import type { NativeConstants } from './NativeConstants'; +import { NativeModules } from './NativePackage'; export interface InstabugNativeModule extends NativeModule { getConstants(): NativeConstants; @@ -120,3 +121,5 @@ export interface InstabugNativeModule extends NativeModule { /** @deprecated */ callPrivateApi(apiName: string, param: any[]): void; } + +export const NativeInstabug = NativeModules.Instabug; diff --git a/src/native/NativePackage.ts b/src/native/NativePackage.ts new file mode 100644 index 0000000000..2adcee7114 --- /dev/null +++ b/src/native/NativePackage.ts @@ -0,0 +1,28 @@ +import { NativeModules as ReactNativeModules } from 'react-native'; + +import type { ApmNativeModule } from './NativeAPM'; +import type { BugReportingNativeModule } from './NativeBugReporting'; +import type { CrashReportingNativeModule } from './NativeCrashReporting'; +import type { FeatureRequestsNativeModule } from './NativeFeatureRequests'; +import type { InstabugNativeModule } from './NativeInstabug'; +import type { RepliesNativeModule } from './NativeReplies'; +import type { SurveysNativeModule } from './NativeSurveys'; + +export interface InstabugNativePackage { + IBGAPM: ApmNativeModule; + IBGBugReporting: BugReportingNativeModule; + IBGCrashReporting: CrashReportingNativeModule; + IBGFeatureRequests: FeatureRequestsNativeModule; + Instabug: InstabugNativeModule; + IBGReplies: RepliesNativeModule; + IBGSurveys: SurveysNativeModule; +} + +export const NativeModules = ReactNativeModules as InstabugNativePackage; + +// export const NativeBugReporting = NativeModules.IBGBugReporting; +// export const NativeCrashReporting = NativeModules.IBGCrashReporting; +// export const NativeFeatureRequests = NativeModules.IBGFeatureRequests; +// export const NativeInstabug = NativeModules.Instabug; +// export const NativeReplies = NativeModules.IBGReplies; +// export const NativeSurveys = NativeModules.IBGSurveys; diff --git a/src/native/RepliesNativeModule.ts b/src/native/NativeReplies.ts similarity index 89% rename from src/native/RepliesNativeModule.ts rename to src/native/NativeReplies.ts index b3db292da8..74d4571bc1 100644 --- a/src/native/RepliesNativeModule.ts +++ b/src/native/NativeReplies.ts @@ -1,5 +1,7 @@ import type { NativeModule } from 'react-native'; +import { NativeModules } from './NativePackage'; + export interface RepliesNativeModule extends NativeModule { // Essential APIs // setEnabled(isEnabled: boolean): void; @@ -22,3 +24,5 @@ export interface RepliesNativeModule extends NativeModule { setPushNotificationChannelId(id: string): void; setSystemReplyNotificationSoundEnabled(isEnabled: boolean): void; } + +export const NativeReplies = NativeModules.IBGReplies; diff --git a/src/native/SurveysNativeModule.ts b/src/native/NativeSurveys.ts similarity index 88% rename from src/native/SurveysNativeModule.ts rename to src/native/NativeSurveys.ts index 575a26d3ed..03281c8ff3 100644 --- a/src/native/SurveysNativeModule.ts +++ b/src/native/NativeSurveys.ts @@ -1,5 +1,7 @@ import type { NativeModule } from 'react-native'; +import { NativeModules } from './NativePackage'; + export interface Survey { title: string; } @@ -24,3 +26,5 @@ export interface SurveysNativeModule extends NativeModule { setOnShowHandler(onShowHandler: () => void): void; setOnDismissHandler(onDismissHandler: () => void): void; } + +export const NativeSurveys = NativeModules.IBGSurveys; diff --git a/src/native/index.ts b/src/native/index.ts deleted file mode 100644 index ba89401774..0000000000 --- a/src/native/index.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { NativeModules as ReactNativeModules } from 'react-native'; - -import type { ApmNativeModule } from './ApmNativeModule'; -import type { BugReportingNativeModule } from './BugReportingNativeModule'; -import type { CrashReportingNativeModule } from './CrashReportingNativeModule'; -import type { FeatureRequestsNativeModule } from './FeatureRequestsNativeModule'; -import type { InstabugNativeModule } from './InstabugNativeModule'; -import type { RepliesNativeModule } from './RepliesNativeModule'; -import type { SurveysNativeModule } from './SurveysNativeModule'; - -export interface InstabugNativePackage { - IBGAPM: ApmNativeModule; - IBGBugReporting: BugReportingNativeModule; - IBGCrashReporting: CrashReportingNativeModule; - IBGFeatureRequests: FeatureRequestsNativeModule; - Instabug: InstabugNativeModule; - IBGReplies: RepliesNativeModule; - IBGSurveys: SurveysNativeModule; -} - -export const NativeModules = ReactNativeModules as InstabugNativePackage; - -export const NativeAPM = NativeModules.IBGAPM; -export const NativeBugReporting = NativeModules.IBGBugReporting; -export const NativeCrashReporting = NativeModules.IBGCrashReporting; -export const NativeFeatureRequests = NativeModules.IBGFeatureRequests; -export const NativeInstabug = NativeModules.Instabug; -export const NativeReplies = NativeModules.IBGReplies; -export const NativeSurveys = NativeModules.IBGSurveys; diff --git a/src/utils/ArgsRegistry.ts b/src/utils/ArgsRegistry.ts index 028d57039d..08b52b7cd7 100644 --- a/src/utils/ArgsRegistry.ts +++ b/src/utils/ArgsRegistry.ts @@ -1,4 +1,4 @@ -import { NativeInstabug } from '../native'; +import { NativeInstabug } from '../native/NativeInstabug'; const constants = NativeInstabug.getConstants(); diff --git a/src/utils/Enums.ts b/src/utils/Enums.ts index e5f3fcaae0..bdae6fbbf2 100644 --- a/src/utils/Enums.ts +++ b/src/utils/Enums.ts @@ -1,4 +1,4 @@ -import { NativeInstabug } from '../native'; +import { NativeInstabug } from '../native/NativeInstabug'; const constants = NativeInstabug.getConstants(); diff --git a/src/utils/InstabugUtils.ts b/src/utils/InstabugUtils.ts index f107eb1377..d88bce4707 100644 --- a/src/utils/InstabugUtils.ts +++ b/src/utils/InstabugUtils.ts @@ -7,8 +7,8 @@ import parseErrorStackLib, { import type { NavigationState as NavigationStateV5, PartialState } from '@react-navigation/native'; import type { NavigationState as NavigationStateV4 } from 'react-navigation'; -import { NativeCrashReporting } from '../native'; -import type { CrashData } from '../native/CrashReportingNativeModule'; +import type { CrashData } from '../native/NativeCrashReporting'; +import { NativeCrashReporting } from '../native/NativeCrashReporting'; export const parseErrorStack = (error: ExtendedError): StackFrame[] => { return parseErrorStackLib(error); diff --git a/test/models/Report.spec.ts b/test/models/Report.spec.ts index c75d46e8ad..20c6c8952f 100644 --- a/test/models/Report.spec.ts +++ b/test/models/Report.spec.ts @@ -1,7 +1,7 @@ import { Platform } from 'react-native'; import Report from '../../src/models/Report'; -import { NativeInstabug } from '../../src/native'; +import { NativeInstabug } from '../../src/native/NativeInstabug'; describe('Report Model', () => { let report: Report; diff --git a/test/models/Trace.spec.ts b/test/models/Trace.spec.ts index a37d722165..8421b419a1 100644 --- a/test/models/Trace.spec.ts +++ b/test/models/Trace.spec.ts @@ -1,5 +1,5 @@ import Trace from '../../src/models/Trace'; -import { NativeAPM } from '../../src/native'; +import { NativeAPM } from '../../src/native/NativeAPM'; describe('Trace Model', () => { it('should set the id, name and attributes if passed', () => { diff --git a/test/modules/APM.spec.ts b/test/modules/APM.spec.ts index b8dcfd29db..fdf90a967a 100644 --- a/test/modules/APM.spec.ts +++ b/test/modules/APM.spec.ts @@ -4,7 +4,8 @@ import { mocked } from 'ts-jest/utils'; import Trace from '../../src/models/Trace'; import * as APM from '../../src/modules/APM'; -import { NativeAPM, NativeInstabug } from '../../src/native'; +import { NativeAPM } from '../../src/native/NativeAPM'; +import { NativeInstabug } from '../../src/native/NativeInstabug'; describe('APM Module', () => { it('should call the native method setEnabled', () => { diff --git a/test/modules/BugReporting.spec.ts b/test/modules/BugReporting.spec.ts index 93003fee8d..f07b5c1512 100644 --- a/test/modules/BugReporting.spec.ts +++ b/test/modules/BugReporting.spec.ts @@ -1,7 +1,7 @@ import { Platform } from 'react-native'; import * as BugReporting from '../../src/modules/BugReporting'; -import { NativeBugReporting } from '../../src/native'; +import { NativeBugReporting } from '../../src/native/NativeBugReporting'; import { ExtendedBugReportMode, FloatingButtonPosition, diff --git a/test/modules/CrashReporting.spec.ts b/test/modules/CrashReporting.spec.ts index f998a39300..62f4ed3c93 100644 --- a/test/modules/CrashReporting.spec.ts +++ b/test/modules/CrashReporting.spec.ts @@ -3,7 +3,7 @@ import '../mocks/mockInstabugUtils'; import { Platform } from 'react-native'; import * as CrashReporting from '../../src/modules/CrashReporting'; -import { NativeCrashReporting } from '../../src/native'; +import { NativeCrashReporting } from '../../src/native/NativeCrashReporting'; describe('CrashReporting Module', () => { it('should call the native method setEnabled', () => { diff --git a/test/modules/FeatureRequests.spec.ts b/test/modules/FeatureRequests.spec.ts index b19aeeb491..6f7c028604 100644 --- a/test/modules/FeatureRequests.spec.ts +++ b/test/modules/FeatureRequests.spec.ts @@ -1,5 +1,5 @@ import * as FeatureRequests from '../../src/modules/FeatureRequests'; -import { NativeFeatureRequests } from '../../src/native'; +import { NativeFeatureRequests } from '../../src/native/NativeFeatureRequests'; import { ActionType } from '../../src/utils/Enums'; describe('Feature Requests Module', () => { diff --git a/test/modules/Instabug.spec.ts b/test/modules/Instabug.spec.ts index b208caf1b5..ef7c525c76 100644 --- a/test/modules/Instabug.spec.ts +++ b/test/modules/Instabug.spec.ts @@ -6,7 +6,7 @@ import waitForExpect from 'wait-for-expect'; import Report from '../../src/models/Report'; import * as Instabug from '../../src/modules/Instabug'; -import { NativeInstabug } from '../../src/native'; +import { NativeInstabug } from '../../src/native/NativeInstabug'; import { ColorTheme, InvocationEvent, diff --git a/test/modules/NetworkLogger.spec.ts b/test/modules/NetworkLogger.spec.ts index 758d4466ba..b536e50ce2 100644 --- a/test/modules/NetworkLogger.spec.ts +++ b/test/modules/NetworkLogger.spec.ts @@ -5,7 +5,8 @@ import { Platform } from 'react-native'; import waitForExpect from 'wait-for-expect'; import * as NetworkLogger from '../../src/modules/NetworkLogger'; -import { NativeAPM, NativeInstabug } from '../../src/native'; +import { NativeAPM } from '../../src/native/NativeAPM'; +import { NativeInstabug } from '../../src/native/NativeInstabug'; import IBGEventEmitter from '../../src/utils/IBGEventEmitter'; import IBGConstants from '../../src/utils/InstabugConstants'; import Interceptor from '../../src/utils/XhrNetworkInterceptor'; diff --git a/test/modules/Replies.spec.ts b/test/modules/Replies.spec.ts index d8784364df..8db4a578f5 100644 --- a/test/modules/Replies.spec.ts +++ b/test/modules/Replies.spec.ts @@ -1,7 +1,7 @@ import { Platform } from 'react-native'; import * as Replies from '../../src/modules/Replies'; -import { NativeReplies } from '../../src/native'; +import { NativeReplies } from '../../src/native/NativeReplies'; import IBGEventEmitter from '../../src/utils/IBGEventEmitter'; import IBGConstants from '../../src/utils/InstabugConstants'; diff --git a/test/modules/Surveys.spec.ts b/test/modules/Surveys.spec.ts index ebb8421180..71c1bda490 100644 --- a/test/modules/Surveys.spec.ts +++ b/test/modules/Surveys.spec.ts @@ -1,7 +1,7 @@ import { Platform } from 'react-native'; import * as Surveys from '../../src/modules/Surveys'; -import { NativeSurveys } from '../../src/native'; +import { NativeSurveys } from '../../src/native/NativeSurveys'; import IBGEventEmitter from '../../src/utils/IBGEventEmitter'; import IBGConstants from '../../src/utils/InstabugConstants'; diff --git a/test/utils/InstabugUtils.spec.ts b/test/utils/InstabugUtils.spec.ts index b60aeef732..1e28530adf 100644 --- a/test/utils/InstabugUtils.spec.ts +++ b/test/utils/InstabugUtils.spec.ts @@ -4,7 +4,7 @@ import { Platform } from 'react-native'; import parseErrorStackLib from 'react-native/Libraries/Core/Devtools/parseErrorStack'; import * as Instabug from '../../src/modules/Instabug'; -import { NativeCrashReporting } from '../../src/native'; +import { NativeCrashReporting } from '../../src/native/NativeCrashReporting'; import { InvocationEvent } from '../../src/utils/Enums'; import InstabugUtils from '../../src/utils/InstabugUtils'; From 0fb9729c122d065dd5e603336ad65b21012ede47 Mon Sep 17 00:00:00 2001 From: Ahmed Mahmoud Date: Wed, 1 Mar 2023 15:47:19 +0200 Subject: [PATCH 2/3] Remove commented code --- src/native/NativePackage.ts | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/native/NativePackage.ts b/src/native/NativePackage.ts index 2adcee7114..2f74572f08 100644 --- a/src/native/NativePackage.ts +++ b/src/native/NativePackage.ts @@ -19,10 +19,3 @@ export interface InstabugNativePackage { } export const NativeModules = ReactNativeModules as InstabugNativePackage; - -// export const NativeBugReporting = NativeModules.IBGBugReporting; -// export const NativeCrashReporting = NativeModules.IBGCrashReporting; -// export const NativeFeatureRequests = NativeModules.IBGFeatureRequests; -// export const NativeInstabug = NativeModules.Instabug; -// export const NativeReplies = NativeModules.IBGReplies; -// export const NativeSurveys = NativeModules.IBGSurveys; From 39c9caa2e842ec02bf4d71c324c14a60e12f5af4 Mon Sep 17 00:00:00 2001 From: Ahmed Mahmoud Date: Wed, 1 Mar 2023 15:49:35 +0200 Subject: [PATCH 3/3] Fix imports in mocks --- test/mocks/mockAPM.ts | 2 +- test/mocks/mockBugReporting.ts | 2 +- test/mocks/mockCrashReporting.ts | 2 +- test/mocks/mockFeatureRequests.ts | 2 +- test/mocks/mockInstabug.ts | 2 +- test/mocks/mockNativeModules.ts | 2 +- test/mocks/mockReplies.ts | 2 +- test/mocks/mockSurveys.ts | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/test/mocks/mockAPM.ts b/test/mocks/mockAPM.ts index 8b8c4c6815..c0465c7bb7 100644 --- a/test/mocks/mockAPM.ts +++ b/test/mocks/mockAPM.ts @@ -1,4 +1,4 @@ -import type { ApmNativeModule } from '../../src/native/ApmNativeModule'; +import type { ApmNativeModule } from '../../src/native/NativeAPM'; const mockAPM: ApmNativeModule = { addListener: jest.fn(), diff --git a/test/mocks/mockBugReporting.ts b/test/mocks/mockBugReporting.ts index fa0f07d19a..03d3bd35d1 100644 --- a/test/mocks/mockBugReporting.ts +++ b/test/mocks/mockBugReporting.ts @@ -1,4 +1,4 @@ -import type { BugReportingNativeModule } from '../../src/native/BugReportingNativeModule'; +import type { BugReportingNativeModule } from '../../src/native/NativeBugReporting'; const mockBugReporting: BugReportingNativeModule = { addListener: jest.fn(), diff --git a/test/mocks/mockCrashReporting.ts b/test/mocks/mockCrashReporting.ts index 43daecca05..0d26851568 100644 --- a/test/mocks/mockCrashReporting.ts +++ b/test/mocks/mockCrashReporting.ts @@ -1,4 +1,4 @@ -import type { CrashReportingNativeModule } from '../../src/native/CrashReportingNativeModule'; +import type { CrashReportingNativeModule } from '../../src/native/NativeCrashReporting'; const mockCrashReporting: CrashReportingNativeModule = { addListener: jest.fn(), diff --git a/test/mocks/mockFeatureRequests.ts b/test/mocks/mockFeatureRequests.ts index 9ed48c02b4..1e1023e465 100644 --- a/test/mocks/mockFeatureRequests.ts +++ b/test/mocks/mockFeatureRequests.ts @@ -1,4 +1,4 @@ -import type { FeatureRequestsNativeModule } from '../../src/native/FeatureRequestsNativeModule'; +import type { FeatureRequestsNativeModule } from '../../src/native/NativeFeatureRequests'; const mockFeatureRequests: FeatureRequestsNativeModule = { addListener: jest.fn(), diff --git a/test/mocks/mockInstabug.ts b/test/mocks/mockInstabug.ts index f8bf85ff14..7b44fe2de0 100644 --- a/test/mocks/mockInstabug.ts +++ b/test/mocks/mockInstabug.ts @@ -1,4 +1,4 @@ -import type { InstabugNativeModule } from '../../src/native/InstabugNativeModule'; +import type { InstabugNativeModule } from '../../src/native/NativeInstabug'; const mockInstabug: InstabugNativeModule = { addListener: jest.fn(), diff --git a/test/mocks/mockNativeModules.ts b/test/mocks/mockNativeModules.ts index 9112004f11..b53fa23517 100644 --- a/test/mocks/mockNativeModules.ts +++ b/test/mocks/mockNativeModules.ts @@ -1,4 +1,4 @@ -import type { InstabugNativePackage } from '../../src/native'; +import type { InstabugNativePackage } from '../../src/native/NativePackage'; import mockAPM from './mockAPM'; import mockBugReporting from './mockBugReporting'; import mockCrashReporting from './mockCrashReporting'; diff --git a/test/mocks/mockReplies.ts b/test/mocks/mockReplies.ts index c2c86b731c..3247155cb5 100644 --- a/test/mocks/mockReplies.ts +++ b/test/mocks/mockReplies.ts @@ -1,4 +1,4 @@ -import type { RepliesNativeModule } from '../../src/native/RepliesNativeModule'; +import type { RepliesNativeModule } from '../../src/native/NativeReplies'; const mockReplies: RepliesNativeModule = { addListener: jest.fn(), diff --git a/test/mocks/mockSurveys.ts b/test/mocks/mockSurveys.ts index d94af4f511..4f886536e8 100644 --- a/test/mocks/mockSurveys.ts +++ b/test/mocks/mockSurveys.ts @@ -1,4 +1,4 @@ -import type { SurveysNativeModule } from '../../src/native/SurveysNativeModule'; +import type { SurveysNativeModule } from '../../src/native/NativeSurveys'; const mockSurveys: SurveysNativeModule = { addListener: jest.fn(),