From cc60682e45e6b654fc9919616cb400325b0271c6 Mon Sep 17 00:00:00 2001 From: Azat S Date: Sun, 16 Jul 2023 14:34:15 +0300 Subject: [PATCH] feat: move to typescript-eslint v6 --- package.json | 9 +- pnpm-lock.yaml | 218 +++++++++++++++++++++++-------- rules/sort-array-includes.ts | 3 +- rules/sort-classes.ts | 18 ++- rules/sort-enums.ts | 3 +- rules/sort-exports.ts | 3 +- rules/sort-imports.ts | 13 +- rules/sort-interfaces.ts | 7 +- rules/sort-jsx-props.ts | 10 +- rules/sort-map-elements.ts | 3 +- rules/sort-named-exports.ts | 3 +- rules/sort-named-imports.ts | 3 +- rules/sort-object-types.ts | 3 +- rules/sort-objects.ts | 7 +- rules/sort-union-types.ts | 3 +- test/sort-array-includes.test.ts | 9 +- test/sort-classes.test.ts | 9 +- test/sort-enums.test.ts | 9 +- test/sort-exports.test.ts | 9 +- test/sort-imports.test.ts | 9 +- test/sort-interfaces.test.ts | 9 +- test/sort-jsx-props.test.ts | 9 +- test/sort-map-elements.test.ts | 9 +- test/sort-named-exports.test.ts | 9 +- test/sort-named-imports.test.ts | 9 +- test/sort-object-types.test.ts | 9 +- test/sort-objects.test.ts | 9 +- test/sort-union-types.test.ts | 9 +- 28 files changed, 303 insertions(+), 120 deletions(-) diff --git a/package.json b/package.json index baf7a0f0..490038ae 100644 --- a/package.json +++ b/package.json @@ -55,8 +55,8 @@ "eslint": ">=8.0.0" }, "dependencies": { - "@typescript-eslint/types": "^5.62.0", - "@typescript-eslint/utils": "^5.62.0", + "@typescript-eslint/types": "^6.0.0", + "@typescript-eslint/utils": "^6.0.0", "is-core-module": "^2.12.1", "json5": "^2.2.3", "minimatch": "^9.0.3", @@ -69,8 +69,9 @@ "@types/is-core-module": "^2.2.0", "@types/natural-compare-lite": "^1.4.0", "@types/node": "^20.4.2", - "@typescript-eslint/eslint-plugin": "^5.62.0", - "@typescript-eslint/parser": "^5.62.0", + "@typescript-eslint/eslint-plugin": "^6.0.0", + "@typescript-eslint/parser": "^6.0.0", + "@typescript-eslint/rule-tester": "^6.0.0", "@vitest/coverage-v8": "^0.33.0", "changelogen": "^0.5.4", "clean-publish": "^4.2.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7090a8bc..77878118 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -6,11 +6,11 @@ settings: dependencies: '@typescript-eslint/types': - specifier: ^5.62.0 - version: 5.62.0 + specifier: ^6.0.0 + version: 6.0.0 '@typescript-eslint/utils': - specifier: ^5.62.0 - version: 5.62.0(eslint@8.44.0)(typescript@5.1.6) + specifier: ^6.0.0 + version: 6.0.0(eslint@8.44.0)(typescript@5.1.6) is-core-module: specifier: ^2.12.1 version: 2.12.1 @@ -27,7 +27,7 @@ dependencies: devDependencies: '@azat-io/eslint-config-typescript': specifier: ^1.1.1 - version: 1.1.1(@typescript-eslint/eslint-plugin@5.62.0)(@typescript-eslint/parser@5.62.0)(eslint-plugin-import@2.27.5)(eslint-plugin-n@16.0.1)(eslint-plugin-perfectionist@1.4.0)(eslint-plugin-prefer-arrow@1.2.3)(eslint-plugin-prefer-let@3.0.1)(eslint-plugin-promise@6.1.1)(eslint-plugin-sonarjs@0.19.0)(eslint-plugin-unicorn@47.0.0)(eslint-plugin-vitest@0.2.6)(eslint@8.44.0) + version: 1.1.1(@typescript-eslint/eslint-plugin@6.0.0)(@typescript-eslint/parser@6.0.0)(eslint-plugin-import@2.27.5)(eslint-plugin-n@16.0.1)(eslint-plugin-perfectionist@1.5.0)(eslint-plugin-prefer-arrow@1.2.3)(eslint-plugin-prefer-let@3.0.1)(eslint-plugin-promise@6.1.1)(eslint-plugin-sonarjs@0.19.0)(eslint-plugin-unicorn@47.0.0)(eslint-plugin-vitest@0.2.6)(eslint@8.44.0) '@commitlint/cli': specifier: ^17.6.6 version: 17.6.6 @@ -44,11 +44,14 @@ devDependencies: specifier: ^20.4.2 version: 20.4.2 '@typescript-eslint/eslint-plugin': - specifier: ^5.62.0 - version: 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.44.0)(typescript@5.1.6) + specifier: ^6.0.0 + version: 6.0.0(@typescript-eslint/parser@6.0.0)(eslint@8.44.0)(typescript@5.1.6) '@typescript-eslint/parser': - specifier: ^5.62.0 - version: 5.62.0(eslint@8.44.0)(typescript@5.1.6) + specifier: ^6.0.0 + version: 6.0.0(eslint@8.44.0)(typescript@5.1.6) + '@typescript-eslint/rule-tester': + specifier: ^6.0.0 + version: 6.0.0(@eslint/eslintrc@2.1.0)(eslint@8.44.0)(typescript@5.1.6) '@vitest/coverage-v8': specifier: ^0.33.0 version: 0.33.0(vitest@0.33.0) @@ -69,13 +72,13 @@ devDependencies: version: 5.1.0(eslint@8.44.0) eslint-plugin-import: specifier: ^2.27.5 - version: 2.27.5(@typescript-eslint/parser@5.62.0)(eslint@8.44.0) + version: 2.27.5(@typescript-eslint/parser@6.0.0)(eslint@8.44.0) eslint-plugin-n: specifier: ^16.0.1 version: 16.0.1(eslint@8.44.0) eslint-plugin-perfectionist: specifier: ^1.4.0 - version: 1.4.0(eslint@8.44.0)(typescript@5.1.6) + version: 1.5.0(eslint@8.44.0)(typescript@5.1.6) eslint-plugin-prefer-arrow: specifier: ^1.2.3 version: 1.2.3(eslint@8.44.0) @@ -270,7 +273,7 @@ packages: '@jridgewell/trace-mapping': 0.3.18 dev: true - /@azat-io/eslint-config-typescript@1.1.1(@typescript-eslint/eslint-plugin@5.62.0)(@typescript-eslint/parser@5.62.0)(eslint-plugin-import@2.27.5)(eslint-plugin-n@16.0.1)(eslint-plugin-perfectionist@1.4.0)(eslint-plugin-prefer-arrow@1.2.3)(eslint-plugin-prefer-let@3.0.1)(eslint-plugin-promise@6.1.1)(eslint-plugin-sonarjs@0.19.0)(eslint-plugin-unicorn@47.0.0)(eslint-plugin-vitest@0.2.6)(eslint@8.44.0): + /@azat-io/eslint-config-typescript@1.1.1(@typescript-eslint/eslint-plugin@6.0.0)(@typescript-eslint/parser@6.0.0)(eslint-plugin-import@2.27.5)(eslint-plugin-n@16.0.1)(eslint-plugin-perfectionist@1.5.0)(eslint-plugin-prefer-arrow@1.2.3)(eslint-plugin-prefer-let@3.0.1)(eslint-plugin-promise@6.1.1)(eslint-plugin-sonarjs@0.19.0)(eslint-plugin-unicorn@47.0.0)(eslint-plugin-vitest@0.2.6)(eslint@8.44.0): resolution: {integrity: sha512-OvN3/IgvxZfWwo7LibT3L+9WEUq1NGi5QVKcKj4x9EyNdOJz6T8CfiYHLsDZXBajHaE1X4/7HC/c9H/E3buKBg==} peerDependencies: '@typescript-eslint/eslint-plugin': ^5.60.0 @@ -286,14 +289,14 @@ packages: eslint-plugin-unicorn: ^47.0.0 eslint-plugin-vitest: ^0.2.6 dependencies: - '@azat-io/eslint-config': 1.1.1(eslint-plugin-import@2.27.5)(eslint-plugin-n@16.0.1)(eslint-plugin-perfectionist@1.4.0)(eslint-plugin-prefer-arrow@1.2.3)(eslint-plugin-prefer-let@3.0.1)(eslint-plugin-promise@6.1.1)(eslint-plugin-sonarjs@0.19.0)(eslint-plugin-unicorn@47.0.0)(eslint-plugin-vitest@0.2.6)(eslint@8.44.0) - '@typescript-eslint/eslint-plugin': 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.44.0)(typescript@5.1.6) - '@typescript-eslint/parser': 5.62.0(eslint@8.44.0)(typescript@5.1.6) + '@azat-io/eslint-config': 1.1.1(eslint-plugin-import@2.27.5)(eslint-plugin-n@16.0.1)(eslint-plugin-perfectionist@1.5.0)(eslint-plugin-prefer-arrow@1.2.3)(eslint-plugin-prefer-let@3.0.1)(eslint-plugin-promise@6.1.1)(eslint-plugin-sonarjs@0.19.0)(eslint-plugin-unicorn@47.0.0)(eslint-plugin-vitest@0.2.6)(eslint@8.44.0) + '@typescript-eslint/eslint-plugin': 6.0.0(@typescript-eslint/parser@6.0.0)(eslint@8.44.0)(typescript@5.1.6) + '@typescript-eslint/parser': 6.0.0(eslint@8.44.0)(typescript@5.1.6) eslint: 8.44.0 - eslint-import-resolver-typescript: 3.5.5(@typescript-eslint/parser@5.62.0)(eslint-plugin-import@2.27.5)(eslint@8.44.0) - eslint-plugin-import: 2.27.5(@typescript-eslint/parser@5.62.0)(eslint@8.44.0) + eslint-import-resolver-typescript: 3.5.5(@typescript-eslint/parser@6.0.0)(eslint-plugin-import@2.27.5)(eslint@8.44.0) + eslint-plugin-import: 2.27.5(@typescript-eslint/parser@6.0.0)(eslint@8.44.0) eslint-plugin-n: 16.0.1(eslint@8.44.0) - eslint-plugin-perfectionist: 1.4.0(eslint@8.44.0)(typescript@5.1.6) + eslint-plugin-perfectionist: 1.5.0(eslint@8.44.0)(typescript@5.1.6) eslint-plugin-prefer-arrow: 1.2.3(eslint@8.44.0) eslint-plugin-prefer-let: 3.0.1 eslint-plugin-promise: 6.1.1(eslint@8.44.0) @@ -306,7 +309,7 @@ packages: - supports-color dev: true - /@azat-io/eslint-config@1.1.1(eslint-plugin-import@2.27.5)(eslint-plugin-n@16.0.1)(eslint-plugin-perfectionist@1.4.0)(eslint-plugin-prefer-arrow@1.2.3)(eslint-plugin-prefer-let@3.0.1)(eslint-plugin-promise@6.1.1)(eslint-plugin-sonarjs@0.19.0)(eslint-plugin-unicorn@47.0.0)(eslint-plugin-vitest@0.2.6)(eslint@8.44.0): + /@azat-io/eslint-config@1.1.1(eslint-plugin-import@2.27.5)(eslint-plugin-n@16.0.1)(eslint-plugin-perfectionist@1.5.0)(eslint-plugin-prefer-arrow@1.2.3)(eslint-plugin-prefer-let@3.0.1)(eslint-plugin-promise@6.1.1)(eslint-plugin-sonarjs@0.19.0)(eslint-plugin-unicorn@47.0.0)(eslint-plugin-vitest@0.2.6)(eslint@8.44.0): resolution: {integrity: sha512-ySEeikfFKh/+pvib/hNqhREyLaZhCCmEXGaj04s43wyrII07a4PDOUlFjChztIZQEImGq5EojJVUwRvKyrbJdQ==} peerDependencies: eslint: ^8.38.0 @@ -321,9 +324,9 @@ packages: eslint-plugin-vitest: ^0.2.6 dependencies: eslint: 8.44.0 - eslint-plugin-import: 2.27.5(@typescript-eslint/parser@5.62.0)(eslint@8.44.0) + eslint-plugin-import: 2.27.5(@typescript-eslint/parser@6.0.0)(eslint@8.44.0) eslint-plugin-n: 16.0.1(eslint@8.44.0) - eslint-plugin-perfectionist: 1.4.0(eslint@8.44.0)(typescript@5.1.6) + eslint-plugin-perfectionist: 1.5.0(eslint@8.44.0)(typescript@5.1.6) eslint-plugin-prefer-arrow: 1.2.3(eslint@8.44.0) eslint-plugin-prefer-let: 3.0.1 eslint-plugin-promise: 6.1.1(eslint@8.44.0) @@ -1009,47 +1012,51 @@ packages: resolution: {integrity: sha512-4p9vcSmxAayx72yn70joFoL44c9MO/0+iVEBIQXe3v2h2SiAsEIo/G5v6ObFWvNKRFjbrVadNf9LqEEZeQPzdA==} dev: true - /@typescript-eslint/eslint-plugin@5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.44.0)(typescript@5.1.6): - resolution: {integrity: sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + /@typescript-eslint/eslint-plugin@6.0.0(@typescript-eslint/parser@6.0.0)(eslint@8.44.0)(typescript@5.1.6): + resolution: {integrity: sha512-xuv6ghKGoiq856Bww/yVYnXGsKa588kY3M0XK7uUW/3fJNNULKRfZfSBkMTSpqGG/8ZCXCadfh8G/z/B4aqS/A==} + engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: - '@typescript-eslint/parser': ^5.0.0 - eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 + '@typescript-eslint/parser': ^6.0.0 || ^6.0.0-alpha + eslint: ^7.0.0 || ^8.0.0 typescript: '*' peerDependenciesMeta: typescript: optional: true dependencies: '@eslint-community/regexpp': 4.5.1 - '@typescript-eslint/parser': 5.62.0(eslint@8.44.0)(typescript@5.1.6) - '@typescript-eslint/scope-manager': 5.62.0 - '@typescript-eslint/type-utils': 5.62.0(eslint@8.44.0)(typescript@5.1.6) - '@typescript-eslint/utils': 5.62.0(eslint@8.44.0)(typescript@5.1.6) + '@typescript-eslint/parser': 6.0.0(eslint@8.44.0)(typescript@5.1.6) + '@typescript-eslint/scope-manager': 6.0.0 + '@typescript-eslint/type-utils': 6.0.0(eslint@8.44.0)(typescript@5.1.6) + '@typescript-eslint/utils': 6.0.0(eslint@8.44.0)(typescript@5.1.6) + '@typescript-eslint/visitor-keys': 6.0.0 debug: 4.3.4 eslint: 8.44.0 + grapheme-splitter: 1.0.4 graphemer: 1.4.0 ignore: 5.2.4 + natural-compare: 1.4.0 natural-compare-lite: 1.4.0 semver: 7.5.4 - tsutils: 3.21.0(typescript@5.1.6) + ts-api-utils: 1.0.1(typescript@5.1.6) typescript: 5.1.6 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/parser@5.62.0(eslint@8.44.0)(typescript@5.1.6): - resolution: {integrity: sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + /@typescript-eslint/parser@6.0.0(eslint@8.44.0)(typescript@5.1.6): + resolution: {integrity: sha512-TNaufYSPrr1U8n+3xN+Yp9g31vQDJqhXzzPSHfQDLcaO4tU+mCfODPxCwf4H530zo7aUBE3QIdxCXamEnG04Tg==} + engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: - eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 + eslint: ^7.0.0 || ^8.0.0 typescript: '*' peerDependenciesMeta: typescript: optional: true dependencies: - '@typescript-eslint/scope-manager': 5.62.0 - '@typescript-eslint/types': 5.62.0 - '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.1.6) + '@typescript-eslint/scope-manager': 6.0.0 + '@typescript-eslint/types': 6.0.0 + '@typescript-eslint/typescript-estree': 6.0.0(typescript@5.1.6) + '@typescript-eslint/visitor-keys': 6.0.0 debug: 4.3.4 eslint: 8.44.0 typescript: 5.1.6 @@ -1057,28 +1064,55 @@ packages: - supports-color dev: true + /@typescript-eslint/rule-tester@6.0.0(@eslint/eslintrc@2.1.0)(eslint@8.44.0)(typescript@5.1.6): + resolution: {integrity: sha512-mHB5phLdzK3Kt7Hf9LzkwF+bgDhfdTi3vggSeyl8/jA6TRk9N7N+td40U1seHEN1Kfp1bM6QJlO8ePTXtCzTmQ==} + engines: {node: ^16.0.0 || >=18.0.0} + peerDependencies: + '@eslint/eslintrc': '>=2' + eslint: '>=8' + dependencies: + '@eslint/eslintrc': 2.1.0 + '@typescript-eslint/typescript-estree': 6.0.0(typescript@5.1.6) + '@typescript-eslint/utils': 6.0.0(eslint@8.44.0)(typescript@5.1.6) + ajv: 6.12.6 + eslint: 8.44.0 + lodash.merge: 4.6.2 + semver: 7.5.4 + transitivePeerDependencies: + - supports-color + - typescript + dev: true + /@typescript-eslint/scope-manager@5.62.0: resolution: {integrity: sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: '@typescript-eslint/types': 5.62.0 '@typescript-eslint/visitor-keys': 5.62.0 + dev: true - /@typescript-eslint/type-utils@5.62.0(eslint@8.44.0)(typescript@5.1.6): - resolution: {integrity: sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + /@typescript-eslint/scope-manager@6.0.0: + resolution: {integrity: sha512-o4q0KHlgCZTqjuaZ25nw5W57NeykZT9LiMEG4do/ovwvOcPnDO1BI5BQdCsUkjxFyrCL0cSzLjvIMfR9uo7cWg==} + engines: {node: ^16.0.0 || >=18.0.0} + dependencies: + '@typescript-eslint/types': 6.0.0 + '@typescript-eslint/visitor-keys': 6.0.0 + + /@typescript-eslint/type-utils@6.0.0(eslint@8.44.0)(typescript@5.1.6): + resolution: {integrity: sha512-ah6LJvLgkoZ/pyJ9GAdFkzeuMZ8goV6BH7eC9FPmojrnX9yNCIsfjB+zYcnex28YO3RFvBkV6rMV6WpIqkPvoQ==} + engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: - eslint: '*' + eslint: ^7.0.0 || ^8.0.0 typescript: '*' peerDependenciesMeta: typescript: optional: true dependencies: - '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.1.6) - '@typescript-eslint/utils': 5.62.0(eslint@8.44.0)(typescript@5.1.6) + '@typescript-eslint/typescript-estree': 6.0.0(typescript@5.1.6) + '@typescript-eslint/utils': 6.0.0(eslint@8.44.0)(typescript@5.1.6) debug: 4.3.4 eslint: 8.44.0 - tsutils: 3.21.0(typescript@5.1.6) + ts-api-utils: 1.0.1(typescript@5.1.6) typescript: 5.1.6 transitivePeerDependencies: - supports-color @@ -1087,6 +1121,11 @@ packages: /@typescript-eslint/types@5.62.0: resolution: {integrity: sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + dev: true + + /@typescript-eslint/types@6.0.0: + resolution: {integrity: sha512-Zk9KDggyZM6tj0AJWYYKgF0yQyrcnievdhG0g5FqyU3Y2DRxJn4yWY21sJC0QKBckbsdKKjYDV2yVrrEvuTgxg==} + engines: {node: ^16.0.0 || >=18.0.0} /@typescript-eslint/typescript-estree@5.62.0(typescript@5.1.6): resolution: {integrity: sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==} @@ -1107,6 +1146,27 @@ packages: typescript: 5.1.6 transitivePeerDependencies: - supports-color + dev: true + + /@typescript-eslint/typescript-estree@6.0.0(typescript@5.1.6): + resolution: {integrity: sha512-2zq4O7P6YCQADfmJ5OTDQTP3ktajnXIRrYAtHM9ofto/CJZV3QfJ89GEaM2BNGeSr1KgmBuLhEkz5FBkS2RQhQ==} + engines: {node: ^16.0.0 || >=18.0.0} + peerDependencies: + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + dependencies: + '@typescript-eslint/types': 6.0.0 + '@typescript-eslint/visitor-keys': 6.0.0 + debug: 4.3.4 + globby: 11.1.0 + is-glob: 4.0.3 + semver: 7.5.4 + ts-api-utils: 1.0.1(typescript@5.1.6) + typescript: 5.1.6 + transitivePeerDependencies: + - supports-color /@typescript-eslint/utils@5.62.0(eslint@8.44.0)(typescript@5.1.6): resolution: {integrity: sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==} @@ -1126,6 +1186,26 @@ packages: transitivePeerDependencies: - supports-color - typescript + dev: true + + /@typescript-eslint/utils@6.0.0(eslint@8.44.0)(typescript@5.1.6): + resolution: {integrity: sha512-SOr6l4NB6HE4H/ktz0JVVWNXqCJTOo/mHnvIte1ZhBQ0Cvd04x5uKZa3zT6tiodL06zf5xxdK8COiDvPnQ27JQ==} + engines: {node: ^16.0.0 || >=18.0.0} + peerDependencies: + eslint: ^7.0.0 || ^8.0.0 + dependencies: + '@eslint-community/eslint-utils': 4.4.0(eslint@8.44.0) + '@types/json-schema': 7.0.12 + '@types/semver': 7.5.0 + '@typescript-eslint/scope-manager': 6.0.0 + '@typescript-eslint/types': 6.0.0 + '@typescript-eslint/typescript-estree': 6.0.0(typescript@5.1.6) + eslint: 8.44.0 + eslint-scope: 5.1.1 + semver: 7.5.4 + transitivePeerDependencies: + - supports-color + - typescript /@typescript-eslint/visitor-keys@5.62.0: resolution: {integrity: sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==} @@ -1133,6 +1213,14 @@ packages: dependencies: '@typescript-eslint/types': 5.62.0 eslint-visitor-keys: 3.4.1 + dev: true + + /@typescript-eslint/visitor-keys@6.0.0: + resolution: {integrity: sha512-cvJ63l8c0yXdeT5POHpL0Q1cZoRcmRKFCtSjNGJxPkcP571EfZMcNbzWAc7oK3D1dRzm/V5EwtkANTZxqvuuUA==} + engines: {node: ^16.0.0 || >=18.0.0} + dependencies: + '@typescript-eslint/types': 6.0.0 + eslint-visitor-keys: 3.4.1 /@vitejs/plugin-vue@4.2.3(vite@4.4.3)(vue@3.3.4): resolution: {integrity: sha512-R6JDUfiZbJA9cMiguQ7jxALsgiprjBeHL5ikpXfJCH62pPHtI+JdJ5xWj6Ev73yXSlYl86+blXn1kZHQ7uElxw==} @@ -2211,7 +2299,7 @@ packages: - supports-color dev: true - /eslint-import-resolver-typescript@3.5.5(@typescript-eslint/parser@5.62.0)(eslint-plugin-import@2.27.5)(eslint@8.44.0): + /eslint-import-resolver-typescript@3.5.5(@typescript-eslint/parser@6.0.0)(eslint-plugin-import@2.27.5)(eslint@8.44.0): resolution: {integrity: sha512-TdJqPHs2lW5J9Zpe17DZNQuDnox4xo2o+0tE7Pggain9Rbc19ik8kFtXdxZ250FVx2kF4vlt2RSf4qlUpG7bhw==} engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: @@ -2221,8 +2309,8 @@ packages: debug: 4.3.4 enhanced-resolve: 5.15.0 eslint: 8.44.0 - eslint-module-utils: 2.8.0(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-typescript@3.5.5)(eslint@8.44.0) - eslint-plugin-import: 2.27.5(@typescript-eslint/parser@5.62.0)(eslint@8.44.0) + eslint-module-utils: 2.8.0(@typescript-eslint/parser@6.0.0)(eslint-import-resolver-typescript@3.5.5)(eslint@8.44.0) + eslint-plugin-import: 2.27.5(@typescript-eslint/parser@6.0.0)(eslint@8.44.0) get-tsconfig: 4.6.2 globby: 13.2.2 is-core-module: 2.12.1 @@ -2235,7 +2323,7 @@ packages: - supports-color dev: true - /eslint-module-utils@2.8.0(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-node@0.3.7)(eslint@8.44.0): + /eslint-module-utils@2.8.0(@typescript-eslint/parser@6.0.0)(eslint-import-resolver-node@0.3.7)(eslint@8.44.0): resolution: {integrity: sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==} engines: {node: '>=4'} peerDependencies: @@ -2256,7 +2344,7 @@ packages: eslint-import-resolver-webpack: optional: true dependencies: - '@typescript-eslint/parser': 5.62.0(eslint@8.44.0)(typescript@5.1.6) + '@typescript-eslint/parser': 6.0.0(eslint@8.44.0)(typescript@5.1.6) debug: 3.2.7 eslint: 8.44.0 eslint-import-resolver-node: 0.3.7 @@ -2264,7 +2352,7 @@ packages: - supports-color dev: true - /eslint-module-utils@2.8.0(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-typescript@3.5.5)(eslint@8.44.0): + /eslint-module-utils@2.8.0(@typescript-eslint/parser@6.0.0)(eslint-import-resolver-typescript@3.5.5)(eslint@8.44.0): resolution: {integrity: sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==} engines: {node: '>=4'} peerDependencies: @@ -2285,10 +2373,10 @@ packages: eslint-import-resolver-webpack: optional: true dependencies: - '@typescript-eslint/parser': 5.62.0(eslint@8.44.0)(typescript@5.1.6) + '@typescript-eslint/parser': 6.0.0(eslint@8.44.0)(typescript@5.1.6) debug: 3.2.7 eslint: 8.44.0 - eslint-import-resolver-typescript: 3.5.5(@typescript-eslint/parser@5.62.0)(eslint-plugin-import@2.27.5)(eslint@8.44.0) + eslint-import-resolver-typescript: 3.5.5(@typescript-eslint/parser@6.0.0)(eslint-plugin-import@2.27.5)(eslint@8.44.0) transitivePeerDependencies: - supports-color dev: true @@ -2315,7 +2403,7 @@ packages: estraverse: 5.3.0 dev: true - /eslint-plugin-import@2.27.5(@typescript-eslint/parser@5.62.0)(eslint@8.44.0): + /eslint-plugin-import@2.27.5(@typescript-eslint/parser@6.0.0)(eslint@8.44.0): resolution: {integrity: sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==} engines: {node: '>=4'} peerDependencies: @@ -2325,7 +2413,7 @@ packages: '@typescript-eslint/parser': optional: true dependencies: - '@typescript-eslint/parser': 5.62.0(eslint@8.44.0)(typescript@5.1.6) + '@typescript-eslint/parser': 6.0.0(eslint@8.44.0)(typescript@5.1.6) array-includes: 3.1.6 array.prototype.flat: 1.3.1 array.prototype.flatmap: 1.3.1 @@ -2333,7 +2421,7 @@ packages: doctrine: 2.1.0 eslint: 8.44.0 eslint-import-resolver-node: 0.3.7 - eslint-module-utils: 2.8.0(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-node@0.3.7)(eslint@8.44.0) + eslint-module-utils: 2.8.0(@typescript-eslint/parser@6.0.0)(eslint-import-resolver-node@0.3.7)(eslint@8.44.0) has: 1.0.3 is-core-module: 2.12.1 is-glob: 4.0.3 @@ -2365,8 +2453,8 @@ packages: semver: 7.5.4 dev: true - /eslint-plugin-perfectionist@1.4.0(eslint@8.44.0)(typescript@5.1.6): - resolution: {integrity: sha512-9gO+qmuU1DYzoYeN2D0PqYrI1FlqMPYGsZTWUWnWPrMQdFGFtq7eYraeQ57/8ffNBbVX6e6HvQOJ9iok9DfJvw==} + /eslint-plugin-perfectionist@1.5.0(eslint@8.44.0)(typescript@5.1.6): + resolution: {integrity: sha512-khVm+M55D95YhoNEjinLdhC5pSse5/EXn7HuI1Y2R+WU1Hb5wWehPlRqAWzWS4VFJKRPWt78OmnzsmnDq1T5IA==} peerDependencies: eslint: '>=8.0.0' dependencies: @@ -2859,6 +2947,10 @@ packages: resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==} dev: true + /grapheme-splitter@1.0.4: + resolution: {integrity: sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==} + dev: true + /graphemer@1.4.0: resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==} @@ -4443,6 +4535,14 @@ packages: engines: {node: '>=8'} dev: true + /ts-api-utils@1.0.1(typescript@5.1.6): + resolution: {integrity: sha512-lC/RGlPmwdrIBFTX59wwNzqh7aR2otPNPR/5brHZm/XKFYKsfqxihXUe9pU3JI+3vGkl+vyCoNNnPhJn3aLK1A==} + engines: {node: '>=16.13.0'} + peerDependencies: + typescript: '>=4.2.0' + dependencies: + typescript: 5.1.6 + /ts-dedent@2.2.0: resolution: {integrity: sha512-q5W7tVM71e2xjHZTlgfTDoPF/SmqKG5hddq9SzR49CH2hayqRKJtQ4mtRlSxKaJlR/+9rEM+mnBHf7I2/BQcpQ==} engines: {node: '>=6.10'} @@ -4490,6 +4590,7 @@ packages: /tslib@1.14.1: resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==} + dev: true /tslib@2.6.0: resolution: {integrity: sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA==} @@ -4503,6 +4604,7 @@ packages: dependencies: tslib: 1.14.1 typescript: 5.1.6 + dev: true /type-check@0.4.0: resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==} diff --git a/rules/sort-array-includes.ts b/rules/sort-array-includes.ts index 9b5d18c0..9cab8f62 100644 --- a/rules/sort-array-includes.ts +++ b/rules/sort-array-includes.ts @@ -33,7 +33,6 @@ export default createEslintRule({ type: 'suggestion', docs: { description: 'enforce sorted arrays before include method', - recommended: false, }, fixable: 'code', schema: [ @@ -47,10 +46,12 @@ export default createEslintRule({ SortType['line-length'], ], default: SortType.natural, + type: 'string', }, order: { enum: [SortOrder.asc, SortOrder.desc], default: SortOrder.asc, + type: 'string', }, 'ignore-case': { type: 'boolean', diff --git a/rules/sort-classes.ts b/rules/sort-classes.ts index a62b2ef2..24efa670 100644 --- a/rules/sort-classes.ts +++ b/rules/sort-classes.ts @@ -45,7 +45,6 @@ export default createEslintRule({ type: 'suggestion', docs: { description: 'enforce sorted classes', - recommended: false, }, fixable: 'code', schema: [ @@ -59,6 +58,7 @@ export default createEslintRule({ SortType['line-length'], ], default: SortType.natural, + type: 'string', }, 'ignore-case': { type: 'boolean', @@ -67,10 +67,24 @@ export default createEslintRule({ order: { enum: [SortOrder.asc, SortOrder.desc], default: SortOrder.asc, + type: 'string', }, groups: { + items: { + type: 'string', + enum: [ + 'private-property', + 'static-property', + 'private-method', + 'static-method', + 'constructor', + 'property', + 'unknown', + 'method', + ], + }, + uniqueItems: true, type: 'array', - default: ['property', 'constructor', 'method', 'unknown'], }, }, additionalProperties: false, diff --git a/rules/sort-enums.ts b/rules/sort-enums.ts index 530a8fa1..1d85bbc6 100644 --- a/rules/sort-enums.ts +++ b/rules/sort-enums.ts @@ -30,7 +30,6 @@ export default createEslintRule({ type: 'suggestion', docs: { description: 'enforce sorted TypeScript enums', - recommended: false, }, fixable: 'code', schema: [ @@ -44,6 +43,7 @@ export default createEslintRule({ SortType['line-length'], ], default: SortType.natural, + type: 'string', }, 'ignore-case': { type: 'boolean', @@ -52,6 +52,7 @@ export default createEslintRule({ order: { enum: [SortOrder.asc, SortOrder.desc], default: SortOrder.asc, + type: 'string', }, }, additionalProperties: false, diff --git a/rules/sort-exports.ts b/rules/sort-exports.ts index 7bfbc81b..bba91d9e 100644 --- a/rules/sort-exports.ts +++ b/rules/sort-exports.ts @@ -31,7 +31,6 @@ export default createEslintRule({ type: 'suggestion', docs: { description: 'enforce sorted exports', - recommended: false, }, fixable: 'code', schema: [ @@ -45,10 +44,12 @@ export default createEslintRule({ SortType['line-length'], ], default: SortType.natural, + type: 'string', }, order: { enum: [SortOrder.asc, SortOrder.desc], default: SortOrder.asc, + type: 'string', }, 'ignore-case': { type: 'boolean', diff --git a/rules/sort-imports.ts b/rules/sort-imports.ts index 04ac5b71..e6959d6e 100644 --- a/rules/sort-imports.ts +++ b/rules/sort-imports.ts @@ -81,7 +81,6 @@ export default createEslintRule, MESSAGE_ID>({ type: 'suggestion', docs: { description: 'enforce sorted imports', - recommended: false, }, fixable: 'code', schema: [ @@ -107,22 +106,29 @@ export default createEslintRule, MESSAGE_ID>({ SortType['line-length'], ], default: SortType.natural, + type: 'string', }, order: { enum: [SortOrder.asc, SortOrder.desc], default: SortOrder.asc, + type: 'string', }, 'ignore-case': { type: 'boolean', default: false, }, groups: { + items: { + type: 'string', + }, + uniqueItems: true, type: 'array', - default: [], }, 'internal-pattern': { + items: { + type: 'string', + }, type: 'array', - default: ['~/**'], }, 'newlines-between': { enum: [ @@ -131,6 +137,7 @@ export default createEslintRule, MESSAGE_ID>({ NewlinesBetweenValue.never, ], default: NewlinesBetweenValue.always, + type: 'string', }, 'read-tsconfig': { type: 'boolean', diff --git a/rules/sort-interfaces.ts b/rules/sort-interfaces.ts index cbe35809..d7256abd 100644 --- a/rules/sort-interfaces.ts +++ b/rules/sort-interfaces.ts @@ -32,7 +32,6 @@ export default createEslintRule({ type: 'suggestion', docs: { description: 'enforce sorted interface properties', - recommended: false, }, fixable: 'code', schema: [ @@ -46,18 +45,22 @@ export default createEslintRule({ SortType['line-length'], ], default: SortType.natural, + type: 'string', }, order: { enum: [SortOrder.asc, SortOrder.desc], default: SortOrder.asc, + type: 'string', }, 'ignore-case': { type: 'boolean', default: false, }, 'ignore-pattern': { + items: { + type: 'string', + }, type: 'array', - default: [], }, }, additionalProperties: false, diff --git a/rules/sort-jsx-props.ts b/rules/sort-jsx-props.ts index 94c5c511..83659e81 100644 --- a/rules/sort-jsx-props.ts +++ b/rules/sort-jsx-props.ts @@ -45,7 +45,6 @@ export default createEslintRule({ type: 'suggestion', docs: { description: 'enforce sorted JSX props', - recommended: false, }, fixable: 'code', schema: [ @@ -59,14 +58,18 @@ export default createEslintRule({ SortType['line-length'], ], default: SortType.natural, + type: 'string', }, order: { enum: [SortOrder.asc, SortOrder.desc], default: SortOrder.asc, + type: 'string', }, 'always-on-top': { + items: { + type: 'string', + }, type: 'array', - default: [], }, 'ignore-case': { type: 'boolean', @@ -74,12 +77,15 @@ export default createEslintRule({ }, shorthand: { enum: [Position.first, Position.last, Position.ignore], + type: 'string', }, callback: { enum: [Position.first, Position.last, Position.ignore], + type: 'string', }, multiline: { enum: [Position.first, Position.last, Position.ignore], + type: 'string', }, }, additionalProperties: false, diff --git a/rules/sort-map-elements.ts b/rules/sort-map-elements.ts index 694823bb..bc35fda5 100644 --- a/rules/sort-map-elements.ts +++ b/rules/sort-map-elements.ts @@ -32,7 +32,6 @@ export default createEslintRule({ type: 'suggestion', docs: { description: 'enforce sorted Map elements', - recommended: false, }, fixable: 'code', schema: [ @@ -46,10 +45,12 @@ export default createEslintRule({ SortType['line-length'], ], default: SortType.natural, + type: 'string', }, order: { enum: [SortOrder.asc, SortOrder.desc], default: SortOrder.asc, + type: 'string', }, 'ignore-case': { type: 'boolean', diff --git a/rules/sort-named-exports.ts b/rules/sort-named-exports.ts index 4a43ab86..a68b2547 100644 --- a/rules/sort-named-exports.ts +++ b/rules/sort-named-exports.ts @@ -27,7 +27,6 @@ export default createEslintRule({ type: 'suggestion', docs: { description: 'enforce sorted named exports', - recommended: false, }, fixable: 'code', schema: [ @@ -41,10 +40,12 @@ export default createEslintRule({ SortType['line-length'], ], default: SortType.natural, + type: 'string', }, order: { enum: [SortOrder.asc, SortOrder.desc], default: SortOrder.asc, + type: 'string', }, 'ignore-case': { type: 'boolean', diff --git a/rules/sort-named-imports.ts b/rules/sort-named-imports.ts index 0a56b585..3bd864af 100644 --- a/rules/sort-named-imports.ts +++ b/rules/sort-named-imports.ts @@ -29,7 +29,6 @@ export default createEslintRule({ type: 'suggestion', docs: { description: 'enforce sorted named imports', - recommended: false, }, fixable: 'code', schema: [ @@ -43,10 +42,12 @@ export default createEslintRule({ SortType['line-length'], ], default: SortType.natural, + type: 'string', }, order: { enum: [SortOrder.asc, SortOrder.desc], default: SortOrder.asc, + type: 'string', }, 'ignore-case': { type: 'boolean', diff --git a/rules/sort-object-types.ts b/rules/sort-object-types.ts index 20a0b91b..c9a9661f 100644 --- a/rules/sort-object-types.ts +++ b/rules/sort-object-types.ts @@ -30,7 +30,6 @@ export default createEslintRule({ type: 'suggestion', docs: { description: 'enforce sorted object types', - recommended: false, }, fixable: 'code', schema: [ @@ -44,10 +43,12 @@ export default createEslintRule({ SortType['line-length'], ], default: SortType.natural, + type: 'string', }, order: { enum: [SortOrder.asc, SortOrder.desc], default: SortOrder.asc, + type: 'string', }, 'ignore-case': { type: 'boolean', diff --git a/rules/sort-objects.ts b/rules/sort-objects.ts index 2cbb16cc..3e5116f9 100644 --- a/rules/sort-objects.ts +++ b/rules/sort-objects.ts @@ -47,7 +47,6 @@ export default createEslintRule({ type: 'suggestion', docs: { description: 'enforce sorted objects', - recommended: false, }, fixable: 'code', schema: [ @@ -65,18 +64,22 @@ export default createEslintRule({ SortType['line-length'], ], default: SortType.natural, + type: 'string', }, order: { enum: [SortOrder.asc, SortOrder.desc], default: SortOrder.asc, + type: 'string', }, 'ignore-case': { type: 'boolean', default: false, }, 'always-on-top': { + items: { + type: 'string', + }, type: 'array', - default: [], }, }, additionalProperties: false, diff --git a/rules/sort-union-types.ts b/rules/sort-union-types.ts index 0d62ac90..2d0335da 100644 --- a/rules/sort-union-types.ts +++ b/rules/sort-union-types.ts @@ -28,7 +28,6 @@ export default createEslintRule({ type: 'suggestion', docs: { description: 'enforce sorted union types', - recommended: false, }, fixable: 'code', schema: [ @@ -42,10 +41,12 @@ export default createEslintRule({ SortType['line-length'], ], default: SortType.natural, + type: 'string', }, order: { enum: [SortOrder.asc, SortOrder.desc], default: SortOrder.asc, + type: 'string', }, 'ignore-case': { type: 'boolean', diff --git a/test/sort-array-includes.test.ts b/test/sort-array-includes.test.ts index 65e7a9ed..20c60f5f 100644 --- a/test/sort-array-includes.test.ts +++ b/test/sort-array-includes.test.ts @@ -1,12 +1,15 @@ -import { ESLintUtils } from '@typescript-eslint/utils' -import { describe, it } from 'vitest' +import { RuleTester } from '@typescript-eslint/rule-tester' +import { afterAll, describe, it } from 'vitest' import { dedent } from 'ts-dedent' import rule, { RULE_NAME } from '../rules/sort-array-includes' import { SortOrder, SortType } from '../typings' describe(RULE_NAME, () => { - let ruleTester = new ESLintUtils.RuleTester({ + RuleTester.afterAll = afterAll + RuleTester.describe = describe + + let ruleTester = new RuleTester({ parser: '@typescript-eslint/parser', }) diff --git a/test/sort-classes.test.ts b/test/sort-classes.test.ts index 1a478999..f17ada8a 100644 --- a/test/sort-classes.test.ts +++ b/test/sort-classes.test.ts @@ -1,12 +1,15 @@ -import { ESLintUtils } from '@typescript-eslint/utils' -import { describe, it } from 'vitest' +import { RuleTester } from '@typescript-eslint/rule-tester' +import { afterAll, describe, it } from 'vitest' import { dedent } from 'ts-dedent' import rule, { RULE_NAME } from '../rules/sort-classes' import { SortOrder, SortType } from '../typings' describe(RULE_NAME, () => { - let ruleTester = new ESLintUtils.RuleTester({ + RuleTester.afterAll = afterAll + RuleTester.describe = describe + + let ruleTester = new RuleTester({ parser: '@typescript-eslint/parser', }) diff --git a/test/sort-enums.test.ts b/test/sort-enums.test.ts index a7537978..899dee50 100644 --- a/test/sort-enums.test.ts +++ b/test/sort-enums.test.ts @@ -1,12 +1,15 @@ -import { ESLintUtils } from '@typescript-eslint/utils' -import { describe, it } from 'vitest' +import { RuleTester } from '@typescript-eslint/rule-tester' +import { afterAll, describe, it } from 'vitest' import { dedent } from 'ts-dedent' import rule, { RULE_NAME } from '../rules/sort-enums' import { SortOrder, SortType } from '../typings' describe(RULE_NAME, () => { - let ruleTester = new ESLintUtils.RuleTester({ + RuleTester.afterAll = afterAll + RuleTester.describe = describe + + let ruleTester = new RuleTester({ parser: '@typescript-eslint/parser', }) diff --git a/test/sort-exports.test.ts b/test/sort-exports.test.ts index 176f6f1c..19745d01 100644 --- a/test/sort-exports.test.ts +++ b/test/sort-exports.test.ts @@ -1,12 +1,15 @@ -import { ESLintUtils } from '@typescript-eslint/utils' -import { describe, it } from 'vitest' +import { RuleTester } from '@typescript-eslint/rule-tester' +import { afterAll, describe, it } from 'vitest' import { dedent } from 'ts-dedent' import rule, { RULE_NAME } from '../rules/sort-exports' import { SortOrder, SortType } from '../typings' describe(RULE_NAME, () => { - let ruleTester = new ESLintUtils.RuleTester({ + RuleTester.afterAll = afterAll + RuleTester.describe = describe + + let ruleTester = new RuleTester({ parser: '@typescript-eslint/parser', }) diff --git a/test/sort-imports.test.ts b/test/sort-imports.test.ts index 3aa57cdb..729b4106 100644 --- a/test/sort-imports.test.ts +++ b/test/sort-imports.test.ts @@ -1,12 +1,15 @@ -import { ESLintUtils } from '@typescript-eslint/utils' -import { describe, it, vi } from 'vitest' +import { RuleTester } from '@typescript-eslint/rule-tester' +import { afterAll, describe, it, vi } from 'vitest' import { dedent } from 'ts-dedent' import rule, { NewlinesBetweenValue, RULE_NAME } from '../rules/sort-imports' import { SortOrder, SortType } from '../typings' describe(RULE_NAME, () => { - let ruleTester = new ESLintUtils.RuleTester({ + RuleTester.afterAll = afterAll + RuleTester.describe = describe + + let ruleTester = new RuleTester({ parser: '@typescript-eslint/parser', }) diff --git a/test/sort-interfaces.test.ts b/test/sort-interfaces.test.ts index 55705216..1dbb3984 100644 --- a/test/sort-interfaces.test.ts +++ b/test/sort-interfaces.test.ts @@ -1,12 +1,15 @@ -import { ESLintUtils } from '@typescript-eslint/utils' -import { describe, it } from 'vitest' +import { RuleTester } from '@typescript-eslint/rule-tester' +import { afterAll, describe, it } from 'vitest' import { dedent } from 'ts-dedent' import rule, { RULE_NAME } from '../rules/sort-interfaces' import { SortOrder, SortType } from '../typings' describe(RULE_NAME, () => { - let ruleTester = new ESLintUtils.RuleTester({ + RuleTester.afterAll = afterAll + RuleTester.describe = describe + + let ruleTester = new RuleTester({ parser: '@typescript-eslint/parser', }) diff --git a/test/sort-jsx-props.test.ts b/test/sort-jsx-props.test.ts index dd31a565..72ce1cfd 100644 --- a/test/sort-jsx-props.test.ts +++ b/test/sort-jsx-props.test.ts @@ -1,12 +1,15 @@ -import { ESLintUtils } from '@typescript-eslint/utils' -import { describe, it } from 'vitest' +import { RuleTester } from '@typescript-eslint/rule-tester' +import { afterAll, describe, it } from 'vitest' import { dedent } from 'ts-dedent' import rule, { RULE_NAME, Position } from '../rules/sort-jsx-props' import { SortOrder, SortType } from '../typings' describe(RULE_NAME, () => { - let ruleTester = new ESLintUtils.RuleTester({ + RuleTester.afterAll = afterAll + RuleTester.describe = describe + + let ruleTester = new RuleTester({ parser: '@typescript-eslint/parser', parserOptions: { ecmaFeatures: { diff --git a/test/sort-map-elements.test.ts b/test/sort-map-elements.test.ts index 99ab68b0..5db244bc 100644 --- a/test/sort-map-elements.test.ts +++ b/test/sort-map-elements.test.ts @@ -1,12 +1,15 @@ -import { ESLintUtils } from '@typescript-eslint/utils' -import { describe, it } from 'vitest' +import { RuleTester } from '@typescript-eslint/rule-tester' +import { afterAll, describe, it } from 'vitest' import { dedent } from 'ts-dedent' import rule, { RULE_NAME } from '../rules/sort-map-elements' import { SortOrder, SortType } from '../typings' describe(RULE_NAME, () => { - let ruleTester = new ESLintUtils.RuleTester({ + RuleTester.afterAll = afterAll + RuleTester.describe = describe + + let ruleTester = new RuleTester({ parser: '@typescript-eslint/parser', }) diff --git a/test/sort-named-exports.test.ts b/test/sort-named-exports.test.ts index 611da738..948f591c 100644 --- a/test/sort-named-exports.test.ts +++ b/test/sort-named-exports.test.ts @@ -1,12 +1,15 @@ -import { ESLintUtils } from '@typescript-eslint/utils' -import { describe, it } from 'vitest' +import { RuleTester } from '@typescript-eslint/rule-tester' +import { afterAll, describe, it } from 'vitest' import { dedent } from 'ts-dedent' import rule, { RULE_NAME } from '../rules/sort-named-exports' import { SortOrder, SortType } from '../typings' describe(RULE_NAME, () => { - let ruleTester = new ESLintUtils.RuleTester({ + RuleTester.afterAll = afterAll + RuleTester.describe = describe + + let ruleTester = new RuleTester({ parser: '@typescript-eslint/parser', }) diff --git a/test/sort-named-imports.test.ts b/test/sort-named-imports.test.ts index 490e18f6..83499729 100644 --- a/test/sort-named-imports.test.ts +++ b/test/sort-named-imports.test.ts @@ -1,12 +1,15 @@ -import { ESLintUtils } from '@typescript-eslint/utils' -import { describe, it } from 'vitest' +import { RuleTester } from '@typescript-eslint/rule-tester' +import { afterAll, describe, it } from 'vitest' import { dedent } from 'ts-dedent' import rule, { RULE_NAME } from '../rules/sort-named-imports' import { SortOrder, SortType } from '../typings' describe(RULE_NAME, () => { - let ruleTester = new ESLintUtils.RuleTester({ + RuleTester.afterAll = afterAll + RuleTester.describe = describe + + let ruleTester = new RuleTester({ parser: '@typescript-eslint/parser', }) diff --git a/test/sort-object-types.test.ts b/test/sort-object-types.test.ts index c36e6891..84c1b2e7 100644 --- a/test/sort-object-types.test.ts +++ b/test/sort-object-types.test.ts @@ -1,12 +1,15 @@ -import { ESLintUtils } from '@typescript-eslint/utils' -import { describe, it } from 'vitest' +import { RuleTester } from '@typescript-eslint/rule-tester' +import { afterAll, describe, it } from 'vitest' import { dedent } from 'ts-dedent' import rule, { RULE_NAME } from '../rules/sort-object-types' import { SortOrder, SortType } from '../typings' describe(RULE_NAME, () => { - let ruleTester = new ESLintUtils.RuleTester({ + RuleTester.afterAll = afterAll + RuleTester.describe = describe + + let ruleTester = new RuleTester({ parser: '@typescript-eslint/parser', }) diff --git a/test/sort-objects.test.ts b/test/sort-objects.test.ts index be57ca63..18a0775f 100644 --- a/test/sort-objects.test.ts +++ b/test/sort-objects.test.ts @@ -1,12 +1,15 @@ -import { ESLintUtils } from '@typescript-eslint/utils' -import { describe, it } from 'vitest' +import { RuleTester } from '@typescript-eslint/rule-tester' +import { afterAll, describe, it } from 'vitest' import { dedent } from 'ts-dedent' import rule, { RULE_NAME } from '../rules/sort-objects' import { SortOrder, SortType } from '../typings' describe(RULE_NAME, () => { - let ruleTester = new ESLintUtils.RuleTester({ + RuleTester.afterAll = afterAll + RuleTester.describe = describe + + let ruleTester = new RuleTester({ parser: '@typescript-eslint/parser', }) diff --git a/test/sort-union-types.test.ts b/test/sort-union-types.test.ts index cbee9c95..fe0ce7e6 100644 --- a/test/sort-union-types.test.ts +++ b/test/sort-union-types.test.ts @@ -1,12 +1,15 @@ -import { ESLintUtils } from '@typescript-eslint/utils' -import { describe, it } from 'vitest' +import { RuleTester } from '@typescript-eslint/rule-tester' +import { afterAll, describe, it } from 'vitest' import { dedent } from 'ts-dedent' import rule, { RULE_NAME } from '../rules/sort-union-types' import { SortOrder, SortType } from '../typings' describe(RULE_NAME, () => { - let ruleTester = new ESLintUtils.RuleTester({ + RuleTester.afterAll = afterAll + RuleTester.describe = describe + + let ruleTester = new RuleTester({ parser: '@typescript-eslint/parser', })