Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
liuxingbaoyu committed Apr 6, 2024
1 parent 8b94a27 commit c8139eb
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 15 deletions.
9 changes: 6 additions & 3 deletions eslint/babel-eslint-plugin/src/rules/new-cap.cjs
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
const ruleComposer = require("eslint-rule-composer");
const eslint = require("eslint");
const eslintVersion = eslint.ESLint.version;

const rule = new eslint.Linter({ configType: "eslintrc" })
.getRules()
.get("new-cap");
const rule = (
parseInt(eslintVersion, 10) >= 9
? require("eslint/use-at-your-own-risk").builtinRules
: new eslint.Linter().getRules()
).get("new-cap");

/**
* Returns whether a node is under a decorator or not.
Expand Down
8 changes: 5 additions & 3 deletions eslint/babel-eslint-plugin/src/rules/no-invalid-this.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@ const ruleComposer = require("eslint-rule-composer");
const eslint = require("eslint");
const eslintVersion = eslint.ESLint.version;

const noInvalidThisRule = new eslint.Linter({ configType: "eslintrc" })
.getRules()
.get("no-invalid-this");
const noInvalidThisRule = (
parseInt(eslintVersion, 10) >= 9
? require("eslint/use-at-your-own-risk").builtinRules
: new eslint.Linter().getRules()
).get("no-invalid-this");

if (parseInt(eslintVersion, 10) >= 8) {
// ESLint 8 supports class properties / private methods natively
Expand Down
9 changes: 6 additions & 3 deletions eslint/babel-eslint-plugin/src/rules/no-undef.cjs
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
const ruleComposer = require("eslint-rule-composer");
const eslint = require("eslint");
const eslintVersion = eslint.ESLint.version;

const rule = new eslint.Linter({ configType: "eslintrc" })
.getRules()
.get("no-undef");
const rule = (
parseInt(eslintVersion, 10) >= 9
? require("eslint/use-at-your-own-risk").builtinRules
: new eslint.Linter().getRules()
).get("no-undef");

/**
* Returns whether a node is under a decorator or not.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
const ruleComposer = require("eslint-rule-composer");
const eslint = require("eslint");
const eslintVersion = eslint.ESLint.version;

const rule = new eslint.Linter({ configType: "eslintrc" })
.getRules()
.get("no-unused-expressions");
const rule = (
parseInt(eslintVersion, 10) >= 9
? require("eslint/use-at-your-own-risk").builtinRules
: new eslint.Linter().getRules()
).get("no-unused-expressions");

/**
* @param {ASTNode} node - any node
Expand Down
9 changes: 6 additions & 3 deletions eslint/babel-eslint-plugin/src/rules/object-curly-spacing.cjs
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
const ruleComposer = require("eslint-rule-composer");
const eslint = require("eslint");
const eslintVersion = eslint.ESLint.version;

const rule = new eslint.Linter({ configType: "eslintrc" })
.getRules()
.get("object-curly-spacing");
const rule = (
parseInt(eslintVersion, 10) >= 9
? require("eslint/use-at-your-own-risk").builtinRules
: new eslint.Linter().getRules()
).get("object-curly-spacing");

module.exports = ruleComposer.filterReports(rule, problem => {
const node = problem.node;
Expand Down
1 change: 1 addition & 0 deletions jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ module.exports = {
...(process.version === "v20.6.0"
? ["/babel-preset-env/test/regressions.js"]
: []),
...(semver.satisfies("^18.18.0 || >=20.0") ? ["<rootDir>/eslint/"] : []),
],
testEnvironment: "node",
transformIgnorePatterns: [
Expand Down

0 comments on commit c8139eb

Please sign in to comment.