4 files changed, 21 insertions, 21 deletions

diff --git a/packages/main/src/controllers/__tests__/config.spec.ts b/packages/main/src/controllers/__tests__/initConfig.spec.ts
index eb67df0..e386a07 100644
--- a/packages/main/src/controllers/__tests__/config.spec.ts
+++ b/packages/main/src/controllers/__tests__/initConfig.spec.ts
@@ -22,20 +22,20 @@ import { jest } from '@jest/globals';
 import { mocked } from 'jest-mock';
 import ms from 'ms';
 
-import { initConfig } from '../config';
-import type { ConfigPersistenceService } from '../../services/ConfigPersistenceService';
+import type ConfigPersistenceService from '../../services/ConfigPersistenceService';
 import { Config, config as configModel } from '../../stores/Config';
-import { Disposer } from '../../utils/disposer';
-import { silenceLogger } from '../../utils/logging';
+import type Disposer from '../../utils/Disposer';
+import { silenceLogger } from '../../utils/log';
+import initConfig from '../initConfig';
 
 let config: Config;
-let persistenceService: ConfigPersistenceService = {
+const persistenceService: ConfigPersistenceService = {
   readConfig: jest.fn(),
   writeConfig: jest.fn(),
   watchConfig: jest.fn(),
 };
-let lessThanThrottleMs = ms('0.1s');
-let throttleMs = ms('1s');
+const lessThanThrottleMs = ms('0.1s');
+const throttleMs = ms('1s');
 
 beforeAll(() => {
   jest.useFakeTimers();
@@ -108,7 +108,7 @@ describe('when initializing', () => {
 
 describe('when it has loaded the config', () => {
   let sutDisposer: Disposer;
-  let watcherDisposer: Disposer = jest.fn();
+  const watcherDisposer: Disposer = jest.fn();
   let configChangedCallback: () => Promise<void>;
 
   beforeEach(async () => {
@@ -118,7 +118,7 @@ describe('when it has loaded the config', () => {
     });
     mocked(persistenceService.watchConfig).mockReturnValueOnce(watcherDisposer);
     sutDisposer = await initConfig(config, persistenceService, throttleMs);
-    configChangedCallback = mocked(persistenceService.watchConfig).mock.calls[0][0];
+    [[configChangedCallback]] = mocked(persistenceService.watchConfig).mock.calls;
     jest.resetAllMocks();
   });
 
diff --git a/packages/main/src/controllers/__tests__/nativeTheme.spec.ts b/packages/main/src/controllers/__tests__/initNativeTheme.spec.ts
index 85d6dd2..bd33f48 100644
--- a/packages/main/src/controllers/__tests__/nativeTheme.spec.ts
+++ b/packages/main/src/controllers/__tests__/initNativeTheme.spec.ts
@@ -22,7 +22,7 @@ import { jest } from '@jest/globals';
 import { mocked } from 'jest-mock';
 
 import { createMainStore, MainStore } from '../../stores/MainStore';
-import { Disposer } from '../../utils/disposer';
+import type Disposer from '../../utils/Disposer';
 
 let shouldUseDarkColors = false;
 
@@ -38,7 +38,7 @@ jest.unstable_mockModule('electron', () => ({
 }));
 
 const { nativeTheme } = await import('electron');
-const { initNativeTheme } = await import('../nativeTheme');
+const { default: initNativeTheme } = await import('../initNativeTheme');
 
 let store: MainStore;
 let disposeSut: Disposer;
diff --git a/packages/main/src/controllers/config.ts b/packages/main/src/controllers/initConfig.ts
index deaeac2..1d40762 100644
--- a/packages/main/src/controllers/config.ts
+++ b/packages/main/src/controllers/initConfig.ts
@@ -19,19 +19,19 @@
  */
 
 import { debounce } from 'lodash-es';
-import ms from 'ms';
 import { applySnapshot, getSnapshot, onSnapshot } from 'mobx-state-tree';
+import ms from 'ms';
 
-import type { ConfigPersistenceService } from '../services/ConfigPersistenceService.js';
-import type { Config, ConfigSnapshotOut } from '../stores/Config.js';
-import { Disposer } from '../utils/disposer';
-import { getLogger } from '../utils/logging';
+import type ConfigPersistenceService from '../services/ConfigPersistenceService';
+import type { Config, ConfigSnapshotOut } from '../stores/Config';
+import type Disposer from '../utils/Disposer';
+import { getLogger } from '../utils/log';
 
 const DEFAULT_CONFIG_DEBOUNCE_TIME = ms('1s');
 
 const log = getLogger('config');
 
-export async function initConfig(
+export default async function initConfig(
   config: Config,
   persistenceService: ConfigPersistenceService,
   debounceTime: number = DEFAULT_CONFIG_DEBOUNCE_TIME,
diff --git a/packages/main/src/controllers/nativeTheme.ts b/packages/main/src/controllers/initNativeTheme.ts
index ccd12d8..d2074ab 100644
--- a/packages/main/src/controllers/nativeTheme.ts
+++ b/packages/main/src/controllers/initNativeTheme.ts
@@ -21,13 +21,13 @@
 import { nativeTheme } from 'electron';
 import { autorun } from 'mobx';
 
-import type { MainStore } from '../stores/MainStore.js';
-import { Disposer } from '../utils/disposer';
-import { getLogger } from '../utils/logging';
+import type { MainStore } from '../stores/MainStore';
+import type Disposer from '../utils/Disposer';
+import { getLogger } from '../utils/log';
 
 const log = getLogger('nativeTheme');
 
-export function initNativeTheme(store: MainStore): Disposer {
+export default function initNativeTheme(store: MainStore): Disposer {
   log.trace('Initializing nativeTheme controller');
 
   const disposeThemeSourceReaction = autorun(() => {