Merge pull request #4443 from github/mbg/vscode-1.128.0

Fix CI failures

Author: josefs

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";
 

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);

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";

extensions/ql-vscode/test/tsconfig.json

@@ -5,6 +5,8 @@
   "compilerOptions": {
     "noEmit": true,
     "resolveJsonModule": true,
-    "rootDir": ".."
+    "rootDir": "..",
+    "types": ["jest"],
+    "isolatedModules": true
   }
 }

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,