From d26e0d9ac4007bd2f90a03bc0a25cd49313d1898 Mon Sep 17 00:00:00 2001 From: Walter Korman Date: Tue, 18 Mar 2025 13:43:43 -0700 Subject: [PATCH 1/2] chore: use explicit pnpm 9 version for reproducibility (#873) --- .github/workflows/lint.yml | 2 +- package.json | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 5b6e442..deda7f5 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -13,7 +13,7 @@ jobs: - name: Install pnpm uses: pnpm/action-setup@v4 with: - version: 9 + version: 9.12.3 - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v4 with: diff --git a/package.json b/package.json index 0cfbbcf..184912c 100644 --- a/package.json +++ b/package.json @@ -103,5 +103,6 @@ "tailwindcss": "^3.4.1", "tsx": "^4.19.1", "typescript": "^5.6.3" - } + }, + "packageManager": "pnpm@9.12.3" } From 1a8cd993f433e03fa33e351de0a9f14648db71b4 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Tue, 18 Mar 2025 13:57:06 -0700 Subject: [PATCH 2/2] feat: reference geist from google fonts (#876) --- app/(auth)/login/page.tsx | 2 +- app/(auth)/register/page.tsx | 2 +- app/(chat)/layout.tsx | 1 - app/globals.css | 14 ----- app/layout.tsx | 19 ++++++- package.json | 2 +- pnpm-lock.yaml | 100 +++++++++++++++++----------------- public/fonts/geist-mono.woff2 | Bin 62216 -> 0 bytes public/fonts/geist.woff2 | Bin 62596 -> 0 bytes tailwind.config.ts | 8 +-- 10 files changed, 73 insertions(+), 75 deletions(-) delete mode 100644 public/fonts/geist-mono.woff2 delete mode 100644 public/fonts/geist.woff2 diff --git a/app/(auth)/login/page.tsx b/app/(auth)/login/page.tsx index 4b44103..ba987c2 100644 --- a/app/(auth)/login/page.tsx +++ b/app/(auth)/login/page.tsx @@ -38,7 +38,7 @@ export default function Page() { setIsSuccessful(true); router.refresh(); } - }, [state.status, router]); + }, [state.status]); const handleSubmit = (formData: FormData) => { setEmail(formData.get('email') as string); diff --git a/app/(auth)/register/page.tsx b/app/(auth)/register/page.tsx index 224f0c0..649278e 100644 --- a/app/(auth)/register/page.tsx +++ b/app/(auth)/register/page.tsx @@ -39,7 +39,7 @@ export default function Page() { setIsSuccessful(true); router.refresh(); } - }, [state, router]); + }, [state]); const handleSubmit = (formData: FormData) => { setEmail(formData.get('email') as string); diff --git a/app/(chat)/layout.tsx b/app/(chat)/layout.tsx index 82d5655..9310a10 100644 --- a/app/(chat)/layout.tsx +++ b/app/(chat)/layout.tsx @@ -2,7 +2,6 @@ import { cookies } from 'next/headers'; import { AppSidebar } from '@/components/app-sidebar'; import { SidebarInset, SidebarProvider } from '@/components/ui/sidebar'; - import { auth } from '../(auth)/auth'; import Script from 'next/script'; diff --git a/app/globals.css b/app/globals.css index 9de647f..3409b98 100644 --- a/app/globals.css +++ b/app/globals.css @@ -102,20 +102,6 @@ body { @apply bg-background text-foreground; } - - @font-face { - font-family: "geist"; - font-style: normal; - font-weight: 100 900; - src: url(/fonts/geist.woff2) format("woff2"); - } - - @font-face { - font-family: "geist-mono"; - font-style: normal; - font-weight: 100 900; - src: url(/fonts/geist-mono.woff2) format("woff2"); - } } .skeleton { diff --git a/app/layout.tsx b/app/layout.tsx index f9ad9db..8a6ad5d 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -1,6 +1,6 @@ -import type { Metadata } from 'next'; import { Toaster } from 'sonner'; - +import type { Metadata } from 'next'; +import { Geist, Geist_Mono } from 'next/font/google'; import { ThemeProvider } from '@/components/theme-provider'; import './globals.css'; @@ -15,6 +15,18 @@ export const viewport = { maximumScale: 1, // Disable auto-zoom on mobile Safari }; +const geist = Geist({ + subsets: ['latin'], + display: 'swap', + variable: '--font-geist', +}); + +const geistMono = Geist_Mono({ + subsets: ['latin'], + display: 'swap', + variable: '--font-geist-mono', +}); + const LIGHT_THEME_COLOR = 'hsl(0 0% 100%)'; const DARK_THEME_COLOR = 'hsl(240deg 10% 3.92%)'; const THEME_COLOR_SCRIPT = `\ @@ -48,6 +60,7 @@ export default async function RootLayout({ // prop is necessary to avoid the React hydration mismatch warning. // https://github.com/pacocoursey/next-themes?tab=readme-ov-file#with-app suppressHydrationWarning + className={`${geist.variable} ${geistMono.variable}`} >