From 3d96b8cf4aa987ffae2f5b193a939f2cfd7ebf9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Minelli?= <michael@minelli.me>
Date: Fri, 10 Nov 2023 19:37:28 +0100
Subject: [PATCH] Typescript => ESLint
---
AssignmentChecker/src/app.ts | 27 ++++++++++---------
AssignmentChecker/src/managers/HttpManager.ts | 2 +-
AssignmentChecker/src/shared | 2 +-
AssignmentChecker/src/sharedByClients | 2 +-
4 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/AssignmentChecker/src/app.ts b/AssignmentChecker/src/app.ts
index 7ae5b39..0a94e4a 100644
--- a/AssignmentChecker/src/app.ts
+++ b/AssignmentChecker/src/app.ts
@@ -1,26 +1,27 @@
// Read from the .env file
-// ATTENTION : This lines MUST be the first of this file (except for the path import)
-const path = require('node:path');
-const myEnv = require('dotenv').config({
- path : path.join(__dirname, '../.env'),
- DOTENV_KEY: 'dotenv://:key_f1778b6998874f6fd78c716ccef982c5595fa300f174b129eafc88ba7044d69b@dotenv.local/vault/.env.vault?environment=development'
- });
-require('dotenv-expand').expand(myEnv);
+// ATTENTION : These lines MUST be the first of this file (except for the path import)
+import path = require('node:path');
+import myEnv = require('dotenv');
+import dotenvExpand = require('dotenv-expand');
+
+
+dotenvExpand.expand(myEnv.config({
+ path : path.join(__dirname, '../.env'),
+ DOTENV_KEY: 'dotenv://:key_f1778b6998874f6fd78c716ccef982c5595fa300f174b129eafc88ba7044d69b@dotenv.local/vault/.env.vault?environment=development'
+ }));
+
require('./shared/helpers/TypeScriptExtensions'); // ATTENTION : This line MUST be the second of this file
+
import ClientsSharedAssignmentHelper from './sharedByClients/helpers/Dojo/ClientsSharedAssignmentHelper';
import AssignmentValidator from './sharedByClients/helpers/Dojo/AssignmentValidator';
import Styles from './types/Style';
-import { exec } from 'child_process';
-import util from 'util';
import HttpManager from './managers/HttpManager';
import Config from './config/Config';
import Icon from './sharedByClients/types/Icon';
(async () => {
- const execAsync = util.promisify(exec);
-
HttpManager.registerAxiosInterceptor();
console.log(Styles.APP_NAME(`${ Config.appName } (version {{VERSION}})`));
@@ -43,13 +44,13 @@ import Icon from './sharedByClients/types/Icon';
}
});
- assignmentValidator.events.on('finished', (success: boolean, exitCode: number) => {
+ assignmentValidator.events.on('finished', (success: boolean) => {
success ? resolve() : reject();
});
assignmentValidator.run();
});
- } catch ( error ) { }
+ } catch ( error ) { /* empty */ }
ClientsSharedAssignmentHelper.displayExecutionResults(assignmentValidator, `The assignment is ready to be published.`, Styles);
diff --git a/AssignmentChecker/src/managers/HttpManager.ts b/AssignmentChecker/src/managers/HttpManager.ts
index afcb7c3..569fff4 100644
--- a/AssignmentChecker/src/managers/HttpManager.ts
+++ b/AssignmentChecker/src/managers/HttpManager.ts
@@ -57,7 +57,7 @@ class HttpManager {
}, (error) => {
if ( error.response ) {
if ( error.response.status === StatusCodes.METHOD_NOT_ALLOWED && error.response.data ) {
- const data: DojoBackendResponse<{}> = error.response.data;
+ const data: DojoBackendResponse<void> = error.response.data;
switch ( data.code ) {
case DojoStatusCode.CLIENT_NOT_SUPPORTED:
diff --git a/AssignmentChecker/src/shared b/AssignmentChecker/src/shared
index 4a5eb68..101cc26 160000
--- a/AssignmentChecker/src/shared
+++ b/AssignmentChecker/src/shared
@@ -1 +1 @@
-Subproject commit 4a5eb68209ae9204b6d4cc8020bd62cf6a5be989
+Subproject commit 101cc26895eb0b5fe97e03bb96039e0cddd94391
diff --git a/AssignmentChecker/src/sharedByClients b/AssignmentChecker/src/sharedByClients
index dc12d17..39ababf 160000
--- a/AssignmentChecker/src/sharedByClients
+++ b/AssignmentChecker/src/sharedByClients
@@ -1 +1 @@
-Subproject commit dc12d17660bf9e92656c6abcb24ec7ce6ab3d675
+Subproject commit 39ababf437cd738b45e07743455be7588640d5c9
--
GitLab