Update rules/tests

babel · Jan 10, 2020 · 2258e2b · 2258e2b
1 parent 374efac
commit 2258e2b
Show file tree

Hide file tree

Showing 18 changed files with 85 additions and 3,854 deletions.
diff --git a/eslint/babel-eslint-parser/package.json b/eslint/babel-eslint-parser/package.json
@@ -29,21 +29,6 @@
   },
   "devDependencies": {
     "@babel/core": "^7.2.0",
-    "@babel/plugin-proposal-class-properties": "^7.1.0",
-    "@babel/plugin-proposal-decorators": "^7.1.2",
-    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.0.0",
-    "@babel/plugin-proposal-optional-chaining": "^7.0.0",
-    "@babel/plugin-proposal-pipeline-operator": "^7.0.0",
-    "@babel/plugin-proposal-private-methods": "^7.7.4",
-    "@babel/plugin-syntax-bigint": "^7.7.4",
-    "@babel/plugin-syntax-dynamic-import": "^7.0.0",
-    "@babel/plugin-syntax-export-default-from": "^7.0.0",
-    "@babel/plugin-syntax-export-namespace-from": "^7.0.0",
-    "@babel/plugin-syntax-import-meta": "^7.0.0",
-    "@babel/plugin-syntax-numeric-separator": "^7.0.0",
-    "@babel/preset-env": "^7.1.5",
-    "@babel/preset-flow": "^7.0.0",
-    "@babel/preset-react": "^7.0.0",
     "dedent": "^0.7.0",
     "eslint": "^6.0.1",
     "espree": "^6.0.0"

diff --git a/eslint/babel-eslint-parser/test/babel-eslint-parser.js b/eslint/babel-eslint-parser/test/babel-eslint-parser.js
@@ -7,7 +7,10 @@ import { parseForESLint } from "../src";
 import assertImplementsAST from "./helpers/assert-implements-ast";
 
 const babelOptions = {
-  configFile: path.resolve(__dirname, "./fixtures/config/babel.config.js"),
+  configFile: path.resolve(
+    __dirname,
+    "../../babel-eslint-shared-fixtures/config/babel.config.js",
+  ),
 };
 
 function parseAndAssertSame(code) {

diff --git a/eslint/babel-eslint-parser/test/non-regression.js b/eslint/babel-eslint-parser/test/non-regression.js
@@ -25,7 +25,7 @@ function verifyAndAssertMessagesWithSpecificESLint(
       babelOptions: {
         configFile: path.resolve(
           __dirname,
-          "./fixtures/config/babel.config.js",
+          "../../babel-eslint-shared-fixtures/config/babel.config.js",
         ),
       },
       ...overrideConfig?.parserOptions,
@@ -1159,7 +1159,7 @@ describe("verify", () => {
           babelOptions: {
             configFile: path.resolve(
               __dirname,
-              "./fixtures/config/babel.config.decorators-legacy.js",
+              "../../babel-eslint-shared-fixtures/config/babel.config.decorators-legacy.js",
             ),
           },
         },

diff --git a/eslint/babel-eslint-plugin/src/rules/camelcase.js b/eslint/babel-eslint-plugin/src/rules/camelcase.js
diff --git a/eslint/babel-eslint-plugin/src/rules/new-cap.js b/eslint/babel-eslint-plugin/src/rules/new-cap.js
@@ -1,7 +1,7 @@
 import ruleComposer from "eslint-rule-composer";
 import eslint from "eslint";
 
-const newCapRule = new eslint.Linter().getRules().get("new-cap");
+const rule = new eslint.Linter().getRules().get("new-cap");
 
 /**
  * Returns whether a node is under a decorator or not.
@@ -13,6 +13,6 @@ function isDecorator(node) {
 }
 
 export default ruleComposer.filterReports(
-  newCapRule,
+  rule,
   problem => !isDecorator(problem.node),
 );
diff --git a/eslint/babel-eslint-plugin/src/rules/no-unused-expressions.js b/eslint/babel-eslint-plugin/src/rules/no-unused-expressions.js
@@ -21,6 +21,7 @@ function isFinalStatementInBlockStatement(node) {
  * @param {ASTNode} node - any node
  * @returns {boolean} whether the given node represents an unbroken chain of
  *   tail ExpressionStatements and IfStatements within a DoExpression
+ * https://github.com/tc39/proposal-do-expressions
  */
 function isInDoStatement(node) {
   if (!node) return false;
@@ -31,7 +32,8 @@ function isInDoStatement(node) {
   if (
     node.type === "IfStatement" &&
     node.parent &&
-    node.parent.type === "IfStatement"
+    node.parent.type === "IfStatement" &&
+    node.parent.alternate === node
   ) {
     return isInDoStatement(node.parent);
   }
@@ -46,7 +48,7 @@ function isInDoStatement(node) {
 /**
  * @param {ASTNode} node - any node
  * @returns {boolean} whether the given node is an optional call expression,
- * see https://github.com/tc39/proposal-optional-chaining
+ * https://github.com/tc39/proposal-optional-chaining
  */
 function isOptionalCallExpression(node) {
   return (

diff --git a/eslint/babel-eslint-plugin/src/rules/object-curly-spacing.js b/eslint/babel-eslint-plugin/src/rules/object-curly-spacing.js
@@ -1,26 +1,20 @@
 import ruleComposer from "eslint-rule-composer";
 import eslint from "eslint";
 
-const objectCurlySpacingRule = new eslint.Linter()
-  .getRules()
-  .get("object-curly-spacing");
+const rule = new eslint.Linter().getRules().get("object-curly-spacing");
 
-export default ruleComposer.filterReports(
-  objectCurlySpacingRule,
-  (problem, metadata) => {
-    const node = problem.node;
+export default ruleComposer.filterReports(rule, problem => {
+  const node = problem.node;
 
-    // Allow `exportNamespaceFrom` and `exportDefaultFrom` syntax:
-    // export * as x from '...';
-    // export x from '...';
-    if (
-      node.type === "ExportNamedDeclaration" &&
-      node.specifiers.length > 0 &&
-      metadata.sourceCode.getTokenBefore(node.specifiers[0]).value === "export"
-    ) {
-      return false;
-    }
+  // Allow exportDefaultFrom syntax:
+  // export x from '...';
+  if (
+    node.type === "ExportNamedDeclaration" &&
+    node.specifiers.length === 1 &&
+    node.specifiers[0].type === "ExportDefaultSpecifier"
+  ) {
+    return false;
+  }
 
-    return true;
-  },
-);
+  return true;
+});