diff --git a/eslint-configs/eslint-config-seekingalpha-base/CHANGELOG.md b/eslint-configs/eslint-config-seekingalpha-base/CHANGELOG.md index c7820525..6a41a744 100644 --- a/eslint-configs/eslint-config-seekingalpha-base/CHANGELOG.md +++ b/eslint-configs/eslint-config-seekingalpha-base/CHANGELOG.md @@ -1,5 +1,9 @@ # Change Log +## 8.17.0 - 2025-03-06 + +- [breaking] removed separate prettier config + ## 8.16.0 - 2025-01-23 - [deps] update `eslint` to version `8.57.1` diff --git a/eslint-configs/eslint-config-seekingalpha-base/flat.js b/eslint-configs/eslint-config-seekingalpha-base/flat.js new file mode 100644 index 00000000..30558acb --- /dev/null +++ b/eslint-configs/eslint-config-seekingalpha-base/flat.js @@ -0,0 +1,8 @@ +import esLintConfig from './rules/eslint/flat'; + +// eslint-disable-next-line import/no-default-export, import/no-anonymous-default-export +export default { + rules: { + ...esLintConfig.rules, + }, +}; diff --git a/eslint-configs/eslint-config-seekingalpha-base/package.json b/eslint-configs/eslint-config-seekingalpha-base/package.json index dbcb4271..b95ccf6e 100644 --- a/eslint-configs/eslint-config-seekingalpha-base/package.json +++ b/eslint-configs/eslint-config-seekingalpha-base/package.json @@ -1,6 +1,6 @@ { "name": "eslint-config-seekingalpha-base", - "version": "8.16.0", + "version": "8.17.0", "description": "SeekingAlpha's sharable base ESLint config", "main": "index.js", "scripts": { diff --git a/eslint-configs/eslint-config-seekingalpha-base/prettier.js b/eslint-configs/eslint-config-seekingalpha-base/prettier.js deleted file mode 100644 index 9a64ac23..00000000 --- a/eslint-configs/eslint-config-seekingalpha-base/prettier.js +++ /dev/null @@ -1,12 +0,0 @@ -module.exports = { - extends: ['./index.js'], - - rules: { - 'unicode-bom': 'off', - - // Unicorn - 'unicorn/empty-brace-spaces': 'off', - 'unicorn/no-nested-ternary': 'off', - 'unicorn/number-literal-case': 'off', - }, -}; diff --git a/eslint-configs/eslint-config-seekingalpha-base/rules/eslint-plugin-unicorn/index.js b/eslint-configs/eslint-config-seekingalpha-base/rules/eslint-plugin-unicorn/index.js index ad9f965e..528e0fcb 100644 --- a/eslint-configs/eslint-config-seekingalpha-base/rules/eslint-plugin-unicorn/index.js +++ b/eslint-configs/eslint-config-seekingalpha-base/rules/eslint-plugin-unicorn/index.js @@ -30,8 +30,11 @@ module.exports = { // https://github.com/sindresorhus/eslint-plugin-unicorn/blob/master/docs/rules/custom-error-definition.md 'unicorn/custom-error-definition': 'error', - // https://github.com/sindresorhus/eslint-plugin-unicorn/blob/master/docs/rules/empty-brace-spaces.md - 'unicorn/empty-brace-spaces': 'error', + /* + * https://github.com/sindresorhus/eslint-plugin-unicorn/blob/master/docs/rules/empty-brace-spaces.md + * Disabled to work with prettier + */ + 'unicorn/empty-brace-spaces': 'off', // https://github.com/sindresorhus/eslint-plugin-unicorn/blob/master/docs/rules/error-message.md 'unicorn/error-message': 'error', @@ -140,7 +143,7 @@ module.exports = { /* * https://github.com/sindresorhus/eslint-plugin-unicorn/blob/master/docs/rules/no-nested-ternary.md - * Disabled in favour of ESLint's rule + * Disabled in favour of ESLint's rule and it does not work with Prettier * https://eslint.org/docs/rules/no-nested-ternary */ 'unicorn/no-nested-ternary': 'off', @@ -217,8 +220,11 @@ module.exports = { // https://github.com/sindresorhus/eslint-plugin-unicorn/blob/master/docs/rules/no-zero-fractions.md 'unicorn/no-zero-fractions': 'error', - // https://github.com/sindresorhus/eslint-plugin-unicorn/blob/master/docs/rules/number-literal-case.md - 'unicorn/number-literal-case': 'error', + /* + * https://github.com/sindresorhus/eslint-plugin-unicorn/blob/master/docs/rules/number-literal-case.md + * Disabled to work with Prettier + */ + 'unicorn/number-literal-case': 'off', // https://github.com/sindresorhus/eslint-plugin-unicorn/blob/master/docs/rules/numeric-separators-style.md 'unicorn/numeric-separators-style': 'off', diff --git a/eslint-configs/eslint-config-seekingalpha-base/rules/eslint/flat.js b/eslint-configs/eslint-config-seekingalpha-base/rules/eslint/flat.js new file mode 100644 index 00000000..39f4f6ba --- /dev/null +++ b/eslint-configs/eslint-config-seekingalpha-base/rules/eslint/flat.js @@ -0,0 +1,12 @@ +import layout from './layout-and-formatting'; +import problems from './possible-problems'; +import suggestions from './suggestions'; + +// eslint-disable-next-line import/no-default-export, import/no-anonymous-default-export +export default { + rules: { + ...layout.rules, + ...problems.rules, + ...suggestions.rules, + }, +}; diff --git a/eslint-configs/eslint-config-seekingalpha-base/rules/eslint/layout-and-formatting.js b/eslint-configs/eslint-config-seekingalpha-base/rules/eslint/layout-and-formatting.js index 059053e6..95b0d0ad 100644 --- a/eslint-configs/eslint-config-seekingalpha-base/rules/eslint/layout-and-formatting.js +++ b/eslint-configs/eslint-config-seekingalpha-base/rules/eslint/layout-and-formatting.js @@ -12,7 +12,10 @@ module.exports = { }, ], - // https://eslint.org/docs/rules/unicode-bom - 'unicode-bom': ['error', 'never'], + /* + * https://eslint.org/docs/rules/unicode-bom + * disabled to work with prettier + */ + 'unicode-bom': 'off', }, }; diff --git a/package.json b/package.json index f3c9f84c..758b87a4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "seekingalpha-javascript-style", - "version": "5.38.102", + "version": "5.38.103", "description": "Set of linting rules, guides and best practices for best Javascript code", "main": "index.js", "type": "module",