Merge pull request #163 from Turbo87/eslint

Replace JSHint/JSCS with ESLint

Author: rwjblue

lib/config/build-config.js

@@ -1,15 +1,14 @@
 'use strict';
 
-// To create fast production builds (without minification, JSCS, or JSHint)
+// To create fast production builds (without minification and ESLint)
 // run the following:
 //
-// DISABLE_JSHINT=true DISABLE_JSCS=true DISABLE_MIN=true ember serve --environment=production
+// DISABLE_ESLINT=true DISABLE_MIN=true ember serve --environment=production
 
 var env           = process.env.EMBER_ENV || 'development';
 var isDevelopment = env === 'development';
 
-var disableJSHint = !!process.env.DISABLE_JSHINT || false;
-var disableJSCS   = !!process.env.DISABLE_JSCS || false;
+var disableESLint = !!process.env.DISABLE_ESLINT || false;
 var disableMin    = !!process.env.DISABLE_MIN || false;
 var enableDocs    = !!process.env.ENABLE_DOCS || false;
 
@@ -28,8 +27,7 @@ if (!isDevelopment && !disableMin) {
 
 module.exports = {
   isDevelopment:       isDevelopment,
-  disableJSHint:       disableJSHint,
-  disableJSCS:         disableJSCS,
+  disableESLint:       disableESLint,
   disableMin:          disableMin,
   enableDocs:          enableDocs,
   enableTreeDebugging: enableTreeDebugging,

lib/ember-build.js

@@ -233,7 +233,8 @@ var EmberBuild = CoreObject.extend({
       currentPackage.trees = es6Package(packages, packageName, {
         htmlbars: this.htmlbars,
         glimmer: this.glimmer,
-        vendoredPackages: vendoredPackages
+        vendoredPackages: vendoredPackages,
+        eslintRulePaths: this.eslintRulePaths,
       });
 
       if (currentPackage['vendorRequirements']) {

lib/get-es6-package.js

@@ -5,22 +5,19 @@ module.exports = getES6Package;
 
 var Funnel     = require('broccoli-funnel');
 var mergeTrees = require('broccoli-merge-trees');
-var jshintTree = require('broccoli-jshint');
-var jscsTree   = require('./jscs-tree');
+var ESLintTree = require('broccoli-lint-eslint');
 
 var config                    = require('./config/build-config');
 var packageDependencyTree     = require('./get-package-dependency-tree');
 var htmlbarsTemplatePrecompiler = require('./utils/htmlbars-template-precompiler');
 var glimmerTemplatePrecompiler = require('./utils/glimmer-template-precompiler');
 
-var disableJSHint = config.disableJSHint;
-var disableJSCS   = config.disableJSCS;
+var disableESLint = config.disableESLint;
 
 function getES6Package(packages, packageName, opts) {
   var pkg        = packages[packageName];
   var options    = opts || {};
   var jsRegExp   = /js$/;
-  var configPath = options.configPath || '';
 
   var libTree;
 
@@ -39,7 +36,8 @@ function getES6Package(packages, packageName, opts) {
     #TODO: moar detail!!!
   */
   packageDependencyTree(packages, packageName, {
-    vendoredPackages: options.vendoredPackages
+    vendoredPackages: options.vendoredPackages,
+    eslintRulePaths: options.eslintRulePaths,
   });
   var vendorTrees = pkg.vendorTrees;
 
@@ -92,11 +90,13 @@ function getES6Package(packages, packageName, opts) {
     },
   });
 
-  var libJSCSTree = jscsTree(libTree, {
-    configPath: configPath
-  });
 
-  var libJSHintTree = jshintTree(libTree);
+  var eslintOptions = {
+    testGenerator: 'qunit',
+    options: { rulePaths: options.eslintRulePaths },
+  };
+
+  var libESLintTree = new ESLintTree(libTree, eslintOptions);
 
   if (pkg.hasTemplates) {
     /*
@@ -121,24 +121,16 @@ function getES6Package(packages, packageName, opts) {
     destDir: '/' + packageName + '/tests'
   });
 
-  var testJSCSTree   = jscsTree(testTree, {
-    configPath: configPath
-  });
-  var testJSHintTree = jshintTree(testTree);
+  var testESLintTree = new ESLintTree(testTree, eslintOptions);
 
   /*
     Merge jshint into testTree in order to ensure that if you have a jshint
     failure you'll see them fail in your browser tests
   */
   var testTrees = [];
-  if (!disableJSHint) {
-    testTrees.push(libJSHintTree);
-    testTrees.push(testJSHintTree);
-  }
-
-  if (!disableJSCS) {
-    testTrees.push(libJSCSTree);
-    testTrees.push(testJSCSTree);
+  if (!disableESLint) {
+    testTrees.push(libESLintTree);
+    testTrees.push(testESLintTree);
   }
   testTrees.push(testTree);
 

package.json

@@ -39,9 +39,8 @@
     "broccoli-concat": "^2.0.0",
     "broccoli-file-creator": "^1.0.0",
     "broccoli-funnel": "^1.0.1",
-    "broccoli-jscs": "^1.4.1",
-    "broccoli-jshint": "^1.1.0",
     "broccoli-kitchen-sink-helpers": "^0.2.6",
+    "broccoli-lint-eslint": "^3.2.0",
     "broccoli-merge-trees": "^1.1.1",
     "broccoli-persistent-filter": "^1.0.8",
     "broccoli-source": "^1.1.0",

tests/config/build-config-test.js

@@ -8,8 +8,7 @@ describe('build config', function() {
   it('returns correct default configuration object', function() {
     expect(buildConfig).to.deep.equal({
       isDevelopment:       true,
-      disableJSHint:       false,
-      disableJSCS:         false,
+      disableESLint:       false,
       disableMin:          false,
       enableDocs:          false,
       enableTreeDebugging: false,