Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: use @eslint-community dependencies #16784

Merged
merged 1 commit into from Mar 3, 2023
Merged

feat: use @eslint-community dependencies #16784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/rules/no-control-regex.js
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@

"use strict";

const RegExpValidator = require("regexpp").RegExpValidator;
const RegExpValidator = require("@eslint-community/regexpp").RegExpValidator;
const collector = new (class {
constructor() {
this._source = "";
Expand Down
2 changes: 1 addition & 1 deletion lib/rules/no-extra-boolean-cast.js
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@
//------------------------------------------------------------------------------

const astUtils = require("./utils/ast-utils");
const eslintUtils = require("eslint-utils");
const eslintUtils = require("@eslint-community/eslint-utils");

const precedence = astUtils.getPrecedence;

Expand Down
2 changes: 1 addition & 1 deletion lib/rules/no-extra-parens.js
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@
// Rule Definition
//------------------------------------------------------------------------------

const { isParenthesized: isParenthesizedRaw } = require("eslint-utils");
const { isParenthesized: isParenthesizedRaw } = require("@eslint-community/eslint-utils");
const astUtils = require("./utils/ast-utils.js");

/** @type {import('../shared/types').Rule} */
Expand Down
2 changes: 1 addition & 1 deletion lib/rules/no-implied-eval.js
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@
//------------------------------------------------------------------------------

const astUtils = require("./utils/ast-utils");
const { getStaticValue } = require("eslint-utils");
const { getStaticValue } = require("@eslint-community/eslint-utils");

//------------------------------------------------------------------------------
// Rule Definition
Expand Down
2 changes: 1 addition & 1 deletion lib/rules/no-import-assign.js
View file
Open in desktop
Expand Up @@ -9,7 +9,7 @@
// Helpers
//------------------------------------------------------------------------------

const { findVariable } = require("eslint-utils");
const { findVariable } = require("@eslint-community/eslint-utils");
const astUtils = require("./utils/ast-utils");

const WellKnownMutationFunctions = {
Expand Down
2 changes: 1 addition & 1 deletion lib/rules/no-invalid-regexp.js
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@
// Requirements
//------------------------------------------------------------------------------

const RegExpValidator = require("regexpp").RegExpValidator;
const RegExpValidator = require("@eslint-community/regexpp").RegExpValidator;
const validator = new RegExpValidator();
const validFlags = /[dgimsuy]/gu;
const undefined1 = void 0;
Expand Down
4 changes: 2 additions & 2 deletions lib/rules/no-misleading-character-class.js
View file
Open in desktop
Expand Up @@ -3,8 +3,8 @@
*/
"use strict";

const { CALL, CONSTRUCT, ReferenceTracker, getStringIfConstant } = require("eslint-utils");
const { RegExpValidator, RegExpParser, visitRegExpAST } = require("regexpp");
const { CALL, CONSTRUCT, ReferenceTracker, getStringIfConstant } = require("@eslint-community/eslint-utils");
const { RegExpValidator, RegExpParser, visitRegExpAST } = require("@eslint-community/regexpp");
const { isCombiningCharacter, isEmojiModifier, isRegionalIndicatorSymbol, isSurrogatePair } = require("./utils/unicode");
const astUtils = require("./utils/ast-utils.js");

Expand Down
2 changes: 1 addition & 1 deletion lib/rules/no-obj-calls.js
View file
Open in desktop
Expand Up @@ -9,7 +9,7 @@
// Requirements
//------------------------------------------------------------------------------

const { CALL, CONSTRUCT, ReferenceTracker } = require("eslint-utils");
const { CALL, CONSTRUCT, ReferenceTracker } = require("@eslint-community/eslint-utils");
const getPropertyName = require("./utils/ast-utils").getStaticPropertyName;

//------------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion lib/rules/no-promise-executor-return.js
View file
Open in desktop
Expand Up @@ -9,7 +9,7 @@
// Requirements
//------------------------------------------------------------------------------

const { findVariable } = require("eslint-utils");
const { findVariable } = require("@eslint-community/eslint-utils");

//------------------------------------------------------------------------------
// Helpers
Expand Down
2 changes: 1 addition & 1 deletion lib/rules/no-regex-spaces.js
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@
//------------------------------------------------------------------------------

const astUtils = require("./utils/ast-utils");
const regexpp = require("regexpp");
const regexpp = require("@eslint-community/regexpp");

//------------------------------------------------------------------------------
// Helpers
Expand Down
2 changes: 1 addition & 1 deletion lib/rules/no-setter-return.js
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@
//------------------------------------------------------------------------------

const astUtils = require("./utils/ast-utils");
const { findVariable } = require("eslint-utils");
const { findVariable } = require("@eslint-community/eslint-utils");

//------------------------------------------------------------------------------
// Helpers
Expand Down
4 changes: 2 additions & 2 deletions lib/rules/no-useless-backreference.js
View file
Open in desktop
Expand Up @@ -9,8 +9,8 @@
// Requirements
//------------------------------------------------------------------------------

const { CALL, CONSTRUCT, ReferenceTracker, getStringIfConstant } = require("eslint-utils");
const { RegExpParser, visitRegExpAST } = require("regexpp");
const { CALL, CONSTRUCT, ReferenceTracker, getStringIfConstant } = require("@eslint-community/eslint-utils");
const { RegExpParser, visitRegExpAST } = require("@eslint-community/regexpp");

//------------------------------------------------------------------------------
// Helpers
Expand Down
2 changes: 1 addition & 1 deletion lib/rules/prefer-exponentiation-operator.js
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@
//------------------------------------------------------------------------------

const astUtils = require("./utils/ast-utils");
const { CALL, ReferenceTracker } = require("eslint-utils");
const { CALL, ReferenceTracker } = require("@eslint-community/eslint-utils");

//------------------------------------------------------------------------------
// Helpers
Expand Down
4 changes: 2 additions & 2 deletions lib/rules/prefer-named-capture-group.js
View file
Open in desktop
Expand Up @@ -14,8 +14,8 @@ const {
CONSTRUCT,
ReferenceTracker,
getStringIfConstant
} = require("eslint-utils");
const regexpp = require("regexpp");
} = require("@eslint-community/eslint-utils");
const regexpp = require("@eslint-community/regexpp");

//------------------------------------------------------------------------------
// Helpers
Expand Down
2 changes: 1 addition & 1 deletion lib/rules/prefer-object-spread.js
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@

"use strict";

const { CALL, ReferenceTracker } = require("eslint-utils");
const { CALL, ReferenceTracker } = require("@eslint-community/eslint-utils");
const {
isCommaToken,
isOpeningParenToken,
Expand Down
4 changes: 2 additions & 2 deletions lib/rules/prefer-regex-literals.js
View file
Open in desktop
Expand Up @@ -10,8 +10,8 @@
//------------------------------------------------------------------------------

const astUtils = require("./utils/ast-utils");
const { CALL, CONSTRUCT, ReferenceTracker, findVariable } = require("eslint-utils");
const { RegExpValidator, visitRegExpAST, RegExpParser } = require("regexpp");
const { CALL, CONSTRUCT, ReferenceTracker, findVariable } = require("@eslint-community/eslint-utils");
const { RegExpValidator, visitRegExpAST, RegExpParser } = require("@eslint-community/regexpp");
const { canTokensBeAdjacent } = require("./utils/ast-utils");

//------------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion lib/rules/require-unicode-regexp.js
View file
Open in desktop
Expand Up @@ -14,7 +14,7 @@ const {
CONSTRUCT,
ReferenceTracker,
getStringIfConstant
} = require("eslint-utils");
} = require("@eslint-community/eslint-utils");

//------------------------------------------------------------------------------
// Rule Definition
Expand Down
2 changes: 1 addition & 1 deletion lib/rules/wrap-iife.js
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@
//------------------------------------------------------------------------------

const astUtils = require("./utils/ast-utils");
const eslintUtils = require("eslint-utils");
const eslintUtils = require("@eslint-community/eslint-utils");

//----------------------------------------------------------------------
// Helpers
Expand Down
2 changes: 1 addition & 1 deletion lib/source-code/source-code.js
View file
Open in desktop
Expand Up @@ -9,7 +9,7 @@
//------------------------------------------------------------------------------

const
{ isCommentToken } = require("eslint-utils"),
{ isCommentToken } = require("@eslint-community/eslint-utils"),
TokenStore = require("./token-store"),
astUtils = require("../shared/ast-utils"),
Traverser = require("../shared/traverser");
Expand Down
2 changes: 1 addition & 1 deletion lib/source-code/token-store/index.js
View file
Open in desktop
Expand Up @@ -9,7 +9,7 @@
//------------------------------------------------------------------------------

const assert = require("assert");
const { isCommentToken } = require("eslint-utils");
const { isCommentToken } = require("@eslint-community/eslint-utils");
const cursors = require("./cursors");
const ForwardTokenCursor = require("./forward-token-cursor");
const PaddedTokenCursor = require("./padded-token-cursor");
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Expand Up @@ -60,6 +60,8 @@
"homepage": "https://eslint.org",
"bugs": "https://github.com/eslint/eslint/issues/",
"dependencies": {
"@eslint-community/eslint-utils": "^4.2.0",
"@eslint-community/regexpp": "^4.4.0",
"@eslint/eslintrc": "^2.0.0",
"@eslint/js": "8.35.0",
"@humanwhocodes/config-array": "^0.11.8",
Expand All @@ -72,7 +74,6 @@
"doctrine": "^3.0.0",
"escape-string-regexp": "^4.0.0",
"eslint-scope": "^7.1.1",
"eslint-utils": "^3.0.0",
"eslint-visitor-keys": "^3.3.0",
"espree": "^9.4.0",
"esquery": "^1.4.2",
Expand All @@ -96,7 +97,6 @@
"minimatch": "^3.1.2",
"natural-compare": "^1.4.0",
"optionator": "^0.9.1",
"regexpp": "^3.2.0",
"strip-ansi": "^6.0.1",
"strip-json-comments": "^3.1.0",
"text-table": "^0.2.0"
Expand Down
9 changes: 9 additions & 0 deletions tests/lib/rules/no-invalid-regexp.js
View file
Open in desktop
Expand Up @@ -71,6 +71,15 @@ ruleTester.run("no-invalid-regexp", rule, {

// ES2022
"new RegExp('a+(?<Z>z)?', 'd')",
"new RegExp('\\\\p{Script=Cpmn}', 'u')",
"new RegExp('\\\\p{Script=Cypro_Minoan}', 'u')",
"new RegExp('\\\\p{Script=Old_Uyghur}', 'u')",
"new RegExp('\\\\p{Script=Ougr}', 'u')",
"new RegExp('\\\\p{Script=Tangsa}', 'u')",
"new RegExp('\\\\p{Script=Tnsa}', 'u')",
"new RegExp('\\\\p{Script=Toto}', 'u')",
"new RegExp('\\\\p{Script=Vith}', 'u')",
"new RegExp('\\\\p{Script=Vithkuqi}', 'u')",

// allowConstructorFlags
{
Expand Down