Skip to content

Commit 274670a

Browse files
authored
Merge pull request #92 from macalinao/igm/bun-update
Update to Bun 1.3
2 parents a115c22 + 3072503 commit 274670a

File tree

9 files changed

+41
-50
lines changed

9 files changed

+41
-50
lines changed

.changeset/long-crabs-follow.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
"@macalinao/wallet-adapter-compat": patch
3+
"@macalinao/react-quarry": patch
4+
"@macalinao/grill": patch
5+
---
6+
7+
Bump to Bun 1.3

.github/workflows/ci.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,21 @@ jobs:
1414
- name: Checkout repository
1515
uses: actions/checkout@v5
1616

17+
- name: Setup Node.js
18+
uses: actions/setup-node@v4
19+
with:
20+
node-version: "22"
21+
1722
- name: Setup Bun
1823
uses: oven-sh/setup-bun@v2
19-
with:
20-
bun-version: 1.2.23
2124

2225
- name: Cache dependencies
2326
uses: actions/cache@v4
2427
with:
2528
path: ~/.bun/install/cache
26-
key: ${{ runner.os }}-buncache-${{ hashFiles('**/bun.lock') }}
29+
key: ${{ runner.os }}-bc-${{ hashFiles('**/bun.lock') }}
2730
restore-keys: |
28-
${{ runner.os }}-buncache-
31+
${{ runner.os }}-bc-
2932
3033
- name: Install dependencies
3134
run: bun install --frozen-lockfile

.github/workflows/release.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,21 @@ jobs:
2828
# This makes Actions fetch all Git history so that Changesets can generate changelogs with the correct commits
2929
fetch-depth: 0
3030

31+
- name: Setup Node.js
32+
uses: actions/setup-node@v4
33+
with:
34+
node-version: "22"
35+
3136
- name: Setup Bun
3237
uses: oven-sh/setup-bun@v2
33-
with:
34-
bun-version: 1.2.23
3538

3639
- name: Cache dependencies
3740
uses: actions/cache@v4
3841
with:
3942
path: ~/.bun/install/cache
40-
key: ${{ runner.os }}-buncache-${{ hashFiles('**/bun.lock') }}
43+
key: ${{ runner.os }}-bc-${{ hashFiles('**/bun.lock') }}
4144
restore-keys: |
42-
${{ runner.os }}-buncache-
45+
${{ runner.os }}-bc-
4346
4447
- name: Install Dependencies
4548
run: bun install --frozen-lockfile

bun.lock

Lines changed: 11 additions & 32 deletions
Large diffs are not rendered by default.

devenv.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,10 @@
7474
},
7575
"nixpkgs": {
7676
"locked": {
77-
"lastModified": 1760164275,
77+
"lastModified": 1760256791,
7878
"owner": "NixOS",
7979
"repo": "nixpkgs",
80-
"rev": "362791944032cb532aabbeed7887a441496d5e6e",
80+
"rev": "832e3b6db48508ae436c2c7bfc0cf914eac6938e",
8181
"type": "github"
8282
},
8383
"original": {

package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
"catalog": {
1313
"eslint": "^9.37.0",
1414
"typescript": "^5.9.3",
15-
"@macalinao/eslint-config": "^6.0.3",
15+
"@macalinao/eslint-config": "^7.0.0",
16+
"@macalinao/eslint-config-react": "^6.0.0",
1617
"@macalinao/tsconfig": "^3.2.3",
1718
"@solana/kit": "^3.0.3",
1819
"tslib": "^2.8.1",
@@ -25,7 +26,7 @@
2526
"react-dom": "^19.2.0",
2627
"gill": "^0.12",
2728
"@gillsdk/react": "^0.6.0",
28-
"@types/bun": "^1.2.23"
29+
"@types/bun": "^1.3.0"
2930
}
3031
},
3132
"scripts": {
@@ -57,7 +58,7 @@
5758
"turbo": "^2.5.8",
5859
"typescript": "^5.9.3"
5960
},
60-
"packageManager": "bun@1.2.23",
61+
"packageManager": "bun@1.3.0",
6162
"lint-staged": {
6263
"*.{json,jsonc,html}": "biome format --write --no-errors-on-unmatched"
6364
},

packages/grill/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,7 @@
5656
"@solana-program/token": "^0.6.0"
5757
},
5858
"devDependencies": {
59-
"@macalinao/eslint-config": "catalog:",
60-
"@macalinao/eslint-config-react": "^5.0.3",
59+
"@macalinao/eslint-config-react": "catalog:",
6160
"@macalinao/tsconfig": "catalog:",
6261
"@solana/kit": "catalog:",
6362
"@tanstack/react-query": "catalog:",

packages/react-quarry/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
"react": "^18 || ^19"
6363
},
6464
"devDependencies": {
65-
"@macalinao/eslint-config-react": "^5.0.3",
65+
"@macalinao/eslint-config-react": "catalog:",
6666
"@macalinao/grill": "workspace:^",
6767
"@macalinao/tsconfig": "catalog:",
6868
"@solana/kit": "catalog:",

packages/wallet-adapter-compat/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@
4747
"tslib": "catalog:"
4848
},
4949
"devDependencies": {
50-
"@macalinao/eslint-config": "catalog:",
51-
"@macalinao/eslint-config-react": "^5.0.3",
50+
"@macalinao/eslint-config-react": "catalog:",
5251
"@macalinao/grill": "workspace:^",
5352
"@macalinao/tsconfig": "catalog:",
5453
"@solana/kit": "catalog:",

0 commit comments

Comments
 (0)