Skip to content

Commit 7a175aa

Browse files
committed
chore: remove legacy dependency
1 parent 55e0960 commit 7a175aa

File tree

4 files changed

+12
-80
lines changed

4 files changed

+12
-80
lines changed

.vscode/launch.json

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,7 @@
1414
"--extensionDevelopmentPath=${workspaceFolder}"
1515
],
1616
"outFiles": [
17-
"${workspaceFolder}/out/**/*.js"
18-
],
19-
"preLaunchTask": "${defaultBuildTask}"
20-
},
21-
{
22-
"name": "Extension Tests",
23-
"type": "extensionHost",
24-
"request": "launch",
25-
"runtimeExecutable": "${execPath}",
26-
"args": [
27-
"--extensionDevelopmentPath=${workspaceFolder}",
28-
"--extensionTestsPath=${workspaceFolder}/out/test/suite/index"
29-
],
30-
"outFiles": [
31-
"${workspaceFolder}/out/test/**/*.js"
17+
"${workspaceFolder}/dist/**/*.js"
3218
],
3319
"preLaunchTask": "${defaultBuildTask}"
3420
}

package.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,10 +125,8 @@
125125
"Other"
126126
],
127127
"dependencies": {
128-
"child-process-promise": "^2.2.1"
129128
},
130129
"devDependencies": {
131-
"@types/child-process-promise": "^2.2.1",
132130
"@types/mocha": "^7.0.2",
133131
"@types/node": "^13.11.0",
134132
"@types/vscode": "^1.45.1",

src/tfs/tfExe.ts

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
11
import * as vscode from "vscode"
2-
import { spawn, SpawnPromiseResult } from "child-process-promise"
2+
import { promisify } from "util"
3+
import { execFile } from "child_process"
34

4-
export async function tf(args: Array<string>): Promise<SpawnPromiseResult> {
5+
const pExecFile = promisify(execFile)
6+
7+
export async function tf(args: Array<string>): Promise<{ stdout: string; stderr: string }> {
58
const tfPath: string | undefined = vscode.workspace.getConfiguration("tfs").get("location")
69

710
if (!tfPath) {
811
throw new Error("tf.exe path is not configured")
912
}
1013

11-
return spawn(tfPath, args, { capture: ["stdout", "stderr"] }).catch((err) => {
12-
throw err.stderr ? new Error(err.stderr) : err
13-
})
14+
try {
15+
return pExecFile(tfPath, args)
16+
} catch (err) {
17+
throw new Error(err.stderr ? err.stderr : err.message)
18+
}
1419
}

yarn.lock

Lines changed: 1 addition & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,6 @@
2323
chalk "^2.0.0"
2424
js-tokens "^4.0.0"
2525

26-
"@types/child-process-promise@^2.2.1":
27-
version "2.2.1"
28-
resolved "https://registry.yarnpkg.com/@types/child-process-promise/-/child-process-promise-2.2.1.tgz#049033bef102f77a1719b38672cc86a2c4710ab1"
29-
integrity sha512-xZ4kkF82YkmqPCERqV9Tj0bVQj3Tk36BqGlNgxv5XhifgDRhwAqp+of+sccksdpZRbbPsNwMOkmUqOnLgxKtGw==
30-
dependencies:
31-
"@types/node" "*"
32-
3326
"@types/color-name@^1.1.1":
3427
version "1.1.1"
3528
resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
@@ -50,11 +43,6 @@
5043
resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-7.0.2.tgz#b17f16cf933597e10d6d78eae3251e692ce8b0ce"
5144
integrity sha512-ZvO2tAcjmMi8V/5Z3JsyofMe3hasRcaw88cto5etSVMwVQfeivGAlEYmaQgceUSVYFofVjT+ioHsATjdWcFt1w==
5245

53-
"@types/node@*":
54-
version "14.0.11"
55-
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.11.tgz#61d4886e2424da73b7b25547f59fdcb534c165a3"
56-
integrity sha512-lCvvI24L21ZVeIiyIUHZ5Oflv1hhHQ5E1S25IRlKIXaRkVgmXpJMI3wUJkmym2bTbCe+WoIibQnMVAU3FguaOg==
57-
5846
"@types/node@^13.11.0":
5947
version "13.13.10"
6048
resolved "https://registry.yarnpkg.com/@types/node/-/node-13.13.10.tgz#34a9be3cbc409fd235984bd18a130006f5234396"
@@ -271,15 +259,6 @@ chardet@^0.7.0:
271259
resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
272260
integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
273261

274-
child-process-promise@^2.2.1:
275-
version "2.2.1"
276-
resolved "https://registry.yarnpkg.com/child-process-promise/-/child-process-promise-2.2.1.tgz#4730a11ef610fad450b8f223c79d31d7bdad8074"
277-
integrity sha1-RzChHvYQ+tRQuPIjx50x172tgHQ=
278-
dependencies:
279-
cross-spawn "^4.0.2"
280-
node-version "^1.0.0"
281-
promise-polyfill "^6.0.1"
282-
283262
chokidar@3.3.0:
284263
version "3.3.0"
285264
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.3.0.tgz#12c0714668c55800f659e262d4962a97faf554a6"
@@ -345,14 +324,6 @@ concat-map@0.0.1:
345324
resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
346325
integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
347326

348-
cross-spawn@^4.0.2:
349-
version "4.0.2"
350-
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-4.0.2.tgz#7b9247621c23adfdd3856004a823cbe397424d41"
351-
integrity sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=
352-
dependencies:
353-
lru-cache "^4.0.1"
354-
which "^1.2.9"
355-
356327
cross-spawn@^7.0.2:
357328
version "7.0.3"
358329
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
@@ -940,14 +911,6 @@ log-symbols@3.0.0:
940911
dependencies:
941912
chalk "^2.4.2"
942913

943-
lru-cache@^4.0.1:
944-
version "4.1.5"
945-
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
946-
integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
947-
dependencies:
948-
pseudomap "^1.0.2"
949-
yallist "^2.1.2"
950-
951914
make-error@^1.1.1:
952915
version "1.3.6"
953916
resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
@@ -1035,11 +998,6 @@ node-environment-flags@1.0.6:
1035998
object.getownpropertydescriptors "^2.0.3"
1036999
semver "^5.7.0"
10371000

1038-
node-version@^1.0.0:
1039-
version "1.2.0"
1040-
resolved "https://registry.yarnpkg.com/node-version/-/node-version-1.2.0.tgz#34fde3ffa8e1149bd323983479dda620e1b5060d"
1041-
integrity sha512-ma6oU4Sk0qOoKEAymVoTvk8EdXEobdS7m/mAGhDJ8Rouugho48crHBORAmy5BoOcv8wraPM6xumapQp5hl4iIQ==
1042-
10431001
normalize-path@^3.0.0, normalize-path@~3.0.0:
10441002
version "3.0.0"
10451003
resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
@@ -1172,16 +1130,6 @@ progress@^2.0.0:
11721130
resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
11731131
integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
11741132

1175-
promise-polyfill@^6.0.1:
1176-
version "6.1.0"
1177-
resolved "https://registry.yarnpkg.com/promise-polyfill/-/promise-polyfill-6.1.0.tgz#dfa96943ea9c121fca4de9b5868cb39d3472e057"
1178-
integrity sha1-36lpQ+qcEh/KTem1hoyznTRy4Fc=
1179-
1180-
pseudomap@^1.0.2:
1181-
version "1.0.2"
1182-
resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
1183-
integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
1184-
11851133
punycode@^2.1.0:
11861134
version "2.1.1"
11871135
resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
@@ -1525,7 +1473,7 @@ which-module@^2.0.0:
15251473
resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
15261474
integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
15271475

1528-
which@1.3.1, which@^1.2.9:
1476+
which@1.3.1:
15291477
version "1.3.1"
15301478
resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
15311479
integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
@@ -1577,11 +1525,6 @@ y18n@^4.0.0:
15771525
resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
15781526
integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
15791527

1580-
yallist@^2.1.2:
1581-
version "2.1.2"
1582-
resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
1583-
integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
1584-
15851528
yargs-parser@13.1.2, yargs-parser@^13.1.2:
15861529
version "13.1.2"
15871530
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38"

0 commit comments

Comments
 (0)