Merge branch 'main' into docs/typo

dfinity · Jun 26, 2023 · 38be34e · 38be34e
2 parents b1d36ed + 11b36b0
commit 38be34e
Show file tree

Hide file tree

Showing 14 changed files with 144 additions and 242 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,11 @@
 - utils `v0.0.18`
 - nns-proto `v0.0.4`
 
+## Breaking Changes
+
+- move `convertStringToE8s` and `TokenAmount` from Nns package to `@dfinity/utils`
+- retire `TokenAmount.toProto()`
+
 ## Features
 
 - add a new utils function `decodePayment` to the `@dfinity/ledger` library. Useful to decode payment through QR code that contains target address and amount

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -50,6 +50,7 @@
     "node-fetch": "^3.3.1",
     "prettier": "^2.8.7",
     "prettier-plugin-organize-imports": "^3.2.2",
+    "semver": "^7.5.3",
     "size-limit": "^8.2.4",
     "text-encoding": "^0.7.0",
     "ts-jest": "^29.1.0",
@@ -144,8 +145,12 @@
       "ignore": [
         "@dfinity/agent",
         "@dfinity/candid",
-        "@dfinity/principal"
+        "@dfinity/principal",
+        "@dfinity/utils"
       ]
     }
-  ]
+  ],
+  "overrides": {
+    "semver": "^7.5.3"
+  }
 }