remove jshint & jscs

Makefile

@@ -2,6 +2,6 @@ APP=carr
 JS_FILES=media/js/quiz/ media/taking_action/js media/bruise_recon/js media/js/dragdropreorder.js
 MAX_COMPLEXITY=7
 
-all: eslint jenkins
+all: jenkins
 
 include *.mk

django.mk

@@ -1,6 +1,7 @@
-# VERSION=1.4.0
+# VERSION=1.5.0
 
 # CHANGES:
+# 1.5.0 - 2017-08-24 - remove jshint/jscs in favor of eslint
 # 1.4.0 - 2017-06-06 - backout the switch to eslint. that's not really ready yet.
 # 1.3.0 - 2017-06-05 - pypi location is not needed anymore
 # 1.2.0 - 2016-12-15 - bump wheel version to 0.29
@@ -22,7 +23,7 @@ INTERFACE ?= localhost
 RUNSERVER_PORT ?= 8000
 PY_DIRS ?= $(APP)
 
-jenkins: check flake8 test jshint jscs
+jenkins: check flake8 test eslint
 
 $(PY_SENTINAL): $(REQUIREMENTS) $(VIRTUALENV) $(SUPPORT_DIR)*
 	rm -rf $(VE)

js.mk

@@ -1,33 +1,36 @@
-# VERSION=1.2.0
+# VERSION=1.3.0
 
 # CHANGES:
+# 1.3.0 - restore eslint
 # 1.2.0 - restore jshint/jscs
 
 # expect JS_FILES to be set from the main Makefile, but default
 # to everything in media/js otherwise.
+#
+# When setting a custom value for this variable in your own Makefile,
+# the line should look like this:
+#   JS_FILES=media/js/src media/js/tests
+#
+# and not:
+#   JS_FILES="media/js/src media/js/tests"
+#
+# Using quotes here will cause eslint to ignore this argument.
+#
 JS_FILES ?= media/js
 
 NODE_MODULES ?= ./node_modules
 JS_SENTINAL ?= $(NODE_MODULES)/sentinal
-JSHINT ?= $(NODE_MODULES)/jshint/bin/jshint
-JSCS ?= $(NODE_MODULES)/jscs/bin/jscs
 ESLINT ?= $(NODE_MODULES)/.bin/eslint
 
 $(JS_SENTINAL): package.json
 	rm -rf $(NODE_MODULES)
 	npm install
 	touch $(JS_SENTINAL)
 
-jshint: $(JS_SENTINAL)
-	$(JSHINT) $(JS_FILES)
-
-jscs: $(JS_SENTINAL)
-	$(JSCS) $(JS_FILES)
-
 eslint: $(JS_SENTINAL)
 	$(ESLINT) $(JS_FILES)
 
 jstest: $(JS_SENTINAL)
 	npm test
 
-.PHONY: jshint jscs eslint jstest
+.PHONY: eslint jstest

package.json

@@ -17,13 +17,8 @@
   },
   "devDependencies": {
     "eslint": "~4.0.0",
-    "jshint": "~2.9.1-rc1",
-    "jscs": "~3.0.7",
     "eslint-config-scanjs": "^1.0.0-beta4",
     "eslint-plugin-no-unsafe-innerhtml": "^1.0.16",
     "eslint-plugin-security": "^1.4.0"
-  },
-  "eslintConfig": {
-    "extends": "secure"
   }
 }