add eslint, remove jscs/jshint

5 files changed, 6 insertions, 49 deletions

diff --git a/.eslintrc b/.eslintrc
index d6b6003..d9f0b2b 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -41,7 +41,9 @@
     "no-loop-func": 2,
     "dot-notation": 0,
     "valid-jsdoc": ["error", {
-        "requireReturn": false
+        "requireReturn": false,
+        "requireReturnDescription": false,
+        "requireReturnType": false
     }]
   }
 }
diff --git a/.jscsrc b/.jscsrc
deleted file mode 100644
index baab92f..0000000
--- a/.jscsrc
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "validateIndentation": 4,
-  "esnext": true,
-  "plugins": [
-    "jscs-jsdoc"
-  ],
-  "jsDoc": {
-    "checkTypes": "strictNativeCase",
-    "enforceExistence": false
-  }
-}
diff --git a/.jshintrc b/.jshintrc
deleted file mode 100644
index 375fbdf..0000000
--- a/.jshintrc
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    // Enforcing options
-    "eqeqeq": false,
-    "forin": true,
-    "indent": 4,
-    "noarg": true,
-    "undef": true,
-    "unused": true,
-    "trailing": true,
-    "evil": true,
-    "laxcomma": true,
-    "esnext": true,
-
-    // Relaxing options
-    "onevar": false,
-    "asi": false,
-    "eqnull": true,
-    "expr": false,
-    "loopfunc": true,
-    "sub": true,
-    "browser": true,
-    "node": true,
-    "globals": {
-        "self": true,
-        "define": true,
-        "describe": true,
-        "context": true,
-        "it": true,
-        "before": true,
-        "after": true
-    }
-}
diff --git a/Makefile b/Makefile
index c9ca369..701f27d 100644
--- a/Makefile
+++ b/Makefile
@@ -37,8 +37,7 @@ clean:
 	rm -rf tmp/
 
 lint:
-	jshint $(LINT_FILES)
-	jscs $(LINT_FILES)
+	eslint $(LINT_FILES)
 
 # Compile the ES6 modules to singular bundles, and individual bundles
 build-bundle: build-modules $(UMD_BUNDLE) $(CJS_BUNDLE)
diff --git a/package.json b/package.json
index 2214d06..d3429f3 100644
--- a/package.json
+++ b/package.json
@@ -33,10 +33,9 @@
     "chai": "^3.1.0",
     "coveralls": "^2.11.2",
     "es6-promise": "^2.3.0",
+    "eslint": "^2.11.1",
     "fs-extra": "^0.26.7",
-    "jscs": "^1.13.1",
     "jscs-jsdoc": "^1.3.2",
-    "jshint": "~2.8.0",
     "karma": "^0.13.2",
     "karma-browserify": "^4.2.1",
     "karma-firefox-launcher": "^0.1.6",
@@ -58,7 +57,7 @@
   "scripts": {
     "coverage": "nyc npm test && nyc report",
     "coveralls": "nyc npm test && nyc report --reporter=text-lcov | coveralls",
-    "lint": "jshint lib/ mocha_test/ perf/memory.js perf/suites.js perf/benchmark.js support/ karma.conf.js && jscs lib/ mocha_test/ perf/memory.js perf/suites.js perf/benchmark.js support/ karma.conf.js",
+    "lint": "eslint lib/ mocha_test/ perf/memory.js perf/suites.js perf/benchmark.js support/ karma.conf.js",
     "mocha-browser-test": "karma start",
     "mocha-node-test": "mocha mocha_test/ --compilers js:babel-core/register",
     "mocha-test": "npm run mocha-node-test && npm run mocha-browser-test",