Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ jobs:
- run: npm ci
- run: npm run test:unit

- name: Test with ESLint v10
if: matrix.node-version == '20.x'
run: npm install --save-dev eslint@10 && npm run test:unit

- name: Coveralls
uses: coverallsapp/github-action@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion lib/rules/no-arrow-tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ module.exports = {
* @returns {boolean}
*/
function isPropertyInModule(propertyNode) {
return (
return !!(
propertyNode &&
propertyNode.parent &&
propertyNode.parent.type === "ObjectExpression" &&
Expand Down
5 changes: 3 additions & 2 deletions lib/rules/no-assert-equal.js
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ module.exports = {
* @returns {boolean}
*/
function isModuleHookCallback(propertyNode) {
return (
return !!(
propertyNode.parent &&
propertyNode.parent.type === "Property" &&
utils.isModuleHookPropertyKey(propertyNode.parent.key) &&
Expand Down Expand Up @@ -240,7 +240,8 @@ module.exports = {
/* istanbul ignore next: deprecated code paths only followed by old eslint versions */
const scope = sourceCode.getScope
? sourceCode.getScope(node)
: context.getScope();
: // @ts-expect-error -- removed in ESLint 10, but needed for ESLint 8 compat
context.getScope();

const tracker = new ReferenceTracker(scope);
const traceMap = { equal: { [ReferenceTracker.CALL]: true } };
Expand Down
3 changes: 2 additions & 1 deletion lib/rules/no-conditional-assertions.js
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ module.exports = {
* @param {import('eslint').Rule.Node} assertNode
*/
function checkAndReport(assertNode) {
/** @type {import('eslint').Rule.Node | null} */
let currentNode = assertNode;

while (
Expand All @@ -86,7 +87,7 @@ module.exports = {
currentNode = currentNode.parent;
}

if (CONDITIONAL_NODE_TYPES.has(currentNode.type)) {
if (currentNode && CONDITIONAL_NODE_TYPES.has(currentNode.type)) {
context.report({
node: assertNode,
messageId: "noAssertionInsideConditional",
Expand Down
3 changes: 2 additions & 1 deletion lib/rules/no-global-assertions.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ module.exports = {
/* istanbul ignore next: deprecated code paths only followed by old eslint versions */
const scope = sourceCode.getScope
? sourceCode.getScope(node)
: context.getScope();
: // @ts-expect-error -- removed in ESLint 10, but needed for ESLint 8 compat
context.getScope();

const tracker = new ReferenceTracker(scope);
/** @type {Record<string, { [ReferenceTracker.CALL]: boolean }>} */
Expand Down
3 changes: 2 additions & 1 deletion lib/rules/no-global-expect.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ module.exports = {
/* istanbul ignore next: deprecated code paths only followed by old eslint versions */
const scope = sourceCode.getScope
? sourceCode.getScope(node)
: context.getScope();
: // @ts-expect-error -- removed in ESLint 10, but needed for ESLint 8 compat
context.getScope();

const tracker = new ReferenceTracker(scope);
const traceMap = { expect: { [ReferenceTracker.CALL]: true } };
Expand Down
3 changes: 2 additions & 1 deletion lib/rules/no-global-module-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ module.exports = {
/* istanbul ignore next: deprecated code paths only followed by old eslint versions */
const scope = sourceCode.getScope
? sourceCode.getScope(node)
: context.getScope();
: // @ts-expect-error -- removed in ESLint 10, but needed for ESLint 8 compat
context.getScope();

const tracker = new ReferenceTracker(scope);
const traceMap = {
Expand Down
3 changes: 2 additions & 1 deletion lib/rules/no-global-stop-start.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ module.exports = {
/* istanbul ignore next: deprecated code paths only followed by old eslint versions */
const scope = sourceCode.getScope
? sourceCode.getScope(node)
: context.getScope();
: // @ts-expect-error -- removed in ESLint 10, but needed for ESLint 8 compat
context.getScope();

const tracker = new ReferenceTracker(scope);
const traceMap = {
Expand Down
2 changes: 1 addition & 1 deletion lib/rules/no-hooks-from-ancestor-modules.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ module.exports = {
* @returns {boolean}
*/
function isInModuleCallbackBody(callExpressionNode) {
return (
return !!(
callExpressionNode &&
callExpressionNode.parent &&
callExpressionNode.parent.type === "ExpressionStatement" &&
Expand Down
2 changes: 1 addition & 1 deletion lib/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ exports.isModule = function (calleeNode) {
* @returns {boolean}
*/
exports.isInModule = function (propertyNode) {
return (
return !!(
propertyNode &&
propertyNode.parent && // ObjectExpression
propertyNode.parent.parent && // CallExpression?
Expand Down
Loading