From 069778463dd87b03e786b8adca5ded43a181ed39 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 25 Apr 2026 20:48:18 +0000 Subject: [PATCH 1/2] Update dependency typescript to v6 --- src/nerdbank-streams/package.json | 2 +- src/nerdbank-streams/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/nerdbank-streams/package.json b/src/nerdbank-streams/package.json index 5f4e2e40..1902c20c 100644 --- a/src/nerdbank-streams/package.json +++ b/src/nerdbank-streams/package.json @@ -54,7 +54,7 @@ "promise": "8.3.0", "ts-jest": "29.4.9", "ts-node": "10.9.2", - "typescript": "5.9.3", + "typescript": "6.0.3", "vscode-jsonrpc": "8.2.1" }, "dependencies": { diff --git a/src/nerdbank-streams/yarn.lock b/src/nerdbank-streams/yarn.lock index 611ae8bd..a7753fb6 100644 --- a/src/nerdbank-streams/yarn.lock +++ b/src/nerdbank-streams/yarn.lock @@ -6454,10 +6454,10 @@ typed-array-length@^1.0.7: possible-typed-array-names "^1.0.0" reflect.getprototypeof "^1.0.6" -typescript@5.9.3: - version "5.9.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.9.3.tgz#5b4f59e15310ab17a216f5d6cf53ee476ede670f" - integrity sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw== +typescript@6.0.3: + version "6.0.3" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-6.0.3.tgz#90251dc007916e972786cb94d74d15b185577d21" + integrity sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw== uglify-js@^3.1.4: version "3.19.3" From d542feb00b50a110bcb87c5f35e9b57250fc7e14 Mon Sep 17 00:00:00 2001 From: Andrew Arnott Date: Sat, 25 Apr 2026 23:47:01 -0600 Subject: [PATCH 2/2] Fix TypeScript 6 build Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- src/nerdbank-streams/asyncprocess.ts | 13 ++-- src/nerdbank-streams/package.json | 3 +- src/nerdbank-streams/tsconfig.json | 2 + src/nerdbank-streams/yarn.lock | 96 ++++++++++++++++++++++------ 4 files changed, 89 insertions(+), 25 deletions(-) diff --git a/src/nerdbank-streams/asyncprocess.ts b/src/nerdbank-streams/asyncprocess.ts index 421f04c1..36d1546c 100644 --- a/src/nerdbank-streams/asyncprocess.ts +++ b/src/nerdbank-streams/asyncprocess.ts @@ -1,5 +1,4 @@ import * as cp from "child_process"; -import * as Promise from "promise"; export interface IExecAsyncResult { stdout: string; @@ -7,12 +6,16 @@ export interface IExecAsyncResult { } export function execAsync(command: string, options?: cp.ExecOptions): Promise { - return new Promise( - (resolve, reject) => cp.exec(command, options, (error, stdout, stderr) => { + return new Promise((resolve, reject) => { + cp.exec(command, options, (error, stdout, stderr) => { if (error) { reject(error); } else { - resolve({ stdout, stderr }); + resolve({ + stdout: stdout.toString(), + stderr: stderr.toString(), + }); } - })); + }); + }); } diff --git a/src/nerdbank-streams/package.json b/src/nerdbank-streams/package.json index 1902c20c..1ce2ae52 100644 --- a/src/nerdbank-streams/package.json +++ b/src/nerdbank-streams/package.json @@ -32,10 +32,10 @@ "watch": "node ./node_modules/typescript/bin/tsc -p tsconfig.json -w" }, "devDependencies": { + "@types/gulp": "4.0.17", "@types/jest": "30.0.0", "@types/msgpack-lite": "0.1.12", "@types/node": "16.18.126", - "@types/promise": "7.1.30", "@typescript-eslint/eslint-plugin": "8.59.0", "@typescript-eslint/parser": "8.59.0", "eslint": "10.2.1", @@ -51,7 +51,6 @@ "nerdbank-gitversioning": "3.9.50", "path": "0.12.7", "prettier": "3.8.3", - "promise": "8.3.0", "ts-jest": "29.4.9", "ts-node": "10.9.2", "typescript": "6.0.3", diff --git a/src/nerdbank-streams/tsconfig.json b/src/nerdbank-streams/tsconfig.json index 0da2db97..05cd0893 100644 --- a/src/nerdbank-streams/tsconfig.json +++ b/src/nerdbank-streams/tsconfig.json @@ -4,8 +4,10 @@ "target": "ES2018", "sourceMap": true, "outDir": "out", + "rootDir": "src", "declaration": true, "module": "commonjs", + "types": ["node", "jest"], "noImplicitAny": false, "noImplicitReturns": true, "noImplicitThis": true, diff --git a/src/nerdbank-streams/yarn.lock b/src/nerdbank-streams/yarn.lock index a7753fb6..0600e5d6 100644 --- a/src/nerdbank-streams/yarn.lock +++ b/src/nerdbank-streams/yarn.lock @@ -1111,6 +1111,30 @@ resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.8.tgz#958b91c991b1867ced318bedea0e215ee050726e" integrity sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w== +"@types/expect@^1.20.4": + version "1.20.4" + resolved "https://registry.yarnpkg.com/@types/expect/-/expect-1.20.4.tgz#8288e51737bf7e3ab5d7c77bfa695883745264e5" + integrity sha512-Q5Vn3yjTDyCMV50TB6VRIbQNxSE4OmZR86VSbGaNpfUolm0iePBB4KdEEHmxoY5sT2+2DIvXW0rvMDP2nHZ4Mg== + +"@types/glob-stream@*": + version "8.0.3" + resolved "https://registry.yarnpkg.com/@types/glob-stream/-/glob-stream-8.0.3.tgz#01033062e1a5e58daff3befe9378fc0e329b538a" + integrity sha512-vctgrT9AH/GK3TRaIbRUU0TZn12GBU4kzelZdPyJp1Sc8L/6Wrq21UrtN4+x4saqTg6COUIUtFV6JSYcVln/EQ== + dependencies: + "@types/node" "*" + "@types/picomatch" "*" + "@types/streamx" "*" + +"@types/gulp@4.0.17": + version "4.0.17" + resolved "https://registry.yarnpkg.com/@types/gulp/-/gulp-4.0.17.tgz#b314c3762d08d8d69b7c0b86f78d069bafd65009" + integrity sha512-+pKQynu2C/HS16kgmDlAicjtFYP8kaa86eE9P0Ae7GB5W29we/E2TIdbOWtEZD5XkpY+jr8fyqfwO6SWZecLpQ== + dependencies: + "@types/node" "*" + "@types/undertaker" ">=1.2.6" + "@types/vinyl-fs" "*" + chokidar "^3.3.1" + "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.6": version "2.0.6" resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz#7739c232a1fee9b4d3ce8985f314c0c6d33549d7" @@ -1172,16 +1196,54 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.126.tgz#27875faa2926c0f475b39a8bb1e546c0176f8d4b" integrity sha512-OTcgaiwfGFBKacvfwuHzzn1KLxH/er8mluiy8/uM3sGXHaRe73RrSIj01jow9t4kJEW633Ov+cOexXeiApTyAw== -"@types/promise@7.1.30": - version "7.1.30" - resolved "https://registry.yarnpkg.com/@types/promise/-/promise-7.1.30.tgz#1b6714b321fdfc54d1527e7a17116a0e1f2ab810" - integrity sha512-hvjy+ob7sxggnVAOaBXLlPAsoeyi40idaRe7qTi57BXQzr72NXy1HBoYfxJ0BzN8HM2hfWt9dCuX71ZJFR5eqA== +"@types/picomatch@*": + version "4.0.3" + resolved "https://registry.yarnpkg.com/@types/picomatch/-/picomatch-4.0.3.tgz#d92bbf24166478c5457c8bb9ba41a7f49d55e094" + integrity sha512-iG0T6+nYJ9FAPmx9SsUlnwcq1ZVRuCXcVEvWnntoPlrOpwtSTKNDC9uVAxTsC3PUvJ+99n4RpAcNgBbHX3JSnQ== "@types/stack-utils@^2.0.3": version "2.0.3" resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.3.tgz#6209321eb2c1712a7e7466422b8cb1fc0d9dd5d8" integrity sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw== +"@types/streamx@*": + version "2.9.5" + resolved "https://registry.yarnpkg.com/@types/streamx/-/streamx-2.9.5.tgz#2a4a28d73e521c6799e06e7faa4dabc2139c5733" + integrity sha512-IHYsa6jYrck8VEdSwpY141FTTf6D7boPeMq9jy4qazNrFMA4VbRz/sw5LSsfR7jwdDcx0QKWkUexZvsWBC2eIQ== + dependencies: + "@types/node" "*" + +"@types/undertaker-registry@*": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@types/undertaker-registry/-/undertaker-registry-1.0.4.tgz#2ea4b68abd0b3ad6716ab8ac28734092c1d152c4" + integrity sha512-tW77pHh2TU4uebWXWeEM5laiw8BuJ7pyJYDh6xenOs75nhny2kVgwYbegJ4BoLMYsIrXaBpKYaPdYO3/udG+hg== + +"@types/undertaker@>=1.2.6": + version "1.2.12" + resolved "https://registry.yarnpkg.com/@types/undertaker/-/undertaker-1.2.12.tgz#dcd9e6e85a994fbb170dd01bdd5cbc4a970c1b44" + integrity sha512-52BiBni1srlIx/o7anEB1Y230yr3+21P0utA4VXLyeyeR2gHANKi5kJ/e0FakD4RYEXX0D9dOC7PDrVqL1j98Q== + dependencies: + "@types/node" "*" + "@types/undertaker-registry" "*" + async-done "~1.3.2" + +"@types/vinyl-fs@*": + version "3.0.7" + resolved "https://registry.yarnpkg.com/@types/vinyl-fs/-/vinyl-fs-3.0.7.tgz#f6f9bc5a5f670ae4becc4150408d5e2d7d2a8b2f" + integrity sha512-ojGFhBnh5pj5Crf2yBOk3rjJXUX2U4W9z6tZ7hn6pUbQa/J8KH8NrXem0POYVQWI3ifnx4T65DPktuWfxc3iiA== + dependencies: + "@types/glob-stream" "*" + "@types/node" "*" + "@types/vinyl" "*" + +"@types/vinyl@*": + version "2.0.12" + resolved "https://registry.yarnpkg.com/@types/vinyl/-/vinyl-2.0.12.tgz#17642ca9a8ae10f3db018e9f885da4188db4c6e6" + integrity sha512-Sr2fYMBUVGYq8kj3UthXFAu5UN6ZW+rYr4NACjZQJvHvj+c8lYv0CahmZ2P/r7iUkN44gGUBwqxZkrKXYPb7cw== + dependencies: + "@types/expect" "^1.20.4" + "@types/node" "*" + "@types/yargs-parser@*": version "21.0.3" resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.3.tgz#815e30b786d2e8f0dcd85fd5bcf5e1a04d008f15" @@ -1675,11 +1737,6 @@ arraybuffer.prototype.slice@^1.0.4: get-intrinsic "^1.2.6" is-array-buffer "^3.0.4" -asap@~2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" - integrity sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA== - assign-symbols@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" @@ -1699,6 +1756,16 @@ async-done@^2.0.0: once "^1.4.0" stream-exhaust "^1.0.2" +async-done@~1.3.2: + version "1.3.2" + resolved "https://registry.yarnpkg.com/async-done/-/async-done-1.3.2.tgz#5e15aa729962a4b07414f528a88cdf18e0b290a2" + integrity sha512-uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw== + dependencies: + end-of-stream "^1.1.0" + once "^1.3.2" + process-nextick-args "^2.0.0" + stream-exhaust "^1.0.1" + async-function@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/async-function/-/async-function-1.0.0.tgz#509c9fca60eaf85034c6829838188e4e4c8ffb2b" @@ -2060,7 +2127,7 @@ char-regex@^1.0.2: resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf" integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw== -chokidar@^3.5.3: +chokidar@^3.3.1, chokidar@^3.5.3: version "3.6.0" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b" integrity sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw== @@ -5395,13 +5462,6 @@ process@^0.11.1: resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" integrity sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A== -promise@8.3.0: - version "8.3.0" - resolved "https://registry.yarnpkg.com/promise/-/promise-8.3.0.tgz#8cb333d1edeb61ef23869fbb8a4ea0279ab60e0a" - integrity sha512-rZPNPKTOYVNEEKFaq1HqTgOwZD+4/YHS5ukLzQCypkj+OkYx7iv0mA91lJlpPPZ8vMau3IIGj5Qlwrx+8iiSmg== - dependencies: - asap "~2.0.6" - pump@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909" @@ -5908,7 +5968,7 @@ stream-composer@^1.0.2: dependencies: streamx "^2.13.2" -stream-exhaust@^1.0.2: +stream-exhaust@^1.0.1, stream-exhaust@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/stream-exhaust/-/stream-exhaust-1.0.2.tgz#acdac8da59ef2bc1e17a2c0ccf6c320d120e555d" integrity sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==