diff options
author | HampusM <hampus@hampusmat.com> | 2021-07-29 17:10:54 +0200 |
---|---|---|
committer | HampusM <hampus@hampusmat.com> | 2021-07-29 17:10:54 +0200 |
commit | 93a4a8bf924588cd866714b86ec8f16f8d51dec0 (patch) | |
tree | a86d3ecba5838fac11042e8ae257dfe1bd3840cb /packages | |
parent | 9d6d2ce8cf34af6e787dae901ee3e5914c4c0fa4 (diff) |
Organized tsconfigs, fixed tests and improved some backend functions
Diffstat (limited to 'packages')
-rw-r--r-- | packages/client/tsconfig.json | 72 | ||||
-rw-r--r-- | packages/server/src/git/http.ts | 1 | ||||
-rw-r--r-- | packages/server/src/git/patch.ts | 4 | ||||
-rw-r--r-- | packages/server/src/git/repository.ts | 4 | ||||
-rw-r--r-- | packages/server/tsconfig.json | 8 |
5 files changed, 40 insertions, 49 deletions
diff --git a/packages/client/tsconfig.json b/packages/client/tsconfig.json index eedafcb..d8f08d5 100644 --- a/packages/client/tsconfig.json +++ b/packages/client/tsconfig.json @@ -1,40 +1,36 @@ { - "compilerOptions": { - "target": "ES2020", - "module": "ES2020", - "strict": true, - "jsx": "preserve", - "moduleResolution": "node", - "experimentalDecorators": true, - "esModuleInterop": true, - "allowSyntheticDefaultImports": true, - "forceConsistentCasingInFileNames": true, - "useDefineForClassFields": true, - "sourceMap": true, - "baseUrl": ".", - "types": [ - "webpack-env" - ], - "paths": { - "@/*": [ - "src/*" - ] - }, - "lib": [ - "esnext", - "dom", - "dom.iterable", - "scripthost" - ] - }, - "include": [ - "src/**/*.ts", - "src/**/*.tsx", - "src/**/*.vue", - "tests/**/*.ts", - "tests/**/*.tsx" - ], - "exclude": [ - "node_modules" - ] + "extends": "../../tsconfig.json", + "compilerOptions": { + "module": "ES2020", + "jsx": "preserve", + "experimentalDecorators": true, + "allowSyntheticDefaultImports": true, + "useDefineForClassFields": true, + "sourceMap": true, + "baseUrl": ".", + "types": [ + "webpack-env" + ], + "paths": { + "@/*": [ + "src/*" + ] + }, + "lib": [ + "esnext", + "dom", + "dom.iterable", + "scripthost" + ] + }, + "include": [ + "src/**/*.ts", + "src/**/*.tsx", + "src/**/*.vue", + "tests/**/*.ts", + "tests/**/*.tsx" + ], + "exclude": [ + "node_modules" + ] } 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<Hunk[] | null> { + public async getHunks(): Promise<Hunk[]> { 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<Repository[] | null> { + public static async openAll(base_dir: string): Promise<Repository[]> { 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 } } |