Skip to content

Commit 6a4119d

Browse files
macalinaomacalinao
authored
Merge pull request #79 from macalinao/igm/version-issues
Fix dependency resolution for workspace
2 parents 60cfbcf + 445baa9 commit 6a4119d

File tree

10 files changed

+79
-62
lines changed

10 files changed

+79
-62
lines changed

‎.changeset/empty-icons-hide.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
"@macalinao/solana-batch-accounts-loader": patch
3+
"@macalinao/wallet-adapter-compat": patch
4+
"@macalinao/react-quarry": patch
5+
"@macalinao/gill-extra": patch
6+
"example-dapp": patch
7+
"@macalinao/quarry": patch
8+
"@macalinao/grill": patch
9+
---
10+
11+
Change resolution to be ^ rather than \* for workspace packages

‎apps/example-dapp/index.html‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,66 @@
11
<!doctype html>
22
<html lang="en">
33
<head>
4-
<meta charset="UTF-8" />
5-
<link rel="icon" type="image/svg+xml" href="/emoji.svg" />
6-
<link rel="alternate icon" href="/favicon.png" />
7-
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
4+
<meta charset="UTF-8">
5+
<link rel="icon" type="image/svg+xml" href="/emoji.svg">
6+
<link rel="alternate icon" href="/favicon.png">
7+
<meta name="viewport" content="width=device-width, initial-scale=1.0">
88

99
<!-- Google Fonts - Inter -->
10-
<link rel="preconnect" href="https://fonts.googleapis.com" />
11-
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
10+
<link rel="preconnect" href="https://fonts.googleapis.com">
11+
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
1212
<link
1313
href="https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;600;700;800;900&display=swap"
1414
rel="stylesheet"
15-
/>
15+
>
1616

1717
<!-- Primary Meta Tags -->
1818
<title>Grill - Modern TypeScript/React library for Solana dapps</title>
19-
<meta name="title" content="Grill - Modern Solana Development Kit" />
19+
<meta name="title" content="Grill - Modern Solana Development Kit">
2020
<meta
2121
name="description"
2222
content="Build efficient Solana applications with automatic account batching, smart caching, and seamless wallet integration. Powered by React, TypeScript, and Gill."
23-
/>
23+
>
2424
<meta
2525
name="keywords"
2626
content="Solana, React, TypeScript, Web3, DApp, Blockchain, Crypto, DataLoader, Account Batching"
27-
/>
28-
<meta name="author" content="Ian Macalinao" />
27+
>
28+
<meta name="author" content="Ian Macalinao">
2929

3030
<!-- Open Graph / Facebook -->
31-
<meta property="og:type" content="website" />
32-
<meta property="og:url" content="https://github.com/macalinao/grill" />
33-
<meta property="og:title" content="Grill - Modern Solana Development Kit" />
31+
<meta property="og:type" content="website">
32+
<meta property="og:url" content="https://github.com/macalinao/grill">
33+
<meta property="og:title" content="Grill - Modern Solana Development Kit">
3434
<meta
3535
property="og:description"
3636
content="Build efficient Solana applications with automatic account batching, smart caching, and seamless wallet integration."
37-
/>
38-
<meta property="og:image" content="/og-image.png" />
37+
>
38+
<meta property="og:image" content="/og-image.png">
3939

4040
<!-- Twitter -->
41-
<meta property="twitter:card" content="summary_large_image" />
42-
<meta property="twitter:url" content="https://github.com/macalinao/grill" />
41+
<meta property="twitter:card" content="summary_large_image">
42+
<meta property="twitter:url" content="https://github.com/macalinao/grill">
4343
<meta
4444
property="twitter:title"
4545
content="Grill - Modern Solana Development Kit"
46-
/>
46+
>
4747
<meta
4848
property="twitter:description"
4949
content="Build efficient Solana applications with automatic account batching, smart caching, and seamless wallet integration."
50-
/>
51-
<meta property="twitter:image" content="/og-image.png" />
50+
>
51+
<meta property="twitter:image" content="/og-image.png">
5252

5353
<!-- Theme Color -->
5454
<meta
5555
name="theme-color"
5656
content="#000000"
5757
media="(prefers-color-scheme: dark)"
58-
/>
58+
>
5959
<meta
6060
name="theme-color"
6161
content="#ffffff"
6262
media="(prefers-color-scheme: light)"
63-
/>
63+
>
6464
</head>
6565
<body>
6666
<div id="root"></div>

‎apps/example-dapp/package.json‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@
2828
"dependencies": {
2929
"@gillsdk/react": "catalog:",
3030
"@hookform/resolvers": "^5.2.2",
31-
"@macalinao/grill": "workspace:*",
32-
"@macalinao/wallet-adapter-compat": "workspace:*",
31+
"@macalinao/wallet-adapter-compat": "workspace:^",
3332
"@radix-ui/react-dialog": "^1.1.15",
3433
"@radix-ui/react-navigation-menu": "^1.2.14",
3534
"@radix-ui/react-separator": "^1.1.7",
@@ -57,7 +56,11 @@
5756
"tailwind-merge": "^3.3.1",
5857
"zod": "^4.1.11"
5958
},
59+
"peerDependencies": {
60+
"@macalinao/grill": "workspace:^"
61+
},
6062
"devDependencies": {
63+
"@macalinao/grill": "workspace:^",
6164
"@eslint/js": "^9.37.0",
6265
"@macalinao/eslint-config": "catalog:",
6366
"@macalinao/tsconfig": "catalog:",

‎bun.lock‎

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"devDependencies": {
77
"@biomejs/biome": "^2.2.5",
88
"@changesets/cli": "^2.29.7",
9-
"@macalinao/biome-config": "^0.1.1",
9+
"@macalinao/biome-config": "^0.1.2",
1010
"eslint": "^9.37.0",
1111
"husky": "^9.1.7",
1212
"lint-staged": "^16.2.3",
@@ -21,8 +21,7 @@
2121
"dependencies": {
2222
"@gillsdk/react": "catalog:",
2323
"@hookform/resolvers": "^5.2.2",
24-
"@macalinao/grill": "workspace:*",
25-
"@macalinao/wallet-adapter-compat": "workspace:*",
24+
"@macalinao/wallet-adapter-compat": "workspace:^",
2625
"@radix-ui/react-dialog": "^1.1.15",
2726
"@radix-ui/react-navigation-menu": "^1.2.14",
2827
"@radix-ui/react-separator": "^1.1.7",
@@ -53,6 +52,7 @@
5352
"devDependencies": {
5453
"@eslint/js": "^9.37.0",
5554
"@macalinao/eslint-config": "catalog:",
55+
"@macalinao/grill": "workspace:^",
5656
"@macalinao/tsconfig": "catalog:",
5757
"@tanstack/react-query-devtools": "^5.90.2",
5858
"@tanstack/react-router-devtools": "^1.132.37",
@@ -72,6 +72,9 @@
7272
"vite-plugin-node-polyfills": "^0.24.0",
7373
"vite-tsconfig-paths": "^5.1.4",
7474
},
75+
"peerDependencies": {
76+
"@macalinao/grill": "workspace:^",
77+
},
7578
},
7679
"packages/dataloader-es": {
7780
"name": "@macalinao/dataloader-es",
@@ -89,10 +92,10 @@
8992
"version": "0.0.7",
9093
"dependencies": {
9194
"@macalinao/clients-token-metadata": "^0.4.0",
92-
"@macalinao/dataloader-es": "workspace:*",
93-
"@macalinao/solana-batch-accounts-loader": "workspace:*",
94-
"@macalinao/token-utils": "workspace:*",
95-
"@macalinao/zod-solana": "workspace:*",
95+
"@macalinao/dataloader-es": "workspace:^",
96+
"@macalinao/solana-batch-accounts-loader": "workspace:^",
97+
"@macalinao/token-utils": "workspace:^",
98+
"@macalinao/zod-solana": "workspace:^",
9699
"@solana-program/token": "^0.6.0",
97100
},
98101
"devDependencies": {
@@ -115,11 +118,11 @@
115118
"dependencies": {
116119
"@gillsdk/react": "catalog:",
117120
"@macalinao/clients-token-metadata": "^0.4.0",
118-
"@macalinao/dataloader-es": "workspace:*",
119-
"@macalinao/gill-extra": "workspace:*",
120-
"@macalinao/solana-batch-accounts-loader": "workspace:*",
121-
"@macalinao/token-utils": "workspace:*",
122-
"@macalinao/zod-solana": "workspace:*",
121+
"@macalinao/dataloader-es": "workspace:^",
122+
"@macalinao/gill-extra": "workspace:^",
123+
"@macalinao/solana-batch-accounts-loader": "workspace:^",
124+
"@macalinao/token-utils": "workspace:^",
125+
"@macalinao/zod-solana": "workspace:^",
123126
"@solana-program/token": "^0.6.0",
124127
},
125128
"devDependencies": {
@@ -148,8 +151,8 @@
148151
"version": "0.2.0",
149152
"dependencies": {
150153
"@macalinao/clients-quarry": "^0.4.2",
151-
"@macalinao/gill-extra": "workspace:*",
152-
"@macalinao/token-utils": "workspace:*",
154+
"@macalinao/gill-extra": "workspace:^",
155+
"@macalinao/token-utils": "workspace:^",
153156
"@solana-program/token": "^0.6.0",
154157
"nonempty-array": "^0.1.4",
155158
},
@@ -168,19 +171,19 @@
168171
"name": "@macalinao/react-quarry",
169172
"version": "1.0.0",
170173
"dependencies": {
171-
"@macalinao/quarry": "workspace:*",
174+
"@macalinao/quarry": "workspace:^",
172175
},
173176
"devDependencies": {
174177
"@macalinao/eslint-config-react": "^5.0.2",
175-
"@macalinao/grill": "workspace:*",
178+
"@macalinao/grill": "workspace:^",
176179
"@macalinao/tsconfig": "catalog:",
177180
"@solana/kit": "catalog:",
178181
"@types/bun": "catalog:",
179182
"@types/react": "catalog:",
180183
"typescript": "catalog:",
181184
},
182185
"peerDependencies": {
183-
"@macalinao/grill": "workspace:*",
186+
"@macalinao/grill": "workspace:^",
184187
"@solana/kit": "catalog:",
185188
"react": "^18 || ^19",
186189
},
@@ -189,7 +192,7 @@
189192
"name": "@macalinao/solana-batch-accounts-loader",
190193
"version": "0.2.5",
191194
"dependencies": {
192-
"@macalinao/dataloader-es": "workspace:*",
195+
"@macalinao/dataloader-es": "workspace:^",
193196
"lodash-es": "^4.17.21",
194197
"tslib": "catalog:",
195198
},
@@ -232,7 +235,7 @@
232235
"devDependencies": {
233236
"@macalinao/eslint-config": "catalog:",
234237
"@macalinao/eslint-config-react": "^5.0.2",
235-
"@macalinao/grill": "workspace:*",
238+
"@macalinao/grill": "workspace:^",
236239
"@macalinao/tsconfig": "catalog:",
237240
"@solana/kit": "catalog:",
238241
"@solana/web3.js": "^1.98.4",
@@ -242,7 +245,7 @@
242245
"typescript": "catalog:",
243246
},
244247
"peerDependencies": {
245-
"@macalinao/grill": "workspace:*",
248+
"@macalinao/grill": "workspace:^",
246249
"@solana/kit": "catalog:",
247250
"@solana/wallet-adapter-base": "catalog:",
248251
"@solana/wallet-adapter-react": "catalog:",

‎packages/gill-extra/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@
4545
},
4646
"dependencies": {
4747
"@macalinao/clients-token-metadata": "^0.4.0",
48-
"@macalinao/dataloader-es": "workspace:*",
49-
"@macalinao/solana-batch-accounts-loader": "workspace:*",
50-
"@macalinao/token-utils": "workspace:*",
51-
"@macalinao/zod-solana": "workspace:*",
48+
"@macalinao/dataloader-es": "workspace:^",
49+
"@macalinao/solana-batch-accounts-loader": "workspace:^",
50+
"@macalinao/token-utils": "workspace:^",
51+
"@macalinao/zod-solana": "workspace:^",
5252
"@solana-program/token": "^0.6.0"
5353
},
5454
"devDependencies": {

‎packages/grill/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@
4848
"dependencies": {
4949
"@gillsdk/react": "catalog:",
5050
"@macalinao/clients-token-metadata": "^0.4.0",
51-
"@macalinao/dataloader-es": "workspace:*",
52-
"@macalinao/gill-extra": "workspace:*",
53-
"@macalinao/solana-batch-accounts-loader": "workspace:*",
54-
"@macalinao/token-utils": "workspace:*",
55-
"@macalinao/zod-solana": "workspace:*",
51+
"@macalinao/dataloader-es": "workspace:^",
52+
"@macalinao/gill-extra": "workspace:^",
53+
"@macalinao/solana-batch-accounts-loader": "workspace:^",
54+
"@macalinao/token-utils": "workspace:^",
55+
"@macalinao/zod-solana": "workspace:^",
5656
"@solana-program/token": "^0.6.0"
5757
},
5858
"devDependencies": {

‎packages/quarry/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@
5959
},
6060
"dependencies": {
6161
"@macalinao/clients-quarry": "^0.4.2",
62-
"@macalinao/gill-extra": "workspace:*",
63-
"@macalinao/token-utils": "workspace:*",
62+
"@macalinao/gill-extra": "workspace:^",
63+
"@macalinao/token-utils": "workspace:^",
6464
"@solana-program/token": "^0.6.0",
6565
"nonempty-array": "^0.1.4"
6666
},

‎packages/react-quarry/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,15 @@
5454
"typecheck": "tsc --noEmit"
5555
},
5656
"dependencies": {
57-
"@macalinao/quarry": "workspace:*"
57+
"@macalinao/quarry": "workspace:^"
5858
},
5959
"peerDependencies": {
60-
"@macalinao/grill": "workspace:*",
60+
"@macalinao/grill": "workspace:^",
6161
"@solana/kit": "catalog:",
6262
"react": "^18 || ^19"
6363
},
6464
"devDependencies": {
65-
"@macalinao/grill": "workspace:*",
65+
"@macalinao/grill": "workspace:^",
6666
"@macalinao/eslint-config-react": "^5.0.2",
6767
"@macalinao/tsconfig": "catalog:",
6868
"@solana/kit": "catalog:",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"test": "bun test src/"
4545
},
4646
"dependencies": {
47-
"@macalinao/dataloader-es": "workspace:*",
47+
"@macalinao/dataloader-es": "workspace:^",
4848
"lodash-es": "^4.17.21",
4949
"tslib": "catalog:"
5050
},

‎packages/wallet-adapter-compat/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"devDependencies": {
5050
"@macalinao/eslint-config": "catalog:",
5151
"@macalinao/eslint-config-react": "^5.0.2",
52-
"@macalinao/grill": "workspace:*",
52+
"@macalinao/grill": "workspace:^",
5353
"@macalinao/tsconfig": "catalog:",
5454
"@solana/kit": "catalog:",
5555
"@solana/web3.js": "^1.98.4",
@@ -59,7 +59,7 @@
5959
"typescript": "catalog:"
6060
},
6161
"peerDependencies": {
62-
"@macalinao/grill": "workspace:*",
62+
"@macalinao/grill": "workspace:^",
6363
"@solana/web3.js": "^1.98.4",
6464
"@solana/kit": "catalog:",
6565
"@solana/wallet-adapter-base": "catalog:",

0 commit comments

Comments
 (0)