From 18aaa9d175879abe09045d6022e5b6ddf1c4d910 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Tue, 28 Jul 2015 10:24:24 -0400 Subject: Adding check target to makefile to run eslint. Adding eslint to package.json --- Makefile | 5 +++++ web/react/package.json | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 222d4ffe4..01986bf64 100644 --- a/Makefile +++ b/Makefile @@ -5,6 +5,7 @@ GOFLAGS ?= $(GOFLAGS:) BUILD_NUMBER ?= $(BUILD_NUMBER:) GO=$(GOPATH)/bin/godep go +ESLINT=web/react/node_modules/eslint/bin/eslint.js ifeq ($(BUILD_NUMBER),) BUILD_NUMBER := dev @@ -62,6 +63,10 @@ install: @cd web/react/ && npm install +check: install + @echo Running ESLint... + @$(ESLINT) web/react/components/* + test: install @mkdir -p logs @$(GO) test $(GOFLAGS) -run=$(TESTS) -test.v -test.timeout=180s ./api || exit 1 diff --git a/web/react/package.json b/web/react/package.json index 8d9d57fab..2bba29e2b 100644 --- a/web/react/package.json +++ b/web/react/package.json @@ -16,7 +16,9 @@ "jest-cli": "~0.1.17", "reactify": "^0.15.2", "uglify-js": "~2.4.15", - "watchify": "^2.1.1" + "watchify": "^2.1.1", + "eslint": "^0.24.1", + "eslint-plugin-react": "^3.0.0" }, "scripts": { "start": "watchify --extension=jsx -o ../static/js/bundle.js -v -d ./**/*.jsx", -- cgit v1.2.3-1-g7c22