support intel

electron-builder.yml

@@ -8,29 +8,41 @@ productName: Glass
 
 # Publish configuration for GitHub releases
 publish:
-  provider: github
+    provider: github
-  owner: pickle-com
+    owner: pickle-com
-  repo: glass
+    repo: glass
-  releaseType: draft
+    releaseType: draft
 
 # List of files to be included in the app package
 files:
-  - src/**/*
+    - src/**/*
-  - package.json
+    - package.json
-  - pickleglass_web/backend_node/**/*
+    - pickleglass_web/backend_node/**/*
-  - '!**/node_modules/electron/**'
+    - '!**/node_modules/electron/**'
-  - public/build/**/*
+    - public/build/**/*
 
 # Additional resources to be copied into the app's resources directory
 extraResources:
-  - from: src/assets/SystemAudioDump
+    - from: src/assets/SystemAudioDump
-    to: SystemAudioDump
+      to: SystemAudioDump
-  - from: pickleglass_web/out
+    - from: pickleglass_web/out
-    to: out
+      to: out
 
 # macOS specific configuration
 mac:
-  # The application category type
+    # The application category type
-  category: public.app-category.utilities
+    category: public.app-category.utilities
-  # Path to the .icns icon file
+    # Path to the .icns icon file
-  icon: src/assets/logo.icns 
+    icon: src/assets/logo.icns
+    # Target both Intel and Apple Silicon architectures
+    target:
+        - target: dmg
+          arch:
+              - x64
+              - arm64
+        - target: zip
+          arch:
+              - x64
+              - arm64
+    # Minimum macOS version (supports both Intel and Apple Silicon)
+    minimumSystemVersion: '11.0'

forge.config.js

@@ -5,25 +5,26 @@ const { notarizeApp } = require('./notarize');
 module.exports = {
     packagerConfig: {
         asar: {
-            unpack:
+            unpack: '**/*.node,**/*.dylib,' + '**/node_modules/{sharp,@img}/**/*',
-                '**/*.node,**/*.dylib,' +
-                '**/node_modules/{sharp,@img}/**/*'
         },
         extraResource: ['./src/assets/SystemAudioDump', './pickleglass_web/out'],
         name: 'Glass',
         icon: 'src/assets/logo',
         appBundleId: 'com.pickle.glass',
+        arch: 'universal',
         protocols: [
             {
                 name: 'PickleGlass Protocol',
-                schemes: ['pickleglass']
+                schemes: ['pickleglass'],
-            }
+            },
         ],
         asarUnpack: [
-            "**/*.node",
+            '**/*.node',
-            "**/*.dylib",
+            '**/*.dylib',
-            "node_modules/@img/sharp-darwin-arm64/**",
+            'node_modules/@img/sharp-darwin-x64/**',
-            "node_modules/@img/sharp-libvips-darwin-arm64/**"
+            'node_modules/@img/sharp-libvips-darwin-x64/**',
+            'node_modules/@img/sharp-darwin-arm64/**',
+            'node_modules/@img/sharp-libvips-darwin-arm64/**',
         ],
         osxSign: {
             identity: process.env.APPLE_SIGNING_IDENTITY,
@@ -35,8 +36,8 @@ module.exports = {
             tool: 'notarytool',
             appleId: process.env.APPLE_ID,
             appleIdPassword: process.env.APPLE_ID_PASSWORD,
-            teamId: process.env.APPLE_TEAM_ID
+            teamId: process.env.APPLE_TEAM_ID,
-        }
+        },
     },
     rebuildConfig: {},
     makers: [

package.json

@@ -65,5 +65,9 @@
         "electron-builder": "^26.0.12",
         "electron-reloader": "^1.2.3",
         "esbuild": "^0.25.5"
+    },
+    "optionalDependencies": {
+        "@img/sharp-darwin-x64": "^0.34.2",
+        "@img/sharp-libvips-darwin-x64": "^1.1.0"
     }
 }