diff --git a/config/js/eslint.config.js b/config/js/eslint.config.js index bf21735b..eb9de21b 100644 --- a/config/js/eslint.config.js +++ b/config/js/eslint.config.js @@ -1,5 +1,3 @@ -const SEVERITY = 2 - module.exports = { extends: [ 'eslint:recommended', @@ -8,6 +6,9 @@ module.exports = { 'plugin:import/warnings', ], + // unignore implicit rules about what types of files can be linted + ignorePatterns: ['!.*'], + plugins: ['prettier'], env: { @@ -28,22 +29,22 @@ module.exports = { rules: { 'max-params': [ - SEVERITY, + 'error', { max: 3, }, ], 'prefer-const': [ - SEVERITY, + 'error', { destructuring: 'any', ignoreReadBeforeAssign: false, }, ], - 'no-mixed-spaces-and-tabs': [SEVERITY], - 'prettier/prettier': [SEVERITY], + 'no-mixed-spaces-and-tabs': ['error'], + 'prettier/prettier': ['error'], 'import/order': [ - SEVERITY, + 'error', { 'newlines-between': 'never', alphabetize: { diff --git a/src/tools/eslint.js b/src/tools/eslint.js index 0e871865..8f64e8c9 100644 --- a/src/tools/eslint.js +++ b/src/tools/eslint.js @@ -1,16 +1,16 @@ const { resolveIgnoreFile } = require('../utils/files.js') -const { PACKAGE_ROOT } = require('../utils/paths.js') +const { PACKAGE_ROOT, ESLINT_CONFIG } = require('../utils/paths.js') const { bin } = require('../utils/run.js') -exports.eslint = ({ files = [], apply = false, config }) => { +exports.eslint = ({ files = [], apply = false, config = ESLINT_CONFIG }) => { const ignoreFile = resolveIgnoreFile(['.eslintignore']) const cmd = 'eslint' const args = [ '--no-color', '--report-unused-disable-directives', '--ignore', - '--quiet', '--format=unix', + '--max-warnings=0', `--resolve-plugins-relative-to=${PACKAGE_ROOT}`, ...(ignoreFile ? ['--ignore-path', ignoreFile] : []), ...(config ? ['--config', config] : []), diff --git a/src/tools/prettier.js b/src/tools/prettier.js index b304a4db..4507853d 100644 --- a/src/tools/prettier.js +++ b/src/tools/prettier.js @@ -1,8 +1,13 @@ const log = require('@dhis2/cli-helpers-engine').reporter const { resolveIgnoreFile } = require('../utils/files.js') +const { PRETTIER_CONFIG } = require('../utils/paths.js') const { bin } = require('../utils/run.js') -exports.prettier = ({ files = [], apply = false, config }) => { +exports.prettier = ({ + files = [], + apply = false, + config = PRETTIER_CONFIG, +}) => { const ignoreFile = resolveIgnoreFile(['.prettierignore']) const cmd = 'prettier' const args = [