Skip to content

Commit 976a326

Browse files
committed
Update nbin
1 parent b901043 commit 976a326

File tree

3 files changed

+126
-6
lines changed

3 files changed

+126
-6
lines changed

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
"patch:apply": "yarn ensure-in-vscode && cd ../../../ && git apply ./src/vs/server/scripts/vscode.patch"
1515
},
1616
"devDependencies": {
17+
"@coder/nbin": "^1.2.0",
1718
"@types/pem": "^1.9.5",
1819
"@types/safe-compare": "^1.1.0",
1920
"@types/tar-stream": "^1.6.1",

scripts/tasks.bash

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -181,13 +181,8 @@ function package-task() {
181181

182182
# Bundle built code into a binary.
183183
function binary-task() {
184-
# I had trouble getting VS Code to build with the @coder/nbin dependency due
185-
# to the types it installs (tons of conflicts), so for now it's a global
186-
# dependency.
187184
cd "${rootPath}"
188-
npm link @coder/nbin
189185
node "${rootPath}/scripts/nbin.js" "${buildPath}" "${target}" "${binaryName}"
190-
rm node_modules/@coder/nbin
191186
log "Binary: ${buildPath}/${binaryName}"
192187
}
193188

yarn.lock

Lines changed: 125 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,17 @@
77
resolved "https://registry.yarnpkg.com/@coder/logger/-/logger-1.1.8.tgz#416a7221d84161ee35eca9cfa93ba9377639b4ee"
88
integrity sha512-NJDC4rZTx0deVYqAxZtJWACq3IrVR59BjFeZebO3i7OfTZZMkkbLsGsCFMnJd5KnX6KjnvvFq4XXtwJ9yf8/YQ==
99

10+
"@coder/nbin@^1.2.0":
11+
version "1.2.0"
12+
resolved "https://registry.yarnpkg.com/@coder/nbin/-/nbin-1.2.0.tgz#b1cc5ed51193ded98ccfe39825ceee500b90f849"
13+
integrity sha512-fHnOqx1yAuK65gr1D9Du7W4AXiITEcFPKIZ3JifvXMeSSwzdVzq3nvVSCPD45KTwK1nS6pDKkXC/CqrYinUf7Q==
14+
dependencies:
15+
"@coder/logger" "^1.1.8"
16+
fs-extra "^7.0.1"
17+
glob "^7.1.3"
18+
node-fetch "^2.3.0"
19+
ora "^3.2.0"
20+
1021
"@types/node@*", "@types/node@^10.12.12":
1122
version "10.14.12"
1223
resolved "https://registry.yarnpkg.com/@types/node/-/node-10.14.12.tgz#0eec3155a46e6c4db1f27c3e588a205f767d622f"
@@ -53,6 +64,11 @@ ansi-regex@^3.0.0:
5364
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
5465
integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
5566

67+
ansi-regex@^4.1.0:
68+
version "4.1.0"
69+
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
70+
integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
71+
5672
ansi-styles@^3.2.1:
5773
version "3.2.1"
5874
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
@@ -226,7 +242,7 @@ capture-stack-trace@^1.0.0:
226242
resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz#a6c0bbe1f38f3aa0b92238ecb6ff42c344d4135d"
227243
integrity sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==
228244

229-
chalk@^2.0.1:
245+
chalk@^2.0.1, chalk@^2.4.2:
230246
version "2.4.2"
231247
resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
232248
integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -284,6 +300,23 @@ cli-boxes@^1.0.0:
284300
resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143"
285301
integrity sha1-T6kXw+WclKAEzWH47lCdplFocUM=
286302

303+
cli-cursor@^2.1.0:
304+
version "2.1.0"
305+
resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
306+
integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=
307+
dependencies:
308+
restore-cursor "^2.0.0"
309+
310+
cli-spinners@^2.0.0:
311+
version "2.2.0"
312+
resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.2.0.tgz#e8b988d9206c692302d8ee834e7a85c0144d8f77"
313+
integrity sha512-tgU3fKwzYjiLEQgPMD9Jt+JjHVL9kW93FiIMX/l7rivvOD4/LL0Mf7gda3+4U2KJBloybwgj5KEoQgGRioMiKQ==
314+
315+
clone@^1.0.2:
316+
version "1.0.4"
317+
resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
318+
integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
319+
287320
code-point-at@^1.0.0:
288321
version "1.1.0"
289322
resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
@@ -396,6 +429,13 @@ deep-extend@^0.6.0:
396429
resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
397430
integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
398431

432+
defaults@^1.0.3:
433+
version "1.0.3"
434+
resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
435+
integrity sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=
436+
dependencies:
437+
clone "^1.0.2"
438+
399439
define-property@^0.2.5:
400440
version "0.2.5"
401441
resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
@@ -539,6 +579,15 @@ fs-constants@^1.0.0:
539579
resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
540580
integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
541581

582+
fs-extra@^7.0.1:
583+
version "7.0.1"
584+
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
585+
integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==
586+
dependencies:
587+
graceful-fs "^4.1.2"
588+
jsonfile "^4.0.0"
589+
universalify "^0.1.0"
590+
542591
fs-minipass@^1.2.5:
543592
version "1.2.5"
544593
resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
@@ -632,6 +681,11 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.2:
632681
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
633682
integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==
634683

684+
graceful-fs@^4.1.6:
685+
version "4.2.2"
686+
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.2.tgz#6f0952605d0140c1cfdb138ed005775b92d67b02"
687+
integrity sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==
688+
635689
has-flag@^3.0.0:
636690
version "3.0.0"
637691
resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
@@ -914,6 +968,13 @@ isobject@^3.0.0, isobject@^3.0.1:
914968
resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
915969
integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
916970

971+
jsonfile@^4.0.0:
972+
version "4.0.0"
973+
resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
974+
integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
975+
optionalDependencies:
976+
graceful-fs "^4.1.6"
977+
917978
kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
918979
version "3.2.2"
919980
resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
@@ -945,6 +1006,13 @@ latest-version@^3.0.0:
9451006
dependencies:
9461007
package-json "^4.0.0"
9471008

1009+
log-symbols@^2.2.0:
1010+
version "2.2.0"
1011+
resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
1012+
integrity sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==
1013+
dependencies:
1014+
chalk "^2.0.1"
1015+
9481016
lowercase-keys@^1.0.0:
9491017
version "1.0.1"
9501018
resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
@@ -1005,6 +1073,11 @@ micromatch@^3.1.10, micromatch@^3.1.4:
10051073
snapdragon "^0.8.1"
10061074
to-regex "^3.0.2"
10071075

1076+
mimic-fn@^1.0.0:
1077+
version "1.2.0"
1078+
resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
1079+
integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
1080+
10081081
minimatch@^3.0.4:
10091082
version "3.0.4"
10101083
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
@@ -1093,6 +1166,11 @@ needle@^2.2.1:
10931166
iconv-lite "^0.4.4"
10941167
sax "^1.2.4"
10951168

1169+
node-fetch@^2.3.0:
1170+
version "2.6.0"
1171+
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd"
1172+
integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==
1173+
10961174
node-pre-gyp@^0.12.0:
10971175
version "0.12.0"
10981176
resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz#39ba4bb1439da030295f899e3b520b7785766149"
@@ -1222,6 +1300,25 @@ once@^1.3.0, once@^1.4.0:
12221300
dependencies:
12231301
wrappy "1"
12241302

1303+
onetime@^2.0.0:
1304+
version "2.0.1"
1305+
resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
1306+
integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=
1307+
dependencies:
1308+
mimic-fn "^1.0.0"
1309+
1310+
ora@^3.2.0:
1311+
version "3.4.0"
1312+
resolved "https://registry.yarnpkg.com/ora/-/ora-3.4.0.tgz#bf0752491059a3ef3ed4c85097531de9fdbcd318"
1313+
integrity sha512-eNwHudNbO1folBP3JsZ19v9azXWtQZjICdr3Q0TDPIaeBQ3mXLrh54wM+er0+hSp+dWKf+Z8KM58CYzEyIYxYg==
1314+
dependencies:
1315+
chalk "^2.4.2"
1316+
cli-cursor "^2.1.0"
1317+
cli-spinners "^2.0.0"
1318+
log-symbols "^2.2.0"
1319+
strip-ansi "^5.2.0"
1320+
wcwidth "^1.0.1"
1321+
12251322
os-homedir@^1.0.0:
12261323
version "1.0.2"
12271324
resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
@@ -1404,6 +1501,14 @@ resolve-url@^0.2.1:
14041501
resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
14051502
integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
14061503

1504+
restore-cursor@^2.0.0:
1505+
version "2.0.0"
1506+
resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
1507+
integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368=
1508+
dependencies:
1509+
onetime "^2.0.0"
1510+
signal-exit "^3.0.2"
1511+
14071512
ret@~0.1.10:
14081513
version "0.1.15"
14091514
resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
@@ -1615,6 +1720,13 @@ strip-ansi@^4.0.0:
16151720
dependencies:
16161721
ansi-regex "^3.0.0"
16171722

1723+
strip-ansi@^5.2.0:
1724+
version "5.2.0"
1725+
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
1726+
integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
1727+
dependencies:
1728+
ansi-regex "^4.1.0"
1729+
16181730
strip-eof@^1.0.0:
16191731
version "1.0.0"
16201732
resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
@@ -1724,6 +1836,11 @@ unique-string@^1.0.0:
17241836
dependencies:
17251837
crypto-random-string "^1.0.0"
17261838

1839+
universalify@^0.1.0:
1840+
version "0.1.2"
1841+
resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
1842+
integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
1843+
17271844
unset-value@^1.0.0:
17281845
version "1.0.0"
17291846
resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
@@ -1780,6 +1897,13 @@ util-deprecate@^1.0.1, util-deprecate@~1.0.1:
17801897
resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
17811898
integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
17821899

1900+
wcwidth@^1.0.1:
1901+
version "1.0.1"
1902+
resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
1903+
integrity sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=
1904+
dependencies:
1905+
defaults "^1.0.3"
1906+
17831907
which@^1.2.9, which@^1.3.1:
17841908
version "1.3.1"
17851909
resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"

0 commit comments

Comments
 (0)