From fce753a1069fbb17a5e5d6b9258b064947eb752a Mon Sep 17 00:00:00 2001 From: "Michael B. Gale" Date: Wed, 8 Jul 2026 11:27:41 +0100 Subject: [PATCH 1/6] Change `moduleResolution` for forthcoming `node10` deprecation --- extensions/ql-vscode/test/tsconfig.json | 3 ++- extensions/ql-vscode/tsconfig.json | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/extensions/ql-vscode/test/tsconfig.json b/extensions/ql-vscode/test/tsconfig.json index 5c668b34d12..6c9f1739a9a 100644 --- a/extensions/ql-vscode/test/tsconfig.json +++ b/extensions/ql-vscode/test/tsconfig.json @@ -5,6 +5,7 @@ "compilerOptions": { "noEmit": true, "resolveJsonModule": true, - "rootDir": ".." + "rootDir": "..", + "types": ["jest"] } } diff --git a/extensions/ql-vscode/tsconfig.json b/extensions/ql-vscode/tsconfig.json index 93f7cb0f26e..a6e7aa4cc68 100644 --- a/extensions/ql-vscode/tsconfig.json +++ b/extensions/ql-vscode/tsconfig.json @@ -3,11 +3,11 @@ "compilerOptions": { "declaration": true, "strict": true, - "module": "commonjs", + "module": "nodenext", "target": "es2021", "outDir": "out", "lib": ["ES2021"], - "moduleResolution": "node", + "moduleResolution": "nodenext", "sourceMap": true, "rootDir": "src", "skipLibCheck": true, From 09c6be8780c59cf229466f6164c20074602c8a24 Mon Sep 17 00:00:00 2001 From: "Michael B. Gale" Date: Wed, 8 Jul 2026 11:30:45 +0100 Subject: [PATCH 2/6] Fix `AppOctokit` using `retry` plugin as `RetryOptions` --- extensions/ql-vscode/src/common/octokit.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/extensions/ql-vscode/src/common/octokit.ts b/extensions/ql-vscode/src/common/octokit.ts index f3717c5b2e9..6ccd8b0449a 100644 --- a/extensions/ql-vscode/src/common/octokit.ts +++ b/extensions/ql-vscode/src/common/octokit.ts @@ -9,5 +9,4 @@ export const AppOctokit = Octokit.defaults({ fetch: (input: string | URL | Request, init?: RequestInit) => fetch(input, init), }, - retry, -}); +}).plugin(retry); From c383755f4a0e9987af20f2f950d9cfcc33d4f2ca Mon Sep 17 00:00:00 2001 From: "Michael B. Gale" Date: Wed, 8 Jul 2026 11:32:57 +0100 Subject: [PATCH 3/6] Fix `UnhandledRequestStrategy` import --- .../ql-vscode/src/common/mock-gh-api/mock-gh-api-server.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/ql-vscode/src/common/mock-gh-api/mock-gh-api-server.ts b/extensions/ql-vscode/src/common/mock-gh-api/mock-gh-api-server.ts index 34f1a954861..c317b5ec60c 100644 --- a/extensions/ql-vscode/src/common/mock-gh-api/mock-gh-api-server.ts +++ b/extensions/ql-vscode/src/common/mock-gh-api/mock-gh-api-server.ts @@ -2,7 +2,7 @@ import { join, resolve } from "path"; import { pathExists } from "fs-extra"; import type { SetupServer } from "msw/node"; import { setupServer } from "msw/node"; -import type { UnhandledRequestStrategy } from "msw/lib/core/utils/request/onUnhandledRequest"; +import type { UnhandledRequestStrategy } from "msw"; import { DisposableObject } from "../disposable-object"; From cc17b702dacaa978f2cbd0382211b8fa54e77232 Mon Sep 17 00:00:00 2001 From: "Michael B. Gale" Date: Wed, 8 Jul 2026 12:55:05 +0100 Subject: [PATCH 4/6] Set `isolatedModules` to `true` for tests --- extensions/ql-vscode/test/tsconfig.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/extensions/ql-vscode/test/tsconfig.json b/extensions/ql-vscode/test/tsconfig.json index 6c9f1739a9a..b2921e4f0a7 100644 --- a/extensions/ql-vscode/test/tsconfig.json +++ b/extensions/ql-vscode/test/tsconfig.json @@ -6,6 +6,7 @@ "noEmit": true, "resolveJsonModule": true, "rootDir": "..", - "types": ["jest"] + "types": ["jest"], + "isolatedModules": true } } From df4702c0b42eb3567d3fd3a39213fd1dfc1a3b38 Mon Sep 17 00:00:00 2001 From: "Michael B. Gale" Date: Wed, 8 Jul 2026 12:57:36 +0100 Subject: [PATCH 5/6] Bump `yauzl` to `3.4.0` --- extensions/ql-vscode/package-lock.json | 10 +++++----- extensions/ql-vscode/package.json | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/extensions/ql-vscode/package-lock.json b/extensions/ql-vscode/package-lock.json index ecb6aeb4d5a..8798b46231d 100644 --- a/extensions/ql-vscode/package-lock.json +++ b/extensions/ql-vscode/package-lock.json @@ -43,7 +43,7 @@ "vscode-extension-telemetry": "^0.1.6", "vscode-jsonrpc": "^8.2.1", "vscode-languageclient": "^8.0.2", - "yauzl": "^3.3.0", + "yauzl": "^3.4.0", "zip-a-folder": "^4.0.4" }, "devDependencies": { @@ -11696,6 +11696,7 @@ "version": "0.2.13", "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==", + "dev": true, "engines": { "node": "*" } @@ -30645,12 +30646,11 @@ } }, "node_modules/yauzl": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-3.3.0.tgz", - "integrity": "sha512-PtGEvEP30p7sbIBJKUBjUnqgTVOyMURc4dLo9iNyAJnNIEz9pm88cCXF21w94Kg3k6RXkeZh5DHOGS0qEONvNQ==", + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-3.4.0.tgz", + "integrity": "sha512-jIH9yLR9wqr0wOS0TpBvo/g/2UgZH5qePVbjgRliiF0BYvOZyaBknKsF+x9Iht0O6sqgnB93rCICdOZFecJuDw==", "license": "MIT", "dependencies": { - "buffer-crc32": "~0.2.3", "pend": "~1.2.0" }, "engines": { diff --git a/extensions/ql-vscode/package.json b/extensions/ql-vscode/package.json index 82cf2fedad5..4687b260438 100644 --- a/extensions/ql-vscode/package.json +++ b/extensions/ql-vscode/package.json @@ -2101,7 +2101,7 @@ "vscode-extension-telemetry": "^0.1.6", "vscode-jsonrpc": "^8.2.1", "vscode-languageclient": "^8.0.2", - "yauzl": "^3.3.0", + "yauzl": "^3.4.0", "zip-a-folder": "^4.0.4" }, "devDependencies": { From 89642d7f3f8f50e6df2012dfb66f4c027eb8176d Mon Sep 17 00:00:00 2001 From: "Michael B. Gale" Date: Wed, 8 Jul 2026 13:20:05 +0100 Subject: [PATCH 6/6] Fix linter errors --- .../ql-vscode/src/databases/local-databases/index.ts | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/extensions/ql-vscode/src/databases/local-databases/index.ts b/extensions/ql-vscode/src/databases/local-databases/index.ts index d426047ae63..e5cf9c49458 100644 --- a/extensions/ql-vscode/src/databases/local-databases/index.ts +++ b/extensions/ql-vscode/src/databases/local-databases/index.ts @@ -1,11 +1,12 @@ -export { +export type { DatabaseContents, DatabaseContentsWithDbScheme, - DatabaseKind, } from "./database-contents"; -export { DatabaseChangedEvent, DatabaseEventKind } from "./database-events"; -export { DatabaseItem, SourceArchiveFile } from "./database-item"; +export { DatabaseKind } from "./database-contents"; +export type { DatabaseChangedEvent } from "./database-events"; +export { DatabaseEventKind } from "./database-events"; +export type { DatabaseItem, SourceArchiveFile } from "./database-item"; export { DatabaseItemImpl } from "./database-item-impl"; export { DatabaseManager } from "./database-manager"; export { DatabaseResolver } from "./database-resolver"; -export { DatabaseOptions, FullDatabaseOptions } from "./database-options"; +export type { DatabaseOptions, FullDatabaseOptions } from "./database-options";