Start updating deps

Arvin8613 · Nov 26, 2023 · f261a0e · f261a0e
1 parent beeaf86
commit f261a0e
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 30 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -8,7 +8,8 @@
   ],
   "plugins": ["tailwindcss"],
   "rules": {
-    "tailwindcss/no-custom-classname": "off"
+    "tailwindcss/no-custom-classname": "off",
+    "tailwindcss/classnames-order": "off"
   },
   "settings": {
     "tailwindcss": {

diff --git a/.gitignore b/.gitignore
@@ -32,7 +32,7 @@ yarn-error.log*
 # turbo
 .turbo
 
-.contentlayer
 .env
 .vercel
-.vscode
+.vscode
+.env*.local
diff --git a/app/layout.tsx b/app/layout.tsx
@@ -1,15 +1,17 @@
 import { Metadata } from 'next'
 
 import { Toaster } from 'react-hot-toast'
+import { GeistSans } from 'geist/font/sans'
+import { GeistMono } from 'geist/font/mono'
 
 import '@/app/globals.css'
-import { fontMono, fontSans } from '@/lib/fonts'
 import { cn } from '@/lib/utils'
 import { TailwindIndicator } from '@/components/tailwind-indicator'
 import { Providers } from '@/components/providers'
 import { Header } from '@/components/header'
 
 export const metadata: Metadata = {
+  metadataBase: new URL('https://chat.vercel.ai/'),
   title: {
     default: 'Next.js AI Chatbot',
     template: `%s - Next.js AI Chatbot`
@@ -33,18 +35,16 @@ interface RootLayoutProps {
 export default function RootLayout({ children }: RootLayoutProps) {
   return (
     <html lang="en" suppressHydrationWarning>
-      <head />
       <body
         className={cn(
           'font-sans antialiased',
-          fontSans.variable,
-          fontMono.variable
+          GeistSans.variable,
+          GeistMono.variable
         )}
       >
         <Toaster />
         <Providers attribute="class" defaultTheme="system" enableSystem>
           <div className="flex flex-col min-h-screen">
-            {/* @ts-ignore */}
             <Header />
             <main className="flex flex-col flex-1 bg-muted/50">{children}</main>
           </div>

diff --git a/components/header.tsx b/components/header.tsx
@@ -17,7 +17,6 @@ import { SidebarFooter } from '@/components/sidebar-footer'
 import { ThemeToggle } from '@/components/theme-toggle'
 import { ClearHistory } from '@/components/clear-history'
 import { UserMenu } from '@/components/user-menu'
-import { LoginButton } from '@/components/login-button'
 
 export async function Header() {
   const session = await auth()

diff --git a/components/toaster.tsx b/components/toaster.tsx
diff --git a/components/user-menu.tsx b/components/user-menu.tsx
@@ -34,7 +34,8 @@ export function UserMenu({ user }: UserMenuProps) {
                 className="w-6 h-6 transition-opacity duration-300 rounded-full select-none ring-1 ring-zinc-100/10 hover:opacity-80"
                 src={user?.image ? `${user.image}&s=60` : ''}
                 alt={user.name ?? 'Avatar'}
-                height={48} width={48}
+                height={48}
+                width={48}
               />
             ) : (
               <div className="flex items-center justify-center text-xs font-medium uppercase rounded-full select-none h-7 w-7 shrink-0 bg-muted/50 text-muted-foreground">

diff --git a/lib/fonts.ts b/lib/fonts.ts
diff --git a/package.json b/package.json
@@ -30,6 +30,7 @@
     "class-variance-authority": "^0.4.0",
     "clsx": "^1.2.1",
     "focus-trap-react": "^10.1.1",
+    "geist": "^1.1.0",
     "nanoid": "^4.0.2",
     "next": "13.4.7-canary.1",
     "next-auth": "0.0.0-manual.83c4ebd1",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/tailwind.config.js b/tailwind.config.js
@@ -1,5 +1,3 @@
-const { fontFamily } = require('tailwindcss/defaultTheme')
-
 /** @type {import('tailwindcss').Config} */
 module.exports = {
   darkMode: ['class'],
@@ -14,7 +12,8 @@ module.exports = {
     },
     extend: {
       fontFamily: {
-        sans: ['var(--font-sans)', ...fontFamily.sans]
+        sans: ['var(--font-geist-sans)'],
+        mono: ['var(--font-geist-mono)']
       },
       colors: {
         border: 'hsl(var(--border))',
-Original file line number
+Diff line change
@@ Expand Up / @@ -32,7 +32,7 @@ yarn-error.log* @@
     # turbo
     .turbo
-    .contentlayer
     .env
     .vercel
-    .vscode
+    .vscode
+    .env*.local