Merge pull request #303 from convergence-rfq/eng-1932-debug-hxro-sdk-…

…issue-in-the-api-repo Fix hxro sdk issue in the api repo
convergence-rfq · Apr 26, 2024 · dbf9200 · dbf9200
2 parents 0adab70 + 66ede0a
commit dbf9200
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 6 deletions.
diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @convergence-rfq/cli
 
+## 6.6.10
+
+### Patch Changes
+
+- Fix an issue with hxro library when the SDK is imported as .mjs
+- Updated dependencies
+  - @convergence-rfq/sdk@6.6.10
+
 ## 6.6.9
 
 ### Patch Changes

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@convergence-rfq/cli",
   "description": "Official Convergence CLI",
-  "version": "6.6.9",
+  "version": "6.6.10",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -47,7 +47,7 @@
     "cli": "ts-node src/index.ts"
   },
   "dependencies": {
-    "@convergence-rfq/sdk": "6.6.9",
+    "@convergence-rfq/sdk": "6.6.10",
     "@solana/web3.js": "^1.87.6",
     "@types/cookie": "^0.5.1",
     "commander": "^10.0.0"

diff --git a/packages/js/CHANGELOG.md b/packages/js/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @convergence-rfq/sdk
 
+## 6.6.10
+
+### Patch Changes
+
+- Fix an issue with hxro library when the SDK is imported as .mjs
+
 ## 6.6.9
 
 ### Patch Changes

diff --git a/packages/js/package.json b/packages/js/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@convergence-rfq/sdk",
   "description": "Official Convergence RFQ SDK",
-  "version": "6.6.9",
+  "version": "6.6.10",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -37,7 +37,8 @@
     "lint": "eslint --ext js,ts,tsx src",
     "lint:fix": "eslint --fix --ext js,ts,tsx src",
     "clean": "rimraf dist",
-    "build": "yarn clean && tsc && tsc-alias && tsc -p tsconfig.json && tsc-alias -p tsconfig.json && rollup -c",
+    "build": "yarn clean && yarn build:types && rollup -c",
+    "build:types": "tsc -p tsconfig.json && tsc-alias -p tsconfig.json",
     "test:coverage": "nyc ts-mocha --timeout 100000 tests/**/*.spec.ts",
     "test": "ts-mocha --paths --timeout 100000 tests/**/*.spec.ts"
   },

diff --git a/packages/js/src/plugins/hxroPrintTradeProviderModule/cache.ts b/packages/js/src/plugins/hxroPrintTradeProviderModule/cache.ts
@@ -21,7 +21,10 @@ export const hxroManifestCache = useCache(async (cvg: Convergence) => {
   console.debug = () => {};
   let manifest: any; // dexterity doesn't export a type for a manifest
   try {
-    manifest = await dexterity.getManifest(
+    // @ts-ignore the next line fixes a strange issue with dexterity default export when imported from .mjs files
+    const getManifest = dexterity.getManifest ?? dexterity.default.getManifest;
+
+    manifest = await getManifest(
       cvg.connection.rpcEndpoint,
       true,
       new CvgWallet(cvg)

diff --git a/packages/js/tsconfig.json b/packages/js/tsconfig.json
@@ -12,7 +12,7 @@
     "esModuleInterop": true,
     "module": "commonjs",
     "declaration": true,
-    "emitDeclarationOnly": false,
+    "emitDeclarationOnly": true,
     "declarationDir": "dist/types",
   }
 }