Merge pull request #153 from AbstractSDK/adair/abstraxion-update

Update abstraxion actions
AbstractSDK · Nov 23, 2024 · d2ad9c6 · d2ad9c6
2 parents 49200dc + 903df40
commit d2ad9c6
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 14 deletions.
diff --git a/.changeset/hungry-phones-sell.md b/.changeset/hungry-phones-sell.md
@@ -0,0 +1,5 @@
+---
+"@abstract-money/actions-xion": patch
+---
+
+Build CJS for XION actions and ensure proper imports
diff --git a/packages/actions-xion/package.json b/packages/actions-xion/package.json
@@ -43,15 +43,36 @@
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
-      "default": "./dist/index.js"
+      "import": {
+        "types": "./dist/index.d.ts",
+        "import": "./dist/index.js"
+      },
+      "require": {
+        "types": "./dist/index.d.cts",
+        "require": "./dist/index.cjs"
+      }
     },
     "./actions": {
       "types": "./dist/actions/index.d.ts",
-      "default": "./dist/actions/index.js"
+      "import": {
+        "types": "./dist/actions/index.d.ts",
+        "import": "./dist/actions/index.js"
+      },
+      "require": {
+        "types": "./dist/actions/index.d.cts",
+        "require": "./dist/actions/index.cjs"
+      }
     },
     "./decorators": {
       "types": "./dist/decorators/index.d.ts",
-      "default": "./dist/decorators/index.js"
+      "import": {
+        "types": "./dist/decorators/index.d.ts",
+        "import": "./dist/decorators/index.js"
+      },
+      "require": {
+        "types": "./dist/decorators/index.d.cts",
+        "require": "./dist/decorators/index.cjs"
+      }
     },
     "./package.json": "./package.json"
   },

diff --git a/packages/actions-xion/src/actions/public/get-xion-account-by-external-owner.ts b/packages/actions-xion/src/actions/public/get-xion-account-by-external-owner.ts
@@ -1,8 +1,8 @@
+import { getRegistryQueryClientFromApi } from '@abstract-money/core/actions'
 import {
   AccountQueryClient,
   RegistryTypes,
 } from '@abstract-money/core/codegen/abstract'
-import { getRegistryQueryClientFromApi } from '@abstract-money/core/src/actions'
 import { CosmWasmClient } from '@cosmjs/cosmwasm-stargate'
 import { predictXionAccountIdByExternalOwner } from './predict-xion-account-id-by-external-owner'
 

diff --git a/packages/actions-xion/src/actions/public/predict-xion-account-id-by-external-owner.ts b/packages/actions-xion/src/actions/public/predict-xion-account-id-by-external-owner.ts
@@ -1,4 +1,4 @@
-import { RegistryTypes } from '@abstract-money/core/src/codegen/abstract'
+import { RegistryTypes } from '@abstract-money/core/codegen/abstract'
 import { CosmWasmClient } from '@cosmjs/cosmwasm-stargate'
 import { Uint64 } from '@cosmjs/math'
 import { decodePubkey } from '@cosmjs/proto-signing'

diff --git a/packages/actions-xion/tsconfig.json b/packages/actions-xion/tsconfig.json
@@ -14,13 +14,13 @@
     // TODO: change to true
     "noUnusedLocals": false,
     "noUnusedParameters": true,
-//    "paths": {
-//      // TODO: Remove once issue is fixed
-//      // https://github.com/microsoft/TypeScript/issues/48212
-//      "@cosmjs/cosmwasm-stargate": [
-//        "packages/core/node_modules/@cosmjs/cosmwasm-stargate/build"
-//      ],
-//    },
+    "paths": {
+      // TODO: Remove once issue is fixed
+      // https://github.com/microsoft/TypeScript/issues/48212
+      "@cosmjs/cosmwasm-stargate": [
+        "packages/core/node_modules/@cosmjs/cosmwasm-stargate/build"
+      ],
+    },
     "resolveJsonModule": true,
     "skipLibCheck": true,
     "strict": true,

diff --git a/packages/actions-xion/tsup.config.ts b/packages/actions-xion/tsup.config.ts
@@ -11,6 +11,6 @@ export default defineConfig(
     entry: ['src/index.ts', 'src/actions/index.ts', 'src/decorators/index.ts'],
     // external: [...Object.keys(dependencies)],
     external: [...Object.keys(dependencies), ...Object.keys(peerDependencies)],
-    format: ['esm'],
+    format: ['esm', 'cjs'],
   }),
 )
diff --git a/packages/react/src/hooks/account/wallet/use-execute-on-remote.ts b/packages/react/src/hooks/account/wallet/use-execute-on-remote.ts
@@ -1,5 +1,5 @@
 import { AccountId, AccountWalletClient } from '@abstract-money/core'
-import { type AccountTypes } from '@abstract-money/core/src/codegen/abstract'
+import { type AccountTypes } from '@abstract-money/core/codegen/abstract'
 import { useMutation } from '@tanstack/react-query'
 import { useConfig } from '../../../contexts'
 import { ExtractArgsFromParameters } from '../../../types/args'