Merge pull request #99 from ember-cli/migrate-to-eslint

.eslintrc.js

@@ -1,3 +1,5 @@
+'use strict';
+
 module.exports = {
   root: true,
   parserOptions: {
@@ -65,7 +67,7 @@ module.exports = {
     'func-call-spacing': 2,
     'indent': [2, 2, {
       'SwitchCase': 1,
-      'VariableDeclarator': { 'var': 2, 'let': 2, 'const': 3 }
+      'VariableDeclarator': { 'var': 2, 'let': 2, 'const': 3 },
     }],
     'key-spacing': 2,
     'keyword-spacing': 2,
@@ -84,7 +86,6 @@ module.exports = {
     'no-whitespace-before-property': 2,
     'object-curly-spacing': [2, 'always'],
     'semi-spacing': 2,
-    'semi': 2,
     'space-before-blocks': 2,
     'space-before-function-paren': [2, 'never'],
     'space-in-parens': 2,
@@ -117,4 +118,13 @@ module.exports = {
     'template-curly-spacing': 2,
     'yield-star-spacing': 2,
   },
+  overrides: [
+    {
+      files: ['test/**/*.js'],
+
+      env: {
+        jest: true,
+      },
+    },
+  ],
 };

package.json

@@ -5,7 +5,8 @@
   "main": "lib/auto-scenario-config-for-ember.js",
   "scripts": {
     "lint": "eslint .",
-    "test": "jest --projects jest.config.js jest.lint.config.js",
+    "test": "npm-run-all lint test:jest",
+    "test:jest": "jest --projects jest.config.js",
     "preversion": "node bin/update-known-versions.js"
   },
   "repository": "ember-cli/ember-try-config",
@@ -15,8 +16,9 @@
   "devDependencies": {
     "codecov": "^3.7.1",
     "glob": "^7.1.6",
+    "eslint": "^7.12.1",
     "jest": "^24.9.0",
-    "jest-runner-eslint": "^0.7.4"
+    "npm-run-all": "^4.1.5"
   },
   "dependencies": {
     "ember-source-channel-url": "^1.0.1",