From 93a4a8bf924588cd866714b86ec8f16f8d51dec0 Mon Sep 17 00:00:00 2001 From: HampusM Date: Thu, 29 Jul 2021 17:10:54 +0200 Subject: Organized tsconfigs, fixed tests and improved some backend functions --- packages/server/src/git/http.ts | 1 + packages/server/src/git/patch.ts | 4 ++-- packages/server/src/git/repository.ts | 4 ++-- packages/server/tsconfig.json | 8 +------- 4 files changed, 6 insertions(+), 11 deletions(-) (limited to 'packages/server') diff --git a/packages/server/src/git/http.ts b/packages/server/src/git/http.ts index c2654e7..183c6df 100644 --- a/packages/server/src/git/http.ts +++ b/packages/server/src/git/http.ts @@ -3,6 +3,7 @@ import { Repository } from "./repository"; import { Route } from "../types/fastify"; import { join } from "path"; import { spawn } from "child_process"; +import { URL } from "url"; export interface Request extends FastifyRequest { params: Route["Params"], diff --git a/packages/server/src/git/patch.ts b/packages/server/src/git/patch.ts index 45ffe23..4239ce4 100644 --- a/packages/server/src/git/patch.ts +++ b/packages/server/src/git/patch.ts @@ -130,12 +130,12 @@ export class Patch { * * @returns An array of hunk instances */ - public async getHunks(): Promise { + public async getHunks(): Promise { const content = (await this._content()).split("\n"); const hunks = await this._ng_patch.hunks(); if(hunks.length === 0) { - return null; + return []; } const hunks_data = hunks.reduce((result: Hunks, hunk, hunk_index) => { diff --git a/packages/server/src/git/repository.ts b/packages/server/src/git/repository.ts index 4250af0..ccc8bcc 100644 --- a/packages/server/src/git/repository.ts +++ b/packages/server/src/git/repository.ts @@ -183,11 +183,11 @@ export class Repository { * @param base_dir - The directory that contains the repositories * @returns An array of repository instances */ - public static async openAll(base_dir: string): Promise { + public static async openAll(base_dir: string): Promise { const dir_content = await getDirectory(base_dir); if(dir_content.length === 0) { - return null; + return []; } const repositories = dir_content.filter(dir_entry => dir_entry.endsWith(".git")); diff --git a/packages/server/tsconfig.json b/packages/server/tsconfig.json index 272318b..a98cc40 100644 --- a/packages/server/tsconfig.json +++ b/packages/server/tsconfig.json @@ -1,12 +1,6 @@ { + "extends": "../../tsconfig.json", "compilerOptions": { - "target": "ES2020", "module": "CommonJS", - "outDir": "dist", - "strict": true, - "esModuleInterop": true, - "moduleResolution": "node", - "skipLibCheck": true, - "forceConsistentCasingInFileNames": true } } -- cgit v1.2.3-18-g5258