Use @babel/core#parse

.npmrc

@@ -0,0 +1 @@
+package-lock = false

README.md

@@ -81,8 +81,6 @@ Check out the [ESLint docs](http://eslint.org/docs/rules/) for all possible rule
 
 `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.
-
 **.eslintrc**
 
 ```json
@@ -91,7 +89,6 @@ Check out the [ESLint docs](http://eslint.org/docs/rules/) for all possible rule
   "parserOptions": {
     "sourceType": "module",
     "allowImportExportEverywhere": false,
-    "codeFrame": false
   }
 }
 ```

lib/analyze-scope.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const t = require("@babel/types");
+const t = require("@babel/core").types;
 const escope = require("eslint-scope");
 const Definition = require("eslint-scope/lib/definition").Definition;
 const OriginalPatternVisitor = require("eslint-scope/lib/pattern-visitor");

lib/babylon-to-espree/toAST.js → lib/babel-to-estree/toAST.js

@@ -1,6 +1,6 @@
 "use strict";
 
-var t = require("@babel/types");
+var t = require("@babel/core").types;
 var convertComments = require("./convertComments");
 
 module.exports = function(ast, traverse, code) {

lib/index.js

@@ -6,7 +6,7 @@ exports.parse = function(code, options) {
 
 exports.parseForESLint = function(code, options) {
   options = options || {};
-  options.ecmaVersion = options.ecmaVersion || 2018;
+  options.ecmaVersion = options.ecmaVersion || 2019;
   options.sourceType = options.sourceType || "module";
   options.allowImportExportEverywhere =
     options.allowImportExportEverywhere || false;

lib/parse.js

@@ -1,87 +1,42 @@
 "use strict";
 
-var babylonToEspree = require("./babylon-to-espree");
-var parse = require("babylon").parse;
-var tt = require("babylon").tokTypes;
+var babel = require("@babel/core");
+var tt = require("@babel/parser").tokTypes;
 var traverse = require("@babel/traverse").default;
-var codeFrameColumns = require("@babel/code-frame").codeFrameColumns;
+var babelToEstree = require("./babel-to-estree");
+
+var ESLINT_DEFAULT_FILEPATH = "<text>";
 
 module.exports = function(code, options) {
   var opts = {
-    codeFrame: options.hasOwnProperty("codeFrame") ? options.codeFrame : true,
-    sourceType: options.sourceType,
-    allowImportExportEverywhere: options.allowImportExportEverywhere, // consistent with espree
-    allowReturnOutsideFunction: true,
-    allowSuperOutsideMethod: true,
-    ranges: true,
-    tokens: true,
-    plugins: [
-      "flow",
-      "jsx",
-      "estree",
-      "asyncFunctions",
-      "asyncGenerators",
-      "classConstructorCall",
-      "classProperties",
-      "decorators",
-      "doExpressions",
-      "exponentiationOperator",
-      "exportDefaultFrom",
-      "exportNamespaceFrom",
-      "functionBind",
-      "functionSent",
-      "objectRestSpread",
-      "trailingFunctionCommas",
-      "dynamicImport",
-      "numericSeparator",
-      "optionalChaining",
-      "importMeta",
-      "classPrivateProperties",
-      "bigInt",
-      "optionalCatchBinding",
-      "throwExpressions",
-      "pipelineOperator",
-      "nullishCoalescingOperator",
-    ],
+    filename:
+      options.filePath && options.filePath !== ESLINT_DEFAULT_FILEPATH
+        ? options.filePath
+        : undefined,
+    parserOpts: {
+      sourceType: options.sourceType,
+      allowImportExportEverywhere: options.allowImportExportEverywhere, // consistent with Espree
+      allowReturnOutsideFunction: true,
+      allowSuperOutsideMethod: true,
+      ranges: true,
+      tokens: true,
+    },
   };
 
   var ast;
+
   try {
-    ast = parse(code, opts);
+    ast = babel.parse(code, opts);
   } catch (err) {
-    if (err instanceof SyntaxError) {
+    if (err instanceof SyntaxError && err.loc) {
       err.lineNumber = err.loc.line;
       err.column = err.loc.column;
-
-      if (opts.codeFrame) {
-        err.lineNumber = err.loc.line;
-        err.column = err.loc.column + 1;
-
-        // remove trailing "(LINE:COLUMN)" acorn message and add in esprima syntax error message start
-        err.message =
-          "Line " +
-          err.lineNumber +
-          ": " +
-          err.message.replace(/ \((\d+):(\d+)\)$/, "") +
-          // add codeframe
-          "\n\n" +
-          codeFrameColumns(
-            code,
-            {
-              start: {
-                line: err.lineNumber,
-                column: err.column,
-              },
-            },
-            { highlightCode: true }
-          );
-      }
     }
 
     throw err;
   }
 
-  babylonToEspree(ast, traverse, tt, code);
+  babelToEstree(ast, traverse, tt, code);
 
   return ast;
 };

lib/patch-eslint-scope.js

@@ -2,7 +2,7 @@
 
 var Module = require("module");
 var path = require("path");
-var t = require("@babel/types");
+var t = require("@babel/core").types;
 
 function getModules() {
   try {

lib/visitor-keys.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const BABEL_VISITOR_KEYS = require("@babel/types").VISITOR_KEYS;
+const BABEL_VISITOR_KEYS = require("@babel/core").types.VISITOR_KEYS;
 const ESLINT_VISITOR_KEYS = require("eslint-visitor-keys").KEYS;
 
 module.exports = Object.assign(

package.json

@@ -10,19 +10,11 @@
     "type": "git",
     "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"
-  },
   "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",
+    "lint": "eslint index.js babel-to-estree test",
+    "fix": "npm run lint -- --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'"
@@ -36,8 +28,17 @@
     "url": "https://github.com/babel/babel-eslint/issues"
   },
   "homepage": "https://github.com/babel/babel-eslint",
+  "peerDependencies": {
+    "@babel/core": ">=7.0.0-beta.51",
+    "eslint": ">=4.14.0"
+  },
+  "dependencies": {
+    "@babel/core": ">=7.0.0-beta.51",
+    "eslint-scope": "~3.7.1",
+    "eslint-visitor-keys": "^1.0.0"
+  },
   "devDependencies": {
-    "babel-eslint": "^8.0.0",
+    "babel-eslint": "^8.2.3",
     "dedent": "^0.7.0",
     "eslint": "npm:[email protected]",
     "eslint-config-babel": "^7.0.1",

test/babel-eslint.js

@@ -40,12 +40,12 @@ function parseAndAssertSame(code) {
     ecmaVersion: 2018,
     sourceType: "module",
   });
-  var babylonAST = babelEslint.parseForESLint(code, {
+  var babelAST = babelEslint.parseForESLint(code, {
     eslintVisitorKeys: true,
     eslintScopeManager: true,
   }).ast;
   try {
-    assertImplementsAST(esAST, babylonAST);
+    assertImplementsAST(esAST, babelAST);
   } catch (err) {
     var traversal = err.message.slice(3, err.message.indexOf(":"));
     err.message += unpad(`
@@ -55,17 +55,17 @@ function parseAndAssertSame(code) {
         colors: true,
       })}
       babel-eslint:
-      ${util.inspect(lookup(babylonAST, traversal, 2), {
+      ${util.inspect(lookup(babelAST, traversal, 2), {
         depth: err.depth,
         colors: true,
       })}
     `);
     throw err;
   }
-  // assert.equal(esAST, babylonAST);
+  // assert.equal(esAST, babAST);
 }
 
-describe("babylon-to-espree", () => {
+describe("babel-to-estree", () => {
   describe("compatibility", () => {
     it("should allow ast.analyze to be called without options", function() {
       var esAST = babelEslint.parseForESLint("`test`", {
@@ -259,31 +259,31 @@ describe("babylon-to-espree", () => {
   // Espree doesn't support the optional chaining operator yet
   it("optional chaining operator (token)", () => {
     const code = "foo?.bar";
-    var babylonAST = babelEslint.parseForESLint(code, {
+    var babelAST = babelEslint.parseForESLint(code, {
       eslintVisitorKeys: true,
       eslintScopeManager: true,
     }).ast;
-    assert.strictEqual(babylonAST.tokens[1].type, "Punctuator");
+    assert.strictEqual(babelAST.tokens[1].type, "Punctuator");
   });
 
   // Espree doesn't support the nullish coalescing operator yet
   it("nullish coalescing operator (token)", () => {
     const code = "foo ?? bar";
-    var babylonAST = babelEslint.parseForESLint(code, {
+    var babelAST = babelEslint.parseForESLint(code, {
       eslintVisitorKeys: true,
       eslintScopeManager: true,
     }).ast;
-    assert.strictEqual(babylonAST.tokens[1].type, "Punctuator");
+    assert.strictEqual(babelAST.tokens[1].type, "Punctuator");
   });
 
   // Espree doesn't support the pipeline operator yet
   it("pipeline operator (token)", () => {
     const code = "foo |> bar";
-    var babylonAST = babelEslint.parseForESLint(code, {
+    var babelAST = babelEslint.parseForESLint(code, {
       eslintVisitorKeys: true,
       eslintScopeManager: true,
     }).ast;
-    assert.strictEqual(babylonAST.tokens[1].type, "Punctuator");
+    assert.strictEqual(babelAST.tokens[1].type, "Punctuator");
   });
 
   it.skip("empty program with line comment", () => {