Skip to content

Commit 7ca8b7d

Browse files
macalinaomacalinao
committed
catalog usage, remove unused stuff
1 parent 59311f7 commit 7ca8b7d

File tree

11 files changed

+88
-103
lines changed

11 files changed

+88
-103
lines changed

‎apps/example-dapp/package.json‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,38 +13,40 @@
1313
"@macalinao/grill": "workspace:*",
1414
"@macalinao/wallet-adapter-compat": "workspace:*",
1515
"@radix-ui/react-slot": "^1.2.3",
16-
"@solana/kit": "^2.3.0",
17-
"@solana/wallet-adapter-react": "^0.15.39",
16+
"@solana/kit": "catalog:",
17+
"@solana/wallet-adapter-react": "catalog:",
1818
"@solana/wallet-adapter-react-ui": "^0.9.39",
1919
"@solana/wallet-adapter-wallets": "^0.19.37",
2020
"@tailwindcss/vite": "^4.1.11",
21-
"@tanstack/react-query": "^5.84.2",
21+
"@tanstack/react-query": "catalog:",
2222
"@tanstack/react-router": "^1.131.2",
2323
"class-variance-authority": "^0.7.1",
2424
"clsx": "^2.1.1",
2525
"gill": "^0.10.3",
2626
"gill-react": "^0.5.0",
2727
"lucide-react": "^0.539.0",
28-
"react": "^19.1.1",
29-
"react-dom": "^19.1.1",
28+
"react": "catalog:",
29+
"react-dom": "catalog:",
3030
"sonner": "^2.0.7",
3131
"tailwind-merge": "^3.3.1"
3232
},
3333
"devDependencies": {
3434
"@eslint/js": "^9.33.0",
35+
"@macalinao/eslint-config": "catalog:",
36+
"@macalinao/tsconfig": "catalog:",
3537
"@tanstack/react-query-devtools": "^5.84.2",
3638
"@tanstack/react-router-devtools": "^1.131.2",
3739
"@tanstack/router-plugin": "^1.131.2",
3840
"@types/react": "^19.1.9",
3941
"@types/react-dom": "^19.1.7",
4042
"@vitejs/plugin-react": "^4.7.0",
41-
"eslint": "^9.33.0",
43+
"eslint": "catalog:",
4244
"eslint-plugin-react-hooks": "^5.2.0",
4345
"eslint-plugin-react-refresh": "^0.4.20",
4446
"globals": "^16.3.0",
4547
"tailwindcss": "^4.1.11",
4648
"tw-animate-css": "^1.3.6",
47-
"typescript": "^5.9.2",
49+
"typescript": "catalog:",
4850
"typescript-eslint": "^8.39.0",
4951
"vite": "^7.1.1",
5052
"vite-plugin-node-polyfills": "^0.22.0",

‎bun.lock‎

Lines changed: 40 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -24,38 +24,40 @@
2424
"@macalinao/grill": "workspace:*",
2525
"@macalinao/wallet-adapter-compat": "workspace:*",
2626
"@radix-ui/react-slot": "^1.2.3",
27-
"@solana/kit": "^2.3.0",
28-
"@solana/wallet-adapter-react": "^0.15.39",
27+
"@solana/kit": "catalog:",
28+
"@solana/wallet-adapter-react": "catalog:",
2929
"@solana/wallet-adapter-react-ui": "^0.9.39",
3030
"@solana/wallet-adapter-wallets": "^0.19.37",
3131
"@tailwindcss/vite": "^4.1.11",
32-
"@tanstack/react-query": "^5.84.2",
32+
"@tanstack/react-query": "catalog:",
3333
"@tanstack/react-router": "^1.131.2",
3434
"class-variance-authority": "^0.7.1",
3535
"clsx": "^2.1.1",
3636
"gill": "^0.10.3",
3737
"gill-react": "^0.5.0",
3838
"lucide-react": "^0.539.0",
39-
"react": "^19.1.1",
40-
"react-dom": "^19.1.1",
39+
"react": "catalog:",
40+
"react-dom": "catalog:",
4141
"sonner": "^2.0.7",
4242
"tailwind-merge": "^3.3.1",
4343
},
4444
"devDependencies": {
4545
"@eslint/js": "^9.33.0",
46+
"@macalinao/eslint-config": "catalog:",
47+
"@macalinao/tsconfig": "catalog:",
4648
"@tanstack/react-query-devtools": "^5.84.2",
4749
"@tanstack/react-router-devtools": "^1.131.2",
4850
"@tanstack/router-plugin": "^1.131.2",
4951
"@types/react": "^19.1.9",
5052
"@types/react-dom": "^19.1.7",
5153
"@vitejs/plugin-react": "^4.7.0",
52-
"eslint": "^9.33.0",
54+
"eslint": "catalog:",
5355
"eslint-plugin-react-hooks": "^5.2.0",
5456
"eslint-plugin-react-refresh": "^0.4.20",
5557
"globals": "^16.3.0",
5658
"tailwindcss": "^4.1.11",
5759
"tw-animate-css": "^1.3.6",
58-
"typescript": "^5.9.2",
60+
"typescript": "catalog:",
5961
"typescript-eslint": "^8.39.0",
6062
"vite": "^7.1.1",
6163
"vite-plugin-node-polyfills": "^0.22.0",
@@ -66,13 +68,13 @@
6668
"name": "@macalinao/dataloader-es",
6769
"version": "0.1.0",
6870
"devDependencies": {
69-
"@macalinao/eslint-config": "^4.2.2",
70-
"@macalinao/tsconfig": "^3.2.2",
71+
"@macalinao/eslint-config": "catalog:",
72+
"@macalinao/tsconfig": "catalog:",
7173
"@types/bun": "^1.2.19",
7274
"@types/node": "^22.17.1",
73-
"eslint": "^9.33.0",
74-
"typescript": "^5.9.2",
75-
"vitest": "^3.2.4",
75+
"eslint": "catalog:",
76+
"typescript": "catalog:",
77+
"vitest": "catalog:",
7678
},
7779
},
7880
"packages/grill": {
@@ -81,15 +83,17 @@
8183
"dependencies": {
8284
"@macalinao/dataloader-es": "workspace:*",
8385
"@macalinao/solana-batch-accounts-loader": "workspace:*",
84-
"@solana/kit": "*",
85-
"@tanstack/react-query": "^5.84.2",
86+
"@solana/kit": "catalog:",
87+
"@tanstack/react-query": "catalog:",
8688
"gill": "^0.10.3",
8789
"gill-react": "^0.5.0",
88-
"react": "^19.1.1",
90+
"react": "catalog:",
8991
},
9092
"devDependencies": {
93+
"@macalinao/eslint-config": "catalog:",
94+
"@macalinao/tsconfig": "catalog:",
9195
"@types/react": "^19.1.9",
92-
"typescript": "^5.9.2",
96+
"typescript": "catalog:",
9397
},
9498
"peerDependencies": {
9599
"react": "^18.0.0 || ^19.0.0",
@@ -101,20 +105,20 @@
101105
"dependencies": {
102106
"@macalinao/dataloader-es": "workspace:*",
103107
"lodash-es": "^4.17.21",
104-
"tslib": "^2.8.1",
108+
"tslib": "catalog:",
105109
},
106110
"devDependencies": {
107-
"@macalinao/eslint-config": "^4.2.2",
108-
"@macalinao/tsconfig": "^3.2.2",
111+
"@macalinao/eslint-config": "catalog:",
112+
"@macalinao/tsconfig": "catalog:",
109113
"@types/bun": "^1.2.19",
110114
"@types/lodash-es": "^4.17.12",
111115
"@types/node": "^22.17.1",
112-
"eslint": "^9.33.0",
113-
"typescript": "^5.9.2",
114-
"vitest": "^3.2.4",
116+
"eslint": "catalog:",
117+
"typescript": "catalog:",
118+
"vitest": "catalog:",
115119
},
116120
"peerDependencies": {
117-
"@solana/kit": "^2.3.0",
121+
"@solana/kit": "catalog:",
118122
},
119123
},
120124
"packages/wallet-adapter-compat": {
@@ -124,26 +128,27 @@
124128
"@macalinao/grill": "workspace:*",
125129
"@solana/webcrypto-ed25519-polyfill": "*",
126130
"sonner": "^2.0.7",
127-
"tslib": "^2.8.1",
131+
"tslib": "catalog:",
128132
},
129133
"devDependencies": {
134+
"@macalinao/eslint-config": "catalog:",
130135
"@macalinao/eslint-config-react": "^3.1.2",
131-
"@macalinao/tsconfig": "^3.2.2",
136+
"@macalinao/tsconfig": "catalog:",
132137
"@solana/web3.js": "^1.98.4",
133138
"@types/node": "^22.17.1",
134139
"@types/react": "^19.1.9",
135140
"@types/react-dom": "^19.1.7",
136-
"eslint": "^9.33.0",
137-
"typescript": "^5.9.2",
138-
"vitest": "^3.2.4",
141+
"eslint": "catalog:",
142+
"typescript": "catalog:",
143+
"vitest": "catalog:",
139144
},
140145
"peerDependencies": {
141-
"@solana/kit": "^2.3.0",
142-
"@solana/wallet-adapter-base": "^0.9.27",
143-
"@solana/wallet-adapter-react": "^0.15.39",
144-
"@tanstack/react-query": "^5.84.0",
145-
"react": "^19.1.0",
146-
"react-dom": "^19.1.0",
146+
"@solana/kit": "catalog:",
147+
"@solana/wallet-adapter-base": "catalog:",
148+
"@solana/wallet-adapter-react": "catalog:",
149+
"@tanstack/react-query": "catalog:",
150+
"react": "catalog:",
151+
"react-dom": "catalog:",
147152
},
148153
},
149154
},
@@ -159,7 +164,7 @@
159164
"react": "^19.1.0",
160165
"react-dom": "^19.1.0",
161166
"tslib": "^2.8.1",
162-
"typescript": "^5.8.3",
167+
"typescript": "^5.9.2",
163168
"vitest": "^3.2.4",
164169
},
165170
"packages": {

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
],
1111
"catalog": {
1212
"eslint": "^9.29.0",
13-
"typescript": "^5.8.3",
13+
"typescript": "^5.9.2",
1414
"@macalinao/eslint-config": "^4.2.0",
1515
"@macalinao/tsconfig": "^3.2.0",
1616
"@solana/kit": "^2.3.0",

‎packages/dataloader-es/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@
3333
"test": "bun test"
3434
},
3535
"devDependencies": {
36-
"@macalinao/eslint-config": "^4.2.2",
37-
"@macalinao/tsconfig": "^3.2.2",
36+
"@macalinao/eslint-config": "catalog:",
37+
"@macalinao/tsconfig": "catalog:",
3838
"@types/bun": "^1.2.19",
3939
"@types/node": "^22.17.1",
40-
"eslint": "^9.33.0",
41-
"typescript": "^5.9.2",
42-
"vitest": "^3.2.4"
40+
"eslint": "catalog:",
41+
"typescript": "catalog:",
42+
"vitest": "catalog:"
4343
}
4444
}

‎packages/grill/eslint.config.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ export default [
99
},
1010
},
1111
},
12-
];
12+
];

‎packages/grill/package.json‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,17 @@
2323
"dependencies": {
2424
"@macalinao/dataloader-es": "workspace:*",
2525
"@macalinao/solana-batch-accounts-loader": "workspace:*",
26-
"@solana/kit": "*",
27-
"@tanstack/react-query": "^5.84.2",
26+
"@solana/kit": "catalog:",
27+
"@tanstack/react-query": "catalog:",
2828
"gill": "^0.10.3",
2929
"gill-react": "^0.5.0",
30-
"react": "^19.1.1"
30+
"react": "catalog:"
3131
},
3232
"devDependencies": {
33+
"@macalinao/eslint-config": "catalog:",
34+
"@macalinao/tsconfig": "catalog:",
3335
"@types/react": "^19.1.9",
34-
"typescript": "^5.9.2"
36+
"typescript": "catalog:"
3537
},
3638
"peerDependencies": {
3739
"react": "^18.0.0 || ^19.0.0"

‎packages/grill/src/hooks/index.ts‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
11
export * from "./use-account.js";
22
export { useConnectedWallet } from "./use-connected-wallet.js";
33
export { useKitWallet } from "./use-kit-wallet.js";
4-
export {
5-
useRequiredTransactionSendingSigner,
6-
useTransactionSendingSigner,
7-
} from "./use-transaction-sending-signer.js";

‎packages/grill/src/hooks/use-account.ts‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ export function useAccount<
5454
networkMode: "offlineFirst",
5555
...options,
5656
queryKey: address ? createAccountQueryKey(address) : [null],
57-
queryFn: async () => {
57+
queryFn: async (): Promise<UseAccountResponse<TDecodedData> | null> => {
5858
if (!address) {
5959
return null;
6060
}
@@ -63,14 +63,17 @@ export function useAccount<
6363
return null;
6464
}
6565
if (decoder) {
66-
return decodeAccount(account, decoder);
66+
return decodeAccount(
67+
account,
68+
decoder,
69+
) as UseAccountResponse<TDecodedData>;
6770
}
68-
return account;
71+
return account as UseAccountResponse<TDecodedData>;
6972
},
7073
enabled: !!address,
7174
});
7275
return {
7376
...rest,
74-
account: data as UseAccountResponse<TDecodedData>,
77+
account: data,
7578
};
7679
}

‎packages/grill/src/hooks/use-transaction-sending-signer.ts‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎packages/solana-batch-accounts-loader/package.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,19 +35,19 @@
3535
"dependencies": {
3636
"@macalinao/dataloader-es": "workspace:*",
3737
"lodash-es": "^4.17.21",
38-
"tslib": "^2.8.1"
38+
"tslib": "catalog:"
3939
},
4040
"devDependencies": {
41-
"@macalinao/eslint-config": "^4.2.2",
42-
"@macalinao/tsconfig": "^3.2.2",
41+
"@macalinao/eslint-config": "catalog:",
42+
"@macalinao/tsconfig": "catalog:",
4343
"@types/bun": "^1.2.19",
4444
"@types/lodash-es": "^4.17.12",
4545
"@types/node": "^22.17.1",
46-
"eslint": "^9.33.0",
47-
"typescript": "^5.9.2",
48-
"vitest": "^3.2.4"
46+
"eslint": "catalog:",
47+
"typescript": "catalog:",
48+
"vitest": "catalog:"
4949
},
5050
"peerDependencies": {
51-
"@solana/kit": "^2.3.0"
51+
"@solana/kit": "catalog:"
5252
}
5353
}

0 commit comments

Comments
 (0)