feat: remove the hidden desktop app idea for now

Author: blakebyrnes

.yarn/install-state.gz

@@ -38,9 +38,6 @@ module.exports = {
     },
     hardenedRuntime: true,
     gatekeeperAssess: false,
-    extendInfo: {
-      LSUIElement: 1,
-    },
     entitlements: 'build-resources/entitlements.mac.plist',
     entitlementsInherit: 'build-resources/entitlements.mac.plist',
     notarize: false, // do this manually

electron-builder.js

@@ -30,7 +30,7 @@ export default class DesktopWindow extends TypedEventEmitter<{
 
   constructor(private apiManager: ApiManager) {
     super();
-    void this.open(false);
+    void this.open(true);
   }
 
   public focus(): void {

src/main/lib/DesktopWindow.ts

@@ -39,11 +39,14 @@ export class Menubar extends EventEmitter {
     }
 
     // hide the dock icon if it shows
-    if (process.platform === 'darwin') {
-      app.setActivationPolicy('accessory');
-    }
     app.on('second-instance', this.onSecondInstance.bind(this));
     app.on('open-file', this.onFileOpened.bind(this));
+    app.on('window-all-closed', () => {
+      console.log('window-all-closed');
+      if (process.platform !== 'darwin') { // On macOS, apps generally stay open until explicitly quit
+        app.quit();
+      }
+    });
     app.setAppLogsPath();
     (process.env as any).ELECTRON_DISABLE_SECURITY_WARNINGS = true;
     void this.appReady();
@@ -55,6 +58,11 @@ export class Menubar extends EventEmitter {
     return this.#tray;
   }
 
+  public async appExit(): Promise<void> {
+    await this.beforeQuit();
+    app.exit();
+  }
+
   private bindSignals(): void {
     let didRun = false;
     const exit = (): Promise<void> => {
@@ -141,11 +149,6 @@ export class Menubar extends EventEmitter {
     }
   }
 
-  private async appExit(): Promise<void> {
-    await this.beforeQuit();
-    app.exit();
-  }
-
   private async appReady(): Promise<void> {
     try {
       await app.whenReady();

src/main/lib/Menubar.ts

@@ -33,7 +33,7 @@ export class WindowManager {
 
     this.bindIpcEvents();
     this.desktopWindow = new DesktopWindow(apiManager);
-    this.events.on(this.desktopWindow, 'close', this.checkOpenWindows.bind(this));
+    this.events.on(this.desktopWindow, 'close', this.close.bind(this));
     this.events.on(this.desktopWindow, 'focus', this.setMenu.bind(this));
     this.events.on(
       apiManager.privateDesktopApiHandler,
@@ -43,13 +43,14 @@ export class WindowManager {
   }
 
   public async openDesktop(): Promise<void> {
-    await app.dock?.show();
     this.setMenu();
-    await this.desktopWindow.open();
+    await this.desktopWindow.open(true);
   }
 
   public close(): void {
+    console.log('Closing Desktop');
     this.events.close();
+    void this.menuBar.appExit();
   }
 
   public async loadChromeAliveWindow(data: {
@@ -61,7 +62,6 @@ export class WindowManager {
       this.#chromeAliveWindowsBySessionId.get(data.heroSessionId)?.window.focus();
       return;
     }
-    await app.dock?.show();
     const chromeAliveWindow = new ChromeAliveWindow(data, data.cloudAddress);
 
     const { heroSessionId } = data;
@@ -167,7 +167,7 @@ export class WindowManager {
 
   private checkOpenWindows(): void {
     if (this.chromeAliveWindows.length === 0 && !this.desktopWindow.isOpen) {
-      app.dock?.hide();
+      app.quit();
     }
   }