From 68e2aab860cea093e150a110c873825b1d23d7c2 Mon Sep 17 00:00:00 2001
From: Kurt <kc13greiner@users.noreply.github.com>
Date: Tue, 18 Oct 2022 09:55:17 -0400
Subject: [PATCH] Feature/upgrade mocha 10.1 (#143468)

* upgrade mocha to 10.1

(cherry picked from commit c365988e0dddafc3bea4441ff1e2156d6d9f659e)

# Conflicts:
#	package.json
#	yarn.lock
---
 package.json |  4 ++++
 yarn.lock    | 18 +++++++++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b092e9327de55..c2014281ecbd8 100644
--- a/package.json
+++ b/package.json
@@ -767,8 +767,12 @@
     "marge": "^1.0.1",
     "micromatch": "3.1.10",
     "minimist": "^1.2.6",
+<<<<<<< HEAD
     "mkdirp": "0.5.1",
     "mocha": "^9.1.0",
+=======
+    "mocha": "^10.1.0",
+>>>>>>> c365988e0dd (Feature/upgrade mocha 10.1 (#143468))
     "mocha-junit-reporter": "^2.0.2",
     "mochawesome": "^7.0.1",
     "mochawesome-merge": "^4.2.1",
diff --git a/yarn.lock b/yarn.lock
index c50851ca6da6b..e6f4ef03e345b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6556,10 +6556,20 @@
     "@typescript-eslint/types" "5.2.0"
     eslint-visitor-keys "^3.0.0"
 
+<<<<<<< HEAD
 "@ungap/promise-all-settled@1.1.2":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44"
   integrity sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==
+=======
+"@webassemblyjs/ast@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7"
+  integrity sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==
+  dependencies:
+    "@webassemblyjs/helper-numbers" "1.11.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
+>>>>>>> c365988e0dd (Feature/upgrade mocha 10.1 (#143468))
 
 "@webassemblyjs/ast@1.9.0":
   version "1.9.0"
@@ -19523,12 +19533,18 @@ mocha-junit-reporter@^2.0.2:
     strip-ansi "^6.0.1"
     xml "^1.0.0"
 
+<<<<<<< HEAD
 mocha@^9.1.0:
   version "9.2.0"
   resolved "https://registry.yarnpkg.com/mocha/-/mocha-9.2.0.tgz#2bfba73d46e392901f877ab9a47b7c9c5d0275cc"
   integrity sha512-kNn7E8g2SzVcq0a77dkphPsDSN7P+iYkqE0ZsGCYWRsoiKjOt+NvXfaagik8vuDa6W5Zw3qxe8Jfpt5qKf+6/Q==
+=======
+mocha@^10.1.0:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.1.0.tgz#dbf1114b7c3f9d0ca5de3133906aea3dfc89ef7a"
+  integrity sha512-vUF7IYxEoN7XhQpFLxQAEMtE4W91acW4B6En9l97MwE9stL1A9gusXfoHZCLVHDUJ/7V5+lbCM6yMqzo5vNymg==
+>>>>>>> c365988e0dd (Feature/upgrade mocha 10.1 (#143468))
   dependencies:
-    "@ungap/promise-all-settled" "1.1.2"
     ansi-colors "4.1.1"
     browser-stdout "1.3.1"
     chokidar "3.5.3"