From 95dadca855dc8fcef1e8e07e724c4ec5df92b8ec Mon Sep 17 00:00:00 2001
From: Joe Portner <5295965+jportner@users.noreply.github.com>
Date: Thu, 7 Apr 2022 22:07:03 -0400
Subject: [PATCH] [7.17] moment 2.28.0 -> 2.29.2 (#129814) (#129832)

* moment 2.28.0 -> 2.29.2 (#129814)

(cherry picked from commit 699c17afec518a5724d3351b5fe74b554faa5964)

# Conflicts:
#	x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/helpers.test.tsx
#	x-pack/plugins/security_solution/server/lib/detection_engine/signals/utils.test.ts
#	yarn.lock

* Fix lockfile
---
 package.json                                              | 2 +-
 .../pages/detection_engine/rules/helpers.test.tsx         | 1 -
 .../server/lib/detection_engine/signals/utils.test.ts     | 1 -
 yarn.lock                                                 | 8 ++++----
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 418cf8b90ea52..22368324a10d3 100644
--- a/package.json
+++ b/package.json
@@ -294,7 +294,7 @@
     "mime-types": "^2.1.27",
     "mini-css-extract-plugin": "1.1.0",
     "minimatch": "^3.1.2",
-    "moment": "^2.24.0",
+    "moment": "^2.29.2",
     "moment-duration-format": "^2.3.2",
     "moment-timezone": "^0.5.27",
     "monaco-editor": "^0.22.3",
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/helpers.test.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/helpers.test.tsx
index fa600d9ce4a0e..26810e4ffbbac 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/helpers.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/helpers.test.tsx
@@ -34,7 +34,6 @@ import {
 import { getThreatMock } from '../../../../../common/detection_engine/schemas/types/threat.mock';
 
 describe('rule helpers', () => {
-  // @ts-expect-error
   moment.suppressDeprecationWarnings = true;
   describe('getStepsData', () => {
     test('returns object with about, define, schedule and actions step properties formatted', () => {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/utils.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/utils.test.ts
index ba10127efd58f..3367e134f745f 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/utils.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/utils.test.ts
@@ -16,7 +16,6 @@ import { ExceptionListClient } from '../../../../../lists/server';
 import { getListArrayMock } from '../../../../common/detection_engine/schemas/types/lists.mock';
 import { getExceptionListItemSchemaMock } from '../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
 
-// @ts-expect-error
 moment.suppressDeprecationWarnings = true;
 
 import {
diff --git a/yarn.lock b/yarn.lock
index c87d786bcdd3f..b38ffddb6c335 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -20037,10 +20037,10 @@ moment-timezone@^0.5.27:
   dependencies:
     moment ">= 2.9.0"
 
-"moment@>= 2.9.0", moment@>=1.6.0, moment@>=2.14.0, moment@^2.10.6, moment@^2.19.3, moment@^2.24.0:
-  version "2.28.0"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.28.0.tgz#cdfe73ce01327cee6537b0fafac2e0f21a237d75"
-  integrity sha512-Z5KOjYmnHyd/ukynmFd/WwyXHd7L4J9vTI/nn5Ap9AVUgaAE15VvQ9MOGmJJygEUklupqIrFnor/tjTwRU+tQw==
+"moment@>= 2.9.0", moment@>=1.6.0, moment@>=2.14.0, moment@^2.10.6, moment@^2.19.3, moment@^2.29.2:
+  version "2.29.2"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.2.tgz#00910c60b20843bcba52d37d58c628b47b1f20e4"
+  integrity sha512-UgzG4rvxYpN15jgCmVJwac49h9ly9NurikMWGPdVxm8GZD6XjkKPxDTjQQ43gtGgnV3X0cAyWDdP2Wexoquifg==
 
 monaco-editor@*, monaco-editor@^0.22.3:
   version "0.22.3"