19 files changed, 139 insertions, 107 deletions

diff --git a/packages/main/.eslintrc.cjs b/packages/main/.eslintrc.cjs
new file mode 100644
index 0000000..548ea34
--- /dev/null
+++ b/packages/main/.eslintrc.cjs
@@ -0,0 +1,6 @@
+module.exports = {
+  env: {
+    node: true,
+    browser: false,
+  },
+};
diff --git a/packages/main/.eslintrc.json b/packages/main/.eslintrc.json
deleted file mode 100644
index 6b736e2..0000000
--- a/packages/main/.eslintrc.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "globals": {
-    "NodeJS": false,
-    "require": false
-  }
-}
diff --git a/packages/main/esbuild.config.js b/packages/main/esbuild.config.js
index c24d6e1..49fba6b 100644
--- a/packages/main/esbuild.config.js
+++ b/packages/main/esbuild.config.js
@@ -1,8 +1,8 @@
-/* eslint-disable no-process-env */
 import getRepoInfo from 'git-repo-info';
+
 import { node } from '../../config/buildConstants.js';
-import { getConfig } from '../../config/esbuildConfig.js';
-import { fileURLToDirname } from '../../config/utils.js';
+import fileURLToDirname from '../../config/fileURLToDirname.js';
+import getEsbuildConfig from '../../config/getEsbuildConfig.js';
 
 const externalPackages = ['electron'];
 
@@ -12,7 +12,7 @@ if (process.env.MODE !== 'development') {
 
 const gitInfo = getRepoInfo();
 
-export default getConfig({
+export default getEsbuildConfig({
   absWorkingDir: fileURLToDirname(import.meta.url),
   entryPoints: [
     'src/index.ts',
diff --git a/packages/main/package.json b/packages/main/package.json
index e1b3f49..d9abf51 100644
--- a/packages/main/package.json
+++ b/packages/main/package.json
@@ -5,7 +5,7 @@
   "type": "module",
   "types": "dist-types/index.d.ts",
   "scripts": {
-    "typecheck": "tsc"
+    "typecheck:workspace": "yarn g:typecheck"
   },
   "dependencies": {
     "@sophie/service-shared": "workspace:*",
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(() => {
diff --git a/packages/main/src/devTools.ts b/packages/main/src/devTools.ts
index 398904c..0486c36 100644
--- a/packages/main/src/devTools.ts
+++ b/packages/main/src/devTools.ts
@@ -46,7 +46,12 @@ export async function installDevToolsExtensions(): Promise<void> {
     default: installExtension,
     REACT_DEVELOPER_TOOLS,
     REDUX_DEVTOOLS,
-  } = require('electron-devtools-installer');
+    /* eslint-disable-next-line
+      import/no-extraneous-dependencies,
+      global-require,
+      @typescript-eslint/no-var-requires
+    */
+  } = require('electron-devtools-installer') as typeof import('electron-devtools-installer');
   await installExtension(
     [
       REACT_DEVELOPER_TOOLS,
diff --git a/packages/main/src/index.ts b/packages/main/src/index.ts
index d0191b7..bc10b4c 100644
--- a/packages/main/src/index.ts
+++ b/packages/main/src/index.ts
@@ -19,18 +19,10 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import {
-  app,
-  BrowserView,
-  BrowserWindow,
-  ipcMain,
-} from 'electron';
 import { arch } from 'os';
-import osName from 'os-name';
-import { ensureDirSync, readFile, readFileSync } from 'fs-extra';
-import { autorun } from 'mobx';
-import { getSnapshot, onPatch } from 'mobx-state-tree';
 import { join } from 'path';
+import { URL } from 'url';
+
 import {
   ServiceToMainIpcMessage,
   unreadCount,
@@ -41,18 +33,30 @@ import {
   MainToRendererIpcMessage,
   RendererToMainIpcMessage,
 } from '@sophie/shared';
-import { URL } from 'url';
+import {
+  app,
+  BrowserView,
+  BrowserWindow,
+  ipcMain,
+} from 'electron';
+import { ensureDirSync, readFile, readFileSync } from 'fs-extra';
+import { autorun } from 'mobx';
+import { getSnapshot, onPatch } from 'mobx-state-tree';
+import osName from 'os-name';
 
-import { init } from './compositionRoot';
 import {
   DEVMODE_ALLOWED_URL_PREFIXES,
   installDevToolsExtensions,
   openDevToolsWhenReady,
 } from './devTools';
+import init from './init';
 import { createMainStore } from './stores/MainStore';
+import { getLogger } from './utils/log';
 
 const isDevelopment = import.meta.env.MODE === 'development';
 
+const log = getLogger('index');
+
 // Always enable sandboxing.
 app.enableSandbox();
 
@@ -93,7 +97,7 @@ app.setAboutPanelOptions({
     `Node.js: ${process.versions.node}`,
     `Platform: ${osName()}`,
     `Arch: ${arch()}`,
-    `Build date: ${new Date(Number(import.meta.env.BUILD_DATE))}`,
+    `Build date: ${new Date(Number(import.meta.env.BUILD_DATE)).toLocaleString()}`,
     `Git SHA: ${import.meta.env.GIT_SHA}`,
     `Git branch: ${import.meta.env.GIT_BRANCH}`,
   ].join('\n'),
@@ -109,9 +113,9 @@ function getResourceUrl(relativePath: string): string {
   return new URL(relativePath, baseUrl).toString();
 }
 
-let serviceInjectRelativePath = '../../service-inject/dist/index.js';
-let serviceInjectPath = getResourcePath(serviceInjectRelativePath);
-let serviceInject: WebSource = {
+const serviceInjectRelativePath = '../../service-inject/dist/index.js';
+const serviceInjectPath = getResourcePath(serviceInjectRelativePath);
+const serviceInject: WebSource = {
   code: readFileSync(serviceInjectPath, 'utf8'),
   url: getResourceUrl(serviceInjectRelativePath),
 };
@@ -122,7 +126,7 @@ const store = createMainStore();
 init(store).then((disposeCompositionRoot) => {
   app.on('will-quit', disposeCompositionRoot);
 }).catch((err) => {
-  console.log('Failed to initialize application', err);
+  log.log('Failed to initialize application', err);
 });
 
 const rendererBaseUrl = getResourceUrl('../renderer/');
@@ -211,7 +215,7 @@ async function createWindow(): Promise<unknown> {
 
   ipcMain.handle(RendererToMainIpcMessage.GetSharedStoreSnapshot, (event) => {
     if (event.sender.id !== webContents.id) {
-      console.warn(
+      log.warn(
         'Unexpected',
         RendererToMainIpcMessage.GetSharedStoreSnapshot,
         'from webContents',
@@ -224,7 +228,7 @@ async function createWindow(): Promise<unknown> {
 
   ipcMain.on(RendererToMainIpcMessage.DispatchAction, (event, rawAction) => {
     if (event.sender.id !== webContents.id) {
-      console.warn(
+      log.warn(
         'Unexpected',
         RendererToMainIpcMessage.DispatchAction,
         'from webContents',
@@ -242,17 +246,26 @@ async function createWindow(): Promise<unknown> {
           store.config.setThemeSource(actionToDispatch.themeSource);
           break;
         case 'reload-all-services':
-          readFile(serviceInjectPath, 'utf8').then((data) => {
-            serviceInject.code = data;
-          }).catch((err) => {
-            console.error('Error while reloading', serviceInjectPath, err);
-          }).then(() => {
-            browserView.webContents.reload();
-          });
+          readFile(serviceInjectPath, 'utf8')
+            .then((data) => {
+              serviceInject.code = data;
+            })
+            .catch((err) => {
+              log.error('Error while reloading', serviceInjectPath, err);
+            })
+            .then(() => {
+              browserView.webContents.reload();
+            })
+            .catch((err) => {
+              log.error('Failed to reload browserView', err);
+            });
+          break;
+        default:
+          log.error('Unexpected action from UI renderer:', actionToDispatch);
           break;
       }
     } catch (err) {
-      console.error('Error while dispatching renderer action', rawAction, err);
+      log.error('Error while dispatching renderer action', rawAction, err);
     }
   });
 
@@ -260,11 +273,10 @@ async function createWindow(): Promise<unknown> {
     webContents.send(MainToRendererIpcMessage.SharedStorePatch, patch);
   });
 
-  ipcMain.handle(ServiceToMainIpcMessage.ApiExposedInMainWorld, (event) => {
-    return event.sender.id === browserView.webContents.id
-      ? serviceInject
-      : null;
-  });
+  ipcMain.handle(
+    ServiceToMainIpcMessage.ApiExposedInMainWorld,
+    (event) => (event.sender.id === browserView.webContents.id ? serviceInject : null),
+  );
 
   browserView.webContents.on('ipc-message', (_event, channel, ...args) => {
     try {
@@ -274,14 +286,14 @@ async function createWindow(): Promise<unknown> {
           // otherwise electron emits a no handler registered warning.
           break;
         case ServiceToMainIpcMessage.SetUnreadCount:
-          console.log('Unread count:', unreadCount.parse(args[0]));
+          log.log('Unread count:', unreadCount.parse(args[0]));
           break;
         default:
-          console.error('Unknown IPC message:', channel, args);
+          log.error('Unknown IPC message:', channel, args);
           break;
       }
     } catch (err) {
-      console.error('Error while processing IPC message:', channel, args, err);
+      log.error('Error while processing IPC message:', channel, args, err);
     }
   });
 
@@ -291,17 +303,22 @@ async function createWindow(): Promise<unknown> {
     },
   );
 
-  browserView.webContents.session.webRequest.onBeforeSendHeaders(({ url, requestHeaders }, callback) => {
-    if (url.match(/^[^:]+:\/\/accounts\.google\.[^.\/]+\//)) {
-      requestHeaders['User-Agent'] = chromelessUserAgent;
-    } else {
-      requestHeaders['User-Agent'] = userAgent;
-    }
-    callback({ requestHeaders });
-  });
+  browserView.webContents.session.webRequest.onBeforeSendHeaders(
+    ({ url, requestHeaders }, callback) => {
+      const requestUserAgent = url.match(/^[^:]+:\/\/accounts\.google\.[^./]+\//)
+        ? chromelessUserAgent
+        : userAgent;
+      callback({
+        requestHeaders: {
+          ...requestHeaders,
+          'User-Agent': requestUserAgent,
+        },
+      });
+    },
+  );
 
   browserView.webContents.loadURL('https://gitlab.com/say-hi-to-sophie/sophie').catch((err) => {
-    console.error('Failed to load browser', err);
+    log.error('Failed to load browser', err);
   });
 
   return mainWindow.loadURL(pageUrl);
@@ -330,12 +347,12 @@ app.whenReady().then(async () => {
     try {
       await installDevToolsExtensions();
     } catch (err) {
-      console.error('Failed to install devtools extensions', err);
+      log.error('Failed to install devtools extensions', err);
     }
   }
 
   return createWindow();
 }).catch((err) => {
-  console.error('Failed to create window', err);
+  log.error('Failed to create window', err);
   process.exit(1);
 });
diff --git a/packages/main/src/compositionRoot.ts b/packages/main/src/init.ts
index 76835a1..4487cc4 100644
--- a/packages/main/src/compositionRoot.ts
+++ b/packages/main/src/init.ts
@@ -20,13 +20,13 @@
 
 import { app } from 'electron';
 
-import { initConfig } from './controllers/config';
-import { initNativeTheme } from './controllers/nativeTheme';
-import { ConfigPersistenceServiceImpl } from './services/impl/ConfigPersistenceServiceImpl';
+import initConfig from './controllers/initConfig';
+import initNativeTheme from './controllers/initNativeTheme';
+import ConfigPersistenceServiceImpl from './services/impl/ConfigPersistenceServiceImpl';
 import { MainStore } from './stores/MainStore';
-import { Disposer } from './utils/disposer';
+import type Disposer from './utils/Disposer';
 
-export async function init(store: MainStore): Promise<Disposer> {
+export default async function init(store: MainStore): Promise<Disposer> {
   const configPersistenceService = new ConfigPersistenceServiceImpl(app.getPath('userData'));
   const disposeConfigController = await initConfig(store.config, configPersistenceService);
   const disposeNativeThemeController = initNativeTheme(store);
diff --git a/packages/main/src/services/ConfigPersistenceService.ts b/packages/main/src/services/ConfigPersistenceService.ts
index aed0ba3..7d508c5 100644
--- a/packages/main/src/services/ConfigPersistenceService.ts
+++ b/packages/main/src/services/ConfigPersistenceService.ts
@@ -18,12 +18,12 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import type { ConfigSnapshotOut } from  '../stores/Config';
-import { Disposer } from '../utils/disposer';
+import type { ConfigSnapshotOut } from '../stores/Config';
+import type Disposer from '../utils/Disposer';
 
 export type ReadConfigResult = { found: true; data: unknown; } | { found: false; };
 
-export interface ConfigPersistenceService {
+export default interface ConfigPersistenceService {
   readConfig(): Promise<ReadConfigResult>;
 
   writeConfig(configSnapshot: ConfigSnapshotOut): Promise<void>;
diff --git a/packages/main/src/services/impl/ConfigPersistenceServiceImpl.ts b/packages/main/src/services/impl/ConfigPersistenceServiceImpl.ts
index 2d19632..df8c807 100644
--- a/packages/main/src/services/impl/ConfigPersistenceServiceImpl.ts
+++ b/packages/main/src/services/impl/ConfigPersistenceServiceImpl.ts
@@ -19,18 +19,20 @@
  */
 import { watch } from 'fs';
 import { readFile, stat, writeFile } from 'fs/promises';
-import JSON5 from 'json5';
-import { throttle }  from 'lodash-es';
 import { join } from 'path';
 
-import type { ConfigPersistenceService, ReadConfigResult } from '../ConfigPersistenceService.js';
-import type { ConfigSnapshotOut } from  '../../stores/Config.js';
-import { Disposer } from '../../utils/disposer';
-import { getLogger } from '../../utils/logging';
+import JSON5 from 'json5';
+import throttle from 'lodash-es/throttle';
+
+import type { ConfigSnapshotOut } from '../../stores/Config';
+import type Disposer from '../../utils/Disposer';
+import { getLogger } from '../../utils/log';
+import type ConfigPersistenceService from '../ConfigPersistenceService';
+import type { ReadConfigResult } from '../ConfigPersistenceService';
 
 const log = getLogger('configPersistence');
 
-export class ConfigPersistenceServiceImpl implements ConfigPersistenceService {
+export default class ConfigPersistenceServiceImpl implements ConfigPersistenceService {
   private readonly configFilePath: string;
 
   private writingConfig = false;
@@ -103,7 +105,7 @@ export class ConfigPersistenceServiceImpl implements ConfigPersistenceService {
           'whish is newer than last written',
           this.timeLastWritten,
         );
-        return callback();
+        await callback();
       }
     }, throttleMs);
 
@@ -115,7 +117,7 @@ export class ConfigPersistenceServiceImpl implements ConfigPersistenceService {
       if (eventType === 'change'
         && (filename === this.configFileName || filename === null)) {
         configChanged()?.catch((err) => {
-          console.log('Unhandled error while listening for config changes', err);
+          log.error('Unhandled error while listening for config changes', err);
         });
       }
     });
diff --git a/packages/main/src/stores/Config.ts b/packages/main/src/stores/Config.ts
index 7d1168f..06dbdeb 100644
--- a/packages/main/src/stores/Config.ts
+++ b/packages/main/src/stores/Config.ts
@@ -18,13 +18,13 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { Instance } from 'mobx-state-tree';
 import {
   config as originalConfig,
   ConfigSnapshotIn,
   ConfigSnapshotOut,
   ThemeSource,
 } from '@sophie/shared';
+import { Instance } from 'mobx-state-tree';
 
 export const config = originalConfig.actions((self) => ({
   setThemeSource(mode: ThemeSource) {
diff --git a/packages/main/src/stores/MainStore.ts b/packages/main/src/stores/MainStore.ts
index f8a09d6..7b26c52 100644
--- a/packages/main/src/stores/MainStore.ts
+++ b/packages/main/src/stores/MainStore.ts
@@ -18,8 +18,8 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { applySnapshot, Instance, types } from 'mobx-state-tree';
 import { BrowserViewBounds } from '@sophie/shared';
+import { applySnapshot, Instance, types } from 'mobx-state-tree';
 
 import type { Config } from './Config.js';
 import { sharedStore } from './SharedStore';
diff --git a/packages/main/src/stores/SharedStore.ts b/packages/main/src/stores/SharedStore.ts
index e20150d..c023fc7 100644
--- a/packages/main/src/stores/SharedStore.ts
+++ b/packages/main/src/stores/SharedStore.ts
@@ -18,8 +18,8 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { Instance, types } from 'mobx-state-tree';
 import { sharedStore as originalSharedStore } from '@sophie/shared';
+import { Instance, types } from 'mobx-state-tree';
 
 import { config } from './Config';
 
diff --git a/packages/main/src/utils/disposer.ts b/packages/main/src/utils/Disposer.ts
index 0d469dd..2e0ca25 100644
--- a/packages/main/src/utils/disposer.ts
+++ b/packages/main/src/utils/Disposer.ts
@@ -20,4 +20,6 @@
 
 import { IDisposer } from 'mobx-state-tree';
 
-export type Disposer = IDisposer;
+type Disposer = IDisposer;
+
+export default Disposer;
diff --git a/packages/main/src/utils/logging.ts b/packages/main/src/utils/log.ts
index f703749..c704797 100644
--- a/packages/main/src/utils/logging.ts
+++ b/packages/main/src/utils/log.ts
@@ -45,7 +45,11 @@ prefix.reg(loglevel);
 prefix.apply(loglevel, {
   format(level, name, timestamp) {
     const levelColor = getColor(level);
-    return `${chalk.gray(`[${timestamp}]`)} ${levelColor(level)} ${chalk.green(`${name}:`)}`;
+    const timeStr = timestamp.toString();
+    const nameStr = typeof name === 'undefined'
+      ? levelColor(':')
+      : ` ${chalk.green(`${name}:`)}`;
+    return `${chalk.gray(`[${timeStr}]`)} ${levelColor(level)}${nameStr}`;
   },
 });
 
@@ -56,7 +60,7 @@ export function getLogger(loggerName: string): Logger {
 export function silenceLogger(): void {
   loglevel.disableAll();
   const loggers = loglevel.getLoggers();
-  for (const loggerName of Object.keys(loggers)) {
+  Object.keys(loggers).forEach((loggerName) => {
     loggers[loggerName].disableAll();
-  }
+  });
 }
diff --git a/packages/main/tsconfig.json b/packages/main/tsconfig.json
index 1401445..00a1985 100644
--- a/packages/main/tsconfig.json
+++ b/packages/main/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../config/tsconfig.base.json",
   "compilerOptions": {
     "noEmit": true,
     "types": [
@@ -9,14 +9,16 @@
   },
   "references": [
     {
-      "path": "../service-shared"
+      "path": "../service-shared/tsconfig.build.json"
     },
     {
-      "path": "../shared"
+      "path": "../shared/tsconfig.build.json"
     }
   ],
   "include": [
     "src/**/*.ts",
-    "types/**/*.d.ts"
+    "types/**/*.d.ts",
+    "esbuild.config.js",
+    "jest.config.js"
   ]
 }