From 608fa371be491eea593a344a478be1ad12084b90 Mon Sep 17 00:00:00 2001 From: DMarinhoCodacy Date: Tue, 25 Nov 2025 17:17:31 +0000 Subject: [PATCH 1/5] Add block files to Eslint configuration file --- .codacy/codacy.yaml | 9 +++------ tools/eslintConfigCreator.go | 1 + 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.codacy/codacy.yaml b/.codacy/codacy.yaml index bed1d05..a257da5 100644 --- a/.codacy/codacy.yaml +++ b/.codacy/codacy.yaml @@ -3,14 +3,11 @@ runtimes: - java@17.0.10 - node@22.2.0 - python@3.11.11 - - dart@3.7.2 tools: - - codacy-enigma-cli@0.0.1-main.8.49310c3 - - dartanalyzer@3.7.2 - - eslint@8.57.0 + - eslint@9.38.0 - lizard@1.17.31 - pmd@6.55.0 - - pylint@3.3.7 - - revive@1.11.0 + - pylint@3.3.9 + - revive@1.12.0 - semgrep@1.78.0 - trivy@0.66.0 diff --git a/tools/eslintConfigCreator.go b/tools/eslintConfigCreator.go index 6416484..da56cc1 100644 --- a/tools/eslintConfigCreator.go +++ b/tools/eslintConfigCreator.go @@ -154,6 +154,7 @@ var rulesWithoutOptions = map[string]bool{ func CreateEslintConfig(toolsConfigDir string, configuration []domain.PatternConfiguration) error { result := `export default [ { + files: ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"], rules: { ` From bd37df306d418e64509045b4506a5bd6a99e299a Mon Sep 17 00:00:00 2001 From: DMarinhoCodacy Date: Tue, 25 Nov 2025 17:37:17 +0000 Subject: [PATCH 2/5] revert .codacy changes --- .codacy/codacy.yaml | 9 ++++++--- tools/eslintConfigCreator.go | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.codacy/codacy.yaml b/.codacy/codacy.yaml index a257da5..bed1d05 100644 --- a/.codacy/codacy.yaml +++ b/.codacy/codacy.yaml @@ -3,11 +3,14 @@ runtimes: - java@17.0.10 - node@22.2.0 - python@3.11.11 + - dart@3.7.2 tools: - - eslint@9.38.0 + - codacy-enigma-cli@0.0.1-main.8.49310c3 + - dartanalyzer@3.7.2 + - eslint@8.57.0 - lizard@1.17.31 - pmd@6.55.0 - - pylint@3.3.9 - - revive@1.12.0 + - pylint@3.3.7 + - revive@1.11.0 - semgrep@1.78.0 - trivy@0.66.0 diff --git a/tools/eslintConfigCreator.go b/tools/eslintConfigCreator.go index da56cc1..d33220c 100644 --- a/tools/eslintConfigCreator.go +++ b/tools/eslintConfigCreator.go @@ -154,7 +154,7 @@ var rulesWithoutOptions = map[string]bool{ func CreateEslintConfig(toolsConfigDir string, configuration []domain.PatternConfiguration) error { result := `export default [ { - files: ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx"], + files: ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx", "**/*.mjs", "**/*.cjs", "**/*.vue"], rules: { ` From 384f2b51115b258f680a45a3e734c36b85c45304 Mon Sep 17 00:00:00 2001 From: DMarinhoCodacy Date: Thu, 11 Dec 2025 14:24:52 +0000 Subject: [PATCH 3/5] fix eslint tests --- .../expected/tools-configs/eslint.config.mjs | 1 + .../expected/tools-configs/eslint.config.mjs | 1 + .../test/src/.codacy/tools-configs/eslint.config.mjs | 1 + tools/eslintConfigCreator_test.go | 8 ++++++++ tools/testdata/repositories/test1/src/eslint.config.mjs | 1 + 5 files changed, 12 insertions(+) diff --git a/integration-tests/config-discover/expected/tools-configs/eslint.config.mjs b/integration-tests/config-discover/expected/tools-configs/eslint.config.mjs index 92f3fc1..13c49c6 100644 --- a/integration-tests/config-discover/expected/tools-configs/eslint.config.mjs +++ b/integration-tests/config-discover/expected/tools-configs/eslint.config.mjs @@ -1,5 +1,6 @@ export default [ { + files: ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx", "**/*.mjs", "**/*.cjs", "**/*.vue"], rules: { "constructor-super": ["error"], "for-direction": ["error"], diff --git a/integration-tests/init-without-token/expected/tools-configs/eslint.config.mjs b/integration-tests/init-without-token/expected/tools-configs/eslint.config.mjs index 92f3fc1..13c49c6 100644 --- a/integration-tests/init-without-token/expected/tools-configs/eslint.config.mjs +++ b/integration-tests/init-without-token/expected/tools-configs/eslint.config.mjs @@ -1,5 +1,6 @@ export default [ { + files: ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx", "**/*.mjs", "**/*.cjs", "**/*.vue"], rules: { "constructor-super": ["error"], "for-direction": ["error"], diff --git a/plugins/tools/eslint/test/src/.codacy/tools-configs/eslint.config.mjs b/plugins/tools/eslint/test/src/.codacy/tools-configs/eslint.config.mjs index 92f3fc1..13c49c6 100644 --- a/plugins/tools/eslint/test/src/.codacy/tools-configs/eslint.config.mjs +++ b/plugins/tools/eslint/test/src/.codacy/tools-configs/eslint.config.mjs @@ -1,5 +1,6 @@ export default [ { + files: ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx", "**/*.mjs", "**/*.cjs", "**/*.vue"], rules: { "constructor-super": ["error"], "for-direction": ["error"], diff --git a/tools/eslintConfigCreator_test.go b/tools/eslintConfigCreator_test.go index 11e631f..c946dc6 100644 --- a/tools/eslintConfigCreator_test.go +++ b/tools/eslintConfigCreator_test.go @@ -33,6 +33,7 @@ func TestCreateEslintConfigEmptyConfig(t *testing.T) { []domain.PatternConfiguration{}, `export default [ { + files: ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx", "**/*.mjs", "**/*.cjs", "**/*.vue"], rules: { } } @@ -50,6 +51,7 @@ func TestCreateEslintConfigConfig1(t *testing.T) { }, `export default [ { + files: ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx", "**/*.mjs", "**/*.cjs", "**/*.vue"], rules: { "semi": ["error"], } @@ -74,6 +76,7 @@ func TestCreateEslintConfigUnnamedParam(t *testing.T) { }, `export default [ { + files: ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx", "**/*.mjs", "**/*.cjs", "**/*.vue"], rules: { "semi": ["error", "never"], } @@ -98,6 +101,7 @@ func TestCreateEslintConfigNamedParam(t *testing.T) { }, `export default [ { + files: ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx", "**/*.mjs", "**/*.cjs", "**/*.vue"], rules: { "consistent-return": ["error", {"treatUndefinedAsUnspecified": false}], } @@ -126,6 +130,7 @@ func TestCreateEslintConfigUnnamedAndNamedParam(t *testing.T) { }, `export default [ { + files: ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx", "**/*.mjs", "**/*.cjs", "**/*.vue"], rules: { "consistent-return": ["error", "foo", {"treatUndefinedAsUnspecified": false}], } @@ -144,6 +149,7 @@ func TestCreateEslintConfigDoNotSupportPlugins(t *testing.T) { }, `export default [ { + files: ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx", "**/*.mjs", "**/*.cjs", "**/*.vue"], rules: { } } @@ -181,6 +187,7 @@ func TestCreateEslintConfigWithDefaultValues(t *testing.T) { }, `export default [ { + files: ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx", "**/*.mjs", "**/*.cjs", "**/*.vue"], rules: { "no-fallthrough": ["error", {"allowEmptyCase": false}], } @@ -211,6 +218,7 @@ func TestCreateEslintConfigWithUnnamedDefaultValues(t *testing.T) { }, `export default [ { + files: ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx", "**/*.mjs", "**/*.cjs", "**/*.vue"], rules: { "no-inner-declarations": ["error", "functions"], } diff --git a/tools/testdata/repositories/test1/src/eslint.config.mjs b/tools/testdata/repositories/test1/src/eslint.config.mjs index 22188e1..0dedc34 100644 --- a/tools/testdata/repositories/test1/src/eslint.config.mjs +++ b/tools/testdata/repositories/test1/src/eslint.config.mjs @@ -1,5 +1,6 @@ export default [ { + files: ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx", "**/*.mjs", "**/*.cjs", "**/*.vue"], rules: { "prefer-const": "error" } From fd3db1f626958c12e6a3cf824b6625303db4646a Mon Sep 17 00:00:00 2001 From: DMarinhoCodacy Date: Thu, 11 Dec 2025 17:28:27 +0000 Subject: [PATCH 4/5] fix test --- .../init-with-token/expected/tools-configs/eslint.config.mjs | 1 + 1 file changed, 1 insertion(+) diff --git a/integration-tests/init-with-token/expected/tools-configs/eslint.config.mjs b/integration-tests/init-with-token/expected/tools-configs/eslint.config.mjs index b593178..0ade727 100644 --- a/integration-tests/init-with-token/expected/tools-configs/eslint.config.mjs +++ b/integration-tests/init-with-token/expected/tools-configs/eslint.config.mjs @@ -1,5 +1,6 @@ export default [ { + files: ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx", "**/*.mjs", "**/*.cjs", "**/*.vue"], rules: { } } From f9a1dfb49637b8a24b2baa0e96f2270c81d3eaab Mon Sep 17 00:00:00 2001 From: DMarinhoCodacy Date: Thu, 11 Dec 2025 17:35:26 +0000 Subject: [PATCH 5/5] fix eslint tests --- tools/eslintConfigCreator_test.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/eslintConfigCreator_test.go b/tools/eslintConfigCreator_test.go index c946dc6..3e72e71 100644 --- a/tools/eslintConfigCreator_test.go +++ b/tools/eslintConfigCreator_test.go @@ -33,7 +33,7 @@ func TestCreateEslintConfigEmptyConfig(t *testing.T) { []domain.PatternConfiguration{}, `export default [ { - files: ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx", "**/*.mjs", "**/*.cjs", "**/*.vue"], + files: ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx", "**/*.mjs", "**/*.cjs", "**/*.vue"], rules: { } } @@ -51,7 +51,7 @@ func TestCreateEslintConfigConfig1(t *testing.T) { }, `export default [ { - files: ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx", "**/*.mjs", "**/*.cjs", "**/*.vue"], + files: ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx", "**/*.mjs", "**/*.cjs", "**/*.vue"], rules: { "semi": ["error"], } @@ -76,7 +76,7 @@ func TestCreateEslintConfigUnnamedParam(t *testing.T) { }, `export default [ { - files: ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx", "**/*.mjs", "**/*.cjs", "**/*.vue"], + files: ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx", "**/*.mjs", "**/*.cjs", "**/*.vue"], rules: { "semi": ["error", "never"], } @@ -101,7 +101,7 @@ func TestCreateEslintConfigNamedParam(t *testing.T) { }, `export default [ { - files: ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx", "**/*.mjs", "**/*.cjs", "**/*.vue"], + files: ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx", "**/*.mjs", "**/*.cjs", "**/*.vue"], rules: { "consistent-return": ["error", {"treatUndefinedAsUnspecified": false}], } @@ -130,7 +130,7 @@ func TestCreateEslintConfigUnnamedAndNamedParam(t *testing.T) { }, `export default [ { - files: ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx", "**/*.mjs", "**/*.cjs", "**/*.vue"], + files: ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx", "**/*.mjs", "**/*.cjs", "**/*.vue"], rules: { "consistent-return": ["error", "foo", {"treatUndefinedAsUnspecified": false}], } @@ -149,7 +149,7 @@ func TestCreateEslintConfigDoNotSupportPlugins(t *testing.T) { }, `export default [ { - files: ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx", "**/*.mjs", "**/*.cjs", "**/*.vue"], + files: ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx", "**/*.mjs", "**/*.cjs", "**/*.vue"], rules: { } } @@ -187,7 +187,7 @@ func TestCreateEslintConfigWithDefaultValues(t *testing.T) { }, `export default [ { - files: ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx", "**/*.mjs", "**/*.cjs", "**/*.vue"], + files: ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx", "**/*.mjs", "**/*.cjs", "**/*.vue"], rules: { "no-fallthrough": ["error", {"allowEmptyCase": false}], } @@ -218,7 +218,7 @@ func TestCreateEslintConfigWithUnnamedDefaultValues(t *testing.T) { }, `export default [ { - files: ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx", "**/*.mjs", "**/*.cjs", "**/*.vue"], + files: ["**/*.js", "**/*.jsx", "**/*.ts", "**/*.tsx", "**/*.mjs", "**/*.cjs", "**/*.vue"], rules: { "no-inner-declarations": ["error", "functions"], }