From 8300f6939bc523e0dcb616ef3ed5895b440841f4 Mon Sep 17 00:00:00 2001
From: Joseph Makar <joseph.makar@sentinelone.com>
Date: Thu, 23 Mar 2023 10:26:06 -0400
Subject: [PATCH] Added resolution for underscore version bump

---
 package.json | 9 ++++++---
 yarn.lock    | 8 ++++----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index f4f0ade..5642d09 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,9 @@
   },
   "author": "scalyr-cloudtech@scalyr.com",
   "license": "Apache-2.0",
+  "engines": {
+    "node": ">=18"
+  },
   "devDependencies": {
     "@babel/core": "^7.16.7",
     "@grafana/e2e": "9.3.8",
@@ -54,9 +57,6 @@
     "webpack-cli": "^4.9.2",
     "webpack-livereload-plugin": "^3.0.2"
   },
-  "engines": {
-    "node": ">=18"
-  },
   "dependencies": {
     "@emotion/css": "^11.1.3",
     "@grafana/data": "latest",
@@ -64,5 +64,8 @@
     "@grafana/ui": "latest",
     "react": "17.0.2",
     "react-dom": "17.0.2"
+  },
+  "resolutions": {
+    "underscore": "1.12.1"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 4bfba3a..5a6fde8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9458,10 +9458,10 @@ unbox-primitive@^1.0.2:
     has-symbols "^1.0.3"
     which-boxed-primitive "^1.0.2"
 
-underscore@1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.7.0.tgz#6bbaf0877500d36be34ecaa584e0db9fef035209"
-  integrity sha512-cp0oQQyZhUM1kpJDLdGO1jPZHgS/MpzoWYfe9+CM2h/QGDZlqwT2T3YGukuBdaNJ/CAPoeyAZRRHz8JFo176vA==
+underscore@1.12.1, underscore@1.7.0:
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.12.1.tgz#7bb8cc9b3d397e201cf8553336d262544ead829e"
+  integrity sha512-hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw==
 
 unicode-canonical-property-names-ecmascript@^2.0.0:
   version "2.0.0"