diff --git a/.eslintignore b/.eslintignore index ab69469269..4f63374256 100644 --- a/.eslintignore +++ b/.eslintignore @@ -25,6 +25,7 @@ packages/babel-standalone/babel.js packages/babel-standalone/babel.min.js packages/babel-parser/test/expressions +eslint/*/lib eslint/*/node_modules eslint/*/test eslint/*/tests diff --git a/.eslintrc.js b/.eslintrc.js index df340d2700..b1ca90ef1f 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -12,7 +12,11 @@ module.exports = { }, overrides: [ { - files: ["packages/*/src/**/*.js", "codemods/*/src/**/*.js"], + files: [ + "packages/*/src/**/*.js", + "codemods/*/src/**/*.js", + "eslint/*/src/**/*.js", + ], rules: { "@babel/development/no-undefined-identifier": "error", "@babel/development/no-deprecated-clone": "error", @@ -24,6 +28,7 @@ module.exports = { files: [ "packages/*/test/**/*.js", "codemods/*/test/**/*.js", + "eslint/*/test/**/*.js", "packages/babel-helper-transform-fixture-test-runner/src/helpers.js", "test/**/*.js", ], diff --git a/.prettierrc b/.prettierrc index 5c53b22f8a..bfe4721c34 100644 --- a/.prettierrc +++ b/.prettierrc @@ -13,10 +13,12 @@ "**/codemods/*/src/**/*.js", "**/codemods/*/test/**/*.js", "**/packages/*/src/**/*.js", - "**/packages/*/test/**/*.js" + "**/packages/*/test/**/*.js", + "**/eslint/*/src/**/*.js", + "**/eslint/*/test/**/*.js" ], - "parser": "babylon", "options": { + "parser": "babel", "trailingComma": "all" } }] diff --git a/eslint/babel-eslint-parser/.eslintignore b/eslint/babel-eslint-parser/.eslintignore deleted file mode 100644 index b18b9022cf..0000000000 --- a/eslint/babel-eslint-parser/.eslintignore +++ /dev/null @@ -1,2 +0,0 @@ -!.*.js -test/fixtures diff --git a/eslint/babel-eslint-parser/.eslintrc.js b/eslint/babel-eslint-parser/.eslintrc.js deleted file mode 100644 index a8781be629..0000000000 --- a/eslint/babel-eslint-parser/.eslintrc.js +++ /dev/null @@ -1,26 +0,0 @@ -"use strict"; - -module.exports = { - root: true, - extends: "babel", - plugins: ["prettier"], - rules: { - "max-len": "off", - strict: "error", - "prettier/prettier": "error", - }, - env: { - node: true, - }, - parserOptions: { - sourceType: "script", - }, - overrides: [ - { - files: ["test/**/*"], - env: { - mocha: true, - }, - }, - ], -}; diff --git a/eslint/babel-eslint-parser/src/analyze-scope.js b/eslint/babel-eslint-parser/src/analyze-scope.js index 38561521d3..a388a45366 100644 --- a/eslint/babel-eslint-parser/src/analyze-scope.js +++ b/eslint/babel-eslint-parser/src/analyze-scope.js @@ -94,7 +94,7 @@ class Referencer extends OriginalReferencer { // Flow super types. this._visitTypeAnnotation(node.implements); this._visitTypeAnnotation( - node.superTypeParameters && node.superTypeParameters.params + node.superTypeParameters && node.superTypeParameters.params, ); // Basic. @@ -205,7 +205,7 @@ class Referencer extends OriginalReferencer { _createScopeVariable(node, name) { this.currentScope().variableScope.__define( name, - new Definition("Variable", name, node, null, null, null) + new Definition("Variable", name, node, null, null, null), ); } @@ -220,7 +220,7 @@ class Referencer extends OriginalReferencer { "type-parameters", parentScope, node, - false + false, ); this.scopeManager.__nestScope(scope); diff --git a/eslint/babel-eslint-parser/src/index.js b/eslint/babel-eslint-parser/src/index.js index 2769d4a0c0..c5c597017e 100644 --- a/eslint/babel-eslint-parser/src/index.js +++ b/eslint/babel-eslint-parser/src/index.js @@ -9,7 +9,7 @@ const SUPPORTED_BABEL_VERSION_RANGE = packageJson.peerDependencies["@babel/core"]; const IS_RUNNING_SUPPORTED_VERSION = semver.satisfies( CURRENT_BABEL_VERSION, - SUPPORTED_BABEL_VERSION_RANGE + SUPPORTED_BABEL_VERSION_RANGE, ); exports.parse = function(code, options) { @@ -19,7 +19,7 @@ exports.parse = function(code, options) { exports.parseForESLint = function(code, options = {}) { if (!IS_RUNNING_SUPPORTED_VERSION) { throw new Error( - `babel-eslint@${packageJson.version} does not support @babel/core@${CURRENT_BABEL_VERSION}. Please downgrade to babel-eslint@^10 or upgrade to @babel/core@${SUPPORTED_BABEL_VERSION_RANGE}` + `babel-eslint@${packageJson.version} does not support @babel/core@${CURRENT_BABEL_VERSION}. Please downgrade to babel-eslint@^10 or upgrade to @babel/core@${SUPPORTED_BABEL_VERSION_RANGE}`, ); } diff --git a/eslint/babel-eslint-parser/src/parse.js b/eslint/babel-eslint-parser/src/parse.js index 3930bb0405..5ae4db7e30 100644 --- a/eslint/babel-eslint-parser/src/parse.js +++ b/eslint/babel-eslint-parser/src/parse.js @@ -46,7 +46,7 @@ module.exports = function(code, options) { if (config !== null) { if (!config.hasFilesystemConfig()) { throw new Error( - `No Babel config file detected for ${config.options.filename}. Either disable config file checking with requireConfigFile: false, or configure Babel so that it can find the config files.` + `No Babel config file detected for ${config.options.filename}. Either disable config file checking with requireConfigFile: false, or configure Babel so that it can find the config files.`, ); } diff --git a/eslint/babel-eslint-parser/src/visitor-keys.js b/eslint/babel-eslint-parser/src/visitor-keys.js index 2ac01887f1..236cf0a782 100644 --- a/eslint/babel-eslint-parser/src/visitor-keys.js +++ b/eslint/babel-eslint-parser/src/visitor-keys.js @@ -7,9 +7,9 @@ module.exports = Object.assign( { Literal: ESLINT_VISITOR_KEYS.Literal, MethodDefinition: ["decorators"].concat( - ESLINT_VISITOR_KEYS.MethodDefinition + ESLINT_VISITOR_KEYS.MethodDefinition, ), Property: ["decorators"].concat(ESLINT_VISITOR_KEYS.Property), }, - BABEL_VISITOR_KEYS + BABEL_VISITOR_KEYS, ); diff --git a/eslint/babel-eslint-plugin-development/src/rules/no-undefined-identifier.js b/eslint/babel-eslint-plugin-development/src/rules/no-undefined-identifier.js index 7a433b160c..c1b4b8a993 100644 --- a/eslint/babel-eslint-plugin-development/src/rules/no-undefined-identifier.js +++ b/eslint/babel-eslint-plugin-development/src/rules/no-undefined-identifier.js @@ -32,7 +32,7 @@ module.exports = { ) { context.report( node, - "Use path.scope.buildUndefinedNode() to create an undefined identifier directly." + "Use path.scope.buildUndefinedNode() to create an undefined identifier directly.", ); } }, diff --git a/eslint/babel-eslint-plugin-development/src/rules/plugin-name.js b/eslint/babel-eslint-plugin-development/src/rules/plugin-name.js index 11dd02808a..58a4bc9f63 100644 --- a/eslint/babel-eslint-plugin-development/src/rules/plugin-name.js +++ b/eslint/babel-eslint-plugin-development/src/rules/plugin-name.js @@ -44,7 +44,7 @@ module.exports = { if (!returnValue.properties.some(p => p.key.name === "name")) { context.report( returnValue, - "This Babel plugin doesn't have a 'name' property." + "This Babel plugin doesn't have a 'name' property.", ); } } diff --git a/eslint/babel-eslint-plugin-development/src/utils/is-from-babel-types.js b/eslint/babel-eslint-plugin-development/src/utils/is-from-babel-types.js index 3045616217..36ab618817 100644 --- a/eslint/babel-eslint-plugin-development/src/utils/is-from-babel-types.js +++ b/eslint/babel-eslint-plugin-development/src/utils/is-from-babel-types.js @@ -6,7 +6,7 @@ const isBabelPluginFactory = require("./is-babel-plugin-factory"); // is a reference to a @babel/types export. module.exports = function isFromBabelTypes( origin /*: ReferenceOrigin */, - scope /*: Scope */ + scope /*: Scope */, ) { if (origin.kind === "import" && origin.source === "@babel/types") { // imported from @babel/types