refactor: Remove @trivago/prettier-plugin-sort-imports and update eslint configuration

This commit removes the "@trivago/prettier-plugin-sort-imports" plugin from the ".prettierrc.json" file and updates the eslint configuration in the "package.json" file. The plugin was removed because it is no longer needed and caused conflicts with the updated eslint configuration. This change improves the codebase by simplifying the prettier configuration and ensuring compatibility with the updated eslint rules.
2026-04-06 00:32:12 +02:00 · 2024-06-14 12:07:16 +01:00
parent 2999e539b3
commit 5152d5de12
5 changed files with 112 additions and 138 deletions
--- a/.prettierrc.json
+++ b/.prettierrc.json
@@ -5,7 +5,6 @@
    "singleQuote": true,
    "bracketSpacing": true,
    "arrowParens": "avoid",
-    "plugins": ["@trivago/prettier-plugin-sort-imports"],
    "importOrderSeparation": true,
    "importOrderSortSpecifiers": true,
    "importOrderParserPlugins": ["typescript", "decorators", "dynamicImport", "jsx"]
--- a/StatusPage/src/Utils/StatusPage.ts
+++ b/StatusPage/src/Utils/StatusPage.ts
@@ -47,10 +47,13 @@ export default class StatusPageUtil {
    }

    public static checkIfUserHasLoggedIn(): void {
+
+        const statusPageId: ObjectID | null = StatusPageUtil.getStatusPageId();
+
        if (
-            StatusPageUtil.getStatusPageId() &&
+            statusPageId &&
            StatusPageUtil.isPrivateStatusPage() &&
-            !UserUtil.isLoggedIn(StatusPageUtil.getStatusPageId()!)
+            !UserUtil.isLoggedIn(statusPageId)
        ) {
            StatusPageUtil.navigateToLoginPage();
        }
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -1,11 +1,13 @@
 // @ts-check
 import eslint from '@eslint/js';
 import tseslint from 'typescript-eslint';
+import eslintPluginPrettierRecommended from 'eslint-plugin-prettier/recommended';

 export default tseslint.config(
    {
-        ignores: ['**/node_modules/', '**/dist/', '**/build/', '**/out/'],
+        ignores: ['**/node_modules/', '**/dist/', '**/build/', '**/out/', '**/coverage/', '**/lib/', '**/esm/', '**/cjs/', '**/playwright-report/', '**/playwright-coverage/', '**/playwright-screenshots/', '**/playwright-videos'],
    },
    eslint.configs.recommended,
-    ...tseslint.configs.strict
+    ...tseslint.configs.strict,
+    eslintPluginPrettierRecommended
 );
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,6 @@
            "version": "3.0.2",
            "license": "Apache-2.0",
            "dependencies": {
-                "@trivago/prettier-plugin-sort-imports": "^4.3.0",
                "@types/lodash": "^4.17.1",
                "jest": "^29.7.0",
                "mailparser": "^3.7.1",
@@ -22,10 +21,12 @@
                "@types/eslint__js": "^8.42.3",
                "ejs-lint": "^1.2.2",
                "eslint": "^8.57.0",
+                "eslint-config-prettier": "^9.1.0",
+                "eslint-plugin-prettier": "^5.1.3",
                "husky": "^7.0.0",
                "lint-staged": "^13.2.1",
                "nodemon": "^2.0.20",
-                "prettier": "^2.6.0",
+                "prettier": "3.3.2",
                "typescript": "^5.4.5",
                "typescript-eslint": "^7.13.0"
            }
@@ -1528,6 +1529,18 @@
                "node": ">=14"
            }
        },
+        "node_modules/@pkgr/core": {
+            "version": "0.1.1",
+            "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.1.1.tgz",
+            "integrity": "sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==",
+            "dev": true,
+            "engines": {
+                "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/unts"
+            }
+        },
        "node_modules/@selderee/plugin-htmlparser2": {
            "version": "0.11.0",
            "resolved": "https://registry.npmjs.org/@selderee/plugin-htmlparser2/-/plugin-htmlparser2-0.11.0.tgz",
@@ -1566,117 +1579,6 @@
            "resolved": "https://registry.npmjs.org/@sqltools/formatter/-/formatter-1.2.5.tgz",
            "integrity": "sha512-Uy0+khmZqUrUGm5dmMqVlnvufZRSK0FbYzVgp0UMstm+F5+W2/jnEEQyc9vo1ZR/E5ZI/B1WjjoTqBqwJL6Krw=="
        },
-        "node_modules/@trivago/prettier-plugin-sort-imports": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/@trivago/prettier-plugin-sort-imports/-/prettier-plugin-sort-imports-4.3.0.tgz",
-            "integrity": "sha512-r3n0onD3BTOVUNPhR4lhVK4/pABGpbA7bW3eumZnYdKaHkf1qEC+Mag6DPbGNuuh0eG8AaYj+YqmVHSiGslaTQ==",
-            "dependencies": {
-                "@babel/generator": "7.17.7",
-                "@babel/parser": "^7.20.5",
-                "@babel/traverse": "7.23.2",
-                "@babel/types": "7.17.0",
-                "javascript-natural-sort": "0.7.1",
-                "lodash": "^4.17.21"
-            },
-            "peerDependencies": {
-                "@vue/compiler-sfc": "3.x",
-                "prettier": "2.x - 3.x"
-            },
-            "peerDependenciesMeta": {
-                "@vue/compiler-sfc": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/@trivago/prettier-plugin-sort-imports/node_modules/@babel/generator": {
-            "version": "7.17.7",
-            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.17.7.tgz",
-            "integrity": "sha512-oLcVCTeIFadUoArDTwpluncplrYBmTCCZZgXCbgNGvOBBiSDDK3eWO4b/+eOTli5tKv1lg+a5/NAXg+nTcei1w==",
-            "dependencies": {
-                "@babel/types": "^7.17.0",
-                "jsesc": "^2.5.1",
-                "source-map": "^0.5.0"
-            },
-            "engines": {
-                "node": ">=6.9.0"
-            }
-        },
-        "node_modules/@trivago/prettier-plugin-sort-imports/node_modules/@babel/traverse": {
-            "version": "7.23.2",
-            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.2.tgz",
-            "integrity": "sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==",
-            "dependencies": {
-                "@babel/code-frame": "^7.22.13",
-                "@babel/generator": "^7.23.0",
-                "@babel/helper-environment-visitor": "^7.22.20",
-                "@babel/helper-function-name": "^7.23.0",
-                "@babel/helper-hoist-variables": "^7.22.5",
-                "@babel/helper-split-export-declaration": "^7.22.6",
-                "@babel/parser": "^7.23.0",
-                "@babel/types": "^7.23.0",
-                "debug": "^4.1.0",
-                "globals": "^11.1.0"
-            },
-            "engines": {
-                "node": ">=6.9.0"
-            }
-        },
-        "node_modules/@trivago/prettier-plugin-sort-imports/node_modules/@babel/traverse/node_modules/@babel/generator": {
-            "version": "7.24.6",
-            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.6.tgz",
-            "integrity": "sha512-S7m4eNa6YAPJRHmKsLHIDJhNAGNKoWNiWefz1MBbpnt8g9lvMDl1hir4P9bo/57bQEmuwEhnRU/AMWsD0G/Fbg==",
-            "dependencies": {
-                "@babel/types": "^7.24.6",
-                "@jridgewell/gen-mapping": "^0.3.5",
-                "@jridgewell/trace-mapping": "^0.3.25",
-                "jsesc": "^2.5.1"
-            },
-            "engines": {
-                "node": ">=6.9.0"
-            }
-        },
-        "node_modules/@trivago/prettier-plugin-sort-imports/node_modules/@babel/traverse/node_modules/@babel/types": {
-            "version": "7.24.6",
-            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.6.tgz",
-            "integrity": "sha512-WaMsgi6Q8zMgMth93GvWPXkhAIEobfsIkLTacoVZoK1J0CevIPGYY2Vo5YvJGqyHqXM6P4ppOYGsIRU8MM9pFQ==",
-            "dependencies": {
-                "@babel/helper-string-parser": "^7.24.6",
-                "@babel/helper-validator-identifier": "^7.24.6",
-                "to-fast-properties": "^2.0.0"
-            },
-            "engines": {
-                "node": ">=6.9.0"
-            }
-        },
-        "node_modules/@trivago/prettier-plugin-sort-imports/node_modules/@babel/types": {
-            "version": "7.17.0",
-            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.17.0.tgz",
-            "integrity": "sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==",
-            "dependencies": {
-                "@babel/helper-validator-identifier": "^7.16.7",
-                "to-fast-properties": "^2.0.0"
-            },
-            "engines": {
-                "node": ">=6.9.0"
-            }
-        },
-        "node_modules/@trivago/prettier-plugin-sort-imports/node_modules/@jridgewell/trace-mapping": {
-            "version": "0.3.25",
-            "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
-            "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
-            "dependencies": {
-                "@jridgewell/resolve-uri": "^3.1.0",
-                "@jridgewell/sourcemap-codec": "^1.4.14"
-            }
-        },
-        "node_modules/@trivago/prettier-plugin-sort-imports/node_modules/source-map": {
-            "version": "0.5.7",
-            "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-            "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
        "node_modules/@tsconfig/node10": {
            "version": "1.0.9",
            "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz",
@@ -3328,6 +3230,48 @@
                "url": "https://opencollective.com/eslint"
            }
        },
+        "node_modules/eslint-config-prettier": {
+            "version": "9.1.0",
+            "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.1.0.tgz",
+            "integrity": "sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==",
+            "dev": true,
+            "bin": {
+                "eslint-config-prettier": "bin/cli.js"
+            },
+            "peerDependencies": {
+                "eslint": ">=7.0.0"
+            }
+        },
+        "node_modules/eslint-plugin-prettier": {
+            "version": "5.1.3",
+            "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.1.3.tgz",
+            "integrity": "sha512-C9GCVAs4Eq7ZC/XFQHITLiHJxQngdtraXaM+LoUFoFp/lHNl2Zn8f3WQbe9HvTBBQ9YnKFB0/2Ajdqwo5D1EAw==",
+            "dev": true,
+            "dependencies": {
+                "prettier-linter-helpers": "^1.0.0",
+                "synckit": "^0.8.6"
+            },
+            "engines": {
+                "node": "^14.18.0 || >=16.0.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/eslint-plugin-prettier"
+            },
+            "peerDependencies": {
+                "@types/eslint": ">=8.0.0",
+                "eslint": ">=8.0.0",
+                "eslint-config-prettier": "*",
+                "prettier": ">=3.0.0"
+            },
+            "peerDependenciesMeta": {
+                "@types/eslint": {
+                    "optional": true
+                },
+                "eslint-config-prettier": {
+                    "optional": true
+                }
+            }
+        },
        "node_modules/eslint-scope": {
            "version": "7.2.2",
            "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
@@ -3597,6 +3541,12 @@
            "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
            "dev": true
        },
+        "node_modules/fast-diff": {
+            "version": "1.3.0",
+            "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.3.0.tgz",
+            "integrity": "sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==",
+            "dev": true
+        },
        "node_modules/fast-glob": {
            "version": "3.2.11",
            "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz",
@@ -4405,11 +4355,6 @@
                "node": ">=8"
            }
        },
-        "node_modules/javascript-natural-sort": {
-            "version": "0.7.1",
-            "resolved": "https://registry.npmjs.org/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz",
-            "integrity": "sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw=="
-        },
        "node_modules/jest": {
            "version": "29.7.0",
            "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz",
@@ -6336,11 +6281,6 @@
                "url": "https://github.com/sponsors/sindresorhus"
            }
        },
-        "node_modules/lodash": {
-            "version": "4.17.21",
-            "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-            "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
-        },
        "node_modules/lodash.merge": {
            "version": "4.6.2",
            "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
@@ -7113,19 +7053,32 @@
            }
        },
        "node_modules/prettier": {
-            "version": "2.6.0",
-            "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.6.0.tgz",
-            "integrity": "sha512-m2FgJibYrBGGgQXNzfd0PuDGShJgRavjUoRCw1mZERIWVSXF0iLzLm+aOqTAbLnC3n6JzUhAA8uZnFVghHJ86A==",
+            "version": "3.3.2",
+            "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.2.tgz",
+            "integrity": "sha512-rAVeHYMcv8ATV5d508CFdn+8/pHPpXeIid1DdrPwXnaAdH7cqjVbpJaT5eq4yRAFU/lsbwYwSF/n5iNrdJHPQA==",
+            "dev": true,
            "bin": {
-                "prettier": "bin-prettier.js"
+                "prettier": "bin/prettier.cjs"
            },
            "engines": {
-                "node": ">=10.13.0"
+                "node": ">=14"
            },
            "funding": {
                "url": "https://github.com/prettier/prettier?sponsor=1"
            }
        },
+        "node_modules/prettier-linter-helpers": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz",
+            "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==",
+            "dev": true,
+            "dependencies": {
+                "fast-diff": "^1.1.2"
+            },
+            "engines": {
+                "node": ">=6.0.0"
+            }
+        },
        "node_modules/pretty-format": {
            "version": "29.7.0",
            "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
@@ -7734,6 +7687,22 @@
                "url": "https://github.com/sponsors/ljharb"
            }
        },
+        "node_modules/synckit": {
+            "version": "0.8.8",
+            "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.8.8.tgz",
+            "integrity": "sha512-HwOKAP7Wc5aRGYdKH+dw0PRRpbO841v2DENBtjnR5HFWoiNByAl7vrx3p0G/rCyYXQsrxqtX48TImFtPcIHSpQ==",
+            "dev": true,
+            "dependencies": {
+                "@pkgr/core": "^0.1.0",
+                "tslib": "^2.6.2"
+            },
+            "engines": {
+                "node": "^14.18.0 || >=16.0.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/unts"
+            }
+        },
        "node_modules/syntax-error": {
            "version": "1.4.0",
            "resolved": "https://registry.npmjs.org/syntax-error/-/syntax-error-1.4.0.tgz",
@@ -7894,9 +7863,9 @@
            }
        },
        "node_modules/tslib": {
-            "version": "2.5.0",
-            "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
-            "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="
+            "version": "2.6.3",
+            "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz",
+            "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ=="
        },
        "node_modules/type-check": {
            "version": "0.4.0",
--- a/package.json
+++ b/package.json
@@ -5,7 +5,6 @@
    "main": "ts",
    "type": "module",
    "dependencies": {
-        "@trivago/prettier-plugin-sort-imports": "^4.3.0",
        "@types/lodash": "^4.17.1",
        "jest": "^29.7.0",
        "mailparser": "^3.7.1",
@@ -18,10 +17,12 @@
        "@types/eslint__js": "^8.42.3",
        "ejs-lint": "^1.2.2",
        "eslint": "^8.57.0",
+        "eslint-config-prettier": "^9.1.0",
+        "eslint-plugin-prettier": "^5.1.3",
        "husky": "^7.0.0",
        "lint-staged": "^13.2.1",
        "nodemon": "^2.0.20",
-        "prettier": "^2.6.0",
+        "prettier": "3.3.2",
        "typescript": "^5.4.5",
        "typescript-eslint": "^7.13.0"
    },