Restructure project files

Author: EhabY

.eslintrc.json

@@ -6,7 +6,7 @@
 		"sourceType": "module",
 		"project": "./tsconfig.json"
 	},
-	"plugins": ["@typescript-eslint", "prettier"],
+	"plugins": ["@typescript-eslint", "prettier", "import"],
 	"extends": [
 		"eslint:recommended",
 		"plugin:@typescript-eslint/recommended",
@@ -69,5 +69,10 @@
 			}
 		]
 	},
-	"ignorePatterns": ["out", "dist", "**/*.d.ts"]
+	"ignorePatterns": ["out", "dist", "**/*.d.ts"],
+	"settings": {
+		"import/resolver": {
+			"typescript": {}
+		}
+	}
 }

.vscode-test.mjs

@@ -1,7 +1,7 @@
 import { defineConfig } from "@vscode/test-cli";
 
 export default defineConfig({
-	files: "out/test/**/*.test.js",
+	files: "out/test/integration/**/*.test.js",
 	extensionDevelopmentPath: ".",
 	extensionTestsPath: "./out/test",
 	launchArgs: ["--enable-proposed-api", "coder.coder-remote"],

.vscodeignore

@@ -13,4 +13,4 @@ node_modules/**
 **/*.map
 **/*.ts
 *.gif
-fixtures/**
+test/**

package.json

@@ -330,11 +330,12 @@
 		"@types/glob": "^7.1.3",
 		"@types/node": "^22.14.1",
 		"@types/node-forge": "^1.3.11",
+		"@types/semver": "^7.7.1",
 		"@types/ua-parser-js": "0.7.36",
 		"@types/vscode": "^1.73.0",
 		"@types/ws": "^8.18.1",
-		"@typescript-eslint/eslint-plugin": "^7.0.0",
-		"@typescript-eslint/parser": "^6.21.0",
+		"@typescript-eslint/eslint-plugin": "^8.44.0",
+		"@typescript-eslint/parser": "^8.44.0",
 		"@vitest/coverage-v8": "^3.2.4",
 		"@vscode/test-cli": "^0.0.11",
 		"@vscode/test-electron": "^2.5.2",
@@ -344,7 +345,8 @@
 		"dayjs": "^1.11.13",
 		"eslint": "^8.57.1",
 		"eslint-config-prettier": "^9.1.0",
-		"eslint-plugin-import": "^2.31.0",
+		"eslint-import-resolver-typescript": "^4.4.4",
+		"eslint-plugin-import": "^2.32.0",
 		"eslint-plugin-md": "^1.0.19",
 		"eslint-plugin-package-json": "^0.40.1",
 		"eslint-plugin-prettier": "^5.4.1",

src/cliUtils.test.ts

@@ -1,8 +1,8 @@
+import * as cli from "@/cliUtils";
 import fs from "fs/promises";
 import os from "os";
 import path from "path";
 import { beforeAll, describe, expect, it } from "vitest";
-import * as cli from "./cliUtils";
 
 describe("cliUtils", () => {
 	const tmp = path.join(os.tmpdir(), "vscode-coder-tests");

src/core/cliManager.test.ts

@@ -8,20 +8,17 @@ import * as os from "os";
 import * as path from "path";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import * as vscode from "vscode";
-import {
-	MockConfigurationProvider,
-	MockProgressReporter,
-	MockUserInteraction,
-} from "../__mocks__/testHelpers";
-import * as cli from "../cliUtils";
-import { Logger } from "../logging/logger";
-import * as pgp from "../pgp";
-import { CliManager } from "./cliManager";
-import { PathResolver } from "./pathResolver";
+import * as cli from "@/cliManager";
+import { CliManager } from "@/core/cliManager";
+import { PathResolver } from "@/core/pathResolver";
+import { Logger } from "@/logging/logger";
+import * as pgp from "@/pgp";
 
 vi.mock("os");
 vi.mock("axios");
 vi.mock("../pgp");
+vi.mock("@/cliManager");
+vi.mock("@/pgp");
 
 vi.mock("fs", async () => {
 	const memfs: { fs: typeof fs } = await vi.importActual("memfs");

src/core/secretsManager.ts

@@ -20,7 +20,7 @@ export class SecretsManager {
 	public async getSessionToken(): Promise<string | undefined> {
 		try {
 			return await this.secrets.get("sessionToken");
-		} catch (ex) {
+		} catch {
 			// The VS Code session store has become corrupt before, and
 			// will fail to get the session token...
 			return undefined;

src/remote.ts

@@ -281,7 +281,7 @@ export class Remote {
 				// This is useful for debugging with a custom bin!
 				binaryPath = path.join(os.tmpdir(), "coder");
 				await fs.stat(binaryPath);
-			} catch (ex) {
+			} catch {
 				binaryPath = await this.cliManager.fetchBinary(
 					workspaceClient,
 					parts.label,
@@ -442,7 +442,7 @@ export class Remote {
 				this.pathResolver.getUserSettingsPath(),
 				"utf8",
 			);
-		} catch (ex) {
+		} catch {
 			// Ignore! It's probably because the file doesn't exist.
 		}
 
@@ -932,7 +932,7 @@ export class Remote {
 				.then((parsed) => {
 					try {
 						updateStatus(parsed);
-					} catch (ex) {
+					} catch {
 						// Ignore
 					}
 				})

src/sshConfig.ts

@@ -107,7 +107,7 @@ export class SSHConfig {
 	async load() {
 		try {
 			this.raw = await this.fileSystem.readFile(this.filePath, "utf-8");
-		} catch (ex) {
+		} catch {
 			// Probably just doesn't exist!
 			this.raw = "";
 		}

src/sshSupport.ts

@@ -6,7 +6,7 @@ export function sshSupportsSetEnv(): boolean {
 		const spawned = childProcess.spawnSync("ssh", ["-V"]);
 		// The version string outputs to stderr.
 		return sshVersionSupportsSetEnv(spawned.stderr.toString().trim());
-	} catch (error) {
+	} catch {
 		return false;
 	}
 }