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
9 changes: 9 additions & 0 deletions .changeset/full-buttons-burn.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
"@macalinao/gill-extra": minor
"@macalinao/zod-solana": minor
"@macalinao/quarry": minor
"@macalinao/grill": minor
"example-dapp": patch
---

Update to latest Gill/Kit
2 changes: 1 addition & 1 deletion apps/example-dapp/biome.jsonc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"root": false,
"$schema": "https://biomejs.dev/schemas/2.3.2/schema.json",
"$schema": "https://biomejs.dev/schemas/2.3.4/schema.json",
"extends": ["@macalinao/biome-config/base", "@macalinao/biome-config/react"],
"linter": {
"domains": {
Expand Down
27 changes: 4 additions & 23 deletions apps/example-dapp/eslint.config.js
Original file line number Diff line number Diff line change
@@ -1,31 +1,12 @@
import js from "@eslint/js";
import { globalIgnores } from "eslint/config";
import reactHooks from "eslint-plugin-react-hooks";
import reactRefresh from "eslint-plugin-react-refresh";
import globals from "globals";
import tseslint from "typescript-eslint";
import { configs } from "@macalinao/eslint-config-vite";

export default tseslint.config([
globalIgnores(["dist"]),
export default [
...configs.viteFull,
{
files: ["**/*.{ts,tsx}"],
extends: [
js.configs.recommended,
tseslint.configs.strictTypeChecked,
tseslint.configs.stylisticTypeChecked,
reactHooks.configs["recommended-latest"],
reactRefresh.configs.vite,
],
languageOptions: {
ecmaVersion: "latest",
globals: globals.browser,
parserOptions: {
project: ["./tsconfig.json"],
tsconfigRootDir: import.meta.dirname,
},
},
// rules: {
// "react-hooks/react-compiler": "error",
// },
},
]);
];
19 changes: 7 additions & 12 deletions apps/example-dapp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
"@radix-ui/react-separator": "^1.1.7",
"@radix-ui/react-slot": "^1.2.3",
"@radix-ui/react-tooltip": "^1.2.8",
"@solana-program/system": "^0.9.0",
"@solana-program/token": "^0.7.0",
"@solana-program/system": "^0.10.0",
"@solana-program/token": "^0.8.0",
"@solana-program/token-2022": "^0.6.0",
"@solana/kit": "catalog:",
"@solana/spl-token": "^0.4.14",
Expand All @@ -44,11 +44,11 @@
"@solana/wallet-adapter-wallets": "^0.19.37",
"@tailwindcss/vite": "^4.1.16",
"@tanstack/react-query": "catalog:",
"@tanstack/react-router": "^1.133.36",
"@tanstack/react-router": "^1.134.15",
"class-variance-authority": "^0.7.1",
"clsx": "^2.1.1",
"gill": "catalog:",
"lucide-react": "^0.546.0",
"lucide-react": "^0.553.0",
"react": "catalog:",
"react-dom": "catalog:",
"react-hook-form": "^7.65.0",
Expand All @@ -60,25 +60,20 @@
"@macalinao/grill": "workspace:^"
},
"devDependencies": {
"@eslint/js": "^9.38.0",
"@macalinao/biome-config": "^0.1.4",
"@macalinao/eslint-config": "catalog:",
"@macalinao/eslint-config-vite": "^2.0.1",
"@macalinao/grill": "workspace:^",
"@macalinao/tsconfig": "catalog:",
"@tanstack/react-query-devtools": "^5.90.2",
"@tanstack/react-router-devtools": "^1.133.36",
"@tanstack/router-plugin": "^1.133.36",
"@tanstack/react-router-devtools": "^1.134.15",
"@tanstack/router-plugin": "^1.134.15",
"@types/react": "catalog:",
"@types/react-dom": "catalog:",
"@vitejs/plugin-react": "^5.1.0",
"eslint": "catalog:",
"eslint-plugin-react-hooks": "^5.2.0",
"eslint-plugin-react-refresh": "^0.4.24",
"globals": "^16.4.0",
"tailwindcss": "^4.1.16",
"tw-animate-css": "^1.4.0",
"typescript": "catalog:",
"typescript-eslint": "^8.46.2",
"vite": "^7.1.12",
"vite-plugin-node-polyfills": "^0.24.0",
"vite-tsconfig-paths": "^5.1.4"
Expand Down
4 changes: 3 additions & 1 deletion apps/example-dapp/src/components/SimpleDashboard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,9 @@ export const SimpleDashboard: React.FC = () => {
This example demonstrates how to use the Grill library with:
</p>
<ul className="list-disc pl-6 mt-2 space-y-1 text-sm text-muted-foreground">
<li>SolanaClientProvider with gill's createSolanaClient</li>
<li>
SolanaClientProvider with gill&apos;s createSolanaClient
</li>
<li>
GrillProvider with React Query for reactive account fetching
</li>
Expand Down
4 changes: 2 additions & 2 deletions apps/example-dapp/src/components/ui/sidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -615,9 +615,9 @@ function SidebarMenuSkeleton({
showIcon?: boolean;
}) {
// Random width between 50 to 90%.
const width = React.useMemo(() => {
const [width] = React.useState(() => {
return `${(Math.floor(Math.random() * 40) + 50).toString()}%`;
}, []);
});

return (
<div
Expand Down
1 change: 0 additions & 1 deletion apps/example-dapp/src/main.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { createRoot } from "react-dom/client";
import "./index.css";
import { App } from "./App.js";

// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
createRoot(document.getElementById("root")!).render(
<StrictMode>
<App />
Expand Down
2 changes: 1 addition & 1 deletion apps/example-dapp/src/routes/examples/static-tokens.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ function StaticTokensPage() {
Static Tokens (Would Load Instantly)
</h2>
<p className="text-sm text-muted-foreground mb-4">
These tokens would normally be configured in GrillProvider's
These tokens would normally be configured in GrillProvider&apos;s
staticTokenInfo prop. They would load instantly without any chain
fetching.
</p>
Expand Down
2 changes: 1 addition & 1 deletion apps/example-dapp/src/routes/examples/token-balances.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ function TokenBalances() {
<ul className="list-disc list-inside mt-1 ml-4">
<li>Computing the ATA address for each token</li>
<li>Fetching token metadata and decimals</li>
<li>Returning zero balance if the ATA doesn't exist</li>
<li>Returning zero balance if the ATA doesn&apos;t exist</li>
<li>Formatting the balance with proper decimal places</li>
</ul>
</p>
Expand Down
2 changes: 1 addition & 1 deletion biome.jsonc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"$schema": "https://biomejs.dev/schemas/2.3.2/schema.json",
"$schema": "https://biomejs.dev/schemas/2.3.4/schema.json",
"extends": ["@macalinao/biome-config/base"]
}
Loading