From 6c99615c07cb9c8c22278221ee41f98e91d80723 Mon Sep 17 00:00:00 2001 From: Sebastian Mahr Date: Tue, 7 May 2024 14:34:27 +0200 Subject: [PATCH 1/5] fix: remove no-return-await to prevent conflicts --- index.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/index.js b/index.js index 5c0070b..7fe4d51 100644 --- a/index.js +++ b/index.js @@ -184,6 +184,7 @@ module.exports = { "no-useless-rename": "error", "prefer-template": "error", "require-yield": "error", - "no-empty": "error" + "no-empty": "error", + "no-return-await": "off", } } From a999eb1f2921483c73b69a3213a7bf98556e09a1 Mon Sep 17 00:00:00 2001 From: Sebastian Mahr Date: Tue, 7 May 2024 14:36:31 +0200 Subject: [PATCH 2/5] chore: bump version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d5bd777..5ea922f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@js-soft/eslint-config-ts", - "version": "1.6.7", + "version": "1.6.8", "description": "j&s-soft typescript linting rules", "repository": { "type": "git", From a39502dc4f7250d1a39ca908c4741a195b89c6df Mon Sep 17 00:00:00 2001 From: Sebastian Mahr Date: Tue, 7 May 2024 14:37:55 +0200 Subject: [PATCH 3/5] chore: bump version in package-lock --- package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index d4b4bfa..5317d80 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@js-soft/eslint-config-ts", - "version": "1.6.7", + "version": "1.6.8", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@js-soft/eslint-config-ts", - "version": "1.6.7", + "version": "1.6.8", "license": "MIT", "dependencies": { "@typescript-eslint/eslint-plugin": "^7.1.1", From c244281899d0f26b5f87d6a097aa67bb95d96213 Mon Sep 17 00:00:00 2001 From: Sebastian Mahr Date: Tue, 7 May 2024 14:41:39 +0200 Subject: [PATCH 4/5] chore: move rule --- index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.js b/index.js index 7fe4d51..a624db6 100644 --- a/index.js +++ b/index.js @@ -54,6 +54,7 @@ module.exports = { "@typescript-eslint/prefer-ts-expect-error": "error", "@typescript-eslint/require-array-sort-compare": ["error", { ignoreStringArrays: true }], "@typescript-eslint/switch-exhaustiveness-check": "warn", + "no-return-await": "off", "@typescript-eslint/return-await": ["error", "always"], "@typescript-eslint/require-await": "error", "no-useless-constructor": "off", @@ -185,6 +186,5 @@ module.exports = { "prefer-template": "error", "require-yield": "error", "no-empty": "error", - "no-return-await": "off", } } From 00280b6ed7f1f944d73458030a090d478a7e3caf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20K=C3=B6nig?= <33655937+jkoenig134@users.noreply.github.com> Date: Tue, 7 May 2024 15:12:34 +0200 Subject: [PATCH 5/5] chore: remove trailing comma --- index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.js b/index.js index a624db6..9a2e3e2 100644 --- a/index.js +++ b/index.js @@ -185,6 +185,6 @@ module.exports = { "no-useless-rename": "error", "prefer-template": "error", "require-yield": "error", - "no-empty": "error", + "no-empty": "error" } }