feat: support eslint 9

Also increased major version
getify · Dec 22, 2024 · c3ddcd9 · c3ddcd9
1 parent f9036ca
commit c3ddcd9
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 11 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -110,7 +110,8 @@ module.exports = {
 
 						// handle "unused" mode
 						if (!noneUnusedMode) {
-							let scope = context.getScope();
+							let sourceCode = getSourceCode(context);
+							let scope = getScope(context,sourceCode,node);
 							let checkParamNames = checkParamIds.map(function getName(paramId){
 								return paramId.name;
 							});
@@ -301,7 +302,9 @@ module.exports = {
 							return;
 						}
 
-						var globalArrow = currentlyInGlobalScope(context.parserOptions,context.getScope());
+						var sourceCode = getSourceCode(context);
+						var scope = getScope(context,sourceCode,node);
+						var globalArrow = currentlyInGlobalScope(context.parserOptions,scope);
 						var globalArrowDeclaration = (
 							globalArrow &&
 							node.parent.type == "VariableDeclarator"
@@ -414,12 +417,13 @@ module.exports = {
 				var sequenceMode = defaultsOnly || !("sequence" in extraOptions) || extraOptions.sequence === true;
 				var ignoreTrivial = !(extraOptions && extraOptions.trivial === true);
 
-				var sourceCode = context.getSourceCode();
+				var sourceCode = getSourceCode(context);
 				var ternaryBodyStack = new Map();
 
 				return {
 					"ConditionalExpression:exit": function exit(node) {
-						var parentArrow = getParentArrowFunction(context.getAncestors(),/*onlyFromBody=*/true);
+						var ancestors = getAncestors(context,sourceCode,node);
+						var parentArrow = getParentArrowFunction(ancestors,/*onlyFromBody=*/true);
 						if (parentArrow) {
 							if (!ternaryBodyStack.has(parentArrow)) {
 								ternaryBodyStack.set(parentArrow,[]);
@@ -562,7 +566,9 @@ module.exports = {
 
 				return {
 					"ThisExpression": function enter(node) {
-						var parentArrow = getParentArrowFunction(context.getAncestors());
+						var sourceCode = getSourceCode(context);
+						var ancestors = getAncestors(context, sourceCode,node);
+						var parentArrow = getParentArrowFunction(ancestors);
 						thisFoundIn.add(parentArrow);
 					},
 					"ArrowFunctionExpression:exit": function exit(node) {
@@ -571,7 +577,9 @@ module.exports = {
 							return;
 						}
 
-						var globalArrow = currentlyInGlobalScope(context.parserOptions,context.getScope());
+						var sourceCode = getSourceCode(context);
+						var scope = getScope(context, sourceCode, node);
+						var globalArrow = currentlyInGlobalScope(context.parserOptions,scope);
 						var foundThis = thisFoundIn.has(node);
 
 						// `this` found in arrow function?
@@ -605,7 +613,8 @@ module.exports = {
 
 							// need to track nested `this`?
 							if (nestedThis || neverGlobalThis) {
-								let parentArrow = getParentArrowFunction(context.getAncestors());
+								let ancestors = getAncestors(context, sourceCode,node);
+								let parentArrow = getParentArrowFunction(ancestors);
 								if (parentArrow) {
 									thisFoundIn.add(parentArrow);
 								}
@@ -801,3 +810,30 @@ function currentlyInGlobalScope(parserOptions,scope) {
 		)
 	);
 }
+
+var getSourceCode = context => {
+	getSourceCode = (
+		context.sourceCode ?
+			context => context.sourceCode :
+			context => context.getSourceCode()
+	);
+	return getSourceCode(context);
+};
+
+var getScope = (context, sourceCode, node) => {
+	getScope = (
+		sourceCode.getScope ?
+			(context, sourceCode, node) => sourceCode.getScope(node) :
+			(context, sourceCode, node) => context.getScope()
+	);
+	return getScope(context, sourceCode, node);
+};
+
+var getAncestors = (context, sourceCode, node) => {
+	getAncestors = (
+		sourceCode.getAncestors ?
+			(context, sourceCode, node) => sourceCode.getAncestors(node) :
+			(context, sourceCode, node) => context.getAncestors()
+	);
+	return getAncestors(context, sourceCode, node);
+};
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@getify/eslint-plugin-proper-arrows",
-	"version": "11.0.3",
+	"version": "12.0.0",
 	"description": "ESLint rules to ensure proper arrow function definitions",
 	"main": "./lib/index.js",
 	"scripts": {
@@ -18,12 +18,12 @@
 	},
 	"devDependencies": {
 		"coveralls": "~3.1.0",
-		"eslint": "~7.25.0",
+		"eslint": "~9.17.0",
 		"qunit": "~2.15.0",
 		"terser": "~5.7.0"
 	},
 	"peerDependencies": {
-		"eslint": ">= 7.25.0"
+		"eslint": ">= 9.17.0"
 	},
 	"repository": "getify/eslint-plugin-proper-arrows",
 	"keywords": [

diff --git a/scripts/node-tests.js b/scripts/node-tests.js
@@ -5,7 +5,7 @@
 var path = require("path");
 
 var Linter = require("eslint").Linter;
-var eslinter = global.eslinter = new Linter();
+var eslinter = global.eslinter = new Linter({ configType: "eslintrc"});
 var properArrows;
 
 /* istanbul ignore next */