From eb0364a2f7e632a7e10c24702a75752bbe7eb6a8 Mon Sep 17 00:00:00 2001
From: Alice Gaudon <alice@gaudon.pro>
Date: Sun, 21 Nov 2021 17:52:56 +0100
Subject: [PATCH] Fix eslint and fix linting issues

---
 package.json                      |  6 +++++-
 src/App.ts                        | 35 ++++++++++++++++---------------
 src/common/dummy.ts               |  2 +-
 src/controllers/HomeController.ts |  2 +-
 src/main.ts                       |  5 +++--
 5 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/package.json b/package.json
index 2ddb61c..5057cc4 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,10 @@
     "@typescript-eslint/eslint-plugin": "^5.4.0",
     "@typescript-eslint/parser": "^5.4.0",
     "concurrently": "^6.0.0",
-    "eslint": "^8.2.0",
+    "eslint": "^8.3.0",
+    "eslint-plugin-import": "^2.25.3",
+    "eslint-plugin-simple-import-sort": "^7.0.0",
+    "eslint-plugin-svelte3": "^3.2.1",
     "feather-icons": "^4.28.0",
     "imagemin-gifsicle": "^7.0.0",
     "imagemin-mozjpeg": "^9.0.0",
@@ -44,6 +47,7 @@
     "maildev": "^1.1.0",
     "nodemon": "^2.0.3",
     "sass": "^1.32.12",
+    "svelte": "^3.44.2",
     "svgo": "^2.3.0",
     "ts-jest": "^27.0.3",
     "typescript": "^4.0.2"
diff --git a/src/App.ts b/src/App.ts
index 768d322..09ffde9 100644
--- a/src/App.ts
+++ b/src/App.ts
@@ -1,30 +1,31 @@
 import Application from "swaf/Application";
-import Migration, {MigrationType} from "swaf/db/Migration";
-import CreateMigrationsTable from "swaf/migrations/CreateMigrationsTable";
+import AutoUpdateComponent from "swaf/components/AutoUpdateComponent";
+import CsrfProtectionComponent from "swaf/components/CsrfProtectionComponent";
 import ExpressAppComponent from "swaf/components/ExpressAppComponent";
-import MysqlComponent from "swaf/components/MysqlComponent";
+import FormHelperComponent from "swaf/components/FormHelperComponent";
+import FrontendToolsComponent from "swaf/components/FrontendToolsComponent";
 import LogRequestsComponent from "swaf/components/LogRequestsComponent";
+import MailComponent from "swaf/components/MailComponent";
+import MaintenanceComponent from "swaf/components/MaintenanceComponent";
+import MysqlComponent from "swaf/components/MysqlComponent";
+import PreviousUrlComponent from "swaf/components/PreviousUrlComponent";
 import RedisComponent from "swaf/components/RedisComponent";
 import ServeStaticDirectoryComponent from "swaf/components/ServeStaticDirectoryComponent";
-import MaintenanceComponent from "swaf/components/MaintenanceComponent";
-import MailComponent from "swaf/components/MailComponent";
 import SessionComponent from "swaf/components/SessionComponent";
-import FormHelperComponent from "swaf/components/FormHelperComponent";
-import CsrfProtectionComponent from "swaf/components/CsrfProtectionComponent";
 import WebSocketServerComponent from "swaf/components/WebSocketServerComponent";
-import HomeController from "./controllers/HomeController";
-import AutoUpdateComponent from "swaf/components/AutoUpdateComponent";
-import DummyMigration from "swaf/migrations/DummyMigration";
-import DropLegacyLogsTable from "swaf/migrations/DropLegacyLogsTable";
-import PreviousUrlComponent from "swaf/components/PreviousUrlComponent";
-import MailViewEngine from "swaf/frontend/MailViewEngine";
+import Migration, {MigrationType} from "swaf/db/Migration";
 import AssetCompiler from "swaf/frontend/AssetCompiler";
-import FrontendToolsComponent from "swaf/components/FrontendToolsComponent";
 import CopyAssetPreCompiler from "swaf/frontend/CopyAssetPreCompiler";
-import ScssAssetPreCompiler from "swaf/frontend/ScssAssetPreCompiler";
-import TypeScriptPreCompiler from "swaf/frontend/TypeScriptPreCompiler";
-import SvelteViewEngine from "swaf/frontend/SvelteViewEngine";
+import MailViewEngine from "swaf/frontend/MailViewEngine";
 import NunjucksViewEngine from "swaf/frontend/NunjucksViewEngine";
+import ScssAssetPreCompiler from "swaf/frontend/ScssAssetPreCompiler";
+import SvelteViewEngine from "swaf/frontend/SvelteViewEngine";
+import TypeScriptPreCompiler from "swaf/frontend/TypeScriptPreCompiler";
+import CreateMigrationsTable from "swaf/migrations/CreateMigrationsTable";
+import DropLegacyLogsTable from "swaf/migrations/DropLegacyLogsTable";
+import DummyMigration from "swaf/migrations/DummyMigration";
+
+import HomeController from "./controllers/HomeController.js";
 
 export default class App extends Application {
     public constructor(
diff --git a/src/common/dummy.ts b/src/common/dummy.ts
index c58f5a5..4f6d24e 100644
--- a/src/common/dummy.ts
+++ b/src/common/dummy.ts
@@ -1 +1 @@
-console.log('common code between back and front');
\ No newline at end of file
+console.log('common code between back and front');
diff --git a/src/controllers/HomeController.ts b/src/controllers/HomeController.ts
index 027d83d..825b619 100644
--- a/src/controllers/HomeController.ts
+++ b/src/controllers/HomeController.ts
@@ -1,6 +1,6 @@
-import Controller from "swaf/Controller";
 import {Request, Response} from "express";
 import {route} from "swaf/common/Routing";
+import Controller from "swaf/Controller";
 
 export default class HomeController extends Controller {
     public routes(): void {
diff --git a/src/main.ts b/src/main.ts
index ff2f443..8bf4ab4 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -6,10 +6,11 @@ process.env['NODE_CONFIG_DIR'] =
     + delimiter
     + (process.env['NODE_CONFIG_DIR'] || __dirname + '/../config/');
 
-import {logger} from "swaf/Logger";
-import App from "./App";
 import config from "config";
 import {promises as fs} from "fs";
+import {logger} from "swaf/Logger";
+
+import App from "./App.js";
 
 (async () => {
     logger.debug('Config path:', process.env['NODE_CONFIG_DIR']);