From 6cf42fcdc68f26a35d6a91304478f5cc854741b8 Mon Sep 17 00:00:00 2001 From: atepem <57289722+atepem@users.noreply.github.com> Date: Tue, 1 Oct 2024 10:53:28 +0100 Subject: [PATCH] chore: moved prettier settings from prettierrc to eslintrc --- .eslintrc.json | 14 +++++++++++++- .prettierrc | 16 ---------------- 2 files changed, 13 insertions(+), 17 deletions(-) delete mode 100644 .prettierrc diff --git a/.eslintrc.json b/.eslintrc.json index 589f7887..f92fcd6c 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -12,7 +12,19 @@ "prettier/prettier": ["error", { "endOfLine": "auto", "semi": true, - "singleQuote": true + "trailingComma": "all", + "singleQuote": true, + "printWidth": 100, + "tabWidth": 2, + "importOrderSeparation": true, + "importOrderSortSpecifiers": true, + "importOrder": [ + "", + "^@autonolas/(.*)$", + "^libs/*", + "^(store|util|common-util|components|data|hooks|context|types)/(.*)$", + "^[./]" + ] }] }, "overrides": [ diff --git a/.prettierrc b/.prettierrc deleted file mode 100644 index ed5f0104..00000000 --- a/.prettierrc +++ /dev/null @@ -1,16 +0,0 @@ -{ - "semi": true, - "trailingComma": "all", - "singleQuote": true, - "printWidth": 100, - "tabWidth": 2, - "importOrderSeparation": true, - "importOrderSortSpecifiers": true, - "importOrder": [ - "", - "^@autonolas/(.*)$", - "^libs/*", - "^(store|util|common-util|components|data|hooks|context|types)/(.*)$", - "^[./]" - ] -}