From d91fa473ab6177e11ccf638fd5afed2e23196cd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= <l.mierzwa@gmail.com>
Date: Wed, 19 Jul 2017 21:21:31 -0700
Subject: [PATCH] Drop jshint, use eslint in es6 mode

---
 .eslintrc.yaml |  3 +++
 .jshintignore  |  1 -
 .jshintrc      | 11 -----------
 Makefile       |  6 +-----
 4 files changed, 4 insertions(+), 17 deletions(-)
 delete mode 100644 .jshintignore
 delete mode 100644 .jshintrc

diff --git a/.eslintrc.yaml b/.eslintrc.yaml
index 753a3db0c..1e3719679 100644
--- a/.eslintrc.yaml
+++ b/.eslintrc.yaml
@@ -1,5 +1,8 @@
 env:
   browser: true
+  commonjs: true
+  es6: true
+  jest: true
   jquery: true
 extends:
   - eslint:recommended
diff --git a/.jshintignore b/.jshintignore
deleted file mode 100644
index 9a4c14fee..000000000
--- a/.jshintignore
+++ /dev/null
@@ -1 +0,0 @@
-assets/static/lru.js
diff --git a/.jshintrc b/.jshintrc
deleted file mode 100644
index 0cfd8a461..000000000
--- a/.jshintrc
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "browser": true,
-  "jquery": true,
-  "devel": true,
-
-  "undef": true,
-  "unused": true,
-
-
-  "quotmark": "double"
-}
diff --git a/Makefile b/Makefile
index 7c933add2..7da3cd4a0 100644
--- a/Makefile
+++ b/Makefile
@@ -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