From 3af833ceb5602242d6c997f98cec7b005b0fbb21 Mon Sep 17 00:00:00 2001
From: Iain Sproat <68657+iainsproat@users.noreply.github.com>
Date: Wed, 6 Sep 2023 09:31:38 +0100
Subject: [PATCH] fix(package.json): tidy resolutions - attempt 2 (#1784)

* Revert "Revert "fix(server/package.json): tidy resolutions (#1782)" (#1783)"
* Explicitly provide dependency in frontend-2
---
 package.json                     | 13 ++++++-------
 packages/frontend-2/package.json |  1 +
 yarn.lock                        | 13 +++++++------
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index 2e61a7a8c..086706908 100644
--- a/package.json
+++ b/package.json
@@ -52,13 +52,13 @@
     "tsconfig-paths": "^4.0.0"
   },
   "resolutions": {
-    "@microsoft/api-extractor/semver": "^7.5.4",
-    "@rushstack/node-core-library/semver": "^7.5.4",
+    "@microsoft/api-extractor/semver": ">=7.5.4",
+    "@rushstack/node-core-library/semver": ">=7.5.4",
     "@typescript-eslint/eslint-plugin": "^6.4.1",
     "@typescript-eslint/parser": "^6.4.1",
     "@types/react": "file:./packages/frontend-2/type-augmentations/stubs/types__react",
     "core-js": "3.22.4",
-    "core-js-compat/semver": "^7.5.4",
+    "core-js-compat/semver": ">=7.5.4",
     "eslint": "^8.11.0",
     "eslint-config-prettier": "^8.5.0",
     "fast-xml-parser": ">=4.2.5",
@@ -66,12 +66,11 @@
     "levelup/bl": ">=1.2.3",
     "levelup/semver": ">=5.7.2",
     "prettier": "^2.8.7",
-    "simple-update-notifier/semver": "^7.5.4",
+    "simple-update-notifier/semver": ">=7.5.4",
     "tough-cookie": ">=4.1.3",
-    "tslib": "^2.3.1",
+    "tslib": ">=2.3.1",
     "typescript": "^5.2.2",
-    "word-wrap": "npm:@aashutoshrathi/word-wrap@^1.2.4",
-    "xml2js": ">=0.5.0"
+    "word-wrap": "npm:@aashutoshrathi/word-wrap@>=1.2.4"
   },
   "config": {
     "commitizen": {
diff --git a/packages/frontend-2/package.json b/packages/frontend-2/package.json
index 9916e6b5c..8099dc51b 100644
--- a/packages/frontend-2/package.json
+++ b/packages/frontend-2/package.json
@@ -66,6 +66,7 @@
     "portal-vue": "^3.0.0",
     "seq-logging": "^2.1.1",
     "subscriptions-transport-ws": "^0.11.0",
+    "tslib": "^2.6.2",
     "vee-validate": "^4.7.0",
     "vue-advanced-cropper": "^2.8.8",
     "vue-tippy": "^6.0.0",
diff --git a/yarn.lock b/yarn.lock
index e79f7e1c6..e16dc2cec 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12504,6 +12504,7 @@ __metadata:
     stylelint-config-standard: ^26.0.0
     subscriptions-transport-ws: ^0.11.0
     tailwindcss: ^3.3.2
+    tslib: ^2.6.2
     type-fest: ^3.5.1
     typescript: ^4.8.3
     vee-validate: ^4.7.0
@@ -38608,7 +38609,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"semver@npm:>=5.7.2, semver@npm:^7.0.0, semver@npm:^7.1.1, semver@npm:^7.1.2, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.6, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.0, semver@npm:^7.5.1, semver@npm:^7.5.3, semver@npm:^7.5.4":
+"semver@npm:>=5.7.2, semver@npm:>=7.5.4, semver@npm:^7.0.0, semver@npm:^7.1.1, semver@npm:^7.1.2, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.6, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.0, semver@npm:^7.5.1, semver@npm:^7.5.3, semver@npm:^7.5.4":
   version: 7.5.4
   resolution: "semver@npm:7.5.4"
   dependencies:
@@ -41012,10 +41013,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tslib@npm:^2.3.1":
-  version: 2.4.0
-  resolution: "tslib@npm:2.4.0"
-  checksum: 8c4aa6a3c5a754bf76aefc38026134180c053b7bd2f81338cb5e5ebf96fefa0f417bff221592bf801077f5bf990562f6264fecbc42cd3309b33872cb6fc3b113
+"tslib@npm:>=2.3.1":
+  version: 2.6.2
+  resolution: "tslib@npm:2.6.2"
+  checksum: 329ea56123005922f39642318e3d1f0f8265d1e7fcb92c633e0809521da75eeaca28d2cf96d7248229deb40e5c19adf408259f4b9640afd20d13aecc1430f3ad
   languageName: node
   linkType: hard
 
@@ -43533,7 +43534,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"word-wrap@npm:@aashutoshrathi/word-wrap@^1.2.4":
+"word-wrap@npm:@aashutoshrathi/word-wrap@>=1.2.4":
   version: 1.2.6
   resolution: "@aashutoshrathi/word-wrap@npm:1.2.6"
   checksum: ada901b9e7c680d190f1d012c84217ce0063d8f5c5a7725bb91ec3c5ed99bb7572680eb2d2938a531ccbaec39a95422fcd8a6b4a13110c7d98dd75402f66a0cd