Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add prebuild targets for Electron 10 and 11 #199

Merged
merged 4 commits into from Nov 30, 2020
Merged

Add prebuild targets for Electron 10 and 11 #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
770e615
Add prebuild targets for Electron 10 and 11
ottosson Nov 17, 2020
e17e214
Merge branch 'master' into pr/199
niik Nov 30, 2020
387eca1
Bump to latest node-abi and prebuild
niik Nov 30, 2020
b6f9091
Get rid of node-abi resolution override
niik Nov 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 5 additions & 8 deletions package.json
View file
Open in desktop
Expand Up @@ -16,9 +16,9 @@
"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-arm64": "prebuild -t 7.0.0 -t 8.0.0 -t 9.0.0 -r electron -a arm64 --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-arm64": "prebuild -t 7.0.0 -t 8.0.0 -t 9.0.0 -t 10.0.0 -t 11.0.0 -r electron -a arm64 --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",
"prebuild-all": "yarn prebuild-node && yarn prebuild-node-ia32 && yarn prebuild-electron && yarn prebuild-electron-ia32 && yarn prebuild-electron-arm64",
"upload": "node ./script/upload.js"
},
Expand All @@ -39,17 +39,14 @@
"@types/node": "^12.0.0",
"benchmark": "^2.1.4",
"jest": "^26.4.2",
"node-abi": "2.18.0",
"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"
},
"dependencies": {
"nan": "^2.14.1",
"prebuild-install": "^5.3.5"
},
"resolutions": {
"**/node-abi": "2.18.0"
}
}
19 changes: 10 additions & 9 deletions yarn.lock
View file
Open in desktop
Expand Up @@ -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==
Expand Down Expand Up @@ -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.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"

Expand Down Expand Up @@ -3754,17 +3754,18 @@ 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"
each-series-async "^1.0.1"
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"
Expand Down