Merge pull request #354 from babel/eslint-config-babel

Use eslint-config-babel

.eslintignore

@@ -0,0 +1 @@
+test/fixtures

.eslintrc.js

@@ -0,0 +1,16 @@
+module.exports = {
+  root: true,
+  extends: "babel",
+  parserOptions: {
+    ecmaVersion: 7,
+    sourceType: "module"
+  },
+  rules: {
+    "no-var": 0,
+    "max-len": 0
+  },
+  env: {
+    node: true,
+    mocha: true
+  }
+};

.travis.yml

@@ -7,3 +7,5 @@ matrix:
     - node_js: "4"
     - node_js: "5"
     - node_js: "6"
+
+script: npm run test-ci

babylon-to-espree/convertTemplateType.js

@@ -90,4 +90,4 @@ module.exports = function (tokens, tt) {
     }
     startingToken++;
   }
-}
+};

babylon-to-espree/index.js

@@ -17,4 +17,4 @@ exports.convertComments = function (comments) {
       comment.range = [comment.start, comment.end];
     }
   }
-}
+};

babylon-to-espree/toAST.js

@@ -17,6 +17,18 @@ function changeToLiteral(node) {
   }
 }
 
+function changeComments(nodeComments) {
+  for (var i = 0; i < nodeComments.length; i++) {
+    var comment = nodeComments[i];
+    if (comment.type === "CommentLine") {
+      comment.type = "Line";
+    } else if (comment.type === "CommentBlock") {
+      comment.type = "Block";
+    }
+    comment.range = [comment.start, comment.end];
+  }
+}
+
 var astTransformVisitor = {
   noScope: true,
   enter: function (path) {
@@ -33,27 +45,11 @@ var astTransformVisitor = {
     }
 
     if (node.trailingComments) {
-      for (var i = 0; i < node.trailingComments.length; i++) {
-        var comment = node.trailingComments[i];
-        if (comment.type === "CommentLine") {
-          comment.type = "Line";
-        } else if (comment.type === "CommentBlock") {
-          comment.type = "Block";
-        }
-        comment.range = [comment.start, comment.end];
-      }
+      changeComments(node.trailingComments);
     }
 
     if (node.leadingComments) {
-      for (var i = 0; i < node.leadingComments.length; i++) {
-        var comment = node.leadingComments[i];
-        if (comment.type === "CommentLine") {
-          comment.type = "Line";
-        } else if (comment.type === "CommentBlock") {
-          comment.type = "Block";
-        }
-        comment.range = [comment.start, comment.end];
-      }
+      changeComments(node.leadingComments);
     }
 
     // make '_paths' non-enumerable (babel-eslint #200)

index.js

@@ -388,7 +388,7 @@ exports.parse = function (code, options) {
   }
 
   return exports.parseNoPatch(code, options);
-}
+};
 
 exports.parseNoPatch = function (code, options) {
   var opts = {
@@ -397,20 +397,20 @@ exports.parseNoPatch = function (code, options) {
     allowReturnOutsideFunction: true,
     allowSuperOutsideMethod: true,
     plugins: [
-        "flow",
-        "jsx",
-        "asyncFunctions",
-        "asyncGenerators",
-        "classConstructorCall",
-        "classProperties",
-        "decorators",
-        "doExpressions",
-        "exponentiationOperator",
-        "exportExtensions",
-        "functionBind",
-        "functionSent",
-        "objectRestSpread",
-        "trailingFunctionCommas"
+      "flow",
+      "jsx",
+      "asyncFunctions",
+      "asyncGenerators",
+      "classConstructorCall",
+      "classProperties",
+      "decorators",
+      "doExpressions",
+      "exponentiationOperator",
+      "exportExtensions",
+      "functionBind",
+      "functionSent",
+      "objectRestSpread",
+      "trailingFunctionCommas"
     ]
   };
 
@@ -458,4 +458,4 @@ exports.parseNoPatch = function (code, options) {
   babylonToEspree.attachComments(ast, ast.comments, ast.tokens);
 
   return ast;
-}
+};

package.json

@@ -22,6 +22,7 @@
     "bootstrap": "git submodule update --init && cd eslint && npm install",
     "eslint": "cd eslint && mocha -c tests/lib/rules/*.js -r ../eslint-tester.js",
     "test": "mocha",
+    "test-ci" "npm test && npm run lint",
     "lint": "eslint index.js babylon-to-espree test",
     "fix": "eslint index.js babylon-to-espree test --fix",
     "preversion": "npm test",
@@ -38,6 +39,7 @@
   "homepage": "https://github.com/babel/babel-eslint",
   "devDependencies": {
     "eslint": "^3.0.0",
+    "eslint-config-babel": "^1.0.1",
     "espree": "^3.0.0",
     "mocha": "^3.0.0"
   }