Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ run_make_lint() {

local eslint_flags=""
if [ "${quiet}" -eq 1 ]; then
eslint_flags="ESLINT_FLAGS='--quiet'"
eslint_flags="STDLIB_ESLINT_FLAGS='--quiet'"
fi

local make_cmd="make lint-javascript-files FIX=${fix} FAST_FAIL=0 FILES=\"${files_to_lint}\" ${make_args} ${eslint_conf_arg} ${eslint_flags}"
Expand All @@ -92,7 +92,7 @@ run_make_lint() {
if ! eval "${make_cmd}"; then
if [ "${quiet}" -eq 0 ]; then
echo "Initial linting failed. Retrying with --quiet and logging errors..."
eval "make lint-javascript-files FIX=${fix} FAST_FAIL=0 FILES=\"${files_to_lint}\" ${make_args} ${eslint_conf_arg} ESLINT_FLAGS='--quiet'" >> "${err_file}" 2>&1
eval "make lint-javascript-files FIX=${fix} FAST_FAIL=0 FILES=\"${files_to_lint}\" ${make_args} ${eslint_conf_arg} STDLIB_ESLINT_FLAGS='--quiet'" >> "${err_file}" 2>&1
else
# Already running with --quiet, just log the error
echo "Linting failed for files." >> "${err_file}"
Expand Down
4 changes: 2 additions & 2 deletions tools/make/lib/lint/javascript/eslint.mk
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ eslint_flags := \
--report-unused-disable-directives

# Define user-supplied command-line options:
ESLINT_FLAGS ?=
STDLIB_ESLINT_FLAGS ?=

ifeq ($(AUTOFIX),true)
eslint_flags += --fix
Expand All @@ -50,7 +50,7 @@ endif
endif

# Append user-supplied command-line options:
eslint_flags += $(ESLINT_FLAGS)
eslint_flags += $(STDLIB_ESLINT_FLAGS)

# RULES #

Expand Down
Loading