use mac x64 during narive:run

instead of old x86 binary. This was a naming misnomer. The binary is no longer updated.

Also updated the naming of the npm build scripts & command arguments

Author: gwleuverink

resources/electron/package.json

@@ -21,15 +21,15 @@
         "publish:win-x64": "cross-env npm run build && cross-env node ./node_modules/electron-builder/cli.js -p always --win --config electron-builder.mjs --x64",
         "publish:mac": "cross-env npm run publish:mac-arm64 -- --x64",
         "publish:mac-arm64": "cross-env npm run build && cross-env node ./node_modules/electron-builder/cli.js -p always --mac --config electron-builder.mjs --arm64 -p always",
-        "publish:mac-x86": "cross-env npm run build && cross-env node ./node_modules/electron-builder/cli.js -p always --mac --config electron-builder.mjs --x64 -p always",
+        "publish:mac-x64": "cross-env npm run build && cross-env node ./node_modules/electron-builder/cli.js -p always --mac --config electron-builder.mjs --x64 -p always",
         "publish:linux": "cross-env npm run publish:linux-x64",
         "publish:linux-x64": "cross-env npm run build && cross-env node ./node_modules/electron-builder/cli.js --linux --config electron-builder.mjs --x64 -p always",
         "build:all": "cross-env npm run build:mac && cross-env npm run build:win && cross-env npm run build:linux",
         "build:win": "cross-env npm run build:win-x64",
         "build:win-x64": "cross-env npm run build && cross-env node ./node_modules/electron-builder/cli.js -p never --win --config electron-builder.mjs --x64",
         "build:mac": "cross-env npm run build:mac-arm64 -- --x64",
         "build:mac-arm64": "cross-env npm run build && cross-env node ./node_modules/electron-builder/cli.js -p never --mac --config electron-builder.mjs --arm64",
-        "build:mac-x86": "cross-env npm run build && cross-env node ./node_modules/electron-builder/cli.js -p never --mac --config electron-builder.mjs --x64",
+        "build:mac-x64": "cross-env npm run build && cross-env node ./node_modules/electron-builder/cli.js -p never --mac --config electron-builder.mjs --x64",
         "build:linux": "cross-env npm run build:linux-x64",
         "build:linux-x64": "cross-env npm run build && cross-env node ./node_modules/electron-builder/cli.js -p never --linux --config electron-builder.mjs --x64",
         "plugin:build": "rimraf electron-plugin/dist/ && node node_modules/typescript/bin/tsc --project electron-plugin",

resources/electron/php.js

@@ -24,8 +24,8 @@ const platform = {
 
 if (isWindows) {
     platform.os = 'win';
-    platform.phpBinary += '.exe';
     platform.arch = 'x64';
+    platform.phpBinary += '.exe';
 }
 
 if (isLinux) {
@@ -35,7 +35,7 @@ if (isLinux) {
 
 if (isDarwin) {
     platform.os = 'mac';
-    platform.arch = 'x86';
+    platform.arch = 'x64';
 }
 
 if (isArm64) {
@@ -46,7 +46,6 @@ if (isArm64) {
 if (isBuilding) {
     // Only one will be used by the configured build commands in package.json
     platform.arch = process.argv.includes('--x64') ? 'x64' : platform.arch;
-    platform.arch = process.argv.includes('--x86') ? 'x86' : platform.arch;
     platform.arch = process.argv.includes('--arm64') ? 'arm64' : platform.arch;
 }
 
@@ -65,6 +64,9 @@ if (platform.phpBinary) {
 
         ensureDirSync(binaryDestDir);
 
+        console.log('FOOOOO')
+        console.dir(binarySrcDir);
+
         // Unzip the files
         unzip.open(binarySrcDir, {lazyEntries: true}, function (err, zipfile) {
             if (err) throw err;

src/Drivers/Electron/Commands/BuildCommand.php

@@ -28,7 +28,7 @@ class BuildCommand extends Command
 
     protected $signature = 'native:build
         {os? : The operating system to build for (all, linux, mac, win)}
-        {arch? : The Processor Architecture to build for (x64, x86, arm64)}
+        {arch? : The Processor Architecture to build for (x64, arm64)}
         {--publish : to publish the app}';
 
     protected array $availableOs = ['win', 'linux', 'mac', 'all'];

src/Drivers/Electron/Commands/PublishCommand.php

@@ -17,7 +17,7 @@ class PublishCommand extends Command
 
     protected $signature = 'native:publish
         {os? : The operating system to build for (all, linux, mac, win)}
-        {arch? : The Processor Architecture to build for (x64, x86, arm64)}';
+        {arch? : The Processor Architecture to build for (x64, arm64)}';
 
     protected array $availableOs = ['win', 'linux', 'mac', 'all'];
 

src/Drivers/Electron/Traits/OsAndArch.php

@@ -45,7 +45,7 @@ protected function getArchitectureForOs(string $os): array
     {
         $archs = match ($os) {
             'win' => ['x64'],
-            'mac' => ['x86', 'arm64'],
+            'mac' => ['x64', 'arm64'],
             'linux' => ['x64'],
             default => throw new \InvalidArgumentException('Invalid OS'),
         };