1 files changed, 12 insertions, 16 deletions

diff --git a/packages/main/src/index.ts b/packages/main/src/index.ts
index 40b15f0..3496212 100644
--- a/packages/main/src/index.ts
+++ b/packages/main/src/index.ts
@@ -19,16 +19,15 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { arch } from 'node:os';
+import os from 'node:os';
 
 import { app } from 'electron';
-import { ensureDirSync } from 'fs-extra';
-import osName from 'os-name';
 
-import { enableStacktraceSourceMaps } from './infrastructure/electron/impl/devTools';
-import initReactions from './initReactions';
-import { createMainStore } from './stores/MainStore';
-import { getLogger } from './utils/log';
+import { enableStacktraceSourceMaps } from './infrastructure/electron/impl/devTools.js';
+import electronShell from './infrastructure/electron/impl/electronShell.js';
+import initReactions from './initReactions.js';
+import MainStore from './stores/MainStore.js';
+import getLogger from './utils/getLogger.js';
 
 const isDevelopment = import.meta.env.MODE === 'development';
 
@@ -38,11 +37,6 @@ const log = getLogger('index');
 app.enableSandbox();
 
 if (isDevelopment) {
-  // Use alternative directory when debugging to avoid clobbering the main installation.
-  app.setPath('userData', `${app.getPath('userData')}-dev`);
-  ensureDirSync(app.getPath('userData'));
-
-  // Use source maps in stack traces.
   enableStacktraceSourceMaps();
 }
 
@@ -66,8 +60,8 @@ app.setAboutPanelOptions({
     `Electron: ${process.versions.electron}`,
     `Chrome: ${process.versions.chrome}`,
     `Node.js: ${process.versions.node}`,
-    `Platform: ${osName()}`,
-    `Arch: ${arch()}`,
+    `Platform: ${os.platform()} ${os.release()}`,
+    `Arch: ${os.arch()}`,
     `Build date: ${new Date(
       Number(import.meta.env.BUILD_DATE),
     ).toLocaleString()}`,
@@ -77,7 +71,7 @@ app.setAboutPanelOptions({
   version: '',
 });
 
-const store = createMainStore();
+const store = MainStore.create({}, electronShell);
 
 app.on('second-instance', () => {
   store.mainWindow?.bringToForeground();
@@ -89,7 +83,9 @@ app.on('window-all-closed', () => {
   }
 });
 
-initReactions(store, isDevelopment)
+const isMac = os.platform() === 'darwin';
+
+initReactions(store, isDevelopment, isMac)
   // eslint-disable-next-line promise/always-return -- `then` instead of top-level await.
   .then((disposeCompositionRoot) => {
     app.on('will-quit', disposeCompositionRoot);