chore: upgrade eslint rule plugins

packages/aws-cdk/lib/parse-command-line-arguments.ts

@@ -2,7 +2,7 @@
 // GENERATED FROM packages/aws-cdk/lib/config.ts.
 // Do not edit by hand; all changes will be overwritten at build time from the config file.
 // -------------------------------------------------------------------------------------------
-/* eslint-disable @typescript-eslint/comma-dangle, comma-spacing, max-len, quotes, quote-props */
+/* eslint-disable @stylistic/comma-dangle, comma-spacing, max-len, quotes, quote-props */
 import { Argv } from 'yargs';
 import * as helpers from './util/yargs-helpers';
 

packages/awslint/.eslintrc.js

@@ -9,6 +9,7 @@ module.exports = {
     '@typescript-eslint',
     'import',
     '@cdklabs',
+    '@stylistic',
     'jest',
   ],
   parser: '@typescript-eslint/parser',
@@ -38,11 +39,11 @@ module.exports = {
     '@cdklabs/invalid-cfn-imports': ['error'],
     // Require use of the `import { foo } from 'bar';` form instead of `import foo = require('bar');`
     '@typescript-eslint/no-require-imports': ['error'],
-    '@typescript-eslint/indent': ['error', 2],
+    '@stylistic/indent': ['error', 2],
 
     // Style
     'quotes': ['error', 'single', { avoidEscape: true }],
-    'comma-dangle': ['error', 'always-multiline'], // ensures clean diffs, see https://medium.com/@nikgraf/why-you-should-enforce-dangling-commas-for-multiline-statements-d034c98e36f8
+    '@stylistic/comma-dangle': ['error', 'always-multiline'], // ensures clean diffs, see https://medium.com/@nikgraf/why-you-should-enforce-dangling-commas-for-multiline-statements-d034c98e36f8
     'comma-spacing': ['error', { before: false, after: true }], // space after, no space before
     'no-multi-spaces': ['error', { ignoreEOLComments: false }], // no multi spaces
     'array-bracket-spacing': ['error', 'never'], // [1, 2, 3]

packages/awslint/package.json

@@ -31,8 +31,9 @@
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^29.5.14",
     "@types/yargs": "^15.0.19",
-    "@typescript-eslint/eslint-plugin": "^6.21.0",
-    "@typescript-eslint/parser": "^6.21.0",
+    "@typescript-eslint/eslint-plugin": "^8",
+    "@stylistic/eslint-plugin": "^2",
+    "@typescript-eslint/parser": "^8",
     "eslint": "^7.32.0",
     "eslint-import-resolver-node": "^0.3.9",
     "eslint-import-resolver-typescript": "^2.7.1",

tools/@aws-cdk/cdk-build-tools/config/eslintrc.js

@@ -16,6 +16,7 @@ module.exports = {
     '@typescript-eslint',
     'import',
     '@cdklabs',
+    '@stylistic',
     'jest',
   ],
   parser: '@typescript-eslint/parser',
@@ -52,12 +53,12 @@ module.exports = {
 
     // Require use of the `import { foo } from 'bar';` form instead of `import foo = require('bar');`
     '@typescript-eslint/no-require-imports': ['error'],
-    '@typescript-eslint/indent': ['error', 2],
+    '@stylistic/indent': ['error', 2],
 
     // Style
     'quotes': ['error', 'single', { avoidEscape: true }],
-    '@typescript-eslint/member-delimiter-style': ['error'], // require semicolon delimiter
-    '@typescript-eslint/comma-dangle': ['error', 'always-multiline'], // ensures clean diffs, see https://medium.com/@nikgraf/why-you-should-enforce-dangling-commas-for-multiline-statements-d034c98e36f8
+    '@stylistic/member-delimiter-style': ['error'], // require semicolon delimiter
+    '@stylistic/comma-dangle': ['error', 'always-multiline'], // ensures clean diffs, see https://medium.com/@nikgraf/why-you-should-enforce-dangling-commas-for-multiline-statements-d034c98e36f8
     'comma-spacing': ['error', { before: false, after: true }], // space after, no space before
     'no-multi-spaces': ['error', { ignoreEOLComments: false }], // no multi spaces
     'array-bracket-spacing': ['error', 'never'], // [1, 2, 3]

tools/@aws-cdk/cdk-build-tools/package.json

@@ -47,8 +47,9 @@
     "@cdklabs/eslint-plugin": "^1.0.0",
     "@aws-cdk/yarn-cling": "0.0.0",
     "@aws-cdk/node-bundle": "0.0.0",
-    "@typescript-eslint/eslint-plugin": "^6.21.0",
-    "@typescript-eslint/parser": "^6.21.0",
+    "@typescript-eslint/eslint-plugin": "^8",
+    "@stylistic/eslint-plugin": "^2",
+    "@typescript-eslint/parser": "^8",
     "awslint": "0.0.0",
     "chalk": "^4",
     "eslint": "^7.32.0",

tools/@aws-cdk/pkglint/.eslintrc.js

@@ -9,6 +9,7 @@ module.exports = {
     '@typescript-eslint',
     'import',
     '@cdklabs',
+    '@stylistic',
     'jest',
   ],
   parser: '@typescript-eslint/parser',
@@ -38,11 +39,11 @@ module.exports = {
     '@cdklabs/invalid-cfn-imports': ['error'],
     // Require use of the `import { foo } from 'bar';` form instead of `import foo = require('bar');`
     '@typescript-eslint/no-require-imports': ['error'],
-    '@typescript-eslint/indent': ['error', 2],
+    '@stylistic/indent': ['error', 2],
 
     // Style
     'quotes': ['error', 'single', { avoidEscape: true }],
-    'comma-dangle': ['error', 'always-multiline'], // ensures clean diffs, see https://medium.com/@nikgraf/why-you-should-enforce-dangling-commas-for-multiline-statements-d034c98e36f8
+    '@stylistic/comma-dangle': ['error', 'always-multiline'], // ensures clean diffs, see https://medium.com/@nikgraf/why-you-should-enforce-dangling-commas-for-multiline-statements-d034c98e36f8
     'comma-spacing': ['error', { before: false, after: true }], // space after, no space before
     'no-multi-spaces': ['error', { ignoreEOLComments: false }], // no multi spaces
     'array-bracket-spacing': ['error', 'never'], // [1, 2, 3]

tools/@aws-cdk/pkglint/package.json

@@ -43,8 +43,9 @@
     "@types/jest": "^29.5.14",
     "@types/semver": "^7.5.8",
     "@types/yargs": "^15.0.19",
-    "@typescript-eslint/eslint-plugin": "^6.21.0",
-    "@typescript-eslint/parser": "^6.21.0",
+    "@typescript-eslint/eslint-plugin": "^8",
+    "@stylistic/eslint-plugin": "^2",
+    "@typescript-eslint/parser": "^8",
     "eslint": "^7.32.0",
     "eslint-import-resolver-node": "^0.3.9",
     "eslint-import-resolver-typescript": "^2.7.1",

tools/@aws-cdk/yargs-gen/lib/yargs-gen.ts

@@ -1,5 +1,4 @@
 import { $E, Expression, ExternalModule, FreeFunction, IScope, Module, SelectiveModuleImport, Statement, ThingSymbol, Type, TypeScriptRenderer, code, expr } from '@cdklabs/typewriter';
-import { EsLintRules } from '@cdklabs/typewriter/lib/eslint-rules';
 import * as prettier from 'prettier';
 import { CliConfig, CliOption, YargsOption } from './yargs-types';
 
@@ -47,12 +46,12 @@ export async function renderYargs(config: CliConfig, helpers: CliHelpers): Promi
 
   const ts = new TypeScriptRenderer({
     disabledEsLintRules: [
-      EsLintRules.COMMA_DANGLE,
-      EsLintRules.COMMA_SPACING,
-      EsLintRules.MAX_LEN,
-      EsLintRules.QUOTES,
-      EsLintRules.QUOTE_PROPS,
-    ],
+      '@stylistic/comma-dangle',
+      '@stylistic/comma-spacing',
+      '@stylistic/max-len',
+      '@stylistic/quotes',
+      '@stylistic/quote-props',
+    ] as any, // Force our string[] into EsLintRules[], it will work out at runtime
   }).render(scope);
 
   return prettier.format(ts, {

tools/@aws-cdk/yargs-gen/test/cli.test.ts

@@ -28,7 +28,7 @@ describe('render', () => {
       // GENERATED FROM packages/aws-cdk/lib/config.ts.
       // Do not edit by hand; all changes will be overwritten at build time from the config file.
       // -------------------------------------------------------------------------------------------
-      /* eslint-disable @typescript-eslint/comma-dangle, comma-spacing, max-len, quotes, quote-props */
+      /* eslint-disable @stylistic/comma-dangle, comma-spacing, max-len, quotes, quote-props */
       import { Argv } from 'yargs';
       import * as helpers from './util/yargs-helpers';
 
@@ -92,7 +92,7 @@ describe('render', () => {
       // GENERATED FROM packages/aws-cdk/lib/config.ts.
       // Do not edit by hand; all changes will be overwritten at build time from the config file.
       // -------------------------------------------------------------------------------------------
-      /* eslint-disable @typescript-eslint/comma-dangle, comma-spacing, max-len, quotes, quote-props */
+      /* eslint-disable @stylistic/comma-dangle, comma-spacing, max-len, quotes, quote-props */
       import { Argv } from 'yargs';
       import * as helpers from './util/yargs-helpers';