feat: use google/font instead of geist font package

sun0225SUN · Dec 18, 2024 · f47cc18 · f47cc18
1 parent b65842b
commit f47cc18
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/biome.json b/biome.json
@@ -14,8 +14,7 @@
     "rules": {
       "recommended": true,
       "suspicious": {
-        "noDebugger": "off",
-        "noConsoleLog": "info"
+        "noDebugger": "off"
       },
       "style": {},
       "a11y": {

diff --git a/package.json b/package.json
@@ -22,7 +22,6 @@
     "@trpc/server": "^11.0.0-rc.446",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
-    "geist": "^1.3.0",
     "lefthook": "^1.9.3",
     "lucide-react": "^0.468.0",
     "next": "^15.1.0",

diff --git a/src/app/[locale]/layout.tsx b/src/app/[locale]/layout.tsx
@@ -5,22 +5,28 @@ import { notFound } from 'next/navigation'
 import { ThemeProvider } from '~/components/theme/provider'
 import { type Locale, routing } from '~/i18n/routing'
 import '~/styles/globals.css'
+import { Geist } from 'next/font/google'
+import { cn } from '~/lib/utils'
 import { TRPCReactProvider } from '~/trpc/react'
 
 export const metadata: Metadata = {
-  title: 'Create T3 App',
-  description: 'Generated by create-t3-app',
+  title: 'Next Starter',
+  description: 'Next.js starter',
   icons: [{ rel: 'icon', url: '/favicon.ico' }],
 }
 
-type Params = Promise<{ locale: string }>
+const geist = Geist({
+  subsets: ['latin'],
+  variable: '--font-geist',
+  display: 'swap',
+})
 
 export default async function LocaleLayout({
   children,
   params,
 }: {
   children: React.ReactNode
-  params: Params
+  params: Promise<{ locale: string }>
 }) {
   const { locale } = await params
 
@@ -39,7 +45,7 @@ export default async function LocaleLayout({
       lang={locale}
       suppressHydrationWarning
     >
-      <body>
+      <body className={cn(geist.variable, geist.className)}>
         <NextIntlClientProvider messages={messages}>
           <TRPCReactProvider>
             <ThemeProvider

diff --git a/src/components/store-demo.tsx b/src/components/store-demo.tsx
@@ -11,11 +11,11 @@ export function StoreDemo() {
   const isClient = useIsClient()
 
   if (!isClient) {
-    return null
+    return <div className='h-10' />
   }
 
   return (
-    <div className='flex h-5 items-center gap-4'>
+    <div className='flex h-10 items-center gap-4'>
       <div>{bears}</div>
       <Button onClick={addABear}>Add a Bear</Button>
     </div>