Merge branch 'main' into fix/sonar_maintain_2

oaknational · Nov 28, 2024 · 0910cf8 · 0910cf8
2 parents eff8b89 + 7ec8444
commit 0910cf8
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 33 deletions.
diff --git a/packages/eslint-config-custom/index.js b/packages/eslint-config-custom/index.js
@@ -17,9 +17,13 @@ module.exports = {
         "plugin:@typescript-eslint/recommended",
         "plugin:@typescript-eslint/recommended-requiring-type-checking",
       ],
+      plugins:["import"],
       parser: "@typescript-eslint/parser",
       files: ["*.{ts,tsx}"],
       rules: {
+        "import/no-cycle": "warn",
+        "import/newline-after-import": "off", // conflict with Prettier
+        "import/no-duplicates": "off", // conflict with Prettier
         "no-console": "warn",
         "no-extra-boolean-cast": "warn",
         "no-useless-escape": "warn",

diff --git a/packages/eslint-config-custom/package.json b/packages/eslint-config-custom/package.json
@@ -23,6 +23,7 @@
   "devDependencies": {
     "eslint": "^8.56.0",
     "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-prettier": "^5.2.1",
     "prettier": "^3.1.1",
     "typescript": "5.3.3"

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml