diff --git a/src/app/core/window-ea.d.ts b/src/app/core/window-ea.d.ts index 79e364361..81fc08666 100644 --- a/src/app/core/window-ea.d.ts +++ b/src/app/core/window-ea.d.ts @@ -4,11 +4,9 @@ import { ElectronAPI } from '../../../electron/electronAPI'; // Extend the existing Window interface declaration -// Note: In test environment, this is declared as required in test.ts -// In runtime, this may be undefined in web context declare global { interface Window { - ea?: ElectronAPI | undefined; + ea: ElectronAPI; } } diff --git a/src/app/util/download.ts b/src/app/util/download.ts index 944468850..47e4db18a 100644 --- a/src/app/util/download.ts +++ b/src/app/util/download.ts @@ -2,7 +2,7 @@ import { saveAs } from 'file-saver'; import { Directory, Encoding, Filesystem, WriteFileResult } from '@capacitor/filesystem'; import { IS_ANDROID_WEB_VIEW } from './is-android-web-view'; import { Log } from '../core/log'; -import '../core/window-ea'; +import '../core/window-ea.d'; const isRunningInSnap = (): boolean => { return !!window.ea?.isSnap?.(); diff --git a/src/main.ts b/src/main.ts index 192c5c015..3eb943170 100644 --- a/src/main.ts +++ b/src/main.ts @@ -11,7 +11,7 @@ import { environment } from './environments/environment'; import { IS_ELECTRON, LanguageCode } from './app/app.constants'; import { IS_ANDROID_WEB_VIEW } from './app/util/is-android-web-view'; import { androidInterface } from './app/features/android/android-interface'; -import { ElectronAPI } from '../electron/electronAPI.d'; +import './app/core/window-ea.d'; import { App as CapacitorApp } from '@capacitor/app'; import { GlobalErrorHandler } from './app/core/error-handler/global-error-handler.class'; import { @@ -77,11 +77,7 @@ if (environment.production || environment.stage) { enableProdMode(); } -declare global { - interface Window { - ea: ElectronAPI; - } -} +// Window.ea declaration is in src/app/core/window-ea.d.ts const createTranslateLoader = (http: HttpClient): TranslateHttpLoader => new TranslateHttpLoader(http, './assets/i18n/', '.json'); diff --git a/src/test.ts b/src/test.ts index 4dc09016b..f696eca25 100644 --- a/src/test.ts +++ b/src/test.ts @@ -6,13 +6,8 @@ import { platformBrowserDynamicTesting, } from '@angular/platform-browser-dynamic/testing'; import { provideExperimentalZonelessChangeDetection } from '@angular/core'; -import { ElectronAPI } from '../electron/electronAPI'; - -declare global { - interface Window { - ea: ElectronAPI; - } -} +// Import type definitions for window.ea +import './app/core/window-ea.d'; beforeAll(() => { jasmine.DEFAULT_TIMEOUT_INTERVAL = 2000;