From 7467e99147a9bc8dbbcbe71b1d1ded7aeb83286c Mon Sep 17 00:00:00 2001 From: Ian Macalinao Date: Mon, 13 Oct 2025 17:46:08 +0800 Subject: [PATCH 1/5] remove bun version stuff --- .github/workflows/ci.yml | 2 -- .github/workflows/release.yml | 2 -- bun.lock | 23 +++++++++++---------- devenv.lock | 4 ++-- package.json | 7 ++++--- packages/grill/package.json | 3 +-- packages/react-quarry/package.json | 2 +- packages/wallet-adapter-compat/package.json | 3 +-- 8 files changed, 21 insertions(+), 25 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bfdd80f..e52d081 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,8 +16,6 @@ jobs: - name: Setup Bun uses: oven-sh/setup-bun@v2 - with: - bun-version: 1.2.23 - name: Cache dependencies uses: actions/cache@v4 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 408dd18..0772d2c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -30,8 +30,6 @@ jobs: - name: Setup Bun uses: oven-sh/setup-bun@v2 - with: - bun-version: 1.2.23 - name: Cache dependencies uses: actions/cache@v4 diff --git a/bun.lock b/bun.lock index f5d1f4c..d0a1c7f 100644 --- a/bun.lock +++ b/bun.lock @@ -9,7 +9,7 @@ "@macalinao/biome-config": "^0.1.2", "eslint": "^9.37.0", "husky": "^9.1.7", - "lint-staged": "^16.2.3", + "lint-staged": "^16.2.4", "prettier": "^3.6.2", "turbo": "^2.5.8", "typescript": "^5.9.3", @@ -130,8 +130,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:", @@ -178,7 +177,7 @@ "@macalinao/quarry": "workspace:^", }, "devDependencies": { - "@macalinao/eslint-config-react": "^5.0.3", + "@macalinao/eslint-config-react": "catalog:", "@macalinao/grill": "workspace:^", "@macalinao/tsconfig": "catalog:", "@solana/kit": "catalog:", @@ -237,8 +236,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:", @@ -283,13 +281,14 @@ }, "catalog": { "@gillsdk/react": "^0.6.0", - "@macalinao/eslint-config": "^6.0.3", + "@macalinao/eslint-config": "^7.0.0", + "@macalinao/eslint-config-react": "^5.0.3", "@macalinao/tsconfig": "^3.2.3", "@solana/kit": "^3.0.3", "@solana/wallet-adapter-base": "^0.9.27", "@solana/wallet-adapter-react": "^0.15.39", "@tanstack/react-query": "^5.90.2", - "@types/bun": "^1.2.23", + "@types/bun": "^1.3.0", "@types/react": "^19.2.0", "@types/react-dom": "^19.2.0", "eslint": "^9.37.0", @@ -628,7 +627,7 @@ "@macalinao/dataloader-es": ["@macalinao/dataloader-es@workspace:packages/dataloader-es"], - "@macalinao/eslint-config": ["@macalinao/eslint-config@6.0.3", "", { "dependencies": { "@eslint/js": "^9.37.0", "@typescript-eslint/parser": "^8.45.0", "eslint-config-turbo": "^2.5.8", "eslint-import-resolver-typescript": "^4.4.4", "eslint-plugin-import-x": "^4.16.1", "eslint-plugin-prettier": "^5.5.4", "eslint-plugin-simple-import-sort": "^12.1.1", "eslint-plugin-unused-imports": "^4.2.0", "globals": "^16.4.0", "typescript-eslint": "^8.39.1" }, "peerDependencies": { "eslint": "^9.33.0" } }, "sha512-uSZpFgnkW8A1fSCF297Npz3ATN6qnKSClX1CozDmetDQVOXjputFuUdRUkmQjfAlaYXCWIqVVS2dknVgV4KIFA=="], + "@macalinao/eslint-config": ["@macalinao/eslint-config@7.0.0", "", { "dependencies": { "@eslint/js": "^9.37.0", "@typescript-eslint/parser": "^8.45.0", "eslint-config-turbo": "^2.5.8", "globals": "^16.4.0", "typescript-eslint": "^8.39.1" }, "peerDependencies": { "eslint": "^9.33.0" } }, "sha512-10eFx35lrAQ/n2x0qjv5VMYjZDCZhhQPbgnKUD2fH0WnN3oA5hvoNTjD1uY1mdpvkBwbqnbAC2OQrjEjUqFQ1A=="], "@macalinao/eslint-config-react": ["@macalinao/eslint-config-react@5.0.3", "", { "dependencies": { "@macalinao/eslint-config": "^6.0.3", "@tanstack/eslint-plugin-query": "^5.91.0", "eslint-plugin-import-x": "^4.16.1", "eslint-plugin-jsx-a11y": "^6.10.2", "eslint-plugin-react": "^7.37.5", "eslint-plugin-react-hooks": "^6.1.1", "typescript-eslint": "^8.39.1" }, "peerDependencies": { "eslint": "^9.33.0" } }, "sha512-Rc+TuUmGJimTTcFBMUW4Ziae7gteVjl7+hnrersW+krJJ+9ZltGylSDmZPV1Y9Icw+R1OeuQ0vyvczZV6XVlzQ=="], @@ -1220,7 +1219,7 @@ "@types/babel__traverse": ["@types/babel__traverse@7.28.0", "", { "dependencies": { "@babel/types": "^7.28.2" } }, "sha512-8PvcXf70gTDZBgt9ptxJ8elBeBjcLOAcOtoO/mPJjtji1+CdGbHgm77om1GrsPxsiE+uXIpNSK64UYaIwQXd4Q=="], - "@types/bun": ["@types/bun@1.2.23", "", { "dependencies": { "bun-types": "1.2.23" } }, "sha512-le8ueOY5b6VKYf19xT3McVbXqLqmxzPXHsQT/q9JHgikJ2X22wyTW3g3ohz2ZMnp7dod6aduIiq8A14Xyimm0A=="], + "@types/bun": ["@types/bun@1.3.0", "", { "dependencies": { "bun-types": "1.3.0" } }, "sha512-+lAGCYjXjip2qY375xX/scJeVRmZ5cY0wyHYyCYxNcdEXrQ4AOe3gACgd4iQ8ksOslJtW4VNxBJ8llUwc3a6AA=="], "@types/connect": ["@types/connect@3.4.38", "", { "dependencies": { "@types/node": "*" } }, "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug=="], @@ -1588,7 +1587,7 @@ "builtin-status-codes": ["builtin-status-codes@3.0.0", "", {}, "sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ=="], - "bun-types": ["bun-types@1.2.23", "", { "dependencies": { "@types/node": "*" }, "peerDependencies": { "@types/react": "^19" } }, "sha512-R9f0hKAZXgFU3mlrA0YpE/fiDvwV0FT9rORApt2aQVWSuJDzZOyB5QLc0N/4HF57CS8IXJ6+L5E4W1bW6NS2Aw=="], + "bun-types": ["bun-types@1.3.0", "", { "dependencies": { "@types/node": "*" }, "peerDependencies": { "@types/react": "^19" } }, "sha512-u8X0thhx+yJ0KmkxuEo9HAtdfgCBaM/aI9K90VQcQioAmkVp3SG3FkwWGibUFz3WdXAdcsqOcbU40lK7tbHdkQ=="], "call-bind": ["call-bind@1.0.8", "", { "dependencies": { "call-bind-apply-helpers": "^1.0.0", "es-define-property": "^1.0.0", "get-intrinsic": "^1.2.4", "set-function-length": "^1.2.2" } }, "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww=="], @@ -3080,6 +3079,8 @@ "@keystonehq/sol-keyring/bs58": ["bs58@5.0.0", "", { "dependencies": { "base-x": "^4.0.0" } }, "sha512-r+ihvQJvahgYT50JD05dyJNKlmmSlMoOGwn1lCcEzanPglg7TxYjioQUYehQ9mAR/+hOSd2jRc/Z2y5UxBymvQ=="], + "@macalinao/eslint-config-react/@macalinao/eslint-config": ["@macalinao/eslint-config@6.0.3", "", { "dependencies": { "@eslint/js": "^9.37.0", "@typescript-eslint/parser": "^8.45.0", "eslint-config-turbo": "^2.5.8", "eslint-import-resolver-typescript": "^4.4.4", "eslint-plugin-import-x": "^4.16.1", "eslint-plugin-prettier": "^5.5.4", "eslint-plugin-simple-import-sort": "^12.1.1", "eslint-plugin-unused-imports": "^4.2.0", "globals": "^16.4.0", "typescript-eslint": "^8.39.1" }, "peerDependencies": { "eslint": "^9.33.0" } }, "sha512-uSZpFgnkW8A1fSCF297Npz3ATN6qnKSClX1CozDmetDQVOXjputFuUdRUkmQjfAlaYXCWIqVVS2dknVgV4KIFA=="], + "@macalinao/eslint-config-react/eslint-plugin-react-hooks": ["eslint-plugin-react-hooks@6.1.1", "", { "dependencies": { "@babel/core": "^7.24.4", "@babel/parser": "^7.24.4", "zod": "^3.22.4 || ^4.0.0", "zod-validation-error": "^3.0.3 || ^4.0.0" }, "peerDependencies": { "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 || ^9.0.0" } }, "sha512-St9EKZzOAQF704nt2oJvAKZHjhrpg25ClQoaAlHmPZuajFldVLqRDW4VBNAS01NzeiQF0m0qhG1ZA807K6aVaQ=="], "@manypkg/find-root/@types/node": ["@types/node@12.20.55", "", {}, "sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ=="], diff --git a/devenv.lock b/devenv.lock index 26c62c5..5bd5efa 100644 --- a/devenv.lock +++ b/devenv.lock @@ -74,10 +74,10 @@ }, "nixpkgs": { "locked": { - "lastModified": 1760164275, + "lastModified": 1760256791, "owner": "NixOS", "repo": "nixpkgs", - "rev": "362791944032cb532aabbeed7887a441496d5e6e", + "rev": "832e3b6db48508ae436c2c7bfc0cf914eac6938e", "type": "github" }, "original": { diff --git a/package.json b/package.json index c2005a1..fe1da20 100644 --- a/package.json +++ b/package.json @@ -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": "^5.0.3", "@macalinao/tsconfig": "^3.2.3", "@solana/kit": "^3.0.3", "tslib": "^2.8.1", @@ -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": { @@ -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" }, diff --git a/packages/grill/package.json b/packages/grill/package.json index ce26025..71a6995 100644 --- a/packages/grill/package.json +++ b/packages/grill/package.json @@ -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:", diff --git a/packages/react-quarry/package.json b/packages/react-quarry/package.json index d046ae6..08c4148 100644 --- a/packages/react-quarry/package.json +++ b/packages/react-quarry/package.json @@ -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:", diff --git a/packages/wallet-adapter-compat/package.json b/packages/wallet-adapter-compat/package.json index 12c49b0..ccdb294 100644 --- a/packages/wallet-adapter-compat/package.json +++ b/packages/wallet-adapter-compat/package.json @@ -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:", From b76d74815218afa6454d638f12fde2bf0a80bf6d Mon Sep 17 00:00:00 2001 From: Ian Macalinao Date: Mon, 13 Oct 2025 17:50:16 +0800 Subject: [PATCH 2/5] update react eslint config --- bun.lock | 26 ++------------------------ package.json | 2 +- 2 files changed, 3 insertions(+), 25 deletions(-) diff --git a/bun.lock b/bun.lock index d0a1c7f..8df9c74 100644 --- a/bun.lock +++ b/bun.lock @@ -282,7 +282,7 @@ "catalog": { "@gillsdk/react": "^0.6.0", "@macalinao/eslint-config": "^7.0.0", - "@macalinao/eslint-config-react": "^5.0.3", + "@macalinao/eslint-config-react": "^6.0.0", "@macalinao/tsconfig": "^3.2.3", "@solana/kit": "^3.0.3", "@solana/wallet-adapter-base": "^0.9.27", @@ -629,7 +629,7 @@ "@macalinao/eslint-config": ["@macalinao/eslint-config@7.0.0", "", { "dependencies": { "@eslint/js": "^9.37.0", "@typescript-eslint/parser": "^8.45.0", "eslint-config-turbo": "^2.5.8", "globals": "^16.4.0", "typescript-eslint": "^8.39.1" }, "peerDependencies": { "eslint": "^9.33.0" } }, "sha512-10eFx35lrAQ/n2x0qjv5VMYjZDCZhhQPbgnKUD2fH0WnN3oA5hvoNTjD1uY1mdpvkBwbqnbAC2OQrjEjUqFQ1A=="], - "@macalinao/eslint-config-react": ["@macalinao/eslint-config-react@5.0.3", "", { "dependencies": { "@macalinao/eslint-config": "^6.0.3", "@tanstack/eslint-plugin-query": "^5.91.0", "eslint-plugin-import-x": "^4.16.1", "eslint-plugin-jsx-a11y": "^6.10.2", "eslint-plugin-react": "^7.37.5", "eslint-plugin-react-hooks": "^6.1.1", "typescript-eslint": "^8.39.1" }, "peerDependencies": { "eslint": "^9.33.0" } }, "sha512-Rc+TuUmGJimTTcFBMUW4Ziae7gteVjl7+hnrersW+krJJ+9ZltGylSDmZPV1Y9Icw+R1OeuQ0vyvczZV6XVlzQ=="], + "@macalinao/eslint-config-react": ["@macalinao/eslint-config-react@6.0.0", "", { "dependencies": { "@macalinao/eslint-config": "^7.0.0", "@tanstack/eslint-plugin-query": "^5.91.0", "eslint-plugin-import-x": "^4.16.1", "eslint-plugin-jsx-a11y": "^6.10.2", "eslint-plugin-react": "^7.37.5", "eslint-plugin-react-hooks": "^6.1.1", "typescript-eslint": "^8.39.1" }, "peerDependencies": { "eslint": "^9.33.0" } }, "sha512-wsTHoXJajl7/xCHk98NAL0jJZwGMh6gH9UGLDE7ZpBhOwgzmKx3lfK71CE+IaTQkizfjbXheChe98RkZYdajlQ=="], "@macalinao/gill-extra": ["@macalinao/gill-extra@workspace:packages/gill-extra"], @@ -683,8 +683,6 @@ "@particle-network/solana-wallet": ["@particle-network/solana-wallet@1.3.2", "", { "dependencies": { "@particle-network/auth": "^1.3.1" }, "peerDependencies": { "@solana/web3.js": "^1.50.1", "bs58": "^4.0.1" } }, "sha512-KviKVP87OtWq813y8IumM3rIQMNkTjHBaQmCUbTWGebz3csFOv54JIoy1r+3J3NnA+mBxBdZeRedZ5g+07v75w=="], - "@pkgr/core": ["@pkgr/core@0.2.9", "", {}, "sha512-QNqXyfVS2wm9hweSYD2O7F0G06uurj9kZ96TRQE5Y9hU7+tgdZwIkbAKc5Ocy1HxEY2kuDQa6cQ1WRs/O5LFKA=="], - "@project-serum/sol-wallet-adapter": ["@project-serum/sol-wallet-adapter@0.2.6", "", { "dependencies": { "bs58": "^4.0.1", "eventemitter3": "^4.0.7" }, "peerDependencies": { "@solana/web3.js": "^1.5.0" } }, "sha512-cpIb13aWPW8y4KzkZAPDgw+Kb+DXjCC6rZoH74MGm3I/6e/zKyGnfAuW5olb2zxonFqsYgnv7ev8MQnvSgJ3/g=="], "@protobufjs/aspromise": ["@protobufjs/aspromise@1.1.2", "", {}, "sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ=="], @@ -1825,32 +1823,22 @@ "eslint": ["eslint@9.37.0", "", { "dependencies": { "@eslint-community/eslint-utils": "^4.8.0", "@eslint-community/regexpp": "^4.12.1", "@eslint/config-array": "^0.21.0", "@eslint/config-helpers": "^0.4.0", "@eslint/core": "^0.16.0", "@eslint/eslintrc": "^3.3.1", "@eslint/js": "9.37.0", "@eslint/plugin-kit": "^0.4.0", "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", "@humanwhocodes/retry": "^0.4.2", "@types/estree": "^1.0.6", "@types/json-schema": "^7.0.15", "ajv": "^6.12.4", "chalk": "^4.0.0", "cross-spawn": "^7.0.6", "debug": "^4.3.2", "escape-string-regexp": "^4.0.0", "eslint-scope": "^8.4.0", "eslint-visitor-keys": "^4.2.1", "espree": "^10.4.0", "esquery": "^1.5.0", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", "file-entry-cache": "^8.0.0", "find-up": "^5.0.0", "glob-parent": "^6.0.2", "ignore": "^5.2.0", "imurmurhash": "^0.1.4", "is-glob": "^4.0.0", "json-stable-stringify-without-jsonify": "^1.0.1", "lodash.merge": "^4.6.2", "minimatch": "^3.1.2", "natural-compare": "^1.4.0", "optionator": "^0.9.3" }, "peerDependencies": { "jiti": "*" }, "optionalPeers": ["jiti"], "bin": { "eslint": "bin/eslint.js" } }, "sha512-XyLmROnACWqSxiGYArdef1fItQd47weqB7iwtfr9JHwRrqIXZdcFMvvEcL9xHCmL0SNsOvF0c42lWyM1U5dgig=="], - "eslint-config-prettier": ["eslint-config-prettier@10.1.8", "", { "peerDependencies": { "eslint": ">=7.0.0" }, "bin": { "eslint-config-prettier": "bin/cli.js" } }, "sha512-82GZUjRS0p/jganf6q1rEO25VSoHH0hKPCTrgillPjdI/3bgBhAE1QzHrHTizjpRvy6pGAvKjDJtk2pF9NDq8w=="], - "eslint-config-turbo": ["eslint-config-turbo@2.5.8", "", { "dependencies": { "eslint-plugin-turbo": "2.5.8" }, "peerDependencies": { "eslint": ">6.6.0", "turbo": ">2.0.0" } }, "sha512-wzxmN7dJNFGDwOvR/4j8U2iaIH/ruYez8qg/sCKrezJ3+ljbFMvJLmgKKt/1mDuyU9wj5aZqO6VijP3QH169FA=="], "eslint-import-context": ["eslint-import-context@0.1.9", "", { "dependencies": { "get-tsconfig": "^4.10.1", "stable-hash-x": "^0.2.0" }, "peerDependencies": { "unrs-resolver": "^1.0.0" }, "optionalPeers": ["unrs-resolver"] }, "sha512-K9Hb+yRaGAGUbwjhFNHvSmmkZs9+zbuoe3kFQ4V1wYjrepUFYM2dZAfNtjbbj3qsPfUfsA68Bx/ICWQMi+C8Eg=="], - "eslint-import-resolver-typescript": ["eslint-import-resolver-typescript@4.4.4", "", { "dependencies": { "debug": "^4.4.1", "eslint-import-context": "^0.1.8", "get-tsconfig": "^4.10.1", "is-bun-module": "^2.0.0", "stable-hash-x": "^0.2.0", "tinyglobby": "^0.2.14", "unrs-resolver": "^1.7.11" }, "peerDependencies": { "eslint": "*", "eslint-plugin-import": "*", "eslint-plugin-import-x": "*" }, "optionalPeers": ["eslint-plugin-import", "eslint-plugin-import-x"] }, "sha512-1iM2zeBvrYmUNTj2vSC/90JTHDth+dfOfiNKkxApWRsTJYNrc8rOdxxIf5vazX+BiAXTeOT0UvWpGI/7qIWQOw=="], - "eslint-plugin-import-x": ["eslint-plugin-import-x@4.16.1", "", { "dependencies": { "@typescript-eslint/types": "^8.35.0", "comment-parser": "^1.4.1", "debug": "^4.4.1", "eslint-import-context": "^0.1.9", "is-glob": "^4.0.3", "minimatch": "^9.0.3 || ^10.0.1", "semver": "^7.7.2", "stable-hash-x": "^0.2.0", "unrs-resolver": "^1.9.2" }, "peerDependencies": { "@typescript-eslint/utils": "^8.0.0", "eslint": "^8.57.0 || ^9.0.0", "eslint-import-resolver-node": "*" }, "optionalPeers": ["@typescript-eslint/utils", "eslint-import-resolver-node"] }, "sha512-vPZZsiOKaBAIATpFE2uMI4w5IRwdv/FpQ+qZZMR4E+PeOcM4OeoEbqxRMnywdxP19TyB/3h6QBB0EWon7letSQ=="], "eslint-plugin-jsx-a11y": ["eslint-plugin-jsx-a11y@6.10.2", "", { "dependencies": { "aria-query": "^5.3.2", "array-includes": "^3.1.8", "array.prototype.flatmap": "^1.3.2", "ast-types-flow": "^0.0.8", "axe-core": "^4.10.0", "axobject-query": "^4.1.0", "damerau-levenshtein": "^1.0.8", "emoji-regex": "^9.2.2", "hasown": "^2.0.2", "jsx-ast-utils": "^3.3.5", "language-tags": "^1.0.9", "minimatch": "^3.1.2", "object.fromentries": "^2.0.8", "safe-regex-test": "^1.0.3", "string.prototype.includes": "^2.0.1" }, "peerDependencies": { "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9" } }, "sha512-scB3nz4WmG75pV8+3eRUQOHZlNSUhFNq37xnpgRkCCELU3XMvXAxLk1eqWWyE22Ki4Q01Fnsw9BA3cJHDPgn2Q=="], - "eslint-plugin-prettier": ["eslint-plugin-prettier@5.5.4", "", { "dependencies": { "prettier-linter-helpers": "^1.0.0", "synckit": "^0.11.7" }, "peerDependencies": { "@types/eslint": ">=8.0.0", "eslint": ">=8.0.0", "eslint-config-prettier": ">= 7.0.0 <10.0.0 || >=10.1.0", "prettier": ">=3.0.0" }, "optionalPeers": ["@types/eslint", "eslint-config-prettier"] }, "sha512-swNtI95SToIz05YINMA6Ox5R057IMAmWZ26GqPxusAp1TZzj+IdY9tXNWWD3vkF/wEqydCONcwjTFpxybBqZsg=="], - "eslint-plugin-react": ["eslint-plugin-react@7.37.5", "", { "dependencies": { "array-includes": "^3.1.8", "array.prototype.findlast": "^1.2.5", "array.prototype.flatmap": "^1.3.3", "array.prototype.tosorted": "^1.1.4", "doctrine": "^2.1.0", "es-iterator-helpers": "^1.2.1", "estraverse": "^5.3.0", "hasown": "^2.0.2", "jsx-ast-utils": "^2.4.1 || ^3.0.0", "minimatch": "^3.1.2", "object.entries": "^1.1.9", "object.fromentries": "^2.0.8", "object.values": "^1.2.1", "prop-types": "^15.8.1", "resolve": "^2.0.0-next.5", "semver": "^6.3.1", "string.prototype.matchall": "^4.0.12", "string.prototype.repeat": "^1.0.0" }, "peerDependencies": { "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9.7" } }, "sha512-Qteup0SqU15kdocexFNAJMvCJEfa2xUKNV4CC1xsVMrIIqEy3SQ/rqyxCWNzfrd3/ldy6HMlD2e0JDVpDg2qIA=="], "eslint-plugin-react-hooks": ["eslint-plugin-react-hooks@5.2.0", "", { "peerDependencies": { "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 || ^9.0.0" } }, "sha512-+f15FfK64YQwZdJNELETdn5ibXEUQmW1DZL6KXhNnc2heoy/sg9VJJeT7n8TlMWouzWqSWavFkIhHyIbIAEapg=="], "eslint-plugin-react-refresh": ["eslint-plugin-react-refresh@0.4.23", "", { "peerDependencies": { "eslint": ">=8.40" } }, "sha512-G4j+rv0NmbIR45kni5xJOrYvCtyD3/7LjpVH8MPPcudXDcNu8gv+4ATTDXTtbRR8rTCM5HxECvCSsRmxKnWDsA=="], - "eslint-plugin-simple-import-sort": ["eslint-plugin-simple-import-sort@12.1.1", "", { "peerDependencies": { "eslint": ">=5.0.0" } }, "sha512-6nuzu4xwQtE3332Uz0to+TxDQYRLTKRESSc2hefVT48Zc8JthmN23Gx9lnYhu0FtkRSL1oxny3kJ2aveVhmOVA=="], - "eslint-plugin-turbo": ["eslint-plugin-turbo@2.5.8", "", { "dependencies": { "dotenv": "16.0.3" }, "peerDependencies": { "eslint": ">6.6.0", "turbo": ">2.0.0" } }, "sha512-bVjx4vTH0oTKIyQ7EGFAXnuhZMrKIfu17qlex/dps7eScPnGQLJ3r1/nFq80l8xA+8oYjsSirSQ2tXOKbz3kEw=="], - "eslint-plugin-unused-imports": ["eslint-plugin-unused-imports@4.2.0", "", { "peerDependencies": { "@typescript-eslint/eslint-plugin": "^8.0.0-0 || ^7.0.0 || ^6.0.0 || ^5.0.0", "eslint": "^9.0.0 || ^8.0.0" }, "optionalPeers": ["@typescript-eslint/eslint-plugin"] }, "sha512-hLbJ2/wnjKq4kGA9AUaExVFIbNzyxYdVo49QZmKCnhk5pc9wcYRbfgLHvWJ8tnsdcseGhoUAddm9gn/lt+d74w=="], - "eslint-scope": ["eslint-scope@8.4.0", "", { "dependencies": { "esrecurse": "^4.3.0", "estraverse": "^5.2.0" } }, "sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg=="], "eslint-visitor-keys": ["eslint-visitor-keys@4.2.1", "", {}, "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ=="], @@ -1899,8 +1887,6 @@ "fast-deep-equal": ["fast-deep-equal@3.1.3", "", {}, "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="], - "fast-diff": ["fast-diff@1.3.0", "", {}, "sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw=="], - "fast-glob": ["fast-glob@3.3.3", "", { "dependencies": { "@nodelib/fs.stat": "^2.0.2", "@nodelib/fs.walk": "^1.2.3", "glob-parent": "^5.1.2", "merge2": "^1.3.0", "micromatch": "^4.0.8" } }, "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg=="], "fast-json-stable-stringify": ["fast-json-stable-stringify@2.1.0", "", {}, "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="], @@ -2085,8 +2071,6 @@ "is-boolean-object": ["is-boolean-object@1.2.2", "", { "dependencies": { "call-bound": "^1.0.3", "has-tostringtag": "^1.0.2" } }, "sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A=="], - "is-bun-module": ["is-bun-module@2.0.0", "", { "dependencies": { "semver": "^7.7.1" } }, "sha512-gNCGbnnnnFAUGKeZ9PdbyeGYJqewpmc2aKHUEMO5nQPWU9lOmv7jcmQIv+qHD8fXW6W7qfuCwX4rY9LNRjXrkQ=="], - "is-callable": ["is-callable@1.2.7", "", {}, "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA=="], "is-core-module": ["is-core-module@2.16.1", "", { "dependencies": { "hasown": "^2.0.2" } }, "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w=="], @@ -2521,8 +2505,6 @@ "prettier": ["prettier@3.6.2", "", { "bin": { "prettier": "bin/prettier.cjs" } }, "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ=="], - "prettier-linter-helpers": ["prettier-linter-helpers@1.0.0", "", { "dependencies": { "fast-diff": "^1.1.2" } }, "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w=="], - "pretty-format": ["pretty-format@27.5.1", "", { "dependencies": { "ansi-regex": "^5.0.1", "ansi-styles": "^5.0.0", "react-is": "^17.0.1" } }, "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ=="], "process": ["process@0.11.10", "", {}, "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A=="], @@ -2809,8 +2791,6 @@ "supports-preserve-symlinks-flag": ["supports-preserve-symlinks-flag@1.0.0", "", {}, "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="], - "synckit": ["synckit@0.11.11", "", { "dependencies": { "@pkgr/core": "^0.2.9" } }, "sha512-MeQTA1r0litLUf0Rp/iisCaL8761lKAZHaimlbGK4j0HysC4PLfqygQj9srcs0m2RdtDYnF8UuYyKpbjHYp7Jw=="], - "tailwind-merge": ["tailwind-merge@3.3.1", "", {}, "sha512-gBXpgUm/3rp1lMZZrM/w7D8GKqshif0zAymAhbCyIt8KMe+0v9DQ7cdYLR4FHH/cKpdTXb+A/tKKU3eolfsI+g=="], "tailwindcss": ["tailwindcss@4.1.14", "", {}, "sha512-b7pCxjGO98LnxVkKjaZSDeNuljC4ueKUddjENJOADtubtdo8llTaJy7HwBMeLNSSo2N5QIAgklslK1+Ir8r6CA=="], @@ -3079,8 +3059,6 @@ "@keystonehq/sol-keyring/bs58": ["bs58@5.0.0", "", { "dependencies": { "base-x": "^4.0.0" } }, "sha512-r+ihvQJvahgYT50JD05dyJNKlmmSlMoOGwn1lCcEzanPglg7TxYjioQUYehQ9mAR/+hOSd2jRc/Z2y5UxBymvQ=="], - "@macalinao/eslint-config-react/@macalinao/eslint-config": ["@macalinao/eslint-config@6.0.3", "", { "dependencies": { "@eslint/js": "^9.37.0", "@typescript-eslint/parser": "^8.45.0", "eslint-config-turbo": "^2.5.8", "eslint-import-resolver-typescript": "^4.4.4", "eslint-plugin-import-x": "^4.16.1", "eslint-plugin-prettier": "^5.5.4", "eslint-plugin-simple-import-sort": "^12.1.1", "eslint-plugin-unused-imports": "^4.2.0", "globals": "^16.4.0", "typescript-eslint": "^8.39.1" }, "peerDependencies": { "eslint": "^9.33.0" } }, "sha512-uSZpFgnkW8A1fSCF297Npz3ATN6qnKSClX1CozDmetDQVOXjputFuUdRUkmQjfAlaYXCWIqVVS2dknVgV4KIFA=="], - "@macalinao/eslint-config-react/eslint-plugin-react-hooks": ["eslint-plugin-react-hooks@6.1.1", "", { "dependencies": { "@babel/core": "^7.24.4", "@babel/parser": "^7.24.4", "zod": "^3.22.4 || ^4.0.0", "zod-validation-error": "^3.0.3 || ^4.0.0" }, "peerDependencies": { "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 || ^9.0.0" } }, "sha512-St9EKZzOAQF704nt2oJvAKZHjhrpg25ClQoaAlHmPZuajFldVLqRDW4VBNAS01NzeiQF0m0qhG1ZA807K6aVaQ=="], "@manypkg/find-root/@types/node": ["@types/node@12.20.55", "", {}, "sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ=="], diff --git a/package.json b/package.json index fe1da20..cbd8e17 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "eslint": "^9.37.0", "typescript": "^5.9.3", "@macalinao/eslint-config": "^7.0.0", - "@macalinao/eslint-config-react": "^5.0.3", + "@macalinao/eslint-config-react": "^6.0.0", "@macalinao/tsconfig": "^3.2.3", "@solana/kit": "^3.0.3", "tslib": "^2.8.1", From ffac787b02257856911e33328c976cec9f5fe0ed Mon Sep 17 00:00:00 2001 From: Ian Macalinao Date: Mon, 13 Oct 2025 17:50:30 +0800 Subject: [PATCH 3/5] docs(changeset): Bump to Bun 1.3 --- .changeset/long-crabs-follow.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .changeset/long-crabs-follow.md diff --git a/.changeset/long-crabs-follow.md b/.changeset/long-crabs-follow.md new file mode 100644 index 0000000..f66a80c --- /dev/null +++ b/.changeset/long-crabs-follow.md @@ -0,0 +1,7 @@ +--- +"@macalinao/wallet-adapter-compat": patch +"@macalinao/react-quarry": patch +"@macalinao/grill": patch +--- + +Bump to Bun 1.3 From 61e32e7c8c33f1dc57c22131b593b8a8d1cbd506 Mon Sep 17 00:00:00 2001 From: Ian Macalinao Date: Mon, 13 Oct 2025 19:06:09 +0800 Subject: [PATCH 4/5] try a different cache --- .github/workflows/ci.yml | 4 ++-- .github/workflows/release.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e52d081..24b2ef7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,9 +21,9 @@ jobs: 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 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0772d2c..9c6cb43 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -35,9 +35,9 @@ jobs: 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 From 30725038ef0809bb335272127dd2d1031785d025 Mon Sep 17 00:00:00 2001 From: Ian Macalinao Date: Mon, 13 Oct 2025 19:06:52 +0800 Subject: [PATCH 5/5] set up node action --- .github/workflows/ci.yml | 5 +++++ .github/workflows/release.yml | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 24b2ef7..680e54c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,6 +14,11 @@ 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 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9c6cb43..182716a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,6 +28,11 @@ 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