diff --git a/.jshintrc b/.jshintrc deleted file mode 100644 index d421faa3..00000000 --- a/.jshintrc +++ /dev/null @@ -1,32 +0,0 @@ -{ - "predef": [ - "document", - "window", - "-Promise" - ], - "browser": true, - "boss": true, - "curly": true, - "debug": false, - "devel": true, - "eqeqeq": true, - "evil": true, - "forin": false, - "immed": false, - "laxbreak": false, - "newcap": true, - "noarg": true, - "noempty": false, - "nonew": false, - "nomen": false, - "onevar": false, - "plusplus": false, - "regexp": false, - "undef": true, - "sub": true, - "strict": false, - "white": false, - "eqnull": true, - "esversion": 6, - "unused": true -} diff --git a/config/ember-try.js b/config/ember-try.js index 88854232..dfaf6f95 100644 --- a/config/ember-try.js +++ b/config/ember-try.js @@ -1,4 +1,4 @@ -/*jshint node:true*/ +/* eslint-env node */ module.exports = { command: 'npm run test:both', useVersionCompatibility: true, diff --git a/config/environment.js b/config/environment.js index 28a787b6..012a412f 100644 --- a/config/environment.js +++ b/config/environment.js @@ -1,4 +1,4 @@ -/*jshint node:true*/ +/* eslint-env node */ 'use strict'; module.exports = function(/* environment, appConfig */) { diff --git a/ember-cli-build.js b/ember-cli-build.js index decad7e2..7db201f9 100644 --- a/ember-cli-build.js +++ b/ember-cli-build.js @@ -1,5 +1,4 @@ -/*jshint node:true*/ -/* global require, module */ +/* eslint-env node */ var EmberAddon = require('ember-cli/lib/broccoli/ember-addon'); module.exports = function(defaults) { diff --git a/index.js b/index.js index fc5e5897..ba60eb6b 100644 --- a/index.js +++ b/index.js @@ -1,4 +1,4 @@ -/* jshint node:true */ +/* eslint-env node */ 'use strict'; module.exports = { diff --git a/strip-test-selectors.js b/strip-test-selectors.js index 355b22ef..b7932c45 100644 --- a/strip-test-selectors.js +++ b/strip-test-selectors.js @@ -1,4 +1,4 @@ -/*jshint node:true*/ +/* eslint-env node */ var TEST_SELECTOR_PREFIX = /data-test-.*/; function StripTestSelectorsTransform() { diff --git a/testem.js b/testem.js index 26044b2f..06a87d56 100644 --- a/testem.js +++ b/testem.js @@ -1,4 +1,4 @@ -/*jshint node:true*/ +/* eslint-env node */ module.exports = { "framework": "qunit", "test_page": "tests/index.html?hidepassed", diff --git a/tests/.jshintrc b/tests/.jshintrc deleted file mode 100644 index d2bd1134..00000000 --- a/tests/.jshintrc +++ /dev/null @@ -1,52 +0,0 @@ -{ - "predef": [ - "document", - "window", - "location", - "setTimeout", - "$", - "-Promise", - "define", - "console", - "visit", - "exists", - "fillIn", - "click", - "keyEvent", - "triggerEvent", - "find", - "findWithAssert", - "wait", - "DS", - "andThen", - "currentURL", - "currentPath", - "currentRouteName" - ], - "node": false, - "browser": false, - "boss": true, - "curly": true, - "debug": false, - "devel": false, - "eqeqeq": true, - "evil": true, - "forin": false, - "immed": false, - "laxbreak": false, - "newcap": true, - "noarg": true, - "noempty": false, - "nonew": false, - "nomen": false, - "onevar": false, - "plusplus": false, - "regexp": false, - "undef": true, - "sub": true, - "strict": false, - "white": false, - "eqnull": true, - "esversion": 6, - "unused": true -}