diff --git a/.eslintrc.yaml b/.eslintrc.yaml new file mode 100644 index 0000000000..911f22c681 --- /dev/null +++ b/.eslintrc.yaml @@ -0,0 +1,11 @@ +env: + node: true + browser: true +parserOptions: + ecmaVersion: 5 + sourceType: script +extends: semistandard +rules: + strict: + - error + - safe diff --git a/Makefile b/Makefile index 7b8ae94cb4..33408bfbad 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ BROWSERIFY := "node_modules/.bin/browserify" -SEMISTANDARD:= "node_modules/.bin/semistandard" +ESLINT := "node_modules/.bin/eslint" KARMA := "node_modules/.bin/karma" MOCHA := "bin/mocha" NYC := "node_modules/.bin/nyc" @@ -34,9 +34,7 @@ clean: lint: @printf "==> [Test :: Lint]\n" - $(SEMISTANDARD) $(SRC) - $(SEMISTANDARD) --env mocha --global assert --global expect --global run $(TESTS) - $(SEMISTANDARD) bin/* scripts/*.js *.js + $(ESLINT) . "bin/*" test-node: test-bdd test-tdd test-qunit test-exports test-unit test-integration test-jsapi test-compilers test-glob test-requires test-reporters test-only test-global-only diff --git a/lib/browser/.eslintrc.yaml b/lib/browser/.eslintrc.yaml new file mode 100644 index 0000000000..d85f537d3b --- /dev/null +++ b/lib/browser/.eslintrc.yaml @@ -0,0 +1,4 @@ +env: + node: false + browser: false + commonjs: true diff --git a/package.json b/package.json index 2a9fc6009b..ac8a6dcfea 100644 --- a/package.json +++ b/package.json @@ -323,6 +323,11 @@ "browserify": "^13.0.0", "coffee-script": "^1.10.0", "coveralls": "^2.11.15", + "eslint": "^3.11.1", + "eslint-config-semistandard": "^7.0.0", + "eslint-config-standard": "^6.2.1", + "eslint-plugin-promise": "^3.4.0", + "eslint-plugin-standard": "2.0.1", "expect.js": "^0.3.1", "istanbul-combine": "^0.3.0", "karma": "1.3.0", @@ -336,7 +341,6 @@ "nyc": "^10.0.0", "phantomjs": "1.9.8", "rimraf": "^2.5.2", - "semistandard": "^9.2.1", "should": "^11.1.1", "through2": "^2.0.1", "watchify": "^3.7.0" @@ -369,11 +373,5 @@ "phantomjs", "lodash.create" ] - }, - "semistandard": { - "ignore": [ - "/mocha.js", - "/lib/to-iso-string/**/*.js" - ] } } diff --git a/test/.eslintrc.yaml b/test/.eslintrc.yaml new file mode 100644 index 0000000000..1830a0b6f4 --- /dev/null +++ b/test/.eslintrc.yaml @@ -0,0 +1,7 @@ +env: + mocha: true +globals: + expect: false + assert: false + # https://github.com/sindresorhus/globals/pull/102 + run: false