build: prepare v6.0.0 release (#1806)

* 6.0.0 * fix build Signed-off-by: Adam Setch <adam.setch@outlook.com> * fix: attempt to fix windows sso login. increase logging Signed-off-by: Adam Setch <adam.setch@outlook.com> * fix margin multi accounts Signed-off-by: Adam Setch <adam.setch@outlook.com> * fix linux permissions Signed-off-by: Adam Setch <adam.setch@outlook.com> * fix linux permissions Signed-off-by: Adam Setch <adam.setch@outlook.com> * change pack scripts Signed-off-by: Adam Setch <adam.setch@outlook.com> * change pack scripts Signed-off-by: Adam Setch <adam.setch@outlook.com> * change pack scripts Signed-off-by: Adam Setch <adam.setch@outlook.com> * change pack scripts Signed-off-by: Adam Setch <adam.setch@outlook.com> * change pack scripts Signed-off-by: Adam Setch <adam.setch@outlook.com> * change pack scripts Signed-off-by: Adam Setch <adam.setch@outlook.com> --------- Signed-off-by: Adam Setch <adam.setch@outlook.com>
gitify-app · Feb 2, 2025 · 94b13f4 · 94b13f4
1 parent 617305b
commit 94b13f4
Show file tree

Hide file tree

Showing 7 changed files with 74 additions and 19 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -14,6 +14,7 @@ jobs:
     name: Tests
     uses: ./.github/workflows/test.yml
     needs: lint
+    secrets: inherit
 
   publish:
     name: Publish

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gitify",
-  "version": "5.18.0",
+  "version": "6.0.0",
   "description": "GitHub notifications on your menu bar.",
   "main": "build/main.js",
   "scripts": {
@@ -129,7 +129,7 @@
       "repo": "gitify"
     },
     "afterSign": "scripts/notarize.js",
-    "afterPack": "scripts/remove-unused-locales.js"
+    "afterPack": "scripts/afterPack.js"
   },
   "dependencies": {
     "@electron/remote": "2.1.2",

diff --git a/scripts/remove-unused-locales.js → scripts/afterPack.js b/scripts/remove-unused-locales.js → scripts/afterPack.js
@@ -8,15 +8,31 @@ const electronLanguages = packageJson.build.electronLanguages;
 /**
  * @param {AfterPackContext} context
  */
-const removeLocales = async (context) => {
+const afterPack = async (context) => {
+  // biome-ignore lint/suspicious/noConsoleLog: disabled
+  console.log('[afterPack]: Starting...');
+
   const appName = context.packager.appInfo.productFilename;
   const appOutDir = context.appOutDir;
   const platform = context.electronPlatformName;
 
-  if (platform !== 'darwin') {
-    return;
+  if (platform === 'darwin') {
+    removeUnusedLocales(appOutDir, appName);
   }
 
+  // biome-ignore lint/suspicious/noConsoleLog: disabled
+  console.log('[afterPack]: Completed');
+};
+
+/**
+ * Removes unused locales for macOS builds.
+ * @param {string} appOutDir
+ * @param {string} appName
+ */
+const removeUnusedLocales = (appOutDir, appName) => {
+  // biome-ignore lint/suspicious/noConsoleLog: disabled
+  console.log('[afterPack]: removing unused locales');
+
   const resourcesPath = path.join(
     appOutDir,
     `${appName}.app`,
@@ -44,4 +60,4 @@ const removeLocales = async (context) => {
   }
 };
 
-exports.default = removeLocales;
+exports.default = afterPack;
diff --git a/src/main/main.ts b/src/main/main.ts
@@ -4,7 +4,8 @@ import { menubar } from 'menubar';
 
 import { APPLICATION } from '../shared/constants';
 import { namespacedEvent } from '../shared/events';
-import { isMacOS, isWindows } from '../shared/platform';
+import { logInfo, logWarn } from '../shared/logger';
+import { isLinux, isMacOS, isWindows } from '../shared/platform';
 import { onFirstRunMaybe } from './first-run';
 import { TrayIcons } from './icons';
 import MenuBuilder from './menu';
@@ -90,6 +91,31 @@ app.whenReady().then(async () => {
     });
   });
 
+  /** Prevent second instances */
+  if (isWindows() || isLinux()) {
+    const gotTheLock = app.requestSingleInstanceLock();
+
+    if (!gotTheLock) {
+      logWarn('main:gotTheLock', 'Second instance detected, quitting');
+      app.quit(); // Quit the second instance
+      return;
+    }
+
+    app.on('second-instance', (_event, commandLine, _workingDirectory) => {
+      logInfo(
+        'main:second-instance',
+        'Second instance was launched.  extracting command to forward',
+      );
+
+      // Get the URL from the command line arguments
+      const url = commandLine.find((arg) => arg.startsWith(`${protocol}://`));
+
+      if (url) {
+        handleURL(url);
+      }
+    });
+  }
+
   /**
    * Gitify custom IPC events
    */
@@ -183,5 +209,13 @@ ipc.handle(namespacedEvent('safe-storage-decrypt'), (_, settings) => {
 // Handle gitify:// custom protocol URL events for OAuth 2.0 callback
 app.on('open-url', (event, url) => {
   event.preventDefault();
-  mb.window.webContents.send(namespacedEvent('auth-callback'), url);
+  logInfo('main:open-url', `URL received ${url}`);
+  handleURL(url);
 });
+
+const handleURL = (url: string) => {
+  if (url.startsWith(`${protocol}://`)) {
+    logInfo('main:handleUrl', `forwarding URL ${url} to renderer process`);
+    mb.window.webContents.send(namespacedEvent('auth-callback'), url);
+  }
+};
diff --git a/src/renderer/routes/Accounts.tsx b/src/renderer/routes/Accounts.tsx
@@ -121,7 +121,7 @@ export const AccountsRoute: FC = () => {
           return (
             <Box
               key={accountUUID}
-              className="rounded-md p-2 bg-gitify-accounts"
+              className="rounded-md p-2 mb-4 bg-gitify-accounts"
             >
               <Stack direction="vertical" align="stretch">
                 <Stack direction="horizontal" align="start">

diff --git a/src/renderer/routes/__snapshots__/Accounts.test.tsx.snap b/src/renderer/routes/__snapshots__/Accounts.test.tsx.snap
diff --git a/src/renderer/utils/auth/utils.ts b/src/renderer/utils/auth/utils.ts
@@ -4,7 +4,7 @@ import semver from 'semver';
 import { ipcRenderer } from 'electron';
 import { APPLICATION } from '../../../shared/constants';
 import { namespacedEvent } from '../../../shared/events';
-import { logError, logWarn } from '../../../shared/logger';
+import { logError, logInfo, logWarn } from '../../../shared/logger';
 import type {
   Account,
   AuthCode,
@@ -62,6 +62,10 @@ export function authGitHub(
     ipcRenderer.on(
       namespacedEvent('auth-callback'),
       (_, callbackUrl: string) => {
+        logInfo(
+          'renderer:auth-callback',
+          `received authentication callback URL ${callbackUrl}`,
+        );
         handleCallback(callbackUrl);
       },
     );