Skip to content

Commit

Permalink
fix size-limit
Browse files Browse the repository at this point in the history
  • Loading branch information
macalinao committed Apr 12, 2024
1 parent 69532db commit 5b7334d
Show file tree
Hide file tree
Showing 18 changed files with 60 additions and 83 deletions.
2 changes: 1 addition & 1 deletion packages/use-solana/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"typescript": "^5.4.5"
},
"dependencies": {
"@ledgerhq/devices": "6.27.1",
"@ledgerhq/devices": "8.2.2",
"@ledgerhq/hw-transport": "6.30.5",
"@ledgerhq/hw-transport-webusb": "6.28.5",
"@saberhq/solana-contrib": "workspace:^",
Expand Down
2 changes: 1 addition & 1 deletion packages/use-solana/src/adapters/ledger/core.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type Transport from "@ledgerhq/hw-transport";
import type { default as Transport } from "@ledgerhq/hw-transport";
import { isVersionedTransaction } from "@saberhq/solana-contrib";
import type { Transaction, VersionedTransaction } from "@solana/web3.js";
import { PublicKey } from "@solana/web3.js";
Expand Down
12 changes: 8 additions & 4 deletions packages/use-solana/src/adapters/ledger/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type Transport from "@ledgerhq/hw-transport";
import TransportWebUSB from "@ledgerhq/hw-transport-webusb";
import type { default as Transport } from "@ledgerhq/hw-transport";
import { default as TransportWebUSB } from "@ledgerhq/hw-transport-webusb";
import type {
Broadcaster,
PendingTransaction,
Expand All @@ -14,8 +14,12 @@ import type {
} from "@solana/web3.js";
import EventEmitter from "eventemitter3";

import type { ConnectedWallet, WalletAdapter } from "../types";
import { getPublicKey, getSolanaDerivationPath, signTransaction } from "./core";
import type { ConnectedWallet, WalletAdapter } from "../types.js";
import {
getPublicKey,
getSolanaDerivationPath,
signTransaction,
} from "./core.js";

const DEFAULT_DERIVATION_PATH = getSolanaDerivationPath();

Expand Down
2 changes: 1 addition & 1 deletion packages/use-solana/src/adapters/readonly/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import type {
import { PublicKey } from "@solana/web3.js";
import { EventEmitter } from "eventemitter3";

import type { WalletAdapter } from "../types";
import type { WalletAdapter } from "../types.js";

declare global {
interface Window {
Expand Down
2 changes: 1 addition & 1 deletion packages/use-solana/src/adapters/secret-key/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import type {
import { Keypair } from "@solana/web3.js";
import EventEmitter from "eventemitter3";

import type { ConnectedWallet, WalletAdapter } from "../types";
import type { ConnectedWallet, WalletAdapter } from "../types.js";

/**
* Adapter backed by a secret key.
Expand Down
2 changes: 1 addition & 1 deletion packages/use-solana/src/adapters/solana.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import type {
VersionedTransaction,
} from "@solana/web3.js";

import type { ConnectedWallet, WalletAdapter } from "./types";
import type { ConnectedWallet, WalletAdapter } from "./types.js";

type SolanaWalletAdapterInterface = Omit<
SignerWalletAdapter,
Expand Down
27 changes: 15 additions & 12 deletions packages/use-solana/src/context.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,29 @@ import type { ReactNode } from "react";
import type { Container } from "unstated-next";
import { createContainer, useContainer } from "unstated-next";

import type { UseSolanaError } from "./error.js";
import { ErrorLevel } from "./error.js";
import type {
DefaultWalletType,
WalletAdapter,
WalletProviderInfo,
WalletTypeEnum,
} from ".";
import type { UseSolanaError } from "./error";
import { ErrorLevel } from "./error";
import type { UnknownWalletType, WalletProviderMap } from "./providers";
import { DEFAULT_WALLET_PROVIDERS } from "./providers";
import { LOCAL_STORAGE_ADAPTER } from "./storage";
} from "./index.js";
import type { UnknownWalletType, WalletProviderMap } from "./providers.js";
import { DEFAULT_WALLET_PROVIDERS } from "./providers.js";
import { LOCAL_STORAGE_ADAPTER } from "./storage.js";
import type {
ConnectionArgs,
ConnectionContext,
} from "./utils/useConnectionInternal";
import { useConnectionInternal } from "./utils/useConnectionInternal";
import type { UseProvider, UseProviderArgs } from "./utils/useProviderInternal";
import { useProviderInternal } from "./utils/useProviderInternal";
import type { UseWallet, UseWalletArgs } from "./utils/useWalletInternal";
import { useWalletInternal } from "./utils/useWalletInternal";
} from "./utils/useConnectionInternal.js";
import { useConnectionInternal } from "./utils/useConnectionInternal.js";
import type {
UseProvider,
UseProviderArgs,
} from "./utils/useProviderInternal.js";
import { useProviderInternal } from "./utils/useProviderInternal.js";
import type { UseWallet, UseWalletArgs } from "./utils/useWalletInternal.js";
import { useWalletInternal } from "./utils/useWalletInternal.js";

export interface UseSolana<
WalletType extends WalletTypeEnum<WalletType> = typeof DefaultWalletType,
Expand Down
2 changes: 1 addition & 1 deletion packages/use-solana/src/error.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { WalletProviderInfo, WalletTypeEnum } from ".";
import type { WalletProviderInfo, WalletTypeEnum } from "./index.js";

export enum ErrorLevel {
WARN = "warn",
Expand Down
14 changes: 9 additions & 5 deletions packages/use-solana/src/hooks.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
import type { Connection } from "@solana/web3.js";

import type { DefaultWalletType, UnknownWalletType, WalletTypeEnum } from ".";
import type { ConnectedWallet } from "./adapters/types";
import type { UseSolana } from "./context";
import { useSolana } from "./context";
import type { ConnectionContext } from "./utils/useConnectionInternal";
import type { ConnectedWallet } from "./adapters/types.js";
import type { UseSolana } from "./context.js";
import { useSolana } from "./context.js";
import type {
DefaultWalletType,
UnknownWalletType,
WalletTypeEnum,
} from "./index.js";
import type { ConnectionContext } from "./utils/useConnectionInternal.js";

/**
* Gets the current Solana wallet.
Expand Down
8 changes: 4 additions & 4 deletions packages/use-solana/src/providers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ import { SolongWalletAdapter } from "@solana/wallet-adapter-solong";
import { WalletConnectWalletAdapter } from "@solana/wallet-adapter-walletconnect";
import type * as React from "react";

import type { WalletAdapterBuilder, WalletOptions } from "./adapters";
import { LedgerWalletAdapter, SolanaWalletAdapter } from "./adapters";
import { ReadonlyAdapter } from "./adapters/readonly";
import { SecretKeyAdapter } from "./adapters/secret-key";
import type { WalletAdapterBuilder, WalletOptions } from "./adapters/index.js";
import { LedgerWalletAdapter, SolanaWalletAdapter } from "./adapters/index.js";
import { ReadonlyAdapter } from "./adapters/readonly/index.js";
import { SecretKeyAdapter } from "./adapters/secret-key/index.js";

export enum DefaultWalletType {
BraveWallet = "BraveWallet",
Expand Down
2 changes: 1 addition & 1 deletion packages/use-solana/src/utils/provider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import type {
} from "@solana/web3.js";
import invariant from "tiny-invariant";

import type { ConnectedWallet } from "../adapters";
import type { ConnectedWallet } from "../adapters/index.js";

export class WalletAdapterTransactionSigner extends SolanaTransactionSigner {
constructor(
Expand Down
4 changes: 2 additions & 2 deletions packages/use-solana/src/utils/useConnectionInternal.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import type { Commitment } from "@solana/web3.js";
import { Connection } from "@solana/web3.js";
import { useMemo } from "react";

import type { StorageAdapter } from "../storage";
import { usePersistedKVStore } from "./usePersistedKVStore";
import type { StorageAdapter } from "../storage.js";
import { usePersistedKVStore } from "./usePersistedKVStore.js";

export type PartialNetworkConfigMap = {
[N in Network]?: Partial<NetworkConfig>;
Expand Down
2 changes: 1 addition & 1 deletion packages/use-solana/src/utils/usePersistedKVStore.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useCallback, useEffect, useState } from "react";

import type { StorageAdapter } from "../storage";
import type { StorageAdapter } from "../storage.js";

export function usePersistedKVStore<T>(
key: string,
Expand Down
4 changes: 2 additions & 2 deletions packages/use-solana/src/utils/useProviderInternal.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import {
import type { Commitment, ConfirmOptions, Connection } from "@solana/web3.js";
import { useMemo } from "react";

import type { ConnectedWallet, WalletAdapter } from "../adapters/types";
import { WalletAdapterProvider } from "./provider";
import type { ConnectedWallet, WalletAdapter } from "../adapters/types.js";
import { WalletAdapterProvider } from "./provider.js";

/**
* Wallet-related information.
Expand Down
14 changes: 7 additions & 7 deletions packages/use-solana/src/utils/useWalletInternal.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,21 @@ import type {
ConnectedWallet,
WalletAdapter,
WalletOptions,
} from "../adapters/types";
import { WrappedWalletAdapter } from "../adapters/types";
import type { UseSolanaError } from "../error";
} from "../adapters/types.js";
import { WrappedWalletAdapter } from "../adapters/types.js";
import type { UseSolanaError } from "../error.js";
import {
WalletActivateError,
WalletAutomaticConnectionError,
WalletDisconnectError,
} from "../error";
} from "../error.js";
import type {
WalletProviderInfo,
WalletProviderMap,
WalletTypeEnum,
} from "../providers";
import type { StorageAdapter } from "../storage";
import { usePersistedKVStore } from "./usePersistedKVStore";
} from "../providers.js";
import type { StorageAdapter } from "../storage.js";
import { usePersistedKVStore } from "./usePersistedKVStore.js";

/**
* Wallet-related information.
Expand Down
2 changes: 1 addition & 1 deletion packages/use-solana/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"rootDir": "src/",
"composite": true,
"jsxImportSource": "react",
"lib": ["ES2015", "DOM"],
"lib": ["ES2022", "DOM"],
"outDir": "dist/esm/",
"types": []
},
Expand Down
1 change: 1 addition & 0 deletions packages/wallet-adapter-icons/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"author": "Saber Team <team@saber.so>",
"license": "Apache-2.0",
"sideEffects": false,
"type": "module",
"exports": {
".": {
"import": "./dist/esm/index.js",
Expand Down
41 changes: 3 additions & 38 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2491,19 +2491,7 @@ __metadata:
languageName: node
linkType: hard

"@ledgerhq/devices@npm:6.27.1":
version: 6.27.1
resolution: "@ledgerhq/devices@npm:6.27.1"
dependencies:
"@ledgerhq/errors": "npm:^6.10.0"
"@ledgerhq/logs": "npm:^6.10.0"
rxjs: "npm:6"
semver: "npm:^7.3.5"
checksum: 10/d5b1552e2f91b75ea36318b35089d1198c1ce68bb24d4beaef647826f4907d4073494a05b72548338ab18c6f82f8022cc012e3991fa0920e8257aa3399f06700
languageName: node
linkType: hard

"@ledgerhq/devices@npm:^8.2.2":
"@ledgerhq/devices@npm:8.2.2, @ledgerhq/devices@npm:^8.2.2":
version: 8.2.2
resolution: "@ledgerhq/devices@npm:8.2.2"
dependencies:
Expand All @@ -2515,13 +2503,6 @@ __metadata:
languageName: node
linkType: hard

"@ledgerhq/errors@npm:^6.10.0":
version: 6.11.0
resolution: "@ledgerhq/errors@npm:6.11.0"
checksum: 10/87d126ec6f19fff2a4903732b52a9c15596f3724020eeb31eddf1f2daba4dee0b3f2dfd872d28a7e72d86240ff4c72002d84a01fb758e9cf4a452e7eb18d9705
languageName: node
linkType: hard

"@ledgerhq/errors@npm:^6.16.3":
version: 6.16.3
resolution: "@ledgerhq/errors@npm:6.16.3"
Expand Down Expand Up @@ -2553,13 +2534,6 @@ __metadata:
languageName: node
linkType: hard

"@ledgerhq/logs@npm:^6.10.0":
version: 6.10.0
resolution: "@ledgerhq/logs@npm:6.10.0"
checksum: 10/e411cb5bd4a2c9ffb4a930900a47c9fd171aa50bdd2150ccfa725233ea98e595acd91489efc8b27548c1a8682e32a8c50d2492ac32aeada2fd594853c8b29306
languageName: node
linkType: hard

"@ledgerhq/logs@npm:^6.12.0":
version: 6.12.0
resolution: "@ledgerhq/logs@npm:6.12.0"
Expand Down Expand Up @@ -3066,7 +3040,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@saberhq/use-solana@workspace:packages/use-solana"
dependencies:
"@ledgerhq/devices": "npm:6.27.1"
"@ledgerhq/devices": "npm:8.2.2"
"@ledgerhq/hw-transport": "npm:6.30.5"
"@ledgerhq/hw-transport-webusb": "npm:6.28.5"
"@saberhq/solana-contrib": "workspace:^"
Expand Down Expand Up @@ -12779,15 +12753,6 @@ __metadata:
languageName: node
linkType: hard

"rxjs@npm:6":
version: 6.6.7
resolution: "rxjs@npm:6.6.7"
dependencies:
tslib: "npm:^1.9.0"
checksum: 10/c8263ebb20da80dd7a91c452b9e96a178331f402344bbb40bc772b56340fcd48d13d1f545a1e3d8e464893008c5e306cc42a1552afe0d562b1a6d4e1e6262b03
languageName: node
linkType: hard

"rxjs@npm:^7.8.1":
version: 7.8.1
resolution: "rxjs@npm:7.8.1"
Expand Down Expand Up @@ -13922,7 +13887,7 @@ __metadata:
languageName: node
linkType: hard

"tslib@npm:1.14.1, tslib@npm:^1.9.0":
"tslib@npm:1.14.1":
version: 1.14.1
resolution: "tslib@npm:1.14.1"
checksum: 10/7dbf34e6f55c6492637adb81b555af5e3b4f9cc6b998fb440dac82d3b42bdc91560a35a5fb75e20e24a076c651438234da6743d139e4feabf0783f3cdfe1dddb
Expand Down

0 comments on commit 5b7334d

Please sign in to comment.