From bc28c3c61ceace0f7a91ec1972c621a7317c5c87 Mon Sep 17 00:00:00 2001
From: Rohit Tarpara <v-rtarpara@microsoft.com>
Date: Wed, 19 Jun 2024 14:56:58 +0530
Subject: [PATCH 1/6] Updated axe-core 4.9.1

---
 package.json                                       |  2 +-
 packages/report/package.json                       |  2 +-
 packages/ui/package.json                           |  2 +-
 .../__snapshots__/settings-drop-down.test.ts.snap  |  1 -
 .../__snapshots__/preview-features.test.ts.snap    |  1 -
 .../__snapshots__/settings-panel.test.ts.snap      |  4 ++--
 .../__snapshots__/first-time-dialog.test.ts.snap   |  1 -
 .../__snapshots__/hamburger-menu.test.ts.snap      |  2 --
 .../popup/__snapshots__/launchpad.test.ts.snap     |  4 ++--
 .../scanner/map-axe-tags-to-guidance-links.test.ts | 10 +++++++++-
 yarn.lock                                          | 14 +++++++-------
 11 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/package.json b/package.json
index 3c9080a1cdc..9f5db09a5fd 100644
--- a/package.json
+++ b/package.json
@@ -155,7 +155,7 @@
         "@microsoft/applicationinsights-web": "^2.8.15",
         "@testing-library/user-event": "^14.5.2",
         "ajv": "^8.12.0",
-        "axe-core": "4.8.4",
+        "axe-core": "4.9.1",
         "classnames": "^2.5.1",
         "idb-keyval": "^6.2.1",
         "lodash": "^4.17.21",
diff --git a/packages/report/package.json b/packages/report/package.json
index 56b8497ad2e..064efff50ee 100644
--- a/packages/report/package.json
+++ b/packages/report/package.json
@@ -19,7 +19,7 @@
     },
     "dependencies": {
         "@fluentui/react": "^8.118.1",
-        "axe-core": "4.8.4",
+        "axe-core": "4.9.1",
         "classnames": "^2.5.1",
         "lodash": "^4.17.21",
         "luxon": "^3.4.4",
diff --git a/packages/ui/package.json b/packages/ui/package.json
index c44dc002fa1..f3c1dd7cf3f 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -18,7 +18,7 @@
     },
     "dependencies": {
         "@fluentui/react": "^8.96.1",
-        "axe-core": "4.8.4",
+        "axe-core": "4.9.1",
         "classnames": "^2.5.1",
         "lodash": "^4.17.21",
         "luxon": "^3.4.4",
diff --git a/src/tests/end-to-end/tests/common/__snapshots__/settings-drop-down.test.ts.snap b/src/tests/end-to-end/tests/common/__snapshots__/settings-drop-down.test.ts.snap
index 24c24d3428e..a92f4784d69 100644
--- a/src/tests/end-to-end/tests/common/__snapshots__/settings-drop-down.test.ts.snap
+++ b/src/tests/end-to-end/tests/common/__snapshots__/settings-drop-down.test.ts.snap
@@ -11,7 +11,6 @@ exports[`Settings Dropdown content should match snapshot 1`] = `
     <div
       class="ms-FocusZone css-000 ms-ContextualMenu is-open ms-BaseButton-menuhost root-000"
       data-focuszone-id="FocusZone000"
-      data-tabster="{"uncontrolled": {}}"
     >
       <ul
         class="ms-ContextualMenu-list is-open list-000"
diff --git a/src/tests/end-to-end/tests/details-view/__snapshots__/preview-features.test.ts.snap b/src/tests/end-to-end/tests/details-view/__snapshots__/preview-features.test.ts.snap
index 2bcb5bbc7cb..56ad7c862f4 100644
--- a/src/tests/end-to-end/tests/details-view/__snapshots__/preview-features.test.ts.snap
+++ b/src/tests/end-to-end/tests/details-view/__snapshots__/preview-features.test.ts.snap
@@ -11,7 +11,6 @@ exports[`Details View -> Preview Features Panel should match content in snapshot
     />
     <div
       class="ms-Panel-main main-000"
-      data-tabster="{"uncontrolled": {"completely": true}}"
     >
       <div
         aria-hidden="true"
diff --git a/src/tests/end-to-end/tests/details-view/__snapshots__/settings-panel.test.ts.snap b/src/tests/end-to-end/tests/details-view/__snapshots__/settings-panel.test.ts.snap
index fd65a3545d7..2852b5b0b65 100644
--- a/src/tests/end-to-end/tests/details-view/__snapshots__/settings-panel.test.ts.snap
+++ b/src/tests/end-to-end/tests/details-view/__snapshots__/settings-panel.test.ts.snap
@@ -12,7 +12,7 @@ exports[`Details View -> Settings Panel should pass accessibility validation wit
   The link has insufficient color contrast of 1.07:1 with the surrounding text. (Minimum contrast is 3:1, link text: #ffff00, surrounding text: #ffffff)
   The link has no styling (such as underline) to distinguish it from the surrounding text",
         "selector": [
-          "p:nth-child(1) > .root-293.insights-link[target="_blank"]",
+          "p:nth-child(1) > .root-294.insights-link[target="_blank"]",
         ],
       },
       {
@@ -20,7 +20,7 @@ exports[`Details View -> Settings Panel should pass accessibility validation wit
   The link has insufficient color contrast of 1.07:1 with the surrounding text. (Minimum contrast is 3:1, link text: #ffff00, surrounding text: #ffffff)
   The link has no styling (such as underline) to distinguish it from the surrounding text",
         "selector": [
-          ".toggle-description--ieTgg > .root-293.insights-link[target="_blank"]",
+          ".toggle-description--ieTgg > .root-294.insights-link[target="_blank"]",
         ],
       },
     ],
diff --git a/src/tests/end-to-end/tests/popup/__snapshots__/first-time-dialog.test.ts.snap b/src/tests/end-to-end/tests/popup/__snapshots__/first-time-dialog.test.ts.snap
index 0915b8c49cc..75b82295ae0 100644
--- a/src/tests/end-to-end/tests/popup/__snapshots__/first-time-dialog.test.ts.snap
+++ b/src/tests/end-to-end/tests/popup/__snapshots__/first-time-dialog.test.ts.snap
@@ -12,7 +12,6 @@ exports[`First time Dialog content should match snapshot 1`] = `
     />
     <div
       class="ms-Dialog-main insights-dialog-main-override telemetry-permission-dialog main-000"
-      data-tabster="{"uncontrolled": {"completely": true}}"
       id="ModalFocusTrapZone000"
     >
       <div
diff --git a/src/tests/end-to-end/tests/popup/__snapshots__/hamburger-menu.test.ts.snap b/src/tests/end-to-end/tests/popup/__snapshots__/hamburger-menu.test.ts.snap
index d52597c897a..8c05dcfb455 100644
--- a/src/tests/end-to-end/tests/popup/__snapshots__/hamburger-menu.test.ts.snap
+++ b/src/tests/end-to-end/tests/popup/__snapshots__/hamburger-menu.test.ts.snap
@@ -11,7 +11,6 @@ exports[`Popup -> Hamburger menu should have content matching snapshot when quic
     <div
       class="ms-FocusZone css-000 ms-ContextualMenu is-open ms-BaseButton-menuhost root-000"
       data-focuszone-id="FocusZone000"
-      data-tabster="{"uncontrolled": {}}"
     >
       <ul
         class="ms-ContextualMenu-list is-open list-000"
@@ -256,7 +255,6 @@ exports[`Popup -> Hamburger menu should have content matching snapshot when quic
     <div
       class="ms-FocusZone css-000 ms-ContextualMenu is-open ms-BaseButton-menuhost root-000"
       data-focuszone-id="FocusZone000"
-      data-tabster="{"uncontrolled": {}}"
     >
       <ul
         class="ms-ContextualMenu-list is-open list-000"
diff --git a/src/tests/end-to-end/tests/popup/__snapshots__/launchpad.test.ts.snap b/src/tests/end-to-end/tests/popup/__snapshots__/launchpad.test.ts.snap
index baa82b71fc4..91634f1f106 100644
--- a/src/tests/end-to-end/tests/popup/__snapshots__/launchpad.test.ts.snap
+++ b/src/tests/end-to-end/tests/popup/__snapshots__/launchpad.test.ts.snap
@@ -289,7 +289,7 @@ exports[`Popup -> Launch Pad content should match snapshot when quick assess fea
                 Navigate to axe-core npm page
               </div>
             </div>
-             4.8.4
+             4.9.1
           </div>
         </div>
       </div>
@@ -587,7 +587,7 @@ exports[`Popup -> Launch Pad content should match snapshot when quick assess fea
                 Navigate to axe-core npm page
               </div>
             </div>
-             4.8.4
+             4.9.1
           </div>
         </div>
       </div>
diff --git a/src/tests/unit/tests/scanner/map-axe-tags-to-guidance-links.test.ts b/src/tests/unit/tests/scanner/map-axe-tags-to-guidance-links.test.ts
index c3543796a25..52193f945c7 100644
--- a/src/tests/unit/tests/scanner/map-axe-tags-to-guidance-links.test.ts
+++ b/src/tests/unit/tests/scanner/map-axe-tags-to-guidance-links.test.ts
@@ -17,7 +17,15 @@ describe('mapAxeTagsToGuidanceLinks', () => {
         expect(mapAxeTagsToGuidanceLinks(defaultIncludedRuleId, tags)).toEqual([]);
     });
 
-    const wcagAAAtags = ['wcag146', 'wcag223', 'wcag224', 'wcag248', 'wcag249', 'wcag325'];
+    const wcagAAAtags = [
+        'wcag146',
+        'wcag213',
+        'wcag223',
+        'wcag224',
+        'wcag248',
+        'wcag249',
+        'wcag325',
+    ];
 
     const irrelevantAxeCoreTags = [
         // axe-core specific, not required for our purposes
diff --git a/yarn.lock b/yarn.lock
index 3b5351a807a..9dc244c2a27 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2793,7 +2793,7 @@ __metadata:
   resolution: "accessibility-insights-report@workspace:packages/report"
   dependencies:
     "@fluentui/react": ^8.118.1
-    axe-core: 4.8.4
+    axe-core: 4.9.1
     classnames: ^2.5.1
     lodash: ^4.17.21
     luxon: ^3.4.4
@@ -2809,7 +2809,7 @@ __metadata:
   resolution: "accessibility-insights-ui@workspace:packages/ui"
   dependencies:
     "@fluentui/react": ^8.96.1
-    axe-core: 4.8.4
+    axe-core: 4.9.1
     classnames: ^2.5.1
     lodash: ^4.17.21
     luxon: ^3.4.4
@@ -2850,7 +2850,7 @@ __metadata:
     "@typescript-eslint/eslint-plugin": ^5.61.0
     "@typescript-eslint/parser": ^6.18.1
     ajv: ^8.12.0
-    axe-core: 4.8.4
+    axe-core: 4.9.1
     case-sensitive-paths-webpack-plugin: ^2.4.0
     classnames: ^2.5.1
     codecov: ^3.8.3
@@ -3361,10 +3361,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"axe-core@npm:4.8.4":
-  version: 4.8.4
-  resolution: "axe-core@npm:4.8.4"
-  checksum: 644da2fec17bcf6f834edaab1baa5a75a9a3ee370c323215c73da6d7e45fac11d01470d92d0a3d5f26695e15c1d9b781733dfbe1fe09d505076c58f09ed74e02
+"axe-core@npm:4.9.1":
+  version: 4.9.1
+  resolution: "axe-core@npm:4.9.1"
+  checksum: 41d9227871781f96c2952e2a777fca73624959dd0e98864f6d82806a77602f82b4fc490852082a7e524d8cd864e50d8b4d9931819b4a150112981d8c932110c5
   languageName: node
   linkType: hard
 

From 1f9eab661219118ae8c0beaec83594fee57072f2 Mon Sep 17 00:00:00 2001
From: Rohit Tarpara <v-rtarpara@microsoft.com>
Date: Wed, 19 Jun 2024 15:37:54 +0530
Subject: [PATCH 2/6] Reverted snap files which throw error

---
 .../tests/common/__snapshots__/settings-drop-down.test.ts.snap  | 1 +
 .../details-view/__snapshots__/preview-features.test.ts.snap    | 1 +
 .../tests/popup/__snapshots__/first-time-dialog.test.ts.snap    | 1 +
 .../tests/popup/__snapshots__/hamburger-menu.test.ts.snap       | 2 ++
 4 files changed, 5 insertions(+)

diff --git a/src/tests/end-to-end/tests/common/__snapshots__/settings-drop-down.test.ts.snap b/src/tests/end-to-end/tests/common/__snapshots__/settings-drop-down.test.ts.snap
index a92f4784d69..24c24d3428e 100644
--- a/src/tests/end-to-end/tests/common/__snapshots__/settings-drop-down.test.ts.snap
+++ b/src/tests/end-to-end/tests/common/__snapshots__/settings-drop-down.test.ts.snap
@@ -11,6 +11,7 @@ exports[`Settings Dropdown content should match snapshot 1`] = `
     <div
       class="ms-FocusZone css-000 ms-ContextualMenu is-open ms-BaseButton-menuhost root-000"
       data-focuszone-id="FocusZone000"
+      data-tabster="{"uncontrolled": {}}"
     >
       <ul
         class="ms-ContextualMenu-list is-open list-000"
diff --git a/src/tests/end-to-end/tests/details-view/__snapshots__/preview-features.test.ts.snap b/src/tests/end-to-end/tests/details-view/__snapshots__/preview-features.test.ts.snap
index 56ad7c862f4..2bcb5bbc7cb 100644
--- a/src/tests/end-to-end/tests/details-view/__snapshots__/preview-features.test.ts.snap
+++ b/src/tests/end-to-end/tests/details-view/__snapshots__/preview-features.test.ts.snap
@@ -11,6 +11,7 @@ exports[`Details View -> Preview Features Panel should match content in snapshot
     />
     <div
       class="ms-Panel-main main-000"
+      data-tabster="{"uncontrolled": {"completely": true}}"
     >
       <div
         aria-hidden="true"
diff --git a/src/tests/end-to-end/tests/popup/__snapshots__/first-time-dialog.test.ts.snap b/src/tests/end-to-end/tests/popup/__snapshots__/first-time-dialog.test.ts.snap
index 75b82295ae0..0915b8c49cc 100644
--- a/src/tests/end-to-end/tests/popup/__snapshots__/first-time-dialog.test.ts.snap
+++ b/src/tests/end-to-end/tests/popup/__snapshots__/first-time-dialog.test.ts.snap
@@ -12,6 +12,7 @@ exports[`First time Dialog content should match snapshot 1`] = `
     />
     <div
       class="ms-Dialog-main insights-dialog-main-override telemetry-permission-dialog main-000"
+      data-tabster="{"uncontrolled": {"completely": true}}"
       id="ModalFocusTrapZone000"
     >
       <div
diff --git a/src/tests/end-to-end/tests/popup/__snapshots__/hamburger-menu.test.ts.snap b/src/tests/end-to-end/tests/popup/__snapshots__/hamburger-menu.test.ts.snap
index 8c05dcfb455..d52597c897a 100644
--- a/src/tests/end-to-end/tests/popup/__snapshots__/hamburger-menu.test.ts.snap
+++ b/src/tests/end-to-end/tests/popup/__snapshots__/hamburger-menu.test.ts.snap
@@ -11,6 +11,7 @@ exports[`Popup -> Hamburger menu should have content matching snapshot when quic
     <div
       class="ms-FocusZone css-000 ms-ContextualMenu is-open ms-BaseButton-menuhost root-000"
       data-focuszone-id="FocusZone000"
+      data-tabster="{"uncontrolled": {}}"
     >
       <ul
         class="ms-ContextualMenu-list is-open list-000"
@@ -255,6 +256,7 @@ exports[`Popup -> Hamburger menu should have content matching snapshot when quic
     <div
       class="ms-FocusZone css-000 ms-ContextualMenu is-open ms-BaseButton-menuhost root-000"
       data-focuszone-id="FocusZone000"
+      data-tabster="{"uncontrolled": {}}"
     >
       <ul
         class="ms-ContextualMenu-list is-open list-000"

From 88833fd85604dadc40260eb33105f07d8ce48d57 Mon Sep 17 00:00:00 2001
From: Rohit Tarpara <v-rtarpara@microsoft.com>
Date: Wed, 19 Jun 2024 19:26:46 +0530
Subject: [PATCH 3/6] Reverted snap

---
 .../details-view/__snapshots__/settings-panel.test.ts.snap    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/tests/end-to-end/tests/details-view/__snapshots__/settings-panel.test.ts.snap b/src/tests/end-to-end/tests/details-view/__snapshots__/settings-panel.test.ts.snap
index 2852b5b0b65..fd65a3545d7 100644
--- a/src/tests/end-to-end/tests/details-view/__snapshots__/settings-panel.test.ts.snap
+++ b/src/tests/end-to-end/tests/details-view/__snapshots__/settings-panel.test.ts.snap
@@ -12,7 +12,7 @@ exports[`Details View -> Settings Panel should pass accessibility validation wit
   The link has insufficient color contrast of 1.07:1 with the surrounding text. (Minimum contrast is 3:1, link text: #ffff00, surrounding text: #ffffff)
   The link has no styling (such as underline) to distinguish it from the surrounding text",
         "selector": [
-          "p:nth-child(1) > .root-294.insights-link[target="_blank"]",
+          "p:nth-child(1) > .root-293.insights-link[target="_blank"]",
         ],
       },
       {
@@ -20,7 +20,7 @@ exports[`Details View -> Settings Panel should pass accessibility validation wit
   The link has insufficient color contrast of 1.07:1 with the surrounding text. (Minimum contrast is 3:1, link text: #ffff00, surrounding text: #ffffff)
   The link has no styling (such as underline) to distinguish it from the surrounding text",
         "selector": [
-          ".toggle-description--ieTgg > .root-294.insights-link[target="_blank"]",
+          ".toggle-description--ieTgg > .root-293.insights-link[target="_blank"]",
         ],
       },
     ],

From a11649fc9a42548287bce226df86e6dcfeb57d9b Mon Sep 17 00:00:00 2001
From: Bill Dengler <codeofdusk@gmail.com>
Date: Thu, 20 Jun 2024 12:05:00 -0700
Subject: [PATCH 4/6] Bump minor version of report package

---
 packages/report/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/report/package.json b/packages/report/package.json
index cb953b5c807..3a8df139df6 100644
--- a/packages/report/package.json
+++ b/packages/report/package.json
@@ -1,6 +1,6 @@
 {
     "name": "accessibility-insights-report",
-    "version": "5.0.0",
+    "version": "5.1.0",
     "description": "Accessibility Insights Report",
     "license": "MIT",
     "files": [

From 5795386f88e48bfc960a366d6b4118b81d4c7cb6 Mon Sep 17 00:00:00 2001
From: Bill Dengler <codeofdusk@gmail.com>
Date: Thu, 20 Jun 2024 12:14:22 -0700
Subject: [PATCH 5/6] Review action

---
 packages/ui/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/ui/package.json b/packages/ui/package.json
index 9eb521bc703..1167d442215 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -17,7 +17,7 @@
         "url": "https://github.com/Microsoft/accessibility-insights-web"
     },
     "dependencies": {
-        "@fluentui/react": "^8.96.1",
+        "@fluentui/react": "^8.118.1",
         "axe-core": "4.9.1",
         "classnames": "^2.5.1",
         "lodash": "^4.17.21",

From d00b91ecef85e2ace73926cdec5b333f3d32fc82 Mon Sep 17 00:00:00 2001
From: Bill Dengler <codeofdusk@gmail.com>
Date: Thu, 20 Jun 2024 12:21:36 -0700
Subject: [PATCH 6/6] Back out unrelated change

Fluentui/react will be updated in a follow-up.

This reverts commit 5795386f88e48bfc960a366d6b4118b81d4c7cb6.
---
 packages/ui/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/ui/package.json b/packages/ui/package.json
index 1167d442215..9eb521bc703 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -17,7 +17,7 @@
         "url": "https://github.com/Microsoft/accessibility-insights-web"
     },
     "dependencies": {
-        "@fluentui/react": "^8.118.1",
+        "@fluentui/react": "^8.96.1",
         "axe-core": "4.9.1",
         "classnames": "^2.5.1",
         "lodash": "^4.17.21",