Merge branch 'main' into releases/terminalone/app

.github/workflows/release-app.yml

@@ -57,8 +57,10 @@ jobs:
         run: npm cache clean -f
       - name: install dependencies
         run: npm ci
-      - name: build for mac
-        run: npm run publish:app:mac
+      - name: build for mac x64
+        run: npm run publish:app:mac:x64
+      - name: build for mac arm64
+        run: npm run publish:app:mac:arm64
   build_on_linux:
     runs-on: ubuntu-latest
     env:

package.json

@@ -30,20 +30,19 @@
     "build:app:windows": "shx rm -rf dist && npm run build && electron-builder --win --publish=never",
     "build:app:mac": "shx rm -rf dist && npm run build && electron-builder --mac --publish=never",
     "build:app:linux": "shx rm -rf dist && npm run build && electron-builder --linux --publish=never",
-    "publish:app:windows": "shx rm -rf dist && npm run build && electron-builder --win --publish=always",
-    "publish:app:mac": "shx rm -rf dist && npm run build && electron-builder --mac --publish=always",
-    "publish:app:linux": "shx rm -rf dist && npm run build && electron-builder --linux --publish=always",
+    "publish:app:windows:x64": "shx rm -rf dist && npm run rebuild:node-pty:x64 && npm run build && electron-builder --win --x64 --publish=always",
+    "publish:app:mac:x64": "shx rm -rf dist && npm run rebuild:node-pty:x64 && npm run build && electron-builder --mac --x64 --publish=always",
+    "publish:app:mac:arm64": "shx rm -rf dist && npm run rebuild:node-pty:arm64 && npm run build && electron-builder --mac --arm64 --publish=always",
+    "publish:app:linux:x64": "shx rm -rf dist && npm run rebuild:node-pty:x64 && npm run build && electron-builder --linux --x64 --publish=always",
     "release:app": "git checkout releases/terminalone/app && git pull && git merge --no-edit --no-ff main && git push && git checkout main",
     "build": "turbo run build",
     "lint": "turbo run lint",
     "lint:fix": "turbo run lint:fix",
     "test": "turbo run test",
     "rebuild:node-pty": "electron-rebuild -f -o node-pty -m packages/app",
-    "prepare": "node -e \"process.env.NODE_ENV != 'production' && process.exit(1)\" || npm run v8-snapshot && electron-builder install-app-deps && npm run rebuild:node-pty",
-    "v8-snapshot": "cross-env npm_config_arch=x64 npm run v8-snapshot:arch && cross-env npm_config_arch=arm64 npm run v8-snapshot:arch",
-    "v8-snapshot:arch": "npm run mk-snapshot && npm run cp-snapshot",
-    "mk-snapshot": "cross-env ELECTRON_CUSTOM_VERSION=$npm_package_devDependencies_electron node node_modules/electron-mksnapshot/download-mksnapshot.js && node scripts/mk-snapshot.js",
-    "cp-snapshot": "node scripts/cp-snapshot.js"
+    "rebuild:node-pty:x64": "electron-rebuild -f --arch=x64 -o node-pty -m packages/app",
+    "rebuild:node-pty:arm64": "electron-rebuild -f --arch=arm64 -o node-pty -m packages/app",
+    "prepare": "node -e \"process.env.NODE_ENV != 'production' && process.exit(1)\" || electron-builder install-app-deps && npm run rebuild:node-pty"
   },
   "main": "packages/app/dist/main.bundle.js",
   "build": {
@@ -65,13 +64,6 @@
       "icon": "icon.icns"
     },
     "mac": {
-      "target": {
-        "target": "default",
-        "arch": [
-          "x64",
-          "arm64"
-        ]
-      },
       "category": "public.app-category.developer-tools",
       "entitlements": "./scripts/entitlements.plist",
       "entitlementsInherit": "./scripts/entitlements.plist",