From e0457f2179eb6ffb101642dbb94dd59b6fbf5562 Mon Sep 17 00:00:00 2001
From: Zane Whitfield <zwhitfield@salesforce.com>
Date: Mon, 25 Mar 2024 11:14:21 -0700
Subject: [PATCH] Remove semver from resolutions & reinstate in /cli
 package.json (#2743)

---
 package.json              |  3 +--
 packages/cli/package.json |  1 +
 yarn.lock                 | 34 +++++++++++++++++++++++++++++++++-
 3 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index f216ed4121..fccaf07425 100644
--- a/package.json
+++ b/package.json
@@ -18,8 +18,7 @@
     "tmp": "^0.2.1"
   },
   "resolutions": {
-    "ansi-regex": "4.1.1",
-    "semver": "5.7.2"
+    "ansi-regex": "4.1.1"
   },
   "standard": {
     "env": "mocha",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 5c82fab4aa..aba6196d92 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -63,6 +63,7 @@
     "node-fetch": "^2.6.7",
     "phoenix": "^1.6.14",
     "rollbar": "^2.26.2",
+    "semver": "5.7.2",
     "shell-escape": "^0.2.0",
     "shell-quote": "^1.8.1",
     "tmp": "^0.0.33",
diff --git a/yarn.lock b/yarn.lock
index 214f655c7a..4405d8ddd8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11096,6 +11096,7 @@ __metadata:
     qqjs: 0.3.11
     read-pkg: ^4.0.1
     rollbar: ^2.26.2
+    semver: 5.7.2
     shell-escape: ^0.2.0
     shell-quote: ^1.8.1
     sinon: ^7.2.4
@@ -17016,7 +17017,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"semver@npm:5.7.2":
+"semver@npm:2 || 3 || 4 || 5, semver@npm:5.7.2, semver@npm:^5.5.0, semver@npm:^5.6.0":
   version: 5.7.2
   resolution: "semver@npm:5.7.2"
   bin:
@@ -17025,6 +17026,37 @@ __metadata:
   languageName: node
   linkType: hard
 
+"semver@npm:7.3.4":
+  version: 7.3.4
+  resolution: "semver@npm:7.3.4"
+  dependencies:
+    lru-cache: ^6.0.0
+  bin:
+    semver: bin/semver.js
+  checksum: 96451bfd7cba9b60ee87571959dc47e87c95b2fe58a9312a926340fee9907fc7bc062c352efdaf5bb24b2dff59c145e14faf7eb9d718a84b4751312531b39f43
+  languageName: node
+  linkType: hard
+
+"semver@npm:^6.0.0, semver@npm:^6.1.0, semver@npm:^6.3.0, semver@npm:^6.3.1":
+  version: 6.3.1
+  resolution: "semver@npm:6.3.1"
+  bin:
+    semver: bin/semver.js
+  checksum: ae47d06de28836adb9d3e25f22a92943477371292d9b665fb023fae278d345d508ca1958232af086d85e0155aee22e313e100971898bbb8d5d89b8b1d4054ca2
+  languageName: node
+  linkType: hard
+
+"semver@npm:^7.0.0, semver@npm:^7.1.1, semver@npm:^7.1.3, semver@npm:^7.2.1, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.1, semver@npm:^7.5.3, semver@npm:^7.5.4":
+  version: 7.6.0
+  resolution: "semver@npm:7.6.0"
+  dependencies:
+    lru-cache: ^6.0.0
+  bin:
+    semver: bin/semver.js
+  checksum: 7427f05b70786c696640edc29fdd4bc33b2acf3bbe1740b955029044f80575fc664e1a512e4113c3af21e767154a94b4aa214bf6cd6e42a1f6dba5914e0b208c
+  languageName: node
+  linkType: hard
+
 "sentence-case@npm:^3.0.4":
   version: 3.0.4
   resolution: "sentence-case@npm:3.0.4"