.travis.yml

@@ -1,9 +1,9 @@
 sudo: false
 language: node_js
 node_js:
+  - "10"
   - "8"
   - "6"
-  - "4"
 
 matrix:
   fast_finish: true

README.md

@@ -79,9 +79,9 @@ Check out the [ESLint docs](http://eslint.org/docs/rules/) for all possible rule
 
 ### Configuration
 
-`sourceType` can be set to `'module'`(default) or `'script'` if your code isn't using ECMAScript modules.
-`allowImportExportEverywhere` can be set to true to allow import and export declarations to appear anywhere a statement is allowed if your build environment supports that. By default, import and export declarations can only appear at a program's top level.
-`codeFrame` can be set to false to disable the code frame in the reporter. This is useful since some eslint formatters don't play well with it.
+- `sourceType` can be set to `'module'`(default) or `'script'` if your code isn't using ECMAScript modules.
+- `allowImportExportEverywhere` (default `false`) can be set to `true` to allow import and export declarations to appear anywhere a statement is allowed if your build environment supports that. Otherwise import and export declarations can only appear at a program's top level.
+- `codeFrame` (default `true`) can be set to `false` to disable the code frame in the reporter. This is useful since some eslint formatters don't play well with it.
 
 **.eslintrc**
 
@@ -91,7 +91,7 @@ Check out the [ESLint docs](http://eslint.org/docs/rules/) for all possible rule
   "parserOptions": {
     "sourceType": "module",
     "allowImportExportEverywhere": false,
-    "codeFrame": false
+    "codeFrame": true
   }
 }
 ```

lib/analyze-scope.js

@@ -1,10 +1,14 @@
 "use strict";
 
 const t = require("@babel/types");
-const escope = require("eslint-scope");
-const Definition = require("eslint-scope/lib/definition").Definition;
-const OriginalPatternVisitor = require("eslint-scope/lib/pattern-visitor");
-const OriginalReferencer = require("eslint-scope/lib/referencer");
+const requireFromESLint = require("./require-from-eslint");
+
+const escope = requireFromESLint("eslint-scope");
+const Definition = requireFromESLint("eslint-scope/lib/definition").Definition;
+const OriginalPatternVisitor = requireFromESLint(
+  "eslint-scope/lib/pattern-visitor"
+);
+const OriginalReferencer = requireFromESLint("eslint-scope/lib/referencer");
 const fallback = require("eslint-visitor-keys").getKeys;
 const childVisitorKeys = require("./visitor-keys");
 
@@ -145,6 +149,10 @@ class Referencer extends OriginalReferencer {
     }
   }
 
+  EnumDeclaration(node) {
+    this._createScopeVariable(node, node.id);
+  }
+
   TypeAlias(node) {
     this._createScopeVariable(node, node.id);
 
@@ -327,11 +335,6 @@ module.exports = function(ast, parserOptions) {
     fallback,
   };
 
-  if (OriginalReferencer._babelEslintPatched) {
-    require("./patch-eslint-scope")(parserOptions);
-    return escope.analyze(ast, options);
-  }
-
   options.childVisitorKeys = childVisitorKeys;
 
   const scopeManager = new escope.ScopeManager(options);

lib/index.js

@@ -11,10 +11,7 @@ exports.parseForESLint = function(code, options) {
   options.allowImportExportEverywhere =
     options.allowImportExportEverywhere || false;
 
-  if (options.eslintVisitorKeys && options.eslintScopeManager) {
-    return require("./parse-with-scope")(code, options);
-  }
-  return { ast: require("./parse-with-patch")(code, options) };
+  return require("./parse-with-scope")(code, options);
 };
 
 exports.parseNoPatch = function(code, options) {

lib/parse.js

@@ -1,12 +1,15 @@
 "use strict";
 
 var babylonToEspree = require("./babylon-to-espree");
-var parse = require("babylon").parse;
-var tt = require("babylon").tokTypes;
+var parse = require("@babel/parser").parse;
+var tt = require("@babel/parser").tokTypes;
 var traverse = require("@babel/traverse").default;
 var codeFrameColumns = require("@babel/code-frame").codeFrameColumns;
 
 module.exports = function(code, options) {
+  const legacyDecorators =
+    options.ecmaFeatures && options.ecmaFeatures.legacyDecorators;
+
   var opts = {
     codeFrame: options.hasOwnProperty("codeFrame") ? options.codeFrame : true,
     sourceType: options.sourceType,
@@ -16,14 +19,16 @@ module.exports = function(code, options) {
     ranges: true,
     tokens: true,
     plugins: [
-      "flow",
+      ["flow", { all: true, enums: true }],
       "jsx",
       "estree",
       "asyncFunctions",
       "asyncGenerators",
       "classConstructorCall",
       "classProperties",
-      "decorators",
+      legacyDecorators
+        ? "decorators-legacy"
+        : ["decorators", { decoratorsBeforeExport: false }],
       "doExpressions",
       "exponentiationOperator",
       "exportDefaultFrom",
@@ -40,8 +45,9 @@ module.exports = function(code, options) {
       "bigInt",
       "optionalCatchBinding",
       "throwExpressions",
-      "pipelineOperator",
+      ["pipelineOperator", { proposal: "minimal" }],
       "nullishCoalescingOperator",
+      "logicalAssignment",
     ],
   };
 

lib/require-from-eslint.js

@@ -0,0 +1,9 @@
+"use strict";
+
+const resolve = require("resolve");
+const eslintBase = require.resolve("eslint");
+
+module.exports = function requireFromESLint(id) {
+  const path = resolve.sync(id, { basedir: eslintBase });
+  return require(path);
+};

package.json

@@ -1,6 +1,6 @@
 {
   "name": "babel-eslint",
-  "version": "8.2.5",
+  "version": "10.1.0",
   "description": "Custom parser for ESLint",
   "main": "lib/index.js",
   "files": [
@@ -11,43 +11,45 @@
     "url": "https://github.com/babel/babel-eslint.git"
   },
   "dependencies": {
-    "@babel/code-frame": "7.0.0-beta.44",
-    "@babel/traverse": "7.0.0-beta.44",
-    "@babel/types": "7.0.0-beta.44",
-    "babylon": "7.0.0-beta.44",
-    "eslint-scope": "~3.7.1",
-    "eslint-visitor-keys": "^1.0.0"
+    "@babel/code-frame": "^7.0.0",
+    "@babel/parser": "^7.7.0",
+    "@babel/traverse": "^7.7.0",
+    "@babel/types": "^7.7.0",
+    "eslint-visitor-keys": "^1.0.0",
+    "resolve": "^1.12.0"
   },
   "scripts": {
     "test": "npm run lint && npm run test-only",
-    "test-only": "mocha && mocha --require test/fixtures/preprocess-to-patch.js && mocha --require test/fixtures/use-eslint-old.js",
-    "lint": "eslint index.js babylon-to-espree test",
-    "fix": "eslint index.js babylon-to-espree test --fix",
+    "test-only": "mocha && mocha --require test/fixtures/preprocess-to-patch.js",
+    "lint": "eslint lib test",
+    "fix": "eslint lib test --fix",
     "precommit": "lint-staged",
     "preversion": "npm test",
     "changelog": "git log `git describe --tags --abbrev=0`..HEAD --pretty=format:' * %s (%an)' | grep -v 'Merge pull request'"
   },
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "license": "MIT",
   "engines": {
-    "node": ">=4"
+    "node": ">=6"
   },
   "bugs": {
     "url": "https://github.com/babel/babel-eslint/issues"
   },
   "homepage": "https://github.com/babel/babel-eslint",
+  "peerDependencies": {
+    "eslint": ">= 4.12.1"
+  },
   "devDependencies": {
-    "babel-eslint": "^8.0.0",
+    "babel-eslint": "^8.2.6",
     "dedent": "^0.7.0",
-    "eslint": "npm:eslint@4.19.1",
+    "eslint": "^5.6.0",
     "eslint-config-babel": "^7.0.1",
-    "eslint-old": "npm:eslint@4.13.1",
     "eslint-plugin-flowtype": "^2.30.3",
-    "eslint-plugin-import": "^2.8.0",
+    "eslint-plugin-import": "^2.14.0",
     "eslint-plugin-prettier": "^2.1.2",
     "espree": "^3.5.2",
-    "husky": "^0.14.0",
-    "lint-staged": "^6.1.1",
+    "husky": "^1.0.0-rc.13",
+    "lint-staged": "^7.2.2",
     "mocha": "^5.0.1",
     "prettier": "^1.4.4"
   },

test/babel-eslint.js

@@ -261,11 +261,11 @@ describe("babylon-to-espree", () => {
   });
 
   it("export named", () => {
-    parseAndAssertSame("export { foo };");
+    parseAndAssertSame("const foo = 1; export { foo };");
   });
 
   it("export named alias", () => {
-    parseAndAssertSame("export { foo as bar };");
+    parseAndAssertSame("const foo = 1; export { foo as bar };");
   });
 
   // Espree doesn't support the optional chaining operator yet
@@ -298,6 +298,16 @@ describe("babylon-to-espree", () => {
     assert.strictEqual(babylonAST.tokens[1].type, "Punctuator");
   });
 
+  // Espree doesn't support Flow enums
+  it("flow enums", () => {
+    const code = "enum E {A, B}";
+    const babylonAST = babelEslint.parseForESLint(code, {
+      eslintVisitorKeys: true,
+      eslintScopeManager: true,
+    }).ast;
+    assert.strictEqual(babylonAST.body[0].type, "EnumDeclaration");
+  });
+
   it.skip("empty program with line comment", () => {
     parseAndAssertSame("// single comment");
   });

test/integration.js

@@ -225,6 +225,7 @@ function strictSuite() {
     // Strip chalk colors, these are not relevant for the test
     const stripAnsi = str =>
       str.replace(
+        // eslint-disable-next-line no-control-regex
         /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g,
         ""
       );

test/non-regression.js

@@ -229,6 +229,24 @@ describe("verify", () => {
       );
     });
 
+    it("enum declaration", () => {
+      verifyAndAssertMessages(
+        `
+          enum E {
+            A,
+            B,
+          }
+          E.A;
+          enum UnusedEnum {
+            A,
+            B,
+          }
+        `,
+        { "no-unused-vars": 1, "no-undef": 1 },
+        ["6:6 'UnusedEnum' is defined but never used. no-unused-vars"]
+      );
+    });
+
     it("type parameter bounds (classes)", () => {
       verifyAndAssertMessages(
         `
@@ -476,7 +494,7 @@ describe("verify", () => {
       );
     });
 
-    it("polymorphpic types #109", () => {
+    it("polymorphic types #109", () => {
       verifyAndAssertMessages(
         "export default function groupByEveryN<T>(array: Array<T>, n: number): Array<Array<?T>> { n; }",
         { "no-unused-vars": 1, "no-undef": 1 }
@@ -494,7 +512,7 @@ describe("verify", () => {
       );
     });
 
-    it("polymorphpic/generic types for class #123", () => {
+    it("polymorphic/generic types for class #123", () => {
       verifyAndAssertMessages(
         `
           class Box<T> {
@@ -507,7 +525,7 @@ describe("verify", () => {
       );
     });
 
-    it("polymorphpic/generic types for function #123", () => {
+    it("polymorphic/generic types for function #123", () => {
       verifyAndAssertMessages(
         `
           export function identity<T>(value) {
@@ -518,7 +536,7 @@ describe("verify", () => {
       );
     });
 
-    it("polymorphpic/generic types for type alias #123", () => {
+    it("polymorphic/generic types for type alias #123", () => {
       verifyAndAssertMessages(
         `
           import Bar from './Bar';
@@ -528,7 +546,7 @@ describe("verify", () => {
       );
     });
 
-    it("polymorphpic/generic types - outside of fn scope #123", () => {
+    it("polymorphic/generic types - outside of fn scope #123", () => {
       verifyAndAssertMessages(
         `
           export function foo<T>(value) { value; };
@@ -542,7 +560,7 @@ describe("verify", () => {
       );
     });
 
-    it("polymorphpic/generic types - extending unknown #123", () => {
+    it("polymorphic/generic types - extending unknown #123", () => {
       verifyAndAssertMessages(
         `
           import Bar from 'bar';
@@ -553,6 +571,28 @@ describe("verify", () => {
       );
     });
 
+    it("polymorphic/generic types - function calls", () => {
+      verifyAndAssertMessages(
+        `
+          function f<T>(): T {}
+          f<T>();
+        `,
+        { "no-unused-vars": 1, "no-undef": 1 },
+        ["2:3 'T' is not defined. no-undef"]
+      );
+    });
+
+    it("polymorphic/generic types - function calls #644", () => {
+      verifyAndAssertMessages(
+        `
+          import type {Type} from 'Type';
+          function f<T>(): T {}
+          f<Type>();
+        `,
+        { "no-unused-vars": 1, "no-undef": 1 }
+      );
+    });
+
     it("support declarations #132", () => {
       verifyAndAssertMessages(
         `
@@ -1124,9 +1164,32 @@ describe("verify", () => {
     );
   });
 
-  describe("decorators #72", () => {
+  describe("decorators #72 (legacy)", () => {
+    function verifyDecoratorsLegacyAndAssertMessages(
+      code,
+      rules,
+      expectedMessages,
+      sourceType
+    ) {
+      const overrideConfig = {
+        parserOptions: {
+          ecmaFeatures: {
+            legacyDecorators: true,
+          },
+          sourceType,
+        },
+      };
+      return verifyAndAssertMessages(
+        code,
+        rules,
+        expectedMessages,
+        sourceType,
+        overrideConfig
+      );
+    }
+
     it("class declaration", () => {
-      verifyAndAssertMessages(
+      verifyDecoratorsLegacyAndAssertMessages(
         `
           import classDeclaration from 'decorator';
           import decoratorParameter from 'decorator';
@@ -1140,7 +1203,7 @@ describe("verify", () => {
     });
 
     it("method definition", () => {
-      verifyAndAssertMessages(
+      verifyDecoratorsLegacyAndAssertMessages(
         `
           import classMethodDeclarationA from 'decorator';
           import decoratorParameter from 'decorator';
@@ -1158,7 +1221,7 @@ describe("verify", () => {
     });
 
     it("method definition get/set", () => {
-      verifyAndAssertMessages(
+      verifyDecoratorsLegacyAndAssertMessages(
         `
           import classMethodDeclarationA from 'decorator';
           import decoratorParameter from 'decorator';
@@ -1178,7 +1241,7 @@ describe("verify", () => {
     });
 
     it("object property", () => {
-      verifyAndAssertMessages(
+      verifyDecoratorsLegacyAndAssertMessages(
         `
           import classMethodDeclarationA from 'decorator';
           import decoratorParameter from 'decorator';
@@ -1197,7 +1260,7 @@ describe("verify", () => {
     });
 
     it("object property get/set", () => {
-      verifyAndAssertMessages(
+      verifyDecoratorsLegacyAndAssertMessages(
         `
           import classMethodDeclarationA from 'decorator';
           import decoratorParameter from 'decorator';
@@ -1218,6 +1281,61 @@ describe("verify", () => {
     });
   });
 
+  describe("decorators #72", () => {
+    it("class declaration", () => {
+      verifyAndAssertMessages(
+        `
+          import classDeclaration from 'decorator';
+          import decoratorParameter from 'decorator';
+          export
+          @classDeclaration((parameter) => parameter)
+          @classDeclaration(decoratorParameter)
+          @classDeclaration
+          class TextareaAutosize {}
+        `,
+        { "no-unused-vars": 1 }
+      );
+    });
+
+    it("method definition", () => {
+      verifyAndAssertMessages(
+        `
+          import classMethodDeclarationA from 'decorator';
+          import decoratorParameter from 'decorator';
+          export class TextareaAutosize {
+          @classMethodDeclarationA((parameter) => parameter)
+          @classMethodDeclarationA(decoratorParameter)
+          @classMethodDeclarationA
+          methodDeclaration(e) {
+          e();
+          }
+          }
+        `,
+        { "no-unused-vars": 1 }
+      );
+    });
+
+    it("method definition get/set", () => {
+      verifyAndAssertMessages(
+        `
+          import classMethodDeclarationA from 'decorator';
+          import decoratorParameter from 'decorator';
+          export class TextareaAutosize {
+          @classMethodDeclarationA((parameter) => parameter)
+          @classMethodDeclarationA(decoratorParameter)
+          @classMethodDeclarationA
+          get bar() { }
+          @classMethodDeclarationA((parameter) => parameter)
+          @classMethodDeclarationA(decoratorParameter)
+          @classMethodDeclarationA
+          set bar(val) { val; }
+          }
+        `,
+        { "no-unused-vars": 1 }
+      );
+    });
+  });
+
   it("detects minimal no-unused-vars case #120", () => {
     verifyAndAssertMessages("var unused;", { "no-unused-vars": 1 }, [
       "1:5 'unused' is defined but never used. no-unused-vars",