Merge pull request #22 from macalinao/igm/fix

Fix packaging and peer dependency issues

Author: macalinao

.changeset/all-rules-tie.md

@@ -0,0 +1,5 @@
+---
+"@macalinao/grill": patch
+---
+
+Fix src/ directory not being included in Grill

.changeset/silver-insects-lay.md

@@ -0,0 +1,14 @@
+---
+"@macalinao/codama-instruction-accounts-dedupe-visitor": patch
+"@macalinao/solana-batch-accounts-loader": patch
+"@macalinao/codama-renderers-js-esm": patch
+"@macalinao/token-metadata-client": patch
+"@macalinao/wallet-adapter-compat": patch
+"@macalinao/dataloader-es": patch
+"@macalinao/zod-solana": patch
+"@macalinao/grill-cli": patch
+"example-dapp": patch
+"@macalinao/grill": patch
+---
+
+Clean up dependencies and peer dependencies

.changeset/some-animals-refuse.md

@@ -0,0 +1,15 @@
+---
+"@macalinao/codama-instruction-accounts-dedupe-visitor": patch
+"@macalinao/solana-batch-accounts-loader": patch
+"@macalinao/codama-renderers-js-esm": patch
+"@macalinao/token-metadata-client": patch
+"@macalinao/wallet-adapter-compat": patch
+"@macalinao/dataloader-es": patch
+"@macalinao/token-utils": patch
+"@macalinao/zod-solana": patch
+"@macalinao/grill-cli": patch
+"example-dapp": patch
+"@macalinao/grill": patch
+---
+
+Move @types/bun into catalog

.vscode/settings.json

@@ -20,9 +20,8 @@
   },
   "editor.formatOnSave": true,
   "editor.codeActionsOnSave": {
-    "quickfix.biome": "explicit",
     "source.fixAll.eslint": "explicit",
     "source.fixAll.biome": "explicit",
-    "source.organizeImports.biome": "explicit"
+    "source.action.organizeImports.biome": "explicit"
   }
 }

apps/example-dapp/package.json

@@ -21,11 +21,11 @@
     "@hookform/resolvers": "^5.2.1",
     "@macalinao/grill": "workspace:*",
     "@macalinao/wallet-adapter-compat": "workspace:*",
-    "@radix-ui/react-dialog": "^1.1.14",
-    "@radix-ui/react-navigation-menu": "^1.2.13",
+    "@radix-ui/react-dialog": "^1.1.15",
+    "@radix-ui/react-navigation-menu": "^1.2.14",
     "@radix-ui/react-separator": "^1.1.7",
     "@radix-ui/react-slot": "^1.2.3",
-    "@radix-ui/react-tooltip": "^1.2.7",
+    "@radix-ui/react-tooltip": "^1.2.8",
     "@solana-program/system": "^0.7.0",
     "@solana-program/token": "^0.5.1",
     "@solana-program/token-2022": "^0.4.2",
@@ -34,9 +34,9 @@
     "@solana/wallet-adapter-react": "catalog:",
     "@solana/wallet-adapter-react-ui": "^0.9.39",
     "@solana/wallet-adapter-wallets": "^0.19.37",
-    "@tailwindcss/vite": "^4.1.11",
+    "@tailwindcss/vite": "^4.1.12",
     "@tanstack/react-query": "catalog:",
-    "@tanstack/react-router": "^1.131.2",
+    "@tanstack/react-router": "^1.131.10",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "gill": "catalog:",
@@ -53,21 +53,21 @@
     "@eslint/js": "^9.33.0",
     "@macalinao/eslint-config": "catalog:",
     "@macalinao/tsconfig": "catalog:",
-    "@tanstack/react-query-devtools": "^5.84.2",
-    "@tanstack/react-router-devtools": "^1.131.2",
-    "@tanstack/router-plugin": "^1.131.2",
-    "@types/react": "^19.1.9",
-    "@types/react-dom": "^19.1.7",
+    "@tanstack/react-query-devtools": "^5.85.3",
+    "@tanstack/react-router-devtools": "^1.131.10",
+    "@tanstack/router-plugin": "^1.131.11",
+    "@types/react": "catalog:",
+    "@types/react-dom": "catalog:",
     "@vitejs/plugin-react": "^5.0.0",
     "eslint": "catalog:",
     "eslint-plugin-react-hooks": "^5.2.0",
     "eslint-plugin-react-refresh": "^0.4.20",
     "globals": "^16.3.0",
-    "tailwindcss": "^4.1.11",
+    "tailwindcss": "^4.1.12",
     "tw-animate-css": "^1.3.6",
     "typescript": "catalog:",
-    "typescript-eslint": "^8.39.0",
-    "vite": "^7.1.1",
+    "typescript-eslint": "^8.39.1",
+    "vite": "^7.1.2",
     "vite-plugin-node-polyfills": "^0.24.0",
     "vite-tsconfig-paths": "^5.1.4"
   },

apps/example-dapp/src/components/layout/examples/index.tsx

@@ -58,7 +58,7 @@ export const ExamplesLayout: React.FC<ExamplesLayoutProps> = ({
   return (
     <SidebarProvider defaultOpen={true}>
       <div className={cn("flex h-full w-full", className)}>
-        <Sidebar variant="sidebar" collapsible="icon" topOffset={64}>
+        <Sidebar variant="sidebar" collapsible="icon" className="top-16">
           <SidebarHeader>
             <div className="px-3 py-2">
               <h2 className="text-lg font-semibold">Examples</h2>

apps/example-dapp/src/components/ui/separator.tsx

@@ -1,3 +1,5 @@
+"use client";
+
 import * as SeparatorPrimitive from "@radix-ui/react-separator";
 import type * as React from "react";
 

apps/example-dapp/src/components/ui/sidebar.tsx

@@ -23,6 +23,7 @@ import { useIsMobile } from "@/hooks/use-mobile";
 import { cn } from "@/lib/utils";
 
 const SIDEBAR_COOKIE_NAME = "sidebar_state";
+const SIDEBAR_COOKIE_MAX_AGE = 60 * 60 * 24 * 7;
 const SIDEBAR_WIDTH = "16rem";
 const SIDEBAR_WIDTH_MOBILE = "18rem";
 const SIDEBAR_WIDTH_ICON = "3rem";
@@ -67,14 +68,7 @@ function SidebarProvider({
 
   // This is the internal state of the sidebar.
   // We use openProp and setOpenProp for control from outside the component.
-  const [_open, _setOpen] = React.useState(() => {
-    try {
-      const stored = localStorage.getItem(SIDEBAR_COOKIE_NAME);
-      return stored !== null ? stored === "true" : defaultOpen;
-    } catch {
-      return defaultOpen;
-    }
-  });
+  const [_open, _setOpen] = React.useState(defaultOpen);
   const open = openProp ?? _open;
   const setOpen = React.useCallback(
     (value: boolean | ((value: boolean) => boolean)) => {
@@ -85,12 +79,9 @@ function SidebarProvider({
         _setOpen(openState);
       }
 
-      // Store the sidebar state in localStorage for persistence
-      try {
-        localStorage.setItem(SIDEBAR_COOKIE_NAME, String(openState));
-      } catch {
-        // Ignore localStorage errors (e.g., in private browsing mode)
-      }
+      // This sets the cookie to keep the sidebar state.
+      // biome-ignore lint/suspicious/noDocumentCookie: shadcn
+      document.cookie = `${SIDEBAR_COOKIE_NAME}=${openState.toString()}; path=/; max-age=${SIDEBAR_COOKIE_MAX_AGE.toString()}`;
     },
     [setOpenProp, open],
   );
@@ -168,15 +159,13 @@ function Sidebar({
   side = "left",
   variant = "sidebar",
   collapsible = "offcanvas",
-  topOffset = 0,
   className,
   children,
   ...props
 }: React.ComponentProps<"div"> & {
   side?: "left" | "right";
   variant?: "sidebar" | "floating" | "inset";
   collapsible?: "offcanvas" | "icon" | "none";
-  topOffset?: number;
 }) {
   const { isMobile, state, openMobile, setOpenMobile } = useSidebar();
 
@@ -244,7 +233,7 @@ function Sidebar({
       <div
         data-slot="sidebar-container"
         className={cn(
-          "fixed z-10 hidden w-(--sidebar-width) transition-[left,right,width] duration-200 ease-linear md:flex",
+          "fixed inset-y-0 z-10 hidden h-svh w-(--sidebar-width) transition-[left,right,width] duration-200 ease-linear md:flex",
           side === "left"
             ? "left-0 group-data-[collapsible=offcanvas]:left-[calc(var(--sidebar-width)*-1)]"
             : "right-0 group-data-[collapsible=offcanvas]:right-[calc(var(--sidebar-width)*-1)]",
@@ -254,10 +243,6 @@ function Sidebar({
             : "group-data-[collapsible=icon]:w-(--sidebar-width-icon) group-data-[side=left]:border-r group-data-[side=right]:border-l",
           className,
         )}
-        style={{
-          top: `${topOffset.toString()}px`,
-          height: `calc(100vh - ${topOffset.toString()}px)`,
-        }}
         {...props}
       >
         <div
@@ -627,7 +612,7 @@ function SidebarMenuSkeleton({
 }) {
   // Random width between 50 to 90%.
   const width = React.useMemo(() => {
-    return `${String(Math.floor(Math.random() * 40) + 50)}%`;
+    return `${(Math.floor(Math.random() * 40) + 50).toString()}%`;
   }, []);
 
   return (
@@ -741,4 +726,6 @@ export {
   SidebarRail,
   SidebarSeparator,
   SidebarTrigger,
+  // eslint-disable-next-line react-refresh/only-export-components
+  useSidebar,
 };

apps/example-dapp/src/hooks/use-mobile.ts

@@ -1,25 +1,25 @@
-import { useEffect, useState } from "react";
+import * as React from "react";
 
 const MOBILE_BREAKPOINT = 768;
 
-export const useIsMobile = (): boolean => {
-  const [isMobile, setIsMobile] = useState<boolean>(false);
+export function useIsMobile() {
+  const [isMobile, setIsMobile] = React.useState<boolean | undefined>(
+    undefined,
+  );
 
-  useEffect(() => {
+  React.useEffect(() => {
     const mql = window.matchMedia(
-      `(max-width: ${String(MOBILE_BREAKPOINT - 1)}px)`,
+      `(max-width: ${(MOBILE_BREAKPOINT - 1).toString()}px)`,
     );
     const onChange = () => {
       setIsMobile(window.innerWidth < MOBILE_BREAKPOINT);
     };
-
     mql.addEventListener("change", onChange);
     setIsMobile(window.innerWidth < MOBILE_BREAKPOINT);
-
     return () => {
       mql.removeEventListener("change", onChange);
     };
   }, []);
 
-  return isMobile;
-};
+  return !!isMobile;
+}

biome.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://biomejs.dev/schemas/2.1.4/schema.json",
+  "$schema": "https://biomejs.dev/schemas/2.2.0/schema.json",
   "vcs": {
     "enabled": true,
     "clientKind": "git",
@@ -39,6 +39,7 @@
         "useSimplifiedLogicExpression": "error"
       },
       "suspicious": {
+        "noUnknownAtRules": "off",
         "noDoubleEquals": "error"
       },
       "style": {