Merge pull request #203 from t-sauer/extensions-config

Make extensions configurable

README.md

@@ -129,6 +129,7 @@ let app = new EmberApp(defaults, {
     testGenerator: 'qunit',
     group: true,
     rulesDir: 'eslint-rules',
+    extensions: ['js'],
   }
 });
 ```
@@ -143,6 +144,8 @@ let app = new EmberApp(defaults, {
 - `rulesDir` is the name of the directory for your custom eslint rules.
   It defaults to `eslint-rules`.
 
+- `extensions` is an array containing the file extensions to lint. If you want to lint JavaScript and TypeScript files for example it should be set to `['js', 'ts']`. _NOTE_: If you add Typescript files `typescript-eslint-parser` has to be installed and specified as the parser. For more information take a look at the [`typescript-eslint-parser`](https://github.com/eslint/typescript-eslint-parser)
+
 ### On Build Files
 
 Please note that if you are using this to lint files which are part of the build

ember-cli-build.js

@@ -10,6 +10,10 @@ module.exports = function (defaults) {
     options.eslint.group = false;
   }
 
+  if (process.env['JSX']) {
+    options.eslint.extensions = ['js', 'jsx'];
+  }
+
   var app = new EmberAddon(defaults, options);
 
   /*

index.js

@@ -44,6 +44,7 @@ module.exports = {
     return ESLint.create(tree, {
       testGenerator: this.options.testGenerator || this._testGenerator,
       group: (this.options.group !== false) ? type : undefined,
+      extensions: this.options.extensions,
 
       options: {
         rulesDir: this.options.rulesDir || 'eslint-rules'

node-tests/test.js

@@ -100,6 +100,29 @@ describe('ember-cli-eslint', function() {
         .to.contain('ok 11 PhantomJS 2.1 - ESLint | tests: test-helper.js');
     })
   });
+
+  it('passes if jsx files are included', function() {
+    process.env['JSX'] = true;
+
+    return emberTest().then(function(result) {
+      expect(result.error).to.not.exist;
+      expect(result.stdout.match(/[^\r\n]+/g))
+        .to.contain('ok 1 PhantomJS 2.1 - ESLint | app: app.js')
+        .to.contain('ok 2 PhantomJS 2.1 - ESLint | app: controllers/thing.js')
+        .to.contain('ok 3 PhantomJS 2.1 - ESLint | app: models/thing.js')
+        .to.contain('ok 4 PhantomJS 2.1 - ESLint | app: resolver.js')
+        .to.contain('ok 5 PhantomJS 2.1 - ESLint | app: router.js')
+        .to.contain('ok 6 PhantomJS 2.1 - ESLint | app: routes/thing.jsx')
+        .to.not.contain('not ok 7 PhantomJS 2.1 - ESLint | app: unused.js');
+
+      expect(result.stdout.match(/[^\r\n]+/g))
+        .to.contain('ok 7 PhantomJS 2.1 - ESLint | tests: helpers/destroy-app.js')
+        .to.contain('ok 8 PhantomJS 2.1 - ESLint | tests: helpers/module-for-acceptance.js')
+        .to.contain('ok 9 PhantomJS 2.1 - ESLint | tests: helpers/resolver.js')
+        .to.contain('ok 10 PhantomJS 2.1 - ESLint | tests: helpers/start-app.js')
+        .to.contain('ok 11 PhantomJS 2.1 - ESLint | tests: test-helper.js');
+    })
+  });
 });
 
 function emberTest() {

package.json

@@ -35,7 +35,7 @@
     "test": "mocha node-tests --recursive"
   },
   "dependencies": {
-    "broccoli-lint-eslint": "^4.0.0",
+    "broccoli-lint-eslint": "^4.1.0",
     "ember-cli-version-checker": "^2.0.0",
     "rsvp": "^3.2.1",
     "walk-sync": "^0.3.0"

tests/dummy/app/routes/thing.jsx

@@ -0,0 +1,4 @@
+import Ember from 'ember';
+
+export default Ember.Route.extend({
+});