From 95ade476e87435699837f041c56d82194e39352a Mon Sep 17 00:00:00 2001 From: Matt Weiden <538456+mweiden@users.noreply.github.com> Date: Wed, 15 Apr 2020 13:46:36 -0700 Subject: [PATCH] Add end of line marker to lint diff regexp (#1400) This prevents json files from being linted --- client/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/client/Makefile b/client/Makefile index a319456e..256048f4 100644 --- a/client/Makefile +++ b/client/Makefile @@ -33,7 +33,10 @@ lint: .PHONY: lint-diff lint-diff: # Get client diff against master, find all js/jsx files, remove the client prefex, run eslinst against result - git diff --name-only --diff-filter=d origin/master...HEAD -- ../client/ | grep -E "(.*)\.(jsx|js)" | sed "s/client\///" | $(if $(IS_DARWIN),xargs ./node_modules/.bin/eslint,xargs -r ./node_modules/.bin/eslint) + git diff --name-only --diff-filter=d origin/master...HEAD -- ../client/ \ + | grep -E "(.*)\.(jsx|js)$$" \ + | sed "s/client\///" \ + | $(if $(IS_DARWIN),xargs ./node_modules/.bin/eslint,xargs -r ./node_modules/.bin/eslint) # Development convenience methods