diff --git a/apps/docs/package.json b/apps/docs/package.json index e86ff02..d0de0ca 100644 --- a/apps/docs/package.json +++ b/apps/docs/package.json @@ -12,7 +12,7 @@ "dependencies": { "@astrojs/starlight": "^0.38.4", "@catppuccin/starlight": "^2.0.1", - "astro": "^6.2.1", + "astro": "^6.3.3", "astro-mermaid": "^2.0.1", "mermaid": "^11.14.0", "sharp": "^0.34.5", diff --git a/apps/docs/tsconfig.json b/apps/docs/tsconfig.json index 8bf91d3..eda45c5 100644 --- a/apps/docs/tsconfig.json +++ b/apps/docs/tsconfig.json @@ -1,5 +1,8 @@ { "extends": "astro/tsconfigs/strict", + "compilerOptions": { + "ignoreDeprecations": "6.0" + }, "include": [".astro/types.d.ts", "**/*"], "exclude": ["dist"] } diff --git a/apps/web/components.json b/apps/web/components.json index 8c574b7..3222df4 100644 --- a/apps/web/components.json +++ b/apps/web/components.json @@ -4,7 +4,7 @@ "rsc": true, "tsx": true, "tailwind": { - "config": "tailwind.config.ts", + "config": "tailwind.config.mts", "css": "src/app/globals.css", "baseColor": "slate", "cssVariables": true, @@ -14,4 +14,4 @@ "components": "@/components", "utils": "@/lib/utils" } -} \ No newline at end of file +} diff --git a/apps/web/package.json b/apps/web/package.json index 5f78ae7..9bfcaef 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -54,7 +54,7 @@ "lucia": "^3.2.2", "lucide-react": "^1.14.0", "media-chrome": "^4.19.0", - "next": "^16.2.4", + "next": "^16.2.6", "next-themes": "^0.4.6", "node-cron": "^4.2.1", "nuqs": "^2.8.9", diff --git a/apps/web/postcss.config.mjs b/apps/web/postcss.config.mjs index 1a69fd2..5d6d845 100644 --- a/apps/web/postcss.config.mjs +++ b/apps/web/postcss.config.mjs @@ -1,7 +1,7 @@ /** @type {import('postcss-load-config').Config} */ const config = { plugins: { - tailwindcss: {}, + '@tailwindcss/postcss': {}, }, }; diff --git a/apps/web/src/app/(ui)/layout.tsx b/apps/web/src/app/(ui)/layout.tsx index 9bc897d..724c492 100644 --- a/apps/web/src/app/(ui)/layout.tsx +++ b/apps/web/src/app/(ui)/layout.tsx @@ -1,5 +1,4 @@ import type { Metadata } from 'next'; -import { Inter } from 'next/font/google'; import { cookies } from 'next/headers'; import '../globals.css'; import Navbar from '@/components/app/NavBar/NavBar'; @@ -9,7 +8,6 @@ import { Toaster } from '@/components/ui/sonner'; import { ThemeProvider } from '@/lib/providers/ThemeProvider'; import { SidebarProvider } from '@/components/ui/sidebar'; import Sidebar from '@/components/app/Sidebar/Sidebar'; -import { cn } from '@/lib/utils'; import EditLivestream from '@/components/app/EditLivestream/EditLivestream'; import { StreamInfoProvider } from '@/lib/providers/StreamInfoProvider'; import { NextSSRPlugin } from "@uploadthing/react/next-ssr-plugin"; @@ -19,8 +17,6 @@ import { NuqsAdapter } from 'nuqs/adapters/next/app' import SonnerNewVersion from '@/components/app/SonnerNewVersion/SonnerNewVersion'; import ConfirmDialogProvider from '@/lib/providers/ConfirmProvider'; -const inter = Inter({ subsets: ['latin'] }); - export const metadata: Metadata = { title: 'hackclub.tv', description: "Hack Club's livestreaming platform", @@ -37,7 +33,7 @@ export default async function RootLayout({ return ( - +
- - + + GitHub Github diff --git a/apps/web/src/components/ui/sidebar.tsx b/apps/web/src/components/ui/sidebar.tsx index 72d6e4f..819a846 100644 --- a/apps/web/src/components/ui/sidebar.tsx +++ b/apps/web/src/components/ui/sidebar.tsx @@ -141,7 +141,7 @@ const SidebarProvider = React.forwardRef< } as React.CSSProperties } className={cn( - "group/sidebar-wrapper flex min-h-svh has-[[data-variant=inset]]:bg-sidebar", + "group/sidebar-wrapper flex min-h-svh flex-col has-[[data-variant=inset]]:bg-sidebar", className )} ref={ref} @@ -181,7 +181,7 @@ const Sidebar = React.forwardRef< return (