chore: resolve conflicts

.github/workflows/ci.yml

@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-20.04
     env: { PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1 }
     steps:
-    - uses: actions/checkout@v4.1.7
+    - uses: actions/checkout@v4.2.2
       timeout-minutes: 2
 
     - uses: actions/setup-node@v4
@@ -52,7 +52,7 @@ jobs:
         shard-index: [1, 2]
 
     steps:
-    - uses: actions/checkout@v4.1.7
+    - uses: actions/checkout@v4.2.2
       timeout-minutes: 2
 
     - uses: actions/setup-node@v4
@@ -83,7 +83,7 @@ jobs:
     runs-on: ubuntu-20.04
     env: { PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1 }
     steps:
-    - uses: actions/checkout@v4.1.7
+    - uses: actions/checkout@v4.2.2
       timeout-minutes: 2
 
     - uses: actions/setup-node@v4
@@ -117,7 +117,7 @@ jobs:
   codeql:
     runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@v4.1.7
+    - uses: actions/checkout@v4.2.2
       timeout-minutes: 2
 
     - uses: github/codeql-action/init@v3
@@ -133,14 +133,14 @@ jobs:
     name: e2e-web-tests (${{ matrix.shard-index }}/${{ strategy.job-total }})
     runs-on: ubuntu-20.04
     # We need to update this each time we update playwright
-    container: mcr.microsoft.com/playwright:v1.45.3-focal
+    container: mcr.microsoft.com/playwright:v1.48.2-focal
     strategy:
       fail-fast: false
       matrix:
         shard-index: [1, 2]
 
     steps:
-    - uses: actions/checkout@v4.1.7
+    - uses: actions/checkout@v4.2.2
       timeout-minutes: 2
 
     - uses: actions/setup-node@v4
@@ -190,7 +190,7 @@ jobs:
     runs-on: ubuntu-20.04
     env: { PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1 }
     steps:
-    - uses: actions/checkout@v4.1.7
+    - uses: actions/checkout@v4.2.2
       timeout-minutes: 2
 
     - uses: actions/setup-node@v4
@@ -219,7 +219,7 @@ jobs:
   check-clearly-defined:
     runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@v4.1.7
+    - uses: actions/checkout@v4.2.2
       timeout-minutes: 2
 
     - name: Check ClearlyDefined for dependabot PR's

Dockerfile

@@ -5,7 +5,7 @@
 # reference: https://stackoverflow.com/a/51683309/3711475
 # reference: https://github.com/GoogleChrome/puppeteer/blob/master/docs/troubleshooting.md#running-puppeteer-in-docker
 
-FROM mcr.microsoft.com/playwright:v1.45.3-focal AS setup
+FROM mcr.microsoft.com/playwright:v1.48.2-focal AS setup
 
 USER root
 

package.json

@@ -80,11 +80,11 @@
         "@swc/jest": "^0.2.36",
         "@testing-library/dom": "^10.3.1",
         "@testing-library/jest-dom": "^6.4.2",
-        "@testing-library/react": "^16.0.0",
+        "@testing-library/react": "^16.0.1",
         "@types/chrome": "0.0.260",
         "@types/jest": "^29.5.11",
         "@types/jsdom": "^21.1.6",
-        "@types/lodash": "^4.14.202",
+        "@types/lodash": "^4.17.12",
         "@types/luxon": "^3.4.2",
         "@types/node": "^22.7.3",
         "@types/react": "^18.3.1",
@@ -108,7 +108,7 @@
         "eslint-plugin-import": "^2.29.1",
         "eslint-plugin-react": "^7.34.4",
         "eslint-plugin-security": "^1.7.1",
-        "express": "^4.19.2",
+        "express": "^4.20.0",
         "extract-zip": "^2.0.1",
         "fake-indexeddb": "^4.0.2",
         "fork-ts-checker-webpack-plugin": "^9.0.2",
@@ -130,14 +130,14 @@
         "license-check-and-add": "^4.0.5",
         "mini-css-extract-plugin": "2.9.0",
         "npm-run-all": "^4.1.5",
-        "playwright": "^1.45.3",
+        "playwright": "^1.48.2",
         "postcss": "^8.4.41",
         "postcss-modules": "^6.0.0",
-        "prettier": "^3.2.5",
+        "prettier": "^3.3.3",
         "regenerator-runtime": "^0.14.1",
         "sass": "^1.69.7",
         "sass-loader": "^13.3.3",
-        "serve-static": "^1.15.0",
+        "serve-static": "^1.16.0",
         "simple-git": "^3.22.0",
         "stylelint": "^15.11.0",
         "stylelint-config-prettier-scss": "^1.0.0",
@@ -146,8 +146,8 @@
         "ts-loader": "^9.5.1",
         "typed-scss-modules": "^8.0.0",
         "typemoq": "^2.1.0",
-        "typescript": "^5.4.5",
-        "webpack": "^5.91.0",
+        "typescript": "^5.6.3",
+        "webpack": "^5.95.0",
         "webpack-cli": "^5.1.4",
         "webpack-node-externals": "^3.0.0"
     },
@@ -156,7 +156,7 @@
         "@microsoft/applicationinsights-web": "^2.8.15",
         "@testing-library/user-event": "^14.5.2",
         "ajv": "^8.12.0",
-        "axe-core": "4.9.1",
+        "axe-core": "4.10.2",
         "classnames": "^2.5.1",
         "idb-keyval": "^6.2.1",
         "lodash": "^4.17.21",

packages/report-e2e-tests/package.json

@@ -21,9 +21,9 @@
     "devDependencies": {
         "@types/jest": "^29.5.11",
         "jest": "^29.7.0",
-        "jest-file-snapshot": "^0.5.0",
+        "jest-file-snapshot": "^0.7.0",
         "jest-junit": "^16.0.0",
-        "prettier": "^3.2.5",
-        "typescript": "^5.4.5"
+        "prettier": "^3.3.3",
+        "typescript": "^5.6.3"
     }
 }

packages/report/package.json

@@ -19,7 +19,7 @@
     },
     "dependencies": {
         "@fluentui/react": "^8.118.1",
-        "axe-core": "4.9.1",
+        "axe-core": "4.10.2",
         "classnames": "^2.5.1",
         "lodash": "^4.17.21",
         "luxon": "^3.5.0",

src/DetailsView/components/issues-table.tsx

@@ -94,7 +94,7 @@ export class IssuesTable extends React.Component<IssuesTableProps> {
         return (
             <h1>
                 {this.props.title}
-                {this.props.includeStepsText ?? true ? ` ${this.props.stepsText}` : null}
+                {(this.props.includeStepsText ?? true) ? ` ${this.props.stepsText}` : null}
             </h1>
         );
     }

src/DetailsView/components/left-nav/left-nav-link-builder.tsx

@@ -207,7 +207,7 @@ export class LeftNavLinkBuilder {
             return test;
         });
 
-        return allTestLinks;
+        return allTestLinks as unknown as BaseLeftNavLink[];
     }
 
     private buildNoncollapsibleAssessmentLink = (

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.9.1
+             4.10.2
           </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.9.1
+             4.10.2
           </div>
         </div>
       </div>

src/tests/unit/tests/scanner/__snapshots__/get-rule-inclusions.test.ts.snap

@@ -323,6 +323,9 @@ exports[`getRuleInclusions getRuleInclusions matches snapshotted list of product
     "reason": "rule is tagged best-practice",
     "status": "excluded",
   },
+  "summary-name": {
+    "status": "included",
+  },
   "svg-img-alt": {
     "status": "included",
   },

src/views/content/content-page.tsx

@@ -127,7 +127,7 @@ export function ContentProvider(root: ContentTree): ContentProvider {
     const contentFromReference = (reference?: ContentReference) =>
         isContentPageComponent(reference) ? reference : getPage(reference);
     const pathFromReference = (reference?: ContentReference) =>
-        isContentPageComponent(reference) ? pathTo(reference) : reference ?? null;
+        isContentPageComponent(reference) ? pathTo(reference) : (reference ?? null);
 
     return { getPage, allPaths, pathTo, contentFromReference, pathFromReference };
 }