Use @babel/core#parse

babel · Nov 7, 2018 · 820c3aa · 820c3aa
1 parent ef1fc0e
commit 820c3aa
Show file tree

Hide file tree

Showing 8 changed files with 98 additions and 128 deletions.
diff --git a/README.md b/README.md
@@ -81,7 +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` (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 +90,6 @@ Check out the [ESLint docs](http://eslint.org/docs/rules/) for all possible rule
   "parserOptions": {
     "sourceType": "module",
     "allowImportExportEverywhere": false,
-    "codeFrame": true
   }
 }
 ```

diff --git a/lib/analyze-scope.js b/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");

diff --git a/lib/babylon-to-espree/toAST.js b/lib/babylon-to-espree/toAST.js
@@ -1,6 +1,6 @@
 "use strict";
 
-const t = require("@babel/types");
+const t = require("@babel/core").types;
 const convertComments = require("./convertComments");
 
 module.exports = function(ast, traverse, code) {

diff --git a/lib/parse.js b/lib/parse.js
@@ -2,16 +2,14 @@
 
 const babylonToEspree = require("./babylon-to-espree");
 const parse = require("@babel/parser").parse;
+const traverse = require("@babel/core").traverse;
 const tt = require("@babel/parser").tokTypes;
-const traverse = require("@babel/traverse").default;
-const codeFrameColumns = require("@babel/code-frame").codeFrameColumns;
 
 module.exports = function(code, options) {
   const legacyDecorators =
     options.ecmaFeatures && options.ecmaFeatures.legacyDecorators;
 
   const opts = {
-    codeFrame: options.hasOwnProperty("codeFrame") ? options.codeFrame : true,
     sourceType: options.sourceType,
     allowImportExportEverywhere: options.allowImportExportEverywhere, // consistent with espree
     allowReturnOutsideFunction: true,
@@ -58,30 +56,6 @@ module.exports = function(code, options) {
     if (err instanceof SyntaxError) {
       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;

diff --git a/lib/visitor-keys.js b/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(

diff --git a/package.json b/package.json
@@ -11,10 +11,8 @@
     "url": "https://github.com/babel/babel-eslint.git"
   },
   "dependencies": {
-    "@babel/code-frame": "^7.0.0",
-    "@babel/parser": "^7.0.0",
-    "@babel/traverse": "^7.0.0",
-    "@babel/types": "^7.0.0",
+    "@babel/core": "^7.1.5",
+    "@babel/parser": "^7.1.5",
     "eslint-scope": "3.7.1",
     "eslint-visitor-keys": "^1.0.0"
   },

diff --git a/test/integration.js b/test/integration.js
@@ -222,64 +222,4 @@ function strictSuite() {
     });
     // it
   });
-  // describe
-  describe('When "codeFrame"', () => {
-    // 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,
-        ""
-      );
-
-    it("should display codeFrame when option is absent", done => {
-      lint(
-        {
-          fixture: ["syntax-error"],
-          eslint: baseEslintOpts,
-        },
-        (err, report) => {
-          if (err) return done(err);
-          assert(stripAnsi(report[0].message).indexOf("^\n  5 |") > -1);
-          done();
-        }
-      );
-    });
-
-    it("should display codeFrame when option is true", done => {
-      lint(
-        {
-          fixture: ["syntax-error"],
-          eslint: Object.assign({}, baseEslintOpts, {
-            parserOptions: {
-              codeFrame: true,
-            },
-          }),
-        },
-        (err, report) => {
-          if (err) return done(err);
-          assert(stripAnsi(report[0].message).indexOf("^\n  5 |") > -1);
-          done();
-        }
-      );
-    });
-
-    it("should not display codeFrame when option is false", done => {
-      lint(
-        {
-          fixture: ["syntax-error"],
-          eslint: Object.assign({}, baseEslintOpts, {
-            parserOptions: {
-              codeFrame: false,
-            },
-          }),
-        },
-        (err, report) => {
-          if (err) return done(err);
-          assert(stripAnsi(report[0].message).indexOf("^\n  5 |") === -1);
-          done();
-        }
-      );
-    });
-  });
 }