Merge pull request #9238 from Clem-Fern/fix-build

Eugeny · Nov 20, 2023 · aae0147 · aae0147
2 parents b4abe29 + 787936b
commit aae0147
Show file tree

Hide file tree

Showing 8 changed files with 252 additions and 401 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -53,8 +53,9 @@ jobs:
 
     - name: Install deps
       run: |
-        sudo -H pip install setuptools
-        sudo npm i -g yarn@1.22.1 node-gyp@10
+        sudo -H pip3 install setuptools
+        npm config set python python3
+        sudo npm i -g yarn@1.22.1
         yarn --network-timeout 1000000
       env:
         ARCH: ${{matrix.arch}}

diff --git a/app/package.json b/app/package.json
@@ -64,7 +64,7 @@
   },
   "resolutions": {
     "*/node-abi": "^2.20.0",
-    "node-gyp": "10.0.0",
+    "node-gyp": "^10.0.0",
     "nan": "github:jkleinsc/nan#remove_accessor_signature"
   }
 }
diff --git a/app/yarn.lock b/app/yarn.lock
@@ -2287,9 +2287,11 @@ lowercase-keys@^1.0.0:
   integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==
 
 lru-cache@^10.0.1, "lru-cache@^9.1.1 || ^10.0.0":
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.0.1.tgz#0a3be479df549cca0e5d693ac402ff19537a6b7a"
-  integrity sha512-IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g==
+  version "10.0.2"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.0.2.tgz#34504678cc3266b09b8dfd6fab4e1515258271b7"
+  integrity sha512-Yj9mA8fPiVgOUpByoTZO5pNrcl5Yk37FcSHsUINpAsaBIEZIuqcCclDZJCVxqQShDsmYX8QG63svJiTbOATZwg==
+  dependencies:
+    semver "^7.3.5"
 
 lru-cache@^4.0.1:
   version "4.1.5"
@@ -2651,10 +2653,10 @@ node-gyp-build@4.6.0:
   resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.6.0.tgz#0c52e4cbf54bbd28b709820ef7b6a3c2d6209055"
   integrity sha512-NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ==
 
-node-gyp@10.0.0, node-gyp@^5.0.2, node-gyp@^5.1.0:
-  version "10.0.0"
-  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-10.0.0.tgz#b802e7177e79f8d7922db5a18b56983e88165f9e"
-  integrity sha512-LkaKUbjyacJGRHiuhUeUblzZNxTF1/XNooyAl6aiaJ6ZpeurR4Mk9sjxncGNSI7pETqyqM+hLAER0788oSxt0A==
+node-gyp@^10.0.0, node-gyp@^5.0.2, node-gyp@^5.1.0:
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-10.0.1.tgz#205514fc19e5830fa991e4a689f9e81af377a966"
+  integrity sha512-gg3/bHehQfZivQVfqIyy8wTdSymF9yTyP4CJifK73imyNMU8AIGQE2pUa7dNWfmMeG9cDVF2eehiRMv0LC1iAg==
   dependencies:
     env-paths "^2.2.0"
     exponential-backoff "^3.1.1"
@@ -3907,7 +3909,6 @@ strict-uri-encode@^2.0.0:
   integrity sha1-ucczDHBChi9rFC3CdLvMWGbONUY=
 
 "string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
-  name string-width-cjs
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -3985,7 +3986,6 @@ stringify-package@^1.0.0, stringify-package@^1.0.1:
   integrity sha512-sa4DUQsYciMP1xhKWGuFM04fB0LG/9DlluZoSVywUMRNvzid6XucHK0/90xGxRoHrAaROrcHK1aPKaijCtSrhg==
 
 "strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.1:
-  name strip-ansi-cjs
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -4432,7 +4432,6 @@ worker-farm@^1.6.0, worker-farm@^1.7.0:
     errno "~0.1.7"
 
 "wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
-  name wrap-ansi-cjs
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==

diff --git a/electron-builder.yml b/electron-builder.yml
@@ -2,6 +2,7 @@
 appId: org.tabby
 productName: Tabby
 compression: normal
+npmRebuild: false
 files:
 - '**/*'
 - dist

diff --git a/package.json b/package.json
@@ -39,7 +39,7 @@
     "cross-env": "7.0.3",
     "css-loader": "^6.7.3",
     "deep-equal": "2.0.5",
-    "electron": "^25.3.0",
+    "electron": "^27.0.4",
     "electron-builder": "^24.6.4",
     "electron-download": "^4.1.1",
     "electron-installer-snap": "^5.1.0",
@@ -55,7 +55,7 @@
     "lru-cache": "^6.0.0",
     "macos-release": "^3.1.0",
     "ngx-toastr": "^16.0.2",
-    "node-abi": "^3.45.0",
+    "node-abi": "^3.51.0",
     "npmlog": "6.0.2",
     "npx": "^10.2.2",
     "patch-package": "^6.4.7",
@@ -96,10 +96,8 @@
   "resolutions": {
     "*/pug": "^3",
     "lzma-native": "^8.0.6",
-    "*/node-abi": "^3.51.0",
     "**/graceful-fs": "^4.2.4",
-    "nan": "2.17.0",
-    "node-gyp": "10.0.0"
+    "nan": "2.17.0"
   },
   "scripts": {
     "build": "npm run build:typings && node scripts/build-modules.mjs",

diff --git a/patches/electron-rebuild+3.2.9.patch b/patches/electron-rebuild+3.2.9.patch
diff --git a/scripts/build-macos.mjs b/scripts/build-macos.mjs
@@ -32,6 +32,7 @@ builder({
                 teamId: process.env.APPLE_TEAM_ID,
             } : false,
         },
+        npmRebuild: process.env.ARCH !== 'arm64',
         publish: process.env.KEYGEN_TOKEN ? [
             vars.keygenConfig,
             {