@vue-solana/vue 1.1.0 → 2.0.0

package/dist/useWallet.d.mts

@@ -1,10 +1,10 @@
-import * as _solana_web3_compat from '@solana/web3-compat';
+import * as _solana_kit from '@solana/kit';
 import * as vue from 'vue';
 import * as _vue_solana_core_types from '@vue-solana/core/types';
 
 declare function useWallet(): {
     wallet: vue.Ref<_vue_solana_core_types.SolanaWallet | null, _vue_solana_core_types.SolanaWallet | null>;
-    publicKey: vue.ComputedRef<_solana_web3_compat.PublicKey | null>;
+    publicKey: vue.ComputedRef<_solana_kit.Address | null>;
     connected: vue.ComputedRef<boolean>;
     connecting: vue.ComputedRef<boolean>;
     disconnecting: vue.ComputedRef<boolean>;

package/dist/useWallet.d.ts

@@ -1,10 +1,10 @@
-import * as _solana_web3_compat from '@solana/web3-compat';
+import * as _solana_kit from '@solana/kit';
 import * as vue from 'vue';
 import * as _vue_solana_core_types from '@vue-solana/core/types';
 
 declare function useWallet(): {
     wallet: vue.Ref<_vue_solana_core_types.SolanaWallet | null, _vue_solana_core_types.SolanaWallet | null>;
-    publicKey: vue.ComputedRef<_solana_web3_compat.PublicKey | null>;
+    publicKey: vue.ComputedRef<_solana_kit.Address | null>;
     connected: vue.ComputedRef<boolean>;
     connecting: vue.ComputedRef<boolean>;
     disconnecting: vue.ComputedRef<boolean>;

package/dist/useWallet.mjs

@@ -1,5 +1,5 @@
-export { u as useWallet } from './shared/vue.B7w1CC4R.mjs';
+export { u as useWallet } from './shared/vue.PJjEncbP.mjs';
 import '@vue-solana/core/errors';
 import '@vue-solana/core/wallet';
 import 'vue';
-import './shared/vue.DCDTsSjf.mjs';
+import './shared/vue.CnUlZSe8.mjs';

package/dist/useWallets.cjs

@@ -1,7 +1,7 @@
 'use strict';
 
-const useWallets = require('./shared/vue.D5Kmwcx3.cjs');
-require('./shared/vue.eNXmiI3a.cjs');
+const useWallets = require('./shared/vue.DgCmU1RR.cjs');
+require('./shared/vue.BaR1VPhl.cjs');
 require('vue');
 
 

package/dist/useWallets.mjs

@@ -1,3 +1,3 @@
-export { u as useWallets } from './shared/vue.Cvg6TEXE.mjs';
-import './shared/vue.DCDTsSjf.mjs';
+export { u as useWallets } from './shared/vue.D7xFeC2m.mjs';
+import './shared/vue.CnUlZSe8.mjs';
 import 'vue';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue-solana/vue",
-  "version": "1.1.0",
+  "version": "2.0.0",
   "description": "Vue plugin and composables for Solana applications.",
   "license": "MIT",
   "keywords": [
@@ -40,6 +40,11 @@
       "import": "./dist/useSolana.mjs",
       "require": "./dist/useSolana.cjs"
     },
+    "./useSolanaClient": {
+      "types": "./dist/useSolanaClient.d.ts",
+      "import": "./dist/useSolanaClient.mjs",
+      "require": "./dist/useSolanaClient.cjs"
+    },
     "./useRpc": {
       "types": "./dist/useRpc.d.ts",
       "import": "./dist/useRpc.mjs",
@@ -110,10 +115,10 @@
       "import": "./dist/useTokenAccounts.mjs",
       "require": "./dist/useTokenAccounts.cjs"
     },
-    "./web3": {
-      "types": "./dist/web3.d.ts",
-      "import": "./dist/web3.mjs",
-      "require": "./dist/web3.cjs"
+    "./kit": {
+      "types": "./dist/kit.d.ts",
+      "import": "./dist/kit.mjs",
+      "require": "./dist/kit.cjs"
     }
   },
   "files": [
@@ -123,9 +128,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@solana/web3-compat": "^0.0.21",
     "bs58": "^6.0.0",
-    "@vue-solana/core": "1.1.0"
+    "@vue-solana/core": "2.0.0"
   },
   "peerDependencies": {
     "vue": "^3.5.0"

package/dist/shared/vue.Bii4W61L.cjs

@@ -1,9 +0,0 @@
-'use strict';
-
-const useRpc = require('./vue.C5C3l0RQ.cjs');
-
-function useConnection() {
-  return useRpc.useRpc().connection;
-}
-
-exports.useConnection = useConnection;

package/dist/shared/vue.CKXhlRu-.cjs

@@ -1,131 +0,0 @@
-'use strict';
-
-const address = require('@vue-solana/core/address');
-const errors = require('@vue-solana/core/errors');
-const vue = require('vue');
-const useConnection = require('./vue.Bii4W61L.cjs');
-const useSolana = require('./vue.eNXmiI3a.cjs');
-
-function useAccountInfo(address$1, options = {}) {
-  const solana = useSolana.tryUseSolana();
-  const connection = solana?.connection ?? useConnection.useConnection();
-  const accountInfo = vue.shallowRef(null);
-  const loading = vue.shallowRef(false);
-  const error = vue.shallowRef(null);
-  let refreshId = 0;
-  let watchId = 0;
-  let subscriptionId = null;
-  let manuallyStopped = false;
-  async function refresh() {
-    const requestId = ++refreshId;
-    const value = vue.toValue(address$1);
-    if (!value || !solana) {
-      accountInfo.value = null;
-      loading.value = false;
-      error.value = null;
-      return null;
-    }
-    loading.value = true;
-    error.value = null;
-    try {
-      const publicKey = address.parsePublicKey(value);
-      if (!publicKey) {
-        accountInfo.value = null;
-        return null;
-      }
-      const nextAccountInfo = await connection.getAccountInfo(publicKey, options.commitment);
-      if (requestId === refreshId) {
-        accountInfo.value = nextAccountInfo;
-      }
-      return nextAccountInfo;
-    } catch (cause) {
-      const normalizedError = errors.normalizeSolanaError(cause, "RPC_FAILURE");
-      if (requestId === refreshId) {
-        accountInfo.value = null;
-        error.value = normalizedError;
-      }
-      throw normalizedError;
-    } finally {
-      if (requestId === refreshId) {
-        loading.value = false;
-      }
-    }
-  }
-  async function stopWatching() {
-    manuallyStopped = true;
-    watchId += 1;
-    await stopCurrentWatcher();
-  }
-  async function stopCurrentWatcher() {
-    if (subscriptionId === null) {
-      return;
-    }
-    const currentSubscriptionId = subscriptionId;
-    subscriptionId = null;
-    try {
-      await connection.removeAccountChangeListener(currentSubscriptionId);
-    } catch (cause) {
-      error.value = errors.normalizeSolanaError(cause, "RPC_FAILURE");
-    }
-  }
-  async function startWatching() {
-    const requestId = ++watchId;
-    await stopCurrentWatcher();
-    if (requestId !== watchId) {
-      return;
-    }
-    if (manuallyStopped || !options.watch || !solana) {
-      return;
-    }
-    try {
-      const publicKey = address.parsePublicKey(vue.toValue(address$1));
-      if (!publicKey) {
-        return;
-      }
-      const nextSubscriptionId = connection.onAccountChange(
-        publicKey,
-        (nextAccountInfo) => {
-          if (requestId !== watchId) {
-            return;
-          }
-          accountInfo.value = nextAccountInfo;
-          error.value = null;
-        },
-        options.commitment
-      );
-      if (requestId !== watchId) {
-        await connection.removeAccountChangeListener(nextSubscriptionId);
-        return;
-      }
-      subscriptionId = nextSubscriptionId;
-    } catch (cause) {
-      if (requestId === watchId) {
-        error.value = errors.normalizeSolanaError(cause, "RPC_FAILURE");
-      }
-    }
-  }
-  vue.onMounted(() => {
-    void refresh().catch(() => void 0);
-    void startWatching();
-  });
-  vue.onUnmounted(() => {
-    refreshId += 1;
-    void stopWatching();
-  });
-  vue.watch(
-    () => vue.toValue(address$1),
-    () => {
-      void refresh().catch(() => void 0);
-      void startWatching();
-    }
-  );
-  return {
-    accountInfo,
-    loading,
-    error,
-    refresh,
-    stopWatching
-  };
-}
-
-exports.useAccountInfo = useAccountInfo;

package/dist/shared/vue.CKx4lRew.mjs

@@ -1,7 +0,0 @@
-import { u as useRpc } from './vue.ChnRkpDR.mjs';
-
-function useConnection() {
-  return useRpc().connection;
-}
-
-export { useConnection as u };

package/dist/shared/vue.DgPfVZnU.mjs

@@ -1,129 +0,0 @@
-import { parsePublicKey } from '@vue-solana/core/address';
-import { normalizeSolanaError } from '@vue-solana/core/errors';
-import { shallowRef, onMounted, onUnmounted, watch, toValue } from 'vue';
-import { u as useConnection } from './vue.CKx4lRew.mjs';
-import { t as tryUseSolana } from './vue.DCDTsSjf.mjs';
-
-function useAccountInfo(address, options = {}) {
-  const solana = tryUseSolana();
-  const connection = solana?.connection ?? useConnection();
-  const accountInfo = shallowRef(null);
-  const loading = shallowRef(false);
-  const error = shallowRef(null);
-  let refreshId = 0;
-  let watchId = 0;
-  let subscriptionId = null;
-  let manuallyStopped = false;
-  async function refresh() {
-    const requestId = ++refreshId;
-    const value = toValue(address);
-    if (!value || !solana) {
-      accountInfo.value = null;
-      loading.value = false;
-      error.value = null;
-      return null;
-    }
-    loading.value = true;
-    error.value = null;
-    try {
-      const publicKey = parsePublicKey(value);
-      if (!publicKey) {
-        accountInfo.value = null;
-        return null;
-      }
-      const nextAccountInfo = await connection.getAccountInfo(publicKey, options.commitment);
-      if (requestId === refreshId) {
-        accountInfo.value = nextAccountInfo;
-      }
-      return nextAccountInfo;
-    } catch (cause) {
-      const normalizedError = normalizeSolanaError(cause, "RPC_FAILURE");
-      if (requestId === refreshId) {
-        accountInfo.value = null;
-        error.value = normalizedError;
-      }
-      throw normalizedError;
-    } finally {
-      if (requestId === refreshId) {
-        loading.value = false;
-      }
-    }
-  }
-  async function stopWatching() {
-    manuallyStopped = true;
-    watchId += 1;
-    await stopCurrentWatcher();
-  }
-  async function stopCurrentWatcher() {
-    if (subscriptionId === null) {
-      return;
-    }
-    const currentSubscriptionId = subscriptionId;
-    subscriptionId = null;
-    try {
-      await connection.removeAccountChangeListener(currentSubscriptionId);
-    } catch (cause) {
-      error.value = normalizeSolanaError(cause, "RPC_FAILURE");
-    }
-  }
-  async function startWatching() {
-    const requestId = ++watchId;
-    await stopCurrentWatcher();
-    if (requestId !== watchId) {
-      return;
-    }
-    if (manuallyStopped || !options.watch || !solana) {
-      return;
-    }
-    try {
-      const publicKey = parsePublicKey(toValue(address));
-      if (!publicKey) {
-        return;
-      }
-      const nextSubscriptionId = connection.onAccountChange(
-        publicKey,
-        (nextAccountInfo) => {
-          if (requestId !== watchId) {
-            return;
-          }
-          accountInfo.value = nextAccountInfo;
-          error.value = null;
-        },
-        options.commitment
-      );
-      if (requestId !== watchId) {
-        await connection.removeAccountChangeListener(nextSubscriptionId);
-        return;
-      }
-      subscriptionId = nextSubscriptionId;
-    } catch (cause) {
-      if (requestId === watchId) {
-        error.value = normalizeSolanaError(cause, "RPC_FAILURE");
-      }
-    }
-  }
-  onMounted(() => {
-    void refresh().catch(() => void 0);
-    void startWatching();
-  });
-  onUnmounted(() => {
-    refreshId += 1;
-    void stopWatching();
-  });
-  watch(
-    () => toValue(address),
-    () => {
-      void refresh().catch(() => void 0);
-      void startWatching();
-    }
-  );
-  return {
-    accountInfo,
-    loading,
-    error,
-    refresh,
-    stopWatching
-  };
-}
-
-export { useAccountInfo as u };

package/dist/web3.cjs

@@ -1,13 +0,0 @@
-'use strict';
-
-const web3 = require('@vue-solana/core/web3');
-
-
-
-exports.Connection = web3.Connection;
-exports.Keypair = web3.Keypair;
-exports.PublicKey = web3.PublicKey;
-exports.SystemProgram = web3.SystemProgram;
-exports.Transaction = web3.Transaction;
-exports.TransactionInstruction = web3.TransactionInstruction;
-exports.VersionedTransaction = web3.VersionedTransaction;

package/dist/web3.d.cts

@@ -1 +0,0 @@
-export { AccountInfo, Commitment, Connection, Keypair, PublicKey, RpcResponseAndContext, SendOptions, SignatureResult, SignatureStatus, SystemProgram, Transaction, TransactionInstruction, TransactionSignature, VersionedTransaction } from '@vue-solana/core/web3';

package/dist/web3.d.mts

@@ -1 +0,0 @@
-export { AccountInfo, Commitment, Connection, Keypair, PublicKey, RpcResponseAndContext, SendOptions, SignatureResult, SignatureStatus, SystemProgram, Transaction, TransactionInstruction, TransactionSignature, VersionedTransaction } from '@vue-solana/core/web3';

package/dist/web3.d.ts

@@ -1 +0,0 @@
-export { AccountInfo, Commitment, Connection, Keypair, PublicKey, RpcResponseAndContext, SendOptions, SignatureResult, SignatureStatus, SystemProgram, Transaction, TransactionInstruction, TransactionSignature, VersionedTransaction } from '@vue-solana/core/web3';

package/dist/web3.mjs

@@ -1 +0,0 @@
-export { Connection, Keypair, PublicKey, SystemProgram, Transaction, TransactionInstruction, VersionedTransaction } from '@vue-solana/core/web3';