Drop support for legacy node type ClassProperty (#1566)

sindresorhus · Nov 1, 2021 · d4ce499 · d4ce499
1 parent 3ef389d
commit d4ce499
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 32 deletions.
diff --git a/package.json b/package.json
@@ -57,7 +57,7 @@
 	"devDependencies": {
 		"@babel/code-frame": "^7.14.5",
 		"@babel/core": "^7.15.5",
-		"@babel/eslint-parser": "^7.15.8",
+		"@babel/eslint-parser": "^7.16.0",
 		"@lubien/fixture-beta-package": "^1.0.0-beta.1",
 		"@typescript-eslint/parser": "^5.2.0",
 		"ava": "^3.15.0",

diff --git a/rules/custom-error-definition.js b/rules/custom-error-definition.js
@@ -53,22 +53,11 @@ const isAssignmentExpression = (node, name) => {
 	return lhs.property.name === name;
 };
 
-const isPropertyDefinition = (node, name) => {
-	const {type, computed, key} = node;
-	if (type !== 'PropertyDefinition' && type !== 'ClassProperty') {
-		return false;
-	}
-
-	if (computed) {
-		return false;
-	}
-
-	if (key.type !== 'Identifier') {
-		return false;
-	}
-
-	return key.name === name;
-};
+const isPropertyDefinition = (node, name) =>
+	node.type === 'PropertyDefinition'
+	&& !node.computed
+	&& node.key.type === 'Identifier'
+	&& node.key.name === name;
 
 function * customErrorDefinition(context, node) {
 	if (!hasValidSuperClass(node)) {

diff --git a/rules/no-static-only-class.js b/rules/no-static-only-class.js
@@ -22,10 +22,7 @@ const isDeclarationOfExportDefaultDeclaration = node =>
 	&& node.parent.type === 'ExportDefaultDeclaration'
 	&& node.parent.declaration === node;
 
-// https://github.com/estree/estree/blob/master/stage3/class-features.md#propertydefinition
-const isPropertyDefinition = node => node.type === 'PropertyDefinition'
-	// Legacy node type
-	|| node.type === 'ClassProperty';
+const isPropertyDefinition = node => node.type === 'PropertyDefinition';
 const isMethodDefinition = node => node.type === 'MethodDefinition';
 
 function isStaticMember(node) {

diff --git a/rules/prevent-abbreviations.js b/rules/prevent-abbreviations.js
@@ -292,15 +292,10 @@ const shouldReportIdentifierAsProperty = identifier => {
 	}
 
 	if (
-		identifier.parent.type === 'MethodDefinition'
-		&& identifier.parent.key === identifier
-		&& !identifier.parent.computed
-	) {
-		return true;
-	}
-
-	if (
-		(identifier.parent.type === 'ClassProperty' || identifier.parent.type === 'PropertyDefinition')
+		(
+			identifier.parent.type === 'MethodDefinition'
+			|| identifier.parent.type === 'PropertyDefinition'
+		)
 		&& identifier.parent.key === identifier
 		&& !identifier.parent.computed
 	) {

diff --git a/rules/selectors/reference-identifier-selector.js b/rules/selectors/reference-identifier-selector.js
@@ -13,8 +13,6 @@ const nonReferenceSelectors = [
 	'ClassDeclaration > .id',
 	// `const foo = class Identifier() {}`
 	'ClassExpression > .id',
-	// TODO: remove `ClassProperty` when `babel` and `typescript` support `PropertyDefinition`
-	'ClassProperty[computed!=true] > .key',
 	// `class Foo {Identifier = 1}`
 	'PropertyDefinition[computed!=true] > .key',
 	// `class Foo {Identifier() {}}`