From 770e6159c5ea0ec7d95e68e6b4859e59130d7fa4 Mon Sep 17 00:00:00 2001 From: Mathias Ottosson Date: Tue, 17 Nov 2020 11:34:51 +0100 Subject: [PATCH 1/3] Add prebuild targets for Electron 10 and 11 --- package.json | 8 ++++---- yarn.lock | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 5cad199..284e8f4 100644 --- a/package.json +++ b/package.json @@ -16,8 +16,8 @@ "check-prettier": "prettier --list-different lib/*.ts test/*.ts", "prebuild-node": "prebuild -t 10.11.0 -t 11.9.0 -t 12.0.0 -t 14.8.0 --strip", "prebuild-node-ia32": "prebuild -t 10.11.0 -t 11.9.0 -t 12.0.0 -t 14.8.0 -a ia32 --strip", - "prebuild-electron": "prebuild -t 7.0.0 -t 8.0.0 -t 9.0.0 -r electron --strip", - "prebuild-electron-ia32": "prebuild -t 7.0.0 -t 8.0.0 -t 9.0.0 -r electron -a ia32 --strip", + "prebuild-electron": "prebuild -t 7.0.0 -t 8.0.0 -t 9.0.0 -t 10.0.0 -t 11.0.0 -r electron --strip", + "prebuild-electron-ia32": "prebuild -t 7.0.0 -t 8.0.0 -t 9.0.0 -t 10.0.0 -t 11.0.0 -r electron -a ia32 --strip", "upload": "node ./script/upload.js" }, "repository": { @@ -37,7 +37,7 @@ "@types/node": "^12.0.0", "benchmark": "^2.1.4", "jest": "^26.4.2", - "node-abi": "2.18.0", + "node-abi": "2.19.1", "prebuild": "^10.0.0", "prettier": "^2.0.5", "ts-node": "^9.0.0", @@ -48,6 +48,6 @@ "prebuild-install": "^5.3.5" }, "resolutions": { - "**/node-abi": "2.18.0" + "**/node-abi": "2.19.1" } } diff --git a/yarn.lock b/yarn.lock index babb807..bf99bab 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3341,10 +3341,10 @@ nice-try@^1.0.4: resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== -node-abi@2.18.0, node-abi@^2.2.0, node-abi@^2.7.0: - version "2.18.0" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.18.0.tgz#1f5486cfd7d38bd4f5392fa44a4ad4d9a0dffbf4" - integrity sha512-yi05ZoiuNNEbyT/xXfSySZE+yVnQW6fxPZuFbLyS1s6b5Kw3HzV2PHOM4XR+nsjzkHxByK+2Wg+yCQbe35l8dw== +node-abi@2.19.1, node-abi@^2.2.0, node-abi@^2.7.0: + version "2.19.1" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.19.1.tgz#6aa32561d0a5e2fdb6810d8c25641b657a8cea85" + integrity sha512-HbtmIuByq44yhAzK7b9j/FelKlHYISKQn0mtvcBrU5QBkhoCMp5bu8Hv5AI34DcKfOAcJBcOEMwLlwO62FFu9A== dependencies: semver "^5.4.1" From 387eca1f92657201337845cbf5cef4790297e5bb Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Mon, 30 Nov 2020 17:19:30 +0100 Subject: [PATCH 2/3] Bump to latest node-abi and prebuild --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index b1c5451..0a5e73b 100644 --- a/package.json +++ b/package.json @@ -39,8 +39,8 @@ "@types/node": "^12.0.0", "benchmark": "^2.1.4", "jest": "^26.4.2", - "node-abi": "2.19.1", - "prebuild": "^10.0.0", + "node-abi": "^2.19.3", + "prebuild": "^10.0.1", "prettier": "^2.0.5", "ts-node": "^9.0.0", "typescript": "^3.9.0" From b6f9091e80ea433b6a621960ab5002a57200aa8c Mon Sep 17 00:00:00 2001 From: Markus Olsson Date: Mon, 30 Nov 2020 17:20:19 +0100 Subject: [PATCH 3/3] Get rid of node-abi resolution override --- package.json | 3 --- yarn.lock | 19 ++++++++++--------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 0a5e73b..4e8683a 100644 --- a/package.json +++ b/package.json @@ -48,8 +48,5 @@ "dependencies": { "nan": "^2.14.1", "prebuild-install": "^5.3.5" - }, - "resolutions": { - "**/node-abi": "2.19.1" } } diff --git a/yarn.lock b/yarn.lock index bf99bab..fa9c1de 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2099,7 +2099,7 @@ glob@^7.1.3: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^7.1.4: +glob@^7.1.4, glob@^7.1.6: version "7.1.6" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== @@ -3341,10 +3341,10 @@ nice-try@^1.0.4: resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== -node-abi@2.19.1, node-abi@^2.2.0, node-abi@^2.7.0: - version "2.19.1" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.19.1.tgz#6aa32561d0a5e2fdb6810d8c25641b657a8cea85" - integrity sha512-HbtmIuByq44yhAzK7b9j/FelKlHYISKQn0mtvcBrU5QBkhoCMp5bu8Hv5AI34DcKfOAcJBcOEMwLlwO62FFu9A== +node-abi@^2.19.3, node-abi@^2.2.0, node-abi@^2.7.0: + version "2.19.3" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.19.3.tgz#252f5dcab12dad1b5503b2d27eddd4733930282d" + integrity sha512-9xZrlyfvKhWme2EXFKQhZRp1yNWT/uI1luYPr3sFl+H4keYY4xR+1jO7mvTTijIsHf1M+QDe9uWuKeEpLInIlg== dependencies: semver "^5.4.1" @@ -3754,10 +3754,10 @@ prebuild-install@^5.3.5: tunnel-agent "^0.6.0" which-pm-runs "^1.0.0" -prebuild@^10.0.0: - version "10.0.0" - resolved "https://registry.yarnpkg.com/prebuild/-/prebuild-10.0.0.tgz#d1597eb028bea978091f9e13bac0b9dd2201a04a" - integrity sha512-WLjsJRX7AJHw937oGyJT6wYscXYCfBVpCDU2shFG/B4rOcn5+3v5M2NoUrfkyVjjaCYLM61Kp7ulL1aNRygW8Q== +prebuild@^10.0.1: + version "10.0.1" + resolved "https://registry.yarnpkg.com/prebuild/-/prebuild-10.0.1.tgz#9d46a00f42b60ad1718479cc5e3d1ef4882b7f33" + integrity sha512-x0CkKDmHFwX49rTGEYJwB9jBQwJWxRzwUtP5PA9dP8khFGMm3oSFgYortxdlp0PkxB29EhWGp/KQE5g+adehYg== dependencies: cmake-js "~5.2.0" detect-libc "^1.0.3" @@ -3765,6 +3765,7 @@ prebuild@^10.0.0: execspawn "^1.0.1" ghreleases "^3.0.2" github-from-package "0.0.0" + glob "^7.1.6" minimist "^1.1.2" mkdirp "^0.5.1" napi-build-utils "^1.0.1"