Merge pull request #128 from AbstractSDK/adair/try-fix-types

Try fixing types
AbstractSDK · Oct 22, 2024 · 1b112f4 · 1b112f4
2 parents 3e4e8bb + e045825
commit 1b112f4
Show file tree

Hide file tree

Showing 18 changed files with 66 additions and 141 deletions.
diff --git a/examples/wagemos-cosmoskit-nextjs/package.json b/examples/wagemos-cosmoskit-nextjs/package.json
@@ -24,7 +24,7 @@
     "@radix-ui/react-select": "^2.0.0",
     "@radix-ui/react-slot": "^1.0.2",
     "@radix-ui/react-toast": "^1.1.5",
-    "@tanstack/react-query": "^4",
+    "@tanstack/react-query": "4.36.1",
     "chain-registry": "^1.63.60",
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.0.0",
@@ -37,7 +37,7 @@
     "react-hook-form": "^7.48.2",
     "tailwind-merge": "^2.0.0",
     "tailwindcss-animate": "^1.0.7",
-    "type-fest": "^3.5.0",
+    "type-fest": "^4.2.6",
     "zod": "^3.22.4"
   },
   "devDependencies": {

diff --git a/examples/wagemos-cosmoskit-nextjs/src/app/_providers/cosmos-kit.tsx b/examples/wagemos-cosmoskit-nextjs/src/app/_providers/cosmos-kit.tsx
@@ -49,6 +49,7 @@ export function CosmosKitProvider(props: { children: ReactNode }) {
       })}
       assetLists={assets}
       wallets={wallets}
+      // @ts-ignore
       signerOptions={signerOptions}
       sessionOptions={{
         duration: 1000 * 60 * 60 * 24 * 7,

diff --git a/examples/wagemos-graz-nextjs/package.json b/examples/wagemos-graz-nextjs/package.json
@@ -24,7 +24,7 @@
     "@radix-ui/react-select": "^2.0.0",
     "@radix-ui/react-slot": "^1.0.2",
     "@radix-ui/react-toast": "^1.1.5",
-    "@tanstack/react-query": "^4",
+    "@tanstack/react-query": "4.36.1",
     "@tanstack/react-query-devtools": "^5.40.0",
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.0.0",
@@ -38,7 +38,7 @@
     "react-hook-form": "^7.48.2",
     "tailwind-merge": "^2.0.0",
     "tailwindcss-animate": "^1.0.7",
-    "type-fest": "^3.5.0",
+    "type-fest": "^4.2.6",
     "zod": "^3.22.4"
   },
   "devDependencies": {

diff --git a/package.json b/package.json
@@ -23,7 +23,7 @@
     "@manypkg/get-packages": "^1.1.3",
     "@microsoft/api-extractor": "^7.39.1",
     "@tanstack/query-core": "^4",
-    "@tanstack/react-query": "^4",
+    "@tanstack/react-query": "4.36.1",
     "@types/dedent": "^0.7.0",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^29.5.2",

diff --git a/packages/cli/tsup.config.ts b/packages/cli/tsup.config.ts
@@ -5,7 +5,7 @@ import { dependencies } from './package.json'
 
 export default defineConfig(
   getConfig({
-    // experimentalDts: false,
+    experimentalDts: false,
     //dev: process.env.DEV === 'true',
     entry: [
       'src/index.ts',

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -44,7 +44,7 @@
     "string-ts": "^2.0.0",
     "ts-mixer": "^6.0.2",
     "ts-pattern": "^4.0.6",
-    "type-fest": "^3.5.0",
+    "type-fest": "^4.2.6",
     "yup": "1.3.2"
   },
   "peerDependenciesMeta": {
@@ -75,8 +75,7 @@
     "serve": "^14.2.0",
     "ts-jest": "^29.0.2"
   },
-  "main": "./dist/index.cjs",
-  "module": "./dist/index.js",
+  "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "exports": {
     ".": {

diff --git a/packages/core/src/actions/wallet/create-account-monarchy.ts b/packages/core/src/actions/wallet/create-account-monarchy.ts
@@ -1,6 +1,5 @@
 import { SigningCosmWasmClient } from '@cosmjs/cosmwasm-stargate'
-import { CamelCasedProperties, Merge } from 'type-fest'
-import { OverrideProperties } from 'type-fest/source/override-properties'
+import { CamelCasedProperties, OverrideProperties } from 'type-fest'
 import { AccountTypes, RegistryTypes } from '../../codegen/abstract'
 import { WithCosmWasmSignOptions } from '../../types/parameters'
 import { WithOptional } from '../../types/utils'

diff --git a/packages/core/src/actions/wallet/create-account.ts b/packages/core/src/actions/wallet/create-account.ts
@@ -1,6 +1,6 @@
 import { SigningCosmWasmClient } from '@cosmjs/cosmwasm-stargate'
 import { CamelCasedProperties, Merge } from 'type-fest'
-import { OverrideProperties } from 'type-fest/source/override-properties'
+import { OverrideProperties } from 'type-fest'
 import { AccountTypes, RegistryTypes } from '../../codegen/abstract'
 import { WithCosmWasmSignOptions } from '../../types/parameters'
 import { WithOptional } from '../../types/utils'

diff --git a/packages/core/src/utils/assets/encode-assets-account-transfer-msgs.ts b/packages/core/src/utils/assets/encode-assets-account-transfer-msgs.ts
@@ -20,7 +20,7 @@ export function encodeAssetsAccountTransferMsgs(
             to_address: toAddress,
           },
         },
-      } as const
+      } satisfies CosmosMsgForEmpty
     }
     if (msg.typeUrl === '/cosmwasm.wasm.v1.MsgExecuteContract') {
       const { contract, msg: execMsg } = msg.value
@@ -32,7 +32,7 @@ export function encodeAssetsAccountTransferMsgs(
             msg: toBase64(execMsg),
           },
         },
-      } as const
+      } satisfies CosmosMsgForEmpty
     }
     throw new Error(`Unsupported message type: ${msg.typeUrl}`)
   }) satisfies CosmosMsgForEmpty[]

diff --git a/packages/cosmwasm-utils/package.json b/packages/cosmwasm-utils/package.json
@@ -31,24 +31,20 @@
     "rimraf": "^3.0.0",
     "@types/node": "^20.0.0"
   },
-  "main": "./dist/index.cjs",
-  "module": "./dist/index.js",
+  "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
-      "require": "./dist/index.cjs",
-      "import": "./dist/index.js"
+      "default": "./dist/index.js"
     },
     "./client": {
       "types": "./dist/client/index.d.ts",
-      "require": "./dist/client/index.cjs",
-      "import": "./dist/client/index.js"
+      "default": "./dist/client/index.js"
     },
     "./query": {
       "types": "./dist/query/index.d.ts",
-      "require": "./dist/query/index.cjs",
-      "import": "./dist/query/index.js"
+      "default": "./dist/query/index.js"
     },
     "./package.json": "./package.json"
   },

diff --git a/packages/cosmwasm-utils/tsup.config.ts b/packages/cosmwasm-utils/tsup.config.ts
@@ -5,10 +5,11 @@ import { dependencies } from './package.json'
 
 export default defineConfig(
   getConfig({
+    experimentalDts: false,
     outDir: 'dist',
     //dev: process.env.DEV === 'true',
     entry: ['src/index.ts', 'src/client/index.ts', 'src/query/index.ts'],
     external: [...Object.keys(dependencies)],
-    format: ['esm', 'cjs'],
+    format: ['esm'],
   }),
 )
diff --git a/packages/react/package.json b/packages/react/package.json
@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "@abstract-money/core": "workspace:*",
-    "@tanstack/react-query": "^4",
+    "@tanstack/react-query": "^4.12",
     "dedent": "^0.7.0",
     "@cosmjs/cosmwasm-stargate": "^0.32.3",
     "@cosmjs/stargate": "^0.32.3",
@@ -51,31 +51,16 @@
     "ts-pattern": "^4.0.6",
     "tslib": "^2.3.1"
   },
-  "main": "dist/index.cjs",
-  "module": "./dist/index.js",
+  "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
-      "import": {
-        "types": "./dist/index.d.ts",
-        "import": "./dist/index.js"
-      },
-      "require": {
-        "types": "./dist/index.d.cts",
-        "require": "./dist/index.cjs"
-      }
+      "default": "./dist/index.js"
     },
     "./hooks": {
       "types": "./dist/hooks/index.d.ts",
-      "import": {
-        "types": "./dist/hooks/index.d.ts",
-        "import": "./dist/hooks/index.js"
-      },
-      "require": {
-        "types": "./dist/hooks/index.d.cts",
-        "require": "./dist/hooks/index.cjs"
-      }
+      "default": "./dist/hooks/index.js"
     },
     "./package.json": "./package.json"
   },

diff --git a/packages/react/src/hooks/account/public/use-remote-account-ids.ts b/packages/react/src/hooks/account/public/use-remote-account-ids.ts
@@ -57,7 +57,10 @@ export function useRemoteAccountIds<TData = QueryData>({
   )
 
   const enabled = React.useMemo(
-    () => Boolean(accountPublicClient && (query.enabled ?? true)),
+    () =>
+      Boolean(
+        accountPublicClient && ((query.enabled as boolean | undefined) ?? true),
+      ),
     [query.enabled, accountPublicClient],
   )
 

diff --git a/packages/react/src/hooks/account/public/use-remote-accounts.ts b/packages/react/src/hooks/account/public/use-remote-accounts.ts
@@ -1,10 +1,10 @@
 import { AccountId, AccountPublicClient } from '@abstract-money/core'
 import {
-  QueryFunction,
   UseQueryOptions,
   UseQueryResult,
   useQuery,
 } from '@tanstack/react-query'
+import { QueryFunction } from '@tanstack/react-query'
 import React from 'react'
 import { useConfig } from '../../../contexts'
 import { WithArgs } from '../../../types/args'

diff --git a/packages/react/tsconfig.json b/packages/react/tsconfig.json
@@ -21,8 +21,8 @@
       "@cosmjs/cosmwasm-stargate": [
         "packages/core/node_modules/@cosmjs/cosmwasm-stargate/build"
       ],
-      "@tanstack/react-query": ["packages/react/node_modules/@tanstack/react-query/src"],
-      "@tanstack/query-core": ["node_modules/@tanstack/query-core/src"]
+//      "@tanstack/react-query": ["packages/react/node_modules/@tanstack/react-query/src"],
+//      "@tanstack/query-core": ["node_modules/@tanstack/query-core/src"]
     },
     "resolveJsonModule": true,
     "skipLibCheck": true,

diff --git a/packages/react/tsup.config.ts b/packages/react/tsup.config.ts
@@ -13,6 +13,6 @@ export default defineConfig(
     banner: {
       js: '"use client";',
     },
-    format: ['esm', 'cjs'],
+    format: ['esm'],
   }),
 )