replace jshint with eslint

ember-cli-deploy · Aug 10, 2017 · 2566d70 · 2566d70
1 parent 37a0bea
commit 2566d70
Show file tree

Hide file tree

Showing 16 changed files with 33 additions and 196 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -0,0 +1,15 @@
+module.exports = {
+  root: true,
+  parserOptions: {
+    ecmaVersion: 2017,
+    sourceType: 'module'
+  },
+  extends: 'eslint:recommended',
+  env: {
+    browser: true,
+    node: true,
+    mocha: true
+  },
+  rules: {
+  }
+};
diff --git a/.jshintignore b/.jshintignore
diff --git a/.jshintrc b/.jshintrc
diff --git a/blueprints/.jshintrc b/blueprints/.jshintrc
diff --git a/blueprints/ember-cli-deploy/files/config/deploy.js b/blueprints/ember-cli-deploy/files/config/deploy.js
@@ -1,5 +1,3 @@
-/* jshint node: true */
-
 module.exports = function(deployTarget) {
   var ENV = {
     build: {}

diff --git a/blueprints/ember-cli-deploy/index.js b/blueprints/ember-cli-deploy/index.js
@@ -8,7 +8,7 @@ module.exports = {
     // not specified (since that doesn't actually matter
     // to us
   },
-  afterInstall: function(options) {
+  afterInstall: function() {
     this.ui.write(green('ember-cli-deploy needs plugins to actually do the deployment work.\nSee http://ember-cli-deploy.com/docs/v1.0.x/quickstart/\nto learn how to install plugins and see what plugins are available.\n'));
   }
 };
diff --git a/ember-cli-build.js b/ember-cli-build.js
@@ -1,4 +1,3 @@
-/* global require, module */
 var EmberApp = require('ember-cli/lib/broccoli/ember-addon');
 
 module.exports = function(defaults) {

diff --git a/lib/models/plugin-registry.js b/lib/models/plugin-registry.js
@@ -274,7 +274,7 @@ module.exports = CoreObject.extend({
 
   _pluginName: function(addon) {
     if(addon.name.indexOf('ember-cli-deploy') > -1) {
-      var pluginNameRegex = /^(ember\-cli\-deploy\-)(.*)$/;
+      var pluginNameRegex = /^(ember-cli-deploy-)(.*)$/;
       return addon.name.match(pluginNameRegex)[2];
     }
     return addon.name;

diff --git a/node-tests/.jshintrc b/node-tests/.jshintrc
diff --git a/node-tests/fixtures/config/empty.js b/node-tests/fixtures/config/empty.js
@@ -1,4 +1,4 @@
-/* jshint unused:false */
+/* eslint-disable no-unused-vars */
 
 module.exports = function(environment) {
   var ENV = {};

diff --git a/node-tests/unit/eslint-test.js b/node-tests/unit/eslint-test.js
@@ -0,0 +1,8 @@
+var lint = require('mocha-eslint');
+lint([
+  'node-tests',
+  'lib',
+  'bin',
+  'index.js',
+  'blueprints'
+])
diff --git a/node-tests/unit/jshint-test.js b/node-tests/unit/jshint-test.js
diff --git a/package.json b/package.json
@@ -20,10 +20,11 @@
     "chai": "^1.9.2",
     "chai-as-promised": "^4.1.1",
     "ember-cli": "^2.10.0",
+    "ember-cli-eslint": "^4.2.0",
     "ember-cli-release": "0.2.9",
     "github": "0.2.3",
     "mocha": "^2.0.1",
-    "mocha-jshint": "^2.2.6"
+    "mocha-eslint": "^4.1.0"
   },
   "keywords": [
     "ember-addon",

diff --git a/tests/.eslintrc.js b/tests/.eslintrc.js
@@ -0,0 +1,5 @@
+module.exports = {
+  env: {
+    embertest: true
+  }
+};
diff --git a/tests/.jshintrc b/tests/.jshintrc
diff --git a/tests/dummy/.jshintrc b/tests/dummy/.jshintrc