From 75b2749a2f7c8e12795ac57cdfbc9d2a2f582459 Mon Sep 17 00:00:00 2001
From: Leszek Stachowski <leszek.stachowski@clabs.co>
Date: Mon, 15 Jul 2024 08:41:04 +0200
Subject: [PATCH] Fix yarn resolution errors (#293)

* Fix yarn resolution errors

* remove comment and flag for CI
---
 .github/workflows/ci.yml                        | 3 +--
 package.json                                    | 2 +-
 packages/sdk/contractkit/package.json           | 4 +++-
 packages/sdk/wallets/wallet-ledger/package.json | 2 ++
 yarn.lock                                       | 4 ++++
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index df0106db9..40bf2a5e1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -75,8 +75,7 @@ jobs:
           restore-keys: |
             node-${{ runner.os }}-${{ runner.arch }}-${{ env.NODE_MODULE_CACHE_VERSION }}-
       - name: Install yarn dependencies
-        # skip check due to YN0078: │ Invalid resolution @celo/connect@npm:^5.1.1 → npm:5.1.1
-        run: git config --global url."https://".insteadOf ssh:// && yarn install  --no-check-resolutions
+        run: git config --global url."https://".insteadOf ssh:// && yarn install
         if: steps.cache_node.outputs.cache-hit != 'true'
       - name: Run yarn postinstall if cache hitted
         run: yarn run postinstall
diff --git a/package.json b/package.json
index 83d8f0210..395439354 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
     "test:watch": "node node_modules/jest/bin/jest.js --watch",
     "postinstall": "husky install && yarn workspaces foreach -piv --all run postinstall",
     "release": "yarn clean && yarn build && yarn workspace @celo/celocli run prepack && yarn cs publish",
-    "version-and-reinstall": "yarn changeset version && yarn install --no-immutable --no-check-resolutions",
+    "version-and-reinstall": "yarn changeset version && yarn install --no-immutable",
     "celocli": "yarn workspace @celo/celocli run --silent celocli"
   },
   "workspaces": {
diff --git a/packages/sdk/contractkit/package.json b/packages/sdk/contractkit/package.json
index 97df8c0ee..ba0660774 100644
--- a/packages/sdk/contractkit/package.json
+++ b/packages/sdk/contractkit/package.json
@@ -48,11 +48,13 @@
     "@celo/typescript": "workspace:^",
     "@truffle/contract": "4.6.31",
     "@types/debug": "^4.1.5",
+    "@types/node": "18.7.16",
     "bn.js": "^5.1.0",
     "fetch-mock": "^10.0.7",
     "ganache": "npm:@celo/ganache@7.8.0-unofficial.0",
     "jest": "^29.7.0",
-    "ts-node": "^10.9.1"
+    "ts-node": "^10.9.1",
+    "typescript": "5.3.3"
   },
   "engines": {
     "node": ">=8.14.2"
diff --git a/packages/sdk/wallets/wallet-ledger/package.json b/packages/sdk/wallets/wallet-ledger/package.json
index 5d694f313..07fa451c8 100644
--- a/packages/sdk/wallets/wallet-ledger/package.json
+++ b/packages/sdk/wallets/wallet-ledger/package.json
@@ -44,7 +44,9 @@
     "@noble/curves": "^1.4.0",
     "@noble/hashes": "^1.3.3",
     "@types/debug": "^4.1.12",
+    "@types/node": "18.7.16",
     "ts-node": "^10.9.2",
+    "typescript": "5.3.3",
     "web3": "1.10.4"
   },
   "engines": {
diff --git a/yarn.lock b/yarn.lock
index fb937b076..25d784bd1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1770,6 +1770,7 @@ __metadata:
     "@truffle/contract": "npm:4.6.31"
     "@types/bn.js": "npm:^5.1.0"
     "@types/debug": "npm:^4.1.5"
+    "@types/node": "npm:18.7.16"
     bignumber.js: "npm:^9.0.0"
     bn.js: "npm:^5.1.0"
     cross-fetch: "npm:3.1.5"
@@ -1781,6 +1782,7 @@ __metadata:
     jest: "npm:^29.7.0"
     semver: "npm:^7.3.5"
     ts-node: "npm:^10.9.1"
+    typescript: "npm:5.3.3"
     web3: "npm:1.10.4"
     web3-core-helpers: "npm:1.10.4"
   languageName: unknown
@@ -2197,9 +2199,11 @@ __metadata:
     "@noble/curves": "npm:^1.4.0"
     "@noble/hashes": "npm:^1.3.3"
     "@types/debug": "npm:^4.1.12"
+    "@types/node": "npm:18.7.16"
     debug: "npm:^4.1.1"
     semver: "npm:^7.6.0"
     ts-node: "npm:^10.9.2"
+    typescript: "npm:5.3.3"
     web3: "npm:1.10.4"
   languageName: unknown
   linkType: soft