diff --git a/package-lock.json b/package-lock.json index 39a76c87..f7982b9d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "@meeco/identity-network-api-sdk": "1.1.0-develop.20230808164050.d37ca3c", "@meeco/keystore-api-sdk": "10.1.1-develop.20230816154849.c7c2018", "@meeco/vault-api-sdk": "39.6.1-develop.20231213134427.3dde2fcb3", - "@meeco/vc-api-sdk": "10.0.0-develop.20241007093232.e3e28ab", + "@meeco/vc-api-sdk": "10.0.0-develop.20241007171031.c55e9e0", "@noble/curves": "^1.4.0", "@noble/hashes": "^1.4.0", "@oclif/config": "^1.18.3", @@ -5461,9 +5461,9 @@ } }, "node_modules/@meeco/vc-api-sdk": { - "version": "10.0.0-develop.20241007093232.e3e28ab", - "resolved": "https://registry.npmjs.org/@meeco/vc-api-sdk/-/vc-api-sdk-10.0.0-develop.20241007093232.e3e28ab.tgz", - "integrity": "sha512-7O2uAKGOup6/uVi/3GN2KO5RR8eUgujLHMnxiiDlEoysCkO0UBu+Tj+2itVKCDa6tO3kVOiU0sGHmoq+GUwjcA==", + "version": "10.0.0-develop.20241007171031.c55e9e0", + "resolved": "https://registry.npmjs.org/@meeco/vc-api-sdk/-/vc-api-sdk-10.0.0-develop.20241007171031.c55e9e0.tgz", + "integrity": "sha512-L79kTlEFmitn5mVoZIJWtMDf3+ZzmU8lTkyU+WVXSk+9uc1g8Wggav9Sjg3jhcYMgkNaQ3OOPIMTEPRrD0ziBg==", "dependencies": { "portable-fetch": "3.0.0" } @@ -19297,9 +19297,9 @@ "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==" }, "node_modules/cookie": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", - "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz", + "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==", "engines": { "node": ">= 0.6" } @@ -22130,9 +22130,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.5.32", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.32.tgz", - "integrity": "sha512-M+7ph0VGBQqqpTT2YrabjNKSQ2fEl9PVx6AK3N558gDH9NO8O6XN9SXXFWRo9u9PbEg/bWq+tjXQr+eXmxubCw==" + "version": "1.5.33", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.33.tgz", + "integrity": "sha512-+cYTcFB1QqD4j4LegwLfpCNxifb6dDFUAwk6RsLusCwIaZI6or2f+q8rs5tTB2YC53HhOlIbEaqHMAAC8IOIwA==" }, "node_modules/elegant-spinner": { "version": "1.0.1", @@ -23136,16 +23136,16 @@ "integrity": "sha512-dX7e/LHVJ6W3DE1MHWi9S1EYzDESENfLrYohG2G++ovZrYOkm4Knwa0mc1cn84xJOR4KEU0WSchhLbd0UklbHw==" }, "node_modules/express": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/express/-/express-4.21.0.tgz", - "integrity": "sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==", + "version": "4.21.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz", + "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==", "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", "body-parser": "1.20.3", "content-disposition": "0.5.4", "content-type": "~1.0.4", - "cookie": "0.6.0", + "cookie": "0.7.1", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "2.0.0", diff --git a/packages/cli/package.json b/packages/cli/package.json index 7b36a260..a7304734 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -12,7 +12,7 @@ "@meeco/cryppo": "2.0.2", "@meeco/file-storage-node": "5.0.4", "@meeco/keystore-api-sdk": "10.1.1-develop.20230816154849.c7c2018", - "@meeco/sdk": "^7.2.0", + "@meeco/sdk": "^7.5.0", "@meeco/vault-api-sdk": "39.6.1-develop.20231213134427.3dde2fcb3", "oclif": "^3.1.0", "@oclif/core": "^1.9.9", diff --git a/packages/file-storage-browser/package.json b/packages/file-storage-browser/package.json index 199cde06..308b5fc2 100644 --- a/packages/file-storage-browser/package.json +++ b/packages/file-storage-browser/package.json @@ -30,7 +30,7 @@ "stream-browserify": "^3.0.0" }, "devDependencies": { - "@meeco/sdk": "^7.2.0", + "@meeco/sdk": "^7.5.0", "bili": "^5.0.5", "typedoc": "^0.23.2", "typescript": "^4.7.4", diff --git a/packages/sdk-demo/package.json b/packages/sdk-demo/package.json index 003ed5b3..ef6a8123 100644 --- a/packages/sdk-demo/package.json +++ b/packages/sdk-demo/package.json @@ -13,7 +13,7 @@ "lint": "tslint -p . -t stylish -c ../../tslint.json" }, "dependencies": { - "@meeco/sdk": "^7.2.0", + "@meeco/sdk": "^7.5.0", "@meeco/style-kit": "^2.0.1", "crypto-browserify": "^3.12.0", "json-formatter-js": "^2.3.4", diff --git a/packages/sdk/CHANGELOG.md b/packages/sdk/CHANGELOG.md index 32b85c32..28612e7a 100644 --- a/packages/sdk/CHANGELOG.md +++ b/packages/sdk/CHANGELOG.md @@ -5,6 +5,28 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project (loosely) adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## 7.5.0 + +### Fixed + +- Fix `import` of `chalk` dependency that makes library to crash + +## 7.4.0 + +### Fixed + +- Fix `import` of `form-data` dependency that makes library to crash + +## 7.3.0 + +### Changed + +- Upgraded `@meeco/vc-api-sdk` version to `10.0.0-develop.20241007171031.c55e9e0` + +### Fixed + +- Fix `import` of `bs58` dependency that makes library to crash + ## 7.2.0 ### Changed diff --git a/packages/sdk/package.json b/packages/sdk/package.json index f307ca7b..7648e203 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,7 +1,7 @@ { "name": "@meeco/sdk", "description": "A wrapper library around Meeco's various API SDK's and encryption libraries", - "version": "7.2.0", + "version": "7.5.0", "author": "Meeco", "bugs": "https://github.com/Meeco/cli/issues", "source": "src/index.ts", @@ -13,7 +13,7 @@ "@meeco/identity-network-api-sdk": "1.1.0-develop.20230808164050.d37ca3c", "@meeco/keystore-api-sdk": "10.1.1-develop.20230816154849.c7c2018", "@meeco/vault-api-sdk": "39.6.1-develop.20231213134427.3dde2fcb3", - "@meeco/vc-api-sdk": "10.0.0-develop.20241007093232.e3e28ab", + "@meeco/vc-api-sdk": "10.0.0-develop.20241007171031.c55e9e0", "@noble/curves": "^1.4.0", "@noble/hashes": "^1.4.0", "bs58": "5.0.0", diff --git a/packages/sdk/src/models/did-management/Ed25519.ts b/packages/sdk/src/models/did-management/Ed25519.ts index 993be689..204028f7 100644 --- a/packages/sdk/src/models/did-management/Ed25519.ts +++ b/packages/sdk/src/models/did-management/Ed25519.ts @@ -1,7 +1,6 @@ -// tslint:disable-next-line: no-var-requires -const b58 = require('bs58'); import { ed25519 } from '@noble/curves/ed25519'; import { bytesToHex } from '@noble/hashes/utils'; +import b58 from 'bs58'; import { bytesToBase64url } from 'did-jwt'; import { IKeyPairDID } from './key-pair-did'; diff --git a/packages/sdk/src/util/api-factory.ts b/packages/sdk/src/util/api-factory.ts index b8907c08..90008426 100644 --- a/packages/sdk/src/util/api-factory.ts +++ b/packages/sdk/src/util/api-factory.ts @@ -3,17 +3,12 @@ import * as Keystore from '@meeco/keystore-api-sdk'; import * as Vault from '@meeco/vault-api-sdk'; import { Configuration } from '@meeco/vault-api-sdk'; import * as VC from '@meeco/vc-api-sdk'; +import chalk from 'chalk'; import { debug } from 'debug'; import { Environment } from '../models/environment'; import { IIdentityNetworkToken, IKeystoreToken, IVaultToken, IVCToken } from '../services/service'; import SDKFormData from './sdk-form-data'; -/** - * INFO: using 'import' statement causes typescript errors either in tests or in built version of the package - */ -/* tslint:disable no-var-requires */ -const chalk = require('chalk'); - let fetchLib = fetch; /** diff --git a/packages/sdk/src/util/sdk-form-data.ts b/packages/sdk/src/util/sdk-form-data.ts index 04dce484..a8d2acb6 100644 --- a/packages/sdk/src/util/sdk-form-data.ts +++ b/packages/sdk/src/util/sdk-form-data.ts @@ -1,5 +1,4 @@ -// tslint:disable-next-line: no-var-requires -const FormData = require('form-data'); +import FormData from 'form-data'; /** * @hidden @@ -10,12 +9,12 @@ const FormData = require('form-data'); * This monkey-patches the constructor of FormData to ensure the argument always exists */ class SDKFormData extends FormData { - append(...args) { - if (args[0] === 'attachment[file]' || args[0] === 'binary[file]') { - return super.append(args[0], args[1], 'file'); + append(key: string, value: any, options?: FormData.AppendOptions | string) { + if (key === 'attachment[file]' || key === 'binary[file]') { + return super.append(key, value, 'file'); } - return super.append(...args); + return super.append(key, value, options); } } diff --git a/packages/sdk/src/util/secrets.ts b/packages/sdk/src/util/secrets.ts index f0c36e39..f7cd2ef1 100644 --- a/packages/sdk/src/util/secrets.ts +++ b/packages/sdk/src/util/secrets.ts @@ -1,6 +1,5 @@ -// tslint:disable-next-line: no-var-requires -const b58 = require('bs58'); import { binaryStringToBytes, bytesToBinaryString } from '@meeco/cryppo'; +import b58 from 'bs58'; import { ERROR_CODES, MeecoServiceError } from '../models/service-error'; import { SymmetricKey } from '../models/symmetric-key'; import cryppo from '../services/cryppo-service';