Fix mac universal bundle (#482)

* fix: added Mac universal flag to compilation process

* fix: added stagign step to the fix

* fix: add x64, arm64 and universal archs to mac target"

* fix: add osx universal option to forge config

* fix: universal build actually being built

* fix: add icon url to windows executable

* fix: remove icon url

* fix: fix screen triggered before ready event

---------

Co-authored-by: Javier Guzman <906599+javierguzman@users.noreply.github.com>

.github/workflows/release.yml

@@ -133,7 +133,7 @@ jobs:
           APPLE_ID: ${{ secrets.APPLEID }}
           APPLE_ID_PASSWORD: ${{ secrets.APPLEIDPASS }}
           APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
-        run: yarn run make
+        run: yarn run make-mac
       - if: runner.os != 'macOS'
         name: Build for Linux/Windows
         run: yarn run make
@@ -163,7 +163,7 @@ jobs:
         with:
           name: artifacts
           path: |
-            out/make/**/*.dmg
+            out/make/**/*universal.dmg
             out/make/**/*.AppImage
             windows_signing/**/*.exe
 

.github/workflows/staging.yml

@@ -133,7 +133,7 @@ jobs:
           APPLE_ID: ${{ secrets.APPLEID }}
           APPLE_ID_PASSWORD: ${{ secrets.APPLEIDPASS }}
           APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
-        run: yarn run make
+        run: yarn run make-mac
       - if: runner.os != 'macOS'
         name: Build for Linux/Windows
         run: yarn run make
@@ -166,7 +166,7 @@ jobs:
         with:
           name: artifacts
           path: |
-            out/make/**/*.dmg
+            out/make/**/*universal.dmg
             out/make/**/*.AppImage
             windows_signing/**/*.exe
 

.gitignore

@@ -15,6 +15,7 @@ pids
 *.seed
 *.pid.lock
 .DS_Store
+.swp
 
 # Directory for instrumented libs generated by jscoverage/JSCover
 lib-cov

forge.config.ts

@@ -11,8 +11,11 @@ import mainConfig from "./webpack.main.config";
 const packagerConfig: ForgePackagerOptions = {
   appBundleId: "com.dygmalab.bazecor",
   darwinDarkModeSupport: true,
-  icon: "./build/logo.png",
+  icon: "./build/logo",
   name: "Bazecor",
+  osxUniversal: {
+    x64ArchFiles: "*",
+  },
   extraResource: ["NEWS.md"],
   appCopyright: "Copyright © 2018, 2023 DygmaLab SL; distributed under the GPLv3",
 };

package.json

@@ -12,12 +12,12 @@
   "scripts": {
     "clean": "rm -rf dist && rm -rf out && rm -rf node_modules",
     "start": "NODE_ENV=development electron-forge start",
-    "make-dev": "NODE_ENV=development electron-forge make",
+    "make-dev": "NODE_ENV=development electron-forge make --platform=darwin --arch=universal",
     "package": "electron-forge package",
     "make": "electron-forge make",
-    "make-win": "electron-forge make --platform win32",
-    "make-mac": "electron-forge make --platform darwin",
-    "make-lin": "electron-forge make --platform linux",
+    "make-win": "electron-forge make --platform=win32",
+    "make-mac": "electron-forge make --platform=darwin --arch=universal",
+    "make-lin": "electron-forge make --platform=linux",
     "lint": "eslint --ext .ts,.tsx,.js,.jsx .",
     "prettier": "prettier --write \"./**/*.{js,json,css,scss,md}\"",
     "test": "vitest run src/renderer/tests src/main/tests",
@@ -56,6 +56,7 @@
     "@electron-forge/maker-rpm": "^6.1.1",
     "@electron-forge/maker-squirrel": "^6.1.1",
     "@electron-forge/plugin-webpack": "^6.1.1",
+    "@electron/universal": "^1.4.1",
     "@playwright/test": "^1.36.0",
     "@reforged/maker-appimage": "^3.3.0",
     "@semantic-release/changelog": "^6.0.3",

src/main/createWindow.ts

@@ -16,7 +16,7 @@ import { configureUSB } from "./setup/configureUSB";
 declare const MAIN_WINDOW_WEBPACK_ENTRY: string;
 declare const MAIN_WINDOW_PRELOAD_WEBPACK_ENTRY: string;
 
-const createWindow = (): void => {
+const createWindow = async (): Promise<void> => {
   // Create the browser window.
   const mainWindowState = windowStateKeeper({
     defaultWidth: 1200,
@@ -46,7 +46,7 @@ const createWindow = (): void => {
   mainWindowState.manage(mainWindow);
 
   // and load the index.html of the app.
-  mainWindow.loadURL(MAIN_WINDOW_WEBPACK_ENTRY);
+  await mainWindow.loadURL(MAIN_WINDOW_WEBPACK_ENTRY);
 
   Window.getInstance(); // init Windows manager
   Window.setWindow(mainWindow);
@@ -61,7 +61,7 @@ const createWindow = (): void => {
   onReadyToShow();
   onDevTools();
   onClose();
-  configureUSB();
+  await configureUSB();
 };
 
 export default createWindow;

src/main/index.ts

@@ -26,7 +26,7 @@ app.on("ready", async () => {
   setBackup();
   setTheme();
   // await setDevTools(); devtools do not work with latest electron
-  createWindow();
+  await createWindow();
   // we do not want a menu on top of the window
   Menu.setApplicationMenu(null);
 });
@@ -41,11 +41,11 @@ app.on("window-all-closed", () => {
   }
 });
 
-app.on("activate", () => {
+app.on("activate", async () => {
   // On OS X it's common to re-create a window in the app when the
   // dock icon is clicked and there are no other windows open.
   if (BrowserWindow.getAllWindows().length === 0) {
-    createWindow();
+    await createWindow();
   }
 });
 

src/main/setup/configureRedirect.ts

@@ -4,15 +4,15 @@ import Window from "../managers/Window";
 const configureRedirect = () => {
   const window = Window.getWindow();
   const handleRedirect = (e: any, url: string) => {
-    if (url != window.webContents.getURL()) {
+    if (url !== window.webContents.getURL()) {
       e.preventDefault();
       shell.openExternal(url);
     }
   };
 
   window.webContents.on("will-navigate", handleRedirect);
 
-  window.webContents.setWindowOpenHandler(details =>
+  window.webContents.setWindowOpenHandler(() =>
     // new-window handler removed in Electron 22
     ({ action: "deny" }),
   );

src/main/setup/configureUSB.ts

@@ -83,5 +83,4 @@ export const configureUSB = async () => {
     const devices = getDeviceList();
     return devices;
   });
-
 };

yarn.lock

@@ -1435,7 +1435,7 @@
     minimatch "^3.0.4"
     plist "^3.0.4"
 
-"@electron/universal@^1.3.2":
+"@electron/universal@^1.3.2", "@electron/universal@^1.4.1":
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-1.4.1.tgz#3fbda2a5ed9ff9f3304c8e8316b94c1e3a7b3785"
   integrity sha512-lE/U3UNw1YHuowNbTmKNs9UlS3En3cPgwM5MI+agIgr/B1hSze9NdOP0qn7boZaI9Lph8IDv3/24g9IxnJP7aQ==