fixing merge conflicts

Author: namrata111f

.vscode/launch.json

@@ -35,9 +35,9 @@
       "cwd": "${workspaceFolder}",
       "program": "${workspaceFolder}/node_modules/.bin/jest",
       "args": [
-        "packages/code-analyzer-eslint-engine/test/engine.test.ts",
+        "packages/code-analyzer-eslint-engine/test/rule-mappings.test.ts",
         "-t",
-        "When file_extensions is only .tsx, then only react rules are returned",
+        "Test that the list of all bundled rules matches our RULE_MAPPINGS list",
         "--runInBand",
         "--coverage=false"
       ],

package-lock.json

@@ -29,6 +29,7 @@
     "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-jest": "^29.12.1",
     "eslint-plugin-react": "^7.37.5",
+    "eslint-plugin-jsx-a11y": "^6.10.2",
     "eslint-plugin-react-hooks": "^7.0.1",
     "globals": "^17.0.0",
     "semver": "^7.7.3",
@@ -79,4 +80,4 @@
       "!src/index.ts"
     ]
   }
-}
+}

packages/code-analyzer-eslint-engine/package.json

@@ -6,6 +6,7 @@ import salesforceEslintConfigLwc from "@salesforce/eslint-config-lwc";
 import sldsEslintPlugin from "@salesforce-ux/eslint-plugin-slds";
 import eslintPluginReact from "eslint-plugin-react";
 import eslintPluginReactHooks from "eslint-plugin-react-hooks";
+import eslintPluginJsxA11y from "eslint-plugin-jsx-a11y";
 import {ESLintEngineConfig} from "./config";
 import globals from "globals";
 
@@ -230,6 +231,8 @@ export class BaseConfigFactory {
         // These rules are not needed for React 17+ which is now the standard (released Oct 2020)
         const jsxRuntimeConfig = eslintPluginReact.configs.flat['jsx-runtime'];
 
+
+
         return [
             // React all rules config
             {
@@ -259,6 +262,11 @@ export class BaseConfigFactory {
                     'react-hooks/rules-of-hooks': 'error',
                     'react-hooks/exhaustive-deps': 'warn'
                 }
+            },
+            // jsx-a11y plugin config
+            {
+                ...eslintPluginJsxA11y.flatConfigs?.strict,
+                files: filePatterns
             }
         ];
     }

packages/code-analyzer-eslint-engine/src/base-config.ts

@@ -15,6 +15,34 @@ declare module '@lwc/eslint-plugin-lwc-platform' {
     export = plugin;
 }
 
+// This declaration adds in the missing types for "eslint-plugin-jsx-a11y"
+declare module 'eslint-plugin-jsx-a11y' {
+    import type { ESLint, Linter } from 'eslint';
+    import type { RuleDefinition } from '@eslint/core';
+
+    const plugin: ESLint.Plugin & {
+        readonly rules: Record<string, RuleDefinition>;
+
+        // Newer flat API (some versions)
+        readonly configs?: {
+            readonly flat?: {
+                readonly recommended: Linter.Config;
+                readonly strict: Linter.Config;
+            };
+            // Some versions expose this key instead
+            readonly 'flat/recommended'?: Linter.Config;
+            readonly 'flat/strict'?: Linter.Config;
+        };
+
+        // Some versions expose flat configs here
+        readonly flatConfigs?: {
+            readonly recommended: Linter.Config;
+            readonly strict: Linter.Config;
+        };
+    };
+    export = plugin;
+}
+
 // This declaration adds in the missing types for "@salesforce/eslint-config-lwc" whose package.json file's main field points to:
 //     node_modules/@salesforce/eslint-config-lwc/index.js
 declare module '@salesforce/eslint-config-lwc' {

packages/code-analyzer-eslint-engine/src/missing-types-for-dependencies.d.ts

@@ -5,6 +5,7 @@ import {RULE_MAPPINGS_TYPESCRIPT_ESLINT} from "./rule-mappings/typescript-eslint
 import {RULE_MAPPINGS_SLDS_HTML} from "./rule-mappings/slds-html";
 import {RULE_MAPPINGS_SLDS_CSS} from "./rule-mappings/slds-css";
 import {RULE_MAPPINGS_REACT} from "./rule-mappings/react";
+import {RULE_MAPPINGS_REACT_A11Y} from "./rule-mappings/react-jsx-a11y";
 
 export const RULE_MAPPINGS: Record<string, {severity: SeverityLevel, tags: string[]}> = {
     ...RULE_MAPPINGS_ESLINT_BASE,
@@ -13,4 +14,5 @@ export const RULE_MAPPINGS: Record<string, {severity: SeverityLevel, tags: strin
     ...RULE_MAPPINGS_SLDS_HTML,
     ...RULE_MAPPINGS_SLDS_CSS,
     ...RULE_MAPPINGS_REACT,
+    ...RULE_MAPPINGS_REACT_A11Y,
 };

packages/code-analyzer-eslint-engine/src/rule-mappings.ts

@@ -2,3 +2,4 @@
 export const LWC = "LWC";
 export const SLDS = "SLDS";
 export const REACT = "React";
+export const A11Y = "A11y";