Skip to content

Commit 2807ce4

Browse files
code-ashercode-asher
committed
Add tar-stream dependency
It's no longer included by the remote dependencies.
1 parent ba72851 commit 2807ce4

3 files changed

Lines changed: 59 additions & 9 deletions

File tree

‎package.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,14 @@
2020
"nodemon": "^1.19.1"
2121
},
2222
"resolutions": {
23-
"@types/node": "^10.12.12"
23+
"@types/node": "^10.12.12",
24+
"safe-buffer": "^5.1.1"
2425
},
2526
"dependencies": {
2627
"@coder/logger": "^1.1.5",
2728
"httpolyglot": "^0.1.2",
2829
"pem": "^1.14.2",
29-
"safe-compare": "^1.1.4"
30+
"safe-compare": "^1.1.4",
31+
"tar-stream": "^2.1.0"
3032
}
3133
}

‎src/marketplace.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
import * as fs from "fs";
22
import * as path from "path";
3-
import * as tarStream from "tar-stream";
43
import * as util from "util";
54
import { CancellationToken } from "vs/base/common/cancellation";
65
import { mkdirp } from "vs/base/node/pfs";
76
import * as vszip from "vs/base/node/zip";
87
import * as nls from "vs/nls";
98
import product from "vs/platform/product/node/product";
9+
import { localRequire } from "vs/server/src/util";
10+
11+
const tarStream = localRequire<typeof import("tar-stream")>("tar-stream/index");
1012

1113
// We will be overriding these, so keep a reference to the original.
1214
const vszipExtract = vszip.extract;

‎yarn.lock‎

Lines changed: 52 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,13 @@ binary-extensions@^1.0.0:
139139
resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.12.0.tgz#c2d780f53d45bba8317a8902d4ceeaf3a6385b14"
140140
integrity sha512-DYWGk01lDcxeS/K9IHPGWfT8PsJmbXRtRd2Sx72Tnb8pcYZQFF1oSDb8hJtS1vhp212q1Rzi5dUf9+nq0o9UIg==
141141

142+
bl@^3.0.0:
143+
version "3.0.0"
144+
resolved "https://registry.yarnpkg.com/bl/-/bl-3.0.0.tgz#3611ec00579fd18561754360b21e9f784500ff88"
145+
integrity sha512-EUAyP5UHU5hxF8BPT0LKW8gjYLhq1DQIcneOX/pL/m2Alo+OYDQAJlHq+yseMP50Os2nHXOSic6Ss3vSQeyf4A==
146+
dependencies:
147+
readable-stream "^3.0.1"
148+
142149
boxen@^1.2.1:
143150
version "1.3.0"
144151
resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.3.0.tgz#55c6c39a8ba58d9c61ad22cd877532deb665a20b"
@@ -433,6 +440,13 @@ duplexer3@^0.1.4:
433440
resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
434441
integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=
435442

443+
end-of-stream@^1.4.1:
444+
version "1.4.1"
445+
resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
446+
integrity sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==
447+
dependencies:
448+
once "^1.4.0"
449+
436450
es6-promisify@^6.0.0:
437451
version "6.0.1"
438452
resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-6.0.1.tgz#6edaa45f3bd570ffe08febce66f7116be4b1cdb6"
@@ -520,6 +534,11 @@ fragment-cache@^0.2.1:
520534
dependencies:
521535
map-cache "^0.2.2"
522536

537+
fs-constants@^1.0.0:
538+
version "1.0.0"
539+
resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
540+
integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
541+
523542
fs-minipass@^1.2.5:
524543
version "1.2.5"
525544
resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
@@ -1196,7 +1215,7 @@ object.pick@^1.3.0:
11961215
dependencies:
11971216
isobject "^3.0.1"
11981217

1199-
once@^1.3.0:
1218+
once@^1.3.0, once@^1.4.0:
12001219
version "1.4.0"
12011220
resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
12021221
integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
@@ -1324,6 +1343,15 @@ readable-stream@^2.0.2, readable-stream@^2.0.6:
13241343
string_decoder "~1.1.1"
13251344
util-deprecate "~1.0.1"
13261345

1346+
readable-stream@^3.0.1, readable-stream@^3.1.1:
1347+
version "3.4.0"
1348+
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.4.0.tgz#a51c26754658e0a3c21dbf59163bd45ba6f447fc"
1349+
integrity sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==
1350+
dependencies:
1351+
inherits "^2.0.3"
1352+
string_decoder "^1.1.1"
1353+
util-deprecate "^1.0.1"
1354+
13271355
readdirp@^2.2.1:
13281356
version "2.2.1"
13291357
resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
@@ -1388,10 +1416,10 @@ rimraf@^2.6.1:
13881416
dependencies:
13891417
glob "^7.1.3"
13901418

1391-
safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
1392-
version "5.1.2"
1393-
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
1394-
integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
1419+
safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1, safe-buffer@~5.2.0:
1420+
version "5.2.0"
1421+
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519"
1422+
integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==
13951423

13961424
safe-compare@^1.1.4:
13971425
version "1.1.4"
@@ -1559,6 +1587,13 @@ string-width@^1.0.1:
15591587
is-fullwidth-code-point "^2.0.0"
15601588
strip-ansi "^4.0.0"
15611589

1590+
string_decoder@^1.1.1:
1591+
version "1.3.0"
1592+
resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
1593+
integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
1594+
dependencies:
1595+
safe-buffer "~5.2.0"
1596+
15621597
string_decoder@~1.1.1:
15631598
version "1.1.1"
15641599
resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
@@ -1597,6 +1632,17 @@ supports-color@^5.2.0, supports-color@^5.3.0:
15971632
dependencies:
15981633
has-flag "^3.0.0"
15991634

1635+
tar-stream@^2.1.0:
1636+
version "2.1.0"
1637+
resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.0.tgz#d1aaa3661f05b38b5acc9b7020efdca5179a2cc3"
1638+
integrity sha512-+DAn4Nb4+gz6WZigRzKEZl1QuJVOLtAwwF+WUxy1fJ6X63CaGaUAxJRD2KEn1OMfcbCjySTYpNC6WmfQoIEOdw==
1639+
dependencies:
1640+
bl "^3.0.0"
1641+
end-of-stream "^1.4.1"
1642+
fs-constants "^1.0.0"
1643+
inherits "^2.0.3"
1644+
readable-stream "^3.1.1"
1645+
16001646
tar@^4:
16011647
version "4.4.8"
16021648
resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.8.tgz#b19eec3fde2a96e64666df9fdb40c5ca1bc3747d"
@@ -1729,7 +1775,7 @@ use@^3.1.0:
17291775
resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
17301776
integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
17311777

1732-
util-deprecate@~1.0.1:
1778+
util-deprecate@^1.0.1, util-deprecate@~1.0.1:
17331779
version "1.0.2"
17341780
resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
17351781
integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=

0 commit comments

Comments
 (0)