Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .changeset/long-crabs-follow.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@macalinao/wallet-adapter-compat": patch
"@macalinao/react-quarry": patch
"@macalinao/grill": patch
---

Bump to Bun 1.3
11 changes: 7 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,21 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v5

- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: "22"

- name: Setup Bun
uses: oven-sh/setup-bun@v2
with:
bun-version: 1.2.23

- name: Cache dependencies
uses: actions/cache@v4
with:
path: ~/.bun/install/cache
key: ${{ runner.os }}-buncache-${{ hashFiles('**/bun.lock') }}
key: ${{ runner.os }}-bc-${{ hashFiles('**/bun.lock') }}
restore-keys: |
${{ runner.os }}-buncache-
${{ runner.os }}-bc-

- name: Install dependencies
run: bun install --frozen-lockfile
Expand Down
11 changes: 7 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,21 @@ jobs:
# This makes Actions fetch all Git history so that Changesets can generate changelogs with the correct commits
fetch-depth: 0

- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: "22"

- name: Setup Bun
uses: oven-sh/setup-bun@v2
with:
bun-version: 1.2.23

- name: Cache dependencies
uses: actions/cache@v4
with:
path: ~/.bun/install/cache
key: ${{ runner.os }}-buncache-${{ hashFiles('**/bun.lock') }}
key: ${{ runner.os }}-bc-${{ hashFiles('**/bun.lock') }}
restore-keys: |
${{ runner.os }}-buncache-
${{ runner.os }}-bc-

- name: Install Dependencies
run: bun install --frozen-lockfile
Expand Down
43 changes: 11 additions & 32 deletions bun.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions devenv.lock
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,10 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1760164275,
"lastModified": 1760256791,
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "362791944032cb532aabbeed7887a441496d5e6e",
"rev": "832e3b6db48508ae436c2c7bfc0cf914eac6938e",
"type": "github"
},
"original": {
Expand Down
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
"catalog": {
"eslint": "^9.37.0",
"typescript": "^5.9.3",
"@macalinao/eslint-config": "^6.0.3",
"@macalinao/eslint-config": "^7.0.0",
"@macalinao/eslint-config-react": "^6.0.0",
"@macalinao/tsconfig": "^3.2.3",
"@solana/kit": "^3.0.3",
"tslib": "^2.8.1",
Expand All @@ -25,7 +26,7 @@
"react-dom": "^19.2.0",
"gill": "^0.12",
"@gillsdk/react": "^0.6.0",
"@types/bun": "^1.2.23"
"@types/bun": "^1.3.0"
}
},
"scripts": {
Expand Down Expand Up @@ -57,7 +58,7 @@
"turbo": "^2.5.8",
"typescript": "^5.9.3"
},
"packageManager": "bun@1.2.23",
"packageManager": "bun@1.3.0",
"lint-staged": {
"*.{json,jsonc,html}": "biome format --write --no-errors-on-unmatched"
},
Expand Down
3 changes: 1 addition & 2 deletions packages/grill/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,7 @@
"@solana-program/token": "^0.6.0"
},
"devDependencies": {
"@macalinao/eslint-config": "catalog:",
"@macalinao/eslint-config-react": "^5.0.3",
"@macalinao/eslint-config-react": "catalog:",
"@macalinao/tsconfig": "catalog:",
"@solana/kit": "catalog:",
"@tanstack/react-query": "catalog:",
Expand Down
2 changes: 1 addition & 1 deletion packages/react-quarry/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"react": "^18 || ^19"
},
"devDependencies": {
"@macalinao/eslint-config-react": "^5.0.3",
"@macalinao/eslint-config-react": "catalog:",
"@macalinao/grill": "workspace:^",
"@macalinao/tsconfig": "catalog:",
"@solana/kit": "catalog:",
Expand Down
3 changes: 1 addition & 2 deletions packages/wallet-adapter-compat/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,7 @@
"tslib": "catalog:"
},
"devDependencies": {
"@macalinao/eslint-config": "catalog:",
"@macalinao/eslint-config-react": "^5.0.3",
"@macalinao/eslint-config-react": "catalog:",
"@macalinao/grill": "workspace:^",
"@macalinao/tsconfig": "catalog:",
"@solana/kit": "catalog:",
Expand Down