Rebase fallout

Author: EhabY

package.json

@@ -420,8 +420,7 @@
 	"devDependencies": {
 		"@eslint/js": "^9.39.2",
 		"@eslint/markdown": "^7.5.1",
-		"@types/eventsource": "^3.0.0",
-		"@types/node": "^22.14.1",
+		"@types/node": "^18",
 		"@types/proper-lockfile": "^4.1.4",
 		"@types/semver": "^7.7.1",
 		"@types/ua-parser-js": "0.7.39",
@@ -436,25 +435,22 @@
 		"bufferutil": "^4.1.0",
 		"coder": "https://github.com/coder/coder#main",
 		"dayjs": "^1.11.19",
-		"electron": "^39.2.6",
+		"electron": "^39.2.7",
 		"eslint": "^9.39.2",
 		"eslint-config-prettier": "^10.1.8",
 		"eslint-import-resolver-typescript": "^4.4.4",
 		"eslint-plugin-import-x": "^4.16.1",
 		"eslint-plugin-package-json": "^0.88.1",
 		"eslint-plugin-prettier": "^5.5.4",
-		"glob": "^13.0.0",
 		"globals": "^16.5.0",
 		"jsonc-eslint-parser": "^2.4.2",
 		"memfs": "^4.51.1",
-		"nyc": "^17.1.0",
 		"prettier": "^3.7.4",
 		"ts-loader": "^9.5.4",
 		"typescript": "^5.9.3",
 		"typescript-eslint": "^8.52.0",
 		"utf-8-validate": "^6.0.6",
 		"vitest": "^4.0.16",
-		"vscode-test": "^1.5.0",
 		"webpack": "^5.104.1",
 		"webpack-cli": "^6.0.1"
 	},

test/unit/api/coderApi.test.ts

@@ -7,7 +7,7 @@ import axios, {
 import { type ProvisionerJobLog } from "coder/site/src/api/typesGenerated";
 import { EventSource } from "eventsource";
 import { ProxyAgent } from "proxy-agent";
-import { describe, it, expect, vi, beforeEach } from "vitest";
+import { describe, it, expect, vi, beforeEach, type Mock } from "vitest";
 import Ws from "ws";
 
 import { CoderApi } from "@/api/coderApi";
@@ -70,7 +70,9 @@ vi.mock("@/api/streamingFetchAdapter", () => ({
 describe("CoderApi", () => {
 	let mockLogger: ReturnType<typeof createMockLogger>;
 	let mockConfig: MockConfigurationProvider;
-	let mockAdapter: ReturnType<typeof vi.fn>;
+	let mockAdapter: Mock<
+		(config: InternalAxiosRequestConfig) => Promise<unknown>
+	>;
 	let api: CoderApi;
 
 	const createApi = (url = CODER_URL, token = AXIOS_TOKEN) => {
@@ -81,7 +83,9 @@ describe("CoderApi", () => {
 		vi.resetAllMocks();
 
 		const axiosMock = axios as typeof axios & {
-			__mockAdapter: ReturnType<typeof vi.fn>;
+			__mockAdapter: Mock<
+				(config: InternalAxiosRequestConfig) => Promise<unknown>
+			>;
 		};
 		mockAdapter = axiosMock.__mockAdapter;
 		mockAdapter.mockImplementation(mockAdapterImpl);

test/unit/login/loginCoordinator.test.ts

@@ -1,5 +1,5 @@
 import axios, { type CreateAxiosDefaults } from "axios";
-import { describe, expect, it, vi } from "vitest";
+import { describe, expect, it, vi, type Mock } from "vitest";
 import * as vscode from "vscode";
 
 import { MementoManager } from "@/core/mementoManager";
@@ -61,7 +61,9 @@ vi.mock("@/api/streamingFetchAdapter", () => ({
 vi.mock("@/promptUtils");
 
 // Type for axios with our mock adapter
-type MockedAxios = typeof axios & { __mockAdapter: ReturnType<typeof vi.fn> };
+type MockedAxios = typeof axios & {
+	__mockAdapter: Mock<(config: Record<string, unknown>) => Promise<unknown>>;
+};
 
 const TEST_URL = "https://coder.example.com";
 const TEST_HOSTNAME = "coder.example.com";