From d258db8aa282b3f0a7a5b00321bc49065c8f3c1d Mon Sep 17 00:00:00 2001
From: Shilong Liu <shilongliu@microsoft.com>
Date: Fri, 29 Apr 2022 13:40:33 +0800
Subject: [PATCH] [CG] Fix CG alert about underscore version. (#10705)

---
 .../0004-Remove-underscore-packages.patch     | 60 +++++++++++++++++++
 src/thrift_0_14_1/thrift.patch/series         |  1 +
 2 files changed, 61 insertions(+)
 create mode 100644 src/thrift_0_14_1/thrift.patch/0004-Remove-underscore-packages.patch

diff --git a/src/thrift_0_14_1/thrift.patch/0004-Remove-underscore-packages.patch b/src/thrift_0_14_1/thrift.patch/0004-Remove-underscore-packages.patch
new file mode 100644
index 000000000000..fd49e9d5655a
--- /dev/null
+++ b/src/thrift_0_14_1/thrift.patch/0004-Remove-underscore-packages.patch
@@ -0,0 +1,60 @@
+diff --git a/lib/ts/package-lock.json b/lib/ts/package-lock.json
+index fddef4426..93a3cbb8f 100644
+--- a/lib/ts/package-lock.json
++++ b/lib/ts/package-lock.json
+@@ -2639,8 +2639,7 @@
+         "mkdirp": "~0.5.1",
+         "requizzle": "~0.2.1",
+         "strip-json-comments": "~2.0.1",
+-        "taffydb": "2.6.2",
+-        "underscore": "~1.8.3"
++        "taffydb": "2.6.2"
+       }
+     },
+     "jshint": {
+@@ -3873,17 +3872,7 @@
+     "requizzle": {
+       "version": "0.2.1",
+       "resolved": "https://registry.npmjs.org/requizzle/-/requizzle-0.2.1.tgz",
+-      "integrity": "sha1-aUPDUwxNmn5G8c3dUcFY/GcM294=",
+-      "requires": {
+-        "underscore": "~1.6.0"
+-      },
+-      "dependencies": {
+-        "underscore": {
+-          "version": "1.6.0",
+-          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz",
+-          "integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag="
+-        }
+-      }
++      "integrity": "sha1-aUPDUwxNmn5G8c3dUcFY/GcM294="
+     },
+     "resolve": {
+       "version": "1.9.0",
+@@ -4622,25 +4611,10 @@
+         "xtend": "^4.0.1"
+       }
+     },
+-    "underscore": {
+-      "version": "1.8.3",
+-      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
+-      "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI="
+-    },
+     "underscore-contrib": {
+       "version": "0.3.0",
+       "resolved": "https://registry.npmjs.org/underscore-contrib/-/underscore-contrib-0.3.0.tgz",
+-      "integrity": "sha1-ZltmwkeD+PorGMn4y7Dix9SMJsc=",
+-      "requires": {
+-        "underscore": "1.6.0"
+-      },
+-      "dependencies": {
+-        "underscore": {
+-          "version": "1.6.0",
+-          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz",
+-          "integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag="
+-        }
+-      }
++      "integrity": "sha1-ZltmwkeD+PorGMn4y7Dix9SMJsc="
+     },
+     "underscore.string": {
+       "version": "3.3.5",
diff --git a/src/thrift_0_14_1/thrift.patch/series b/src/thrift_0_14_1/thrift.patch/series
index 9fe00d007f63..19ba4dba26f3 100644
--- a/src/thrift_0_14_1/thrift.patch/series
+++ b/src/thrift_0_14_1/thrift.patch/series
@@ -1,3 +1,4 @@
 0001-Remove-unneeded-packages.patch
 0002-Fix-build-rules.patch
 0003-Remove-minimist-packages.patch
+0004-Remove-underscore-packages.patch