Merge pull request #761 from rage/prettier-fix

Prettier fix

Author: Heliozoa

.prettierrc

@@ -1,13 +1,8 @@
 {
-    "printWidth": 110,
-    "tabWidth": 2,
-    "useTabs": false,
-    "semi": true,
-    "singleQuote": false,
-    "quoteProps": "consistent",
-    "jsxSingleQuote": false,
-    "trailingComma": "es5",
-    "bracketSpacing": true,
-    "jsxBracketSameLine": true,
-    "arrowParens": "always"
+    "plugins": ["@trivago/prettier-plugin-sort-imports"],
+    "arrowParens": "always",
+    "endOfLine": "lf",
+    "printWidth": 100,
+    "tabWidth": 4,
+    "trailingComma": "all"
 }

backend/index.ts

@@ -1,6 +1,3 @@
-import bodyParser from "body-parser";
-import express, { Response } from "express";
-
 import {
     Course,
     CourseDetails,
@@ -13,7 +10,6 @@ import {
     SubmissionResponse,
     SubmissionStatusReport,
 } from "../src/api/types";
-
 import { applicationRouter, langsRounter, oauthRouter } from "./controllers";
 import {
     BackendCourse,
@@ -27,6 +23,8 @@ import {
     passingExerciseId,
     respondWithFile,
 } from "./utils";
+import bodyParser from "body-parser";
+import express, { Response } from "express";
 
 const PORT = 4001;
 

backend/setup.ts

@@ -1,11 +1,10 @@
+import * as config from "../config";
+import { getLangsCLIForPlatform, getPlatform } from "../src/utilities/env";
 import archiver from "archiver";
 import fs from "fs";
 import { ncp } from "ncp";
 import path from "path";
 
-import * as config from "../config";
-import { getLangsCLIForPlatform, getPlatform } from "../src/utilities/env";
-
 const TMC_LANGS_DL_URL = config.productionApi.__TMC_LANGS_DL_URL__.replace(/"/g, "");
 const TMC_LANGS_VERSION = config.productionApi.__TMC_LANGS_VERSION__.replace(/"/g, "");
 

backend/utils.ts

@@ -1,6 +1,3 @@
-import { Response } from "express";
-import path from "path";
-
 import {
     Course,
     CourseDetails,
@@ -12,6 +9,8 @@ import {
     Organization,
     SubmissionResultReport,
 } from "../src/api/types";
+import { Response } from "express";
+import path from "path";
 
 interface CreateOrganizationParams {
     information: string;

eslint.config.mjs

@@ -1,12 +1,12 @@
+import { FlatCompat } from "@eslint/eslintrc";
+import js from "@eslint/js";
 import typescriptEslint from "@typescript-eslint/eslint-plugin";
+import tsParser from "@typescript-eslint/parser";
 import prettier from "eslint-plugin-prettier";
 import sortClassMembers from "eslint-plugin-sort-class-members";
 import globals from "globals";
-import tsParser from "@typescript-eslint/parser";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
-import js from "@eslint/js";
-import { FlatCompat } from "@eslint/eslintrc";
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);

package-lock.json

@@ -457,13 +457,6 @@
             "eslint src --cache --max-warnings 0"
         ]
     },
-    "prettier": {
-        "arrowParens": "always",
-        "endOfLine": "lf",
-        "printWidth": 100,
-        "tabWidth": 4,
-        "trailingComma": "all"
-    },
     "dependencies": {
         "@aws-crypto/sha256-js": "^5.2.0",
         "del": "^8.0.0",
@@ -486,6 +479,7 @@
         "@eslint/eslintrc": "^3.1.0",
         "@eslint/js": "^9.10.0",
         "@playwright/test": "1.46.1",
+        "@trivago/prettier-plugin-sort-imports": "^5.2.2",
         "@types/chai": "^4.3.3",
         "@types/chai-as-promised": "^7.1.8",
         "@types/du": "^1.0.3",
@@ -513,7 +507,7 @@
         "husky": "^9.1.5",
         "lint-staged": "^15.2.9",
         "mocha": "^10.7.3",
-        "prettier": "^3.3.3",
+        "prettier": "^3.6.2",
         "raw-loader": "^4.0.2",
         "terser-webpack-plugin": "^5.3.10",
         "tmp": "0.2.3",

package.json

@@ -1,6 +1,5 @@
-import { FrameLocator, Page } from "@playwright/test";
-
 import { TmcPage } from "./tmc";
+import { FrameLocator, Page } from "@playwright/test";
 
 export class CoursePage extends TmcPage {
     constructor(

playwright/pages/course.ts

@@ -1,6 +1,5 @@
-import { FrameLocator, Page } from "@playwright/test";
-
 import { TmcPage } from "./tmc";
+import { FrameLocator, Page } from "@playwright/test";
 
 export class LoginPage extends TmcPage {
     constructor(

playwright/pages/login.ts

@@ -1,8 +1,7 @@
-import { FrameLocator, Page } from "@playwright/test";
-
 import { SelectCourse } from "./select-course";
 import { SelectOrganization } from "./select-organization";
 import { TmcPage } from "./tmc";
+import { FrameLocator, Page } from "@playwright/test";
 
 export class MyCoursesPage extends TmcPage {
     constructor(