From 86cc5e69b072804c066d10e9008d1576e26aa3cf Mon Sep 17 00:00:00 2001 From: Adam Boro Date: Thu, 9 Jan 2020 13:33:32 +0100 Subject: [PATCH] Handle multiple eslint config formats (#313) Eslint can be configured using `.eslintrc`/`.eslintrc.js`/`.eslintrc.json` file names --- scripts/check-diff.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/check-diff.sh b/scripts/check-diff.sh index 1479284..2fad916 100755 --- a/scripts/check-diff.sh +++ b/scripts/check-diff.sh @@ -185,7 +185,7 @@ function set_environment_variables { fi if [ -z "$ESLINT_CONFIG" ]; then - ESLINT_CONFIG="$( upsearch .eslintrc )" + ESLINT_CONFIG="$( upsearch .eslintrc* )" fi if [ -z "$ESLINT_IGNORE" ]; then ESLINT_IGNORE="$( upsearch .eslintignore )" @@ -308,7 +308,7 @@ function set_environment_variables { done # Make sure linter configs get copied linting directory since upsearch is relative. - for linter_file in .jshintrc .jshintignore .jscsrc .jscs.json .eslintignore .eslintrc .phpcs.xml phpcs.xml .phpcs.xml.dist phpcs.xml.dist phpcs.ruleset.xml ruleset.xml; do + for linter_file in .jshintrc .jshintignore .jscsrc .jscs.json .eslintignore .eslintrc .eslintrc.js .eslintrc.json .phpcs.xml phpcs.xml .phpcs.xml.dist phpcs.xml.dist phpcs.ruleset.xml ruleset.xml; do if git ls-files "$linter_file" --error-unmatch > /dev/null 2>&1; then if [ -L $linter_file ]; then ln -fs $(git show :"$linter_file") "$LINTING_DIRECTORY/$linter_file"