Drop jshint, use eslint in es6 mode

This commit is contained in:
Łukasz Mierzwa
2017-07-19 21:21:31 -07:00
parent 9ea3236ee5
commit d91fa473ab
4 changed files with 4 additions and 17 deletions

View File

@@ -1,5 +1,8 @@
env:
browser: true
commonjs: true
es6: true
jest: true
jquery: true
extends:
- eslint:recommended

View File

@@ -1 +0,0 @@
assets/static/lru.js

View File

@@ -1,11 +0,0 @@
{
"browser": true,
"jquery": true,
"devel": true,
"undef": true,
"unused": true,
"quotmark": "double"
}

View File

@@ -19,8 +19,7 @@ ifdef DEBUG
DOCKER_ARGS = -v $(CURDIR)/assets:$(CURDIR)/assets:ro
endif
# detect if jshint and/or eslint is installed
JSHINT := $(shell which jshint)
# detect if eslint is installed
ESLINT := $(shell which eslint)
.DEFAULT_GOAL := $(NAME)
@@ -91,9 +90,6 @@ run-docker: docker-image
.PHONY: lint
lint: .build/deps.ok
@golint ./... | (egrep -v "^vendor/|^bindata_assetfs.go" || true)
ifneq ($(JSHINT),)
$(JSHINT) assets/static/*.js
endif
ifneq ($(ESLINT),)
$(ESLINT) --quiet assets/static/*.js
endif