From 8d8f0169dbaaa28143cf936cba3046c6e53fa134 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=2E=20Ren=C3=A9e=20Beach?= <splendidnoise@gmail.com>
Date: Sat, 24 Jun 2023 16:16:17 -0700
Subject: [PATCH 1/3] [Fix] pin `aria-query` and `axe-core` to fix failing
 tests on main

For `axe-core`, see https://github.com/dequelabs/axe-core/issues/4127
---
 __mocks__/genInteractives.js                                  | 1 -
 .../no-interactive-element-to-noninteractive-role-test.js     | 1 -
 __tests__/src/rules/no-static-element-interactions-test.js    | 2 +-
 package.json                                                  | 4 ++--
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/__mocks__/genInteractives.js b/__mocks__/genInteractives.js
index 11f32ec9b..68b239260 100644
--- a/__mocks__/genInteractives.js
+++ b/__mocks__/genInteractives.js
@@ -49,7 +49,6 @@ const interactiveElementsMap = {
   menuitem: [],
   option: [],
   select: [],
-  summary: [],
   // Whereas ARIA makes a distinction between cell and gridcell, the AXObject
   // treats them both as CellRole and since gridcell is interactive, we consider
   // cell interactive as well.
diff --git a/__tests__/src/rules/no-interactive-element-to-noninteractive-role-test.js b/__tests__/src/rules/no-interactive-element-to-noninteractive-role-test.js
index 393987b02..7f8a61b6e 100644
--- a/__tests__/src/rules/no-interactive-element-to-noninteractive-role-test.js
+++ b/__tests__/src/rules/no-interactive-element-to-noninteractive-role-test.js
@@ -369,7 +369,6 @@ const neverValid = [
   { code: '<menuitem role="listitem" />;', errors: [expectedError] },
   { code: '<option className="foo" role="listitem" />', errors: [expectedError] },
   { code: '<select className="foo" role="listitem" />', errors: [expectedError] },
-  { code: '<summary role="listitem" />;', errors: [expectedError] },
   { code: '<textarea className="foo" role="listitem" />', errors: [expectedError] },
   { code: '<tr role="listitem" />;', errors: [expectedError] },
   /* Custom elements */
diff --git a/__tests__/src/rules/no-static-element-interactions-test.js b/__tests__/src/rules/no-static-element-interactions-test.js
index fb6cb2d1e..c4f5730d1 100644
--- a/__tests__/src/rules/no-static-element-interactions-test.js
+++ b/__tests__/src/rules/no-static-element-interactions-test.js
@@ -157,7 +157,6 @@ const alwaysValid = [
   { code: '<ruby onClick={() => {}} />;' },
   { code: '<section onClick={() => {}} aria-label="Aa" />;' },
   { code: '<section onClick={() => {}} aria-labelledby="js_1" />;' },
-  { code: '<summary onClick={() => {}} />;' },
   { code: '<table onClick={() => {}} />;' },
   { code: '<tbody onClick={() => {}} />;' },
   { code: '<tfoot onClick={() => {}} />;' },
@@ -340,6 +339,7 @@ const neverValid = [
   { code: '<style onClick={() => {}} />;', errors: [expectedError] },
   { code: '<sub onClick={() => {}} />;', errors: [expectedError] },
   { code: '<sup onClick={() => {}} />;', errors: [expectedError] },
+  { code: '<summary onClick={() => {}} />;', errors: [expectedError] },
   { code: '<title onClick={() => {}} />;', errors: [expectedError] },
   { code: '<track onClick={() => {}} />;', errors: [expectedError] },
   { code: '<tt onClick={() => {}} />;', errors: [expectedError] },
diff --git a/package.json b/package.json
index 30ef40b5e..671adddd4 100644
--- a/package.json
+++ b/package.json
@@ -73,11 +73,11 @@
   "license": "MIT",
   "dependencies": {
     "@babel/runtime": "^7.20.7",
-    "aria-query": "^5.1.3",
+    "aria-query": "=5.1.3",
     "array-includes": "^3.1.6",
     "array.prototype.flatmap": "^1.3.1",
     "ast-types-flow": "^0.0.7",
-    "axe-core": "^4.6.2",
+    "axe-core": "=4.7.0",
     "axobject-query": "^3.1.1",
     "damerau-levenshtein": "^1.0.8",
     "emoji-regex": "^9.2.2",

From 0c278f4805ec18d8ee4d3e8dfa2f603a28d7e113 Mon Sep 17 00:00:00 2001
From: Jordan Harband <ljharb@gmail.com>
Date: Fri, 11 Aug 2023 15:09:45 -0700
Subject: [PATCH 2/3] [Dev Deps] pin `jackspeak` since 2.1.2+ depends on npm
 aliases, which kill the install process in npm < 6

See https://github.com/isaacs/jackspeak/issues/4
---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index 671adddd4..9cfbc9ab8 100644
--- a/package.json
+++ b/package.json
@@ -58,6 +58,7 @@
     "expect": "^24.9.0",
     "flow-bin": "^0.147.0",
     "in-publish": "^2.0.1",
+    "jackspeak": "=2.1.1",
     "jest": "^24.9.0",
     "jscodeshift": "^0.7.1",
     "minimist": "^1.2.7",

From eadd70cb1d0478c24538ee7604cf5493a96c0715 Mon Sep 17 00:00:00 2001
From: Jordan Harband <ljharb@gmail.com>
Date: Fri, 11 Aug 2023 15:10:27 -0700
Subject: [PATCH 3/3] [patch] `mouse-events-have-key-events`: rport the
 attribute, not the node

This has the side benefit of making the error message ordering consistent, since when both were on the JSXOpeningElement, since eslint/node combinations ordered the errors inconsistently
---
 __tests__/src/rules/mouse-events-have-key-events-test.js | 8 ++++----
 src/rules/mouse-events-have-key-events.js                | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/__tests__/src/rules/mouse-events-have-key-events-test.js b/__tests__/src/rules/mouse-events-have-key-events-test.js
index 4c1f41b44..638c9a51b 100644
--- a/__tests__/src/rules/mouse-events-have-key-events-test.js
+++ b/__tests__/src/rules/mouse-events-have-key-events-test.js
@@ -20,19 +20,19 @@ const ruleTester = new RuleTester();
 
 const mouseOverError = {
   message: 'onMouseOver must be accompanied by onFocus for accessibility.',
-  type: 'JSXOpeningElement',
+  type: 'JSXAttribute',
 };
 const pointerEnterError = {
   message: 'onPointerEnter must be accompanied by onFocus for accessibility.',
-  type: 'JSXOpeningElement',
+  type: 'JSXAttribute',
 };
 const mouseOutError = {
   message: 'onMouseOut must be accompanied by onBlur for accessibility.',
-  type: 'JSXOpeningElement',
+  type: 'JSXAttribute',
 };
 const pointerLeaveError = {
   message: 'onPointerLeave must be accompanied by onBlur for accessibility.',
-  type: 'JSXOpeningElement',
+  type: 'JSXAttribute',
 };
 
 ruleTester.run('mouse-events-have-key-events', rule, {
diff --git a/src/rules/mouse-events-have-key-events.js b/src/rules/mouse-events-have-key-events.js
index ce30d6025..386c99870 100644
--- a/src/rules/mouse-events-have-key-events.js
+++ b/src/rules/mouse-events-have-key-events.js
@@ -67,7 +67,7 @@ export default ({
 
         if (hasOnFocus === false || onFocusValue === null || onFocusValue === undefined) {
           context.report({
-            node,
+            node: getProp(attributes, firstHoverInHandlerWithValue),
             message: `${firstHoverInHandlerWithValue} must be accompanied by onFocus for accessibility.`,
           });
         }
@@ -86,7 +86,7 @@ export default ({
 
         if (hasOnBlur === false || onBlurValue === null || onBlurValue === undefined) {
           context.report({
-            node,
+            node: getProp(attributes, firstHoverOutHandlerWithValue),
             message: `${firstHoverOutHandlerWithValue} must be accompanied by onBlur for accessibility.`,
           });
         }