diff options
Diffstat (limited to 'packages/main/src/infrastructure')
10 files changed, 17 insertions, 29 deletions
diff --git a/packages/main/src/infrastructure/config/impl/ConfigFile.ts b/packages/main/src/infrastructure/config/impl/ConfigFile.ts index 8b110a2..6203c89 100644 --- a/packages/main/src/infrastructure/config/impl/ConfigFile.ts +++ b/packages/main/src/infrastructure/config/impl/ConfigFile.ts | |||
@@ -25,8 +25,8 @@ import path from 'node:path'; | |||
25 | import { throttle } from 'lodash-es'; | 25 | import { throttle } from 'lodash-es'; |
26 | 26 | ||
27 | import type Disposer from '../../../utils/Disposer'; | 27 | import type Disposer from '../../../utils/Disposer'; |
28 | import getLogger from '../../../utils/getLogger'; | ||
28 | import isErrno from '../../../utils/isErrno'; | 29 | import isErrno from '../../../utils/isErrno'; |
29 | import { getLogger } from '../../../utils/log'; | ||
30 | import type ConfigRepository from '../ConfigRepository'; | 30 | import type ConfigRepository from '../ConfigRepository'; |
31 | import type { ReadConfigResult } from '../ConfigRepository'; | 31 | import type { ReadConfigResult } from '../ConfigRepository'; |
32 | 32 | ||
diff --git a/packages/main/src/infrastructure/electron/RendererBridge.ts b/packages/main/src/infrastructure/electron/RendererBridge.ts index c26aa94..3f9b512 100644 --- a/packages/main/src/infrastructure/electron/RendererBridge.ts +++ b/packages/main/src/infrastructure/electron/RendererBridge.ts | |||
@@ -29,7 +29,7 @@ import { | |||
29 | 29 | ||
30 | import type MainStore from '../../stores/MainStore'; | 30 | import type MainStore from '../../stores/MainStore'; |
31 | import Disposer from '../../utils/Disposer'; | 31 | import Disposer from '../../utils/Disposer'; |
32 | import { getLogger } from '../../utils/log'; | 32 | import getLogger from '../../utils/getLogger'; |
33 | 33 | ||
34 | const log = getLogger('RendererBridge'); | 34 | const log = getLogger('RendererBridge'); |
35 | 35 | ||
diff --git a/packages/main/src/infrastructure/electron/impl/ElectronMainWindow.ts b/packages/main/src/infrastructure/electron/impl/ElectronMainWindow.ts index b0db115..20a1f70 100644 --- a/packages/main/src/infrastructure/electron/impl/ElectronMainWindow.ts +++ b/packages/main/src/infrastructure/electron/impl/ElectronMainWindow.ts | |||
@@ -28,7 +28,7 @@ import { BrowserWindow, ipcMain, IpcMainEvent } from 'electron'; | |||
28 | import type { IJsonPatch } from 'mobx-state-tree'; | 28 | import type { IJsonPatch } from 'mobx-state-tree'; |
29 | 29 | ||
30 | import type MainStore from '../../../stores/MainStore'; | 30 | import type MainStore from '../../../stores/MainStore'; |
31 | import { getLogger } from '../../../utils/log'; | 31 | import getLogger from '../../../utils/getLogger'; |
32 | import RendererBridge from '../RendererBridge'; | 32 | import RendererBridge from '../RendererBridge'; |
33 | import type { MainWindow, ServiceView } from '../types'; | 33 | import type { MainWindow, ServiceView } from '../types'; |
34 | 34 | ||
diff --git a/packages/main/src/infrastructure/electron/impl/ElectronServiceView.ts b/packages/main/src/infrastructure/electron/impl/ElectronServiceView.ts index 3118efc..a9298bd 100644 --- a/packages/main/src/infrastructure/electron/impl/ElectronServiceView.ts +++ b/packages/main/src/infrastructure/electron/impl/ElectronServiceView.ts | |||
@@ -21,7 +21,7 @@ | |||
21 | import { BrowserView } from 'electron'; | 21 | import { BrowserView } from 'electron'; |
22 | 22 | ||
23 | import type Service from '../../../stores/Service'; | 23 | import type Service from '../../../stores/Service'; |
24 | import { getLogger } from '../../../utils/log'; | 24 | import getLogger from '../../../utils/getLogger'; |
25 | import type Resources from '../../resources/Resources'; | 25 | import type Resources from '../../resources/Resources'; |
26 | import type { ServiceView } from '../types'; | 26 | import type { ServiceView } from '../types'; |
27 | 27 | ||
diff --git a/packages/main/src/infrastructure/electron/impl/__tests__/electron.integ.spec.ts b/packages/main/src/infrastructure/electron/impl/__tests__/electron.integ.spec.ts new file mode 100644 index 0000000..f6bd440 --- /dev/null +++ b/packages/main/src/infrastructure/electron/impl/__tests__/electron.integ.spec.ts | |||
@@ -0,0 +1,9 @@ | |||
1 | import { BrowserWindow } from 'electron'; | ||
2 | |||
3 | import '../ElectronMainWindow'; | ||
4 | |||
5 | it('should create a BrowserWindow', async () => { | ||
6 | const w = new BrowserWindow(); | ||
7 | await expect(w.loadURL('https://example.org')).resolves.toBeUndefined(); | ||
8 | w.close(); | ||
9 | }); | ||
diff --git a/packages/main/src/infrastructure/electron/impl/__tests__/hardenSession.spec.ts b/packages/main/src/infrastructure/electron/impl/__tests__/hardenSession.spec.ts index 7457729..ae10677 100644 --- a/packages/main/src/infrastructure/electron/impl/__tests__/hardenSession.spec.ts +++ b/packages/main/src/infrastructure/electron/impl/__tests__/hardenSession.spec.ts | |||
@@ -30,7 +30,6 @@ import type { | |||
30 | WebContents, | 30 | WebContents, |
31 | } from 'electron'; | 31 | } from 'electron'; |
32 | 32 | ||
33 | import { silenceLogger } from '../../../../utils/log'; | ||
34 | import type Resources from '../../../resources/Resources'; | 33 | import type Resources from '../../../resources/Resources'; |
35 | import hardenSession from '../hardenSession'; | 34 | import hardenSession from '../hardenSession'; |
36 | 35 | ||
@@ -90,10 +89,6 @@ const fakeSession = fake<Session>({ | |||
90 | }, | 89 | }, |
91 | }); | 90 | }); |
92 | 91 | ||
93 | beforeAll(() => { | ||
94 | silenceLogger(); | ||
95 | }); | ||
96 | |||
97 | beforeEach(() => { | 92 | beforeEach(() => { |
98 | permissionRequestHandler = undefined; | 93 | permissionRequestHandler = undefined; |
99 | onBeforeRequest = undefined; | 94 | onBeforeRequest = undefined; |
diff --git a/packages/main/src/infrastructure/electron/impl/__tests__/lockWebContentsToFile.spec.ts b/packages/main/src/infrastructure/electron/impl/__tests__/lockWebContentsToFile.spec.ts index 29c0516..f7bad0a 100644 --- a/packages/main/src/infrastructure/electron/impl/__tests__/lockWebContentsToFile.spec.ts +++ b/packages/main/src/infrastructure/electron/impl/__tests__/lockWebContentsToFile.spec.ts | |||
@@ -25,7 +25,6 @@ import { fake } from '@sophie/test-utils'; | |||
25 | import type { Event, HandlerDetails, WebContents } from 'electron'; | 25 | import type { Event, HandlerDetails, WebContents } from 'electron'; |
26 | import { mocked } from 'jest-mock'; | 26 | import { mocked } from 'jest-mock'; |
27 | 27 | ||
28 | import { silenceLogger } from '../../../../utils/log'; | ||
29 | import type Resources from '../../../resources/Resources'; | 28 | import type Resources from '../../../resources/Resources'; |
30 | import lockWebContentsToFile from '../lockWebContentsToFile'; | 29 | import lockWebContentsToFile from '../lockWebContentsToFile'; |
31 | 30 | ||
@@ -59,17 +58,13 @@ const fakeWebContents = fake<WebContents>({ | |||
59 | } | 58 | } |
60 | return this as WebContents; | 59 | return this as WebContents; |
61 | }, | 60 | }, |
62 | loadURL: jest.fn(), | 61 | loadURL: jest.fn<WebContents['loadURL']>(), |
63 | }); | 62 | }); |
64 | 63 | ||
65 | const event: Event = { | 64 | const event: Event = { |
66 | preventDefault: jest.fn(), | 65 | preventDefault: jest.fn(), |
67 | }; | 66 | }; |
68 | 67 | ||
69 | beforeAll(() => { | ||
70 | silenceLogger(); | ||
71 | }); | ||
72 | |||
73 | beforeEach(async () => { | 68 | beforeEach(async () => { |
74 | windowOpenHandler = undefined; | 69 | windowOpenHandler = undefined; |
75 | willNavigate = undefined; | 70 | willNavigate = undefined; |
diff --git a/packages/main/src/infrastructure/electron/impl/devTools.ts b/packages/main/src/infrastructure/electron/impl/devTools.ts index 6db88d1..6b06d8f 100644 --- a/packages/main/src/infrastructure/electron/impl/devTools.ts +++ b/packages/main/src/infrastructure/electron/impl/devTools.ts | |||
@@ -18,7 +18,7 @@ | |||
18 | * SPDX-License-Identifier: AGPL-3.0-only | 18 | * SPDX-License-Identifier: AGPL-3.0-only |
19 | */ | 19 | */ |
20 | 20 | ||
21 | import { app, type BrowserWindow } from 'electron'; | 21 | import type { BrowserWindow } from 'electron'; |
22 | 22 | ||
23 | /* eslint-disable | 23 | /* eslint-disable |
24 | import/no-extraneous-dependencies, | 24 | import/no-extraneous-dependencies, |
@@ -29,17 +29,6 @@ import { app, type BrowserWindow } from 'electron'; | |||
29 | */ | 29 | */ |
30 | 30 | ||
31 | /** | 31 | /** |
32 | * Makes sure we use a separate data dir for development. | ||
33 | */ | ||
34 | export function ensureDevDataDir(): void { | ||
35 | // Use alternative directory when debugging to avoid clobbering the main installation. | ||
36 | app.setPath('userData', `${app.getPath('userData')}-dev`); | ||
37 | const userData = app.getPath('userData'); | ||
38 | const mkdirp = require('mkdirp') as typeof import('mkdirp'); | ||
39 | mkdirp.sync(userData); | ||
40 | } | ||
41 | |||
42 | /** | ||
43 | * Enables using source maps for node stack traces. | 32 | * Enables using source maps for node stack traces. |
44 | */ | 33 | */ |
45 | export function enableStacktraceSourceMaps(): void { | 34 | export function enableStacktraceSourceMaps(): void { |
diff --git a/packages/main/src/infrastructure/electron/impl/hardenSession.ts b/packages/main/src/infrastructure/electron/impl/hardenSession.ts index 53675a7..fc358a1 100644 --- a/packages/main/src/infrastructure/electron/impl/hardenSession.ts +++ b/packages/main/src/infrastructure/electron/impl/hardenSession.ts | |||
@@ -22,7 +22,7 @@ import { URL } from 'node:url'; | |||
22 | 22 | ||
23 | import type { Session } from 'electron'; | 23 | import type { Session } from 'electron'; |
24 | 24 | ||
25 | import { getLogger } from '../../../utils/log'; | 25 | import getLogger from '../../../utils/getLogger'; |
26 | import type Resources from '../../resources/Resources'; | 26 | import type Resources from '../../resources/Resources'; |
27 | 27 | ||
28 | /** | 28 | /** |
diff --git a/packages/main/src/infrastructure/electron/impl/lockWebContentsToFile.ts b/packages/main/src/infrastructure/electron/impl/lockWebContentsToFile.ts index 48b1bf0..8d557c4 100644 --- a/packages/main/src/infrastructure/electron/impl/lockWebContentsToFile.ts +++ b/packages/main/src/infrastructure/electron/impl/lockWebContentsToFile.ts | |||
@@ -20,7 +20,7 @@ | |||
20 | 20 | ||
21 | import type { WebContents } from 'electron'; | 21 | import type { WebContents } from 'electron'; |
22 | 22 | ||
23 | import { getLogger } from '../../../utils/log'; | 23 | import getLogger from '../../../utils/getLogger'; |
24 | import type Resources from '../../resources/Resources'; | 24 | import type Resources from '../../resources/Resources'; |
25 | 25 | ||
26 | const log = getLogger('lockWebContentsToFile'); | 26 | const log = getLogger('lockWebContentsToFile'); |