Feat/upgrade to next 15

apps/chat-with-pdf/app/(default)/chat/[documentId]/page.tsx

@@ -5,20 +5,22 @@ import { getChat } from "lib/supabase/queries/get-chat";
 import { getDocumentByChatId } from "@/app/actions/get-document-by-chat-id";
 
 type Props = {
-  params: {
+  params: Promise<{
     documentId: string;
-  };
+  }>;
 };
 
-export async function generateMetadata({ params }: Props): Promise<Metadata> {
+export async function generateMetadata(props: Props): Promise<Metadata> {
+  const params = await props.params;
   const document = await getDocumentByChatId(params.documentId);
 
   return {
     title: `Chat - ${document?.name || "Untitled"}`,
   };
 }
 
-export default async function Page({ params }: Props) {
+export default async function Page(props: Props) {
+  const params = await props.params;
   const chatData = await getChat(params.documentId);
 
   if (!chatData) redirect("/chat");

apps/chat-with-pdf/app/(default)/layout.tsx

@@ -14,7 +14,7 @@ export default async function DefaultLayout({
 }: {
   children: React.ReactNode;
 }) {
-  const supabase = createSupabaseServer();
+  const supabase = await createSupabaseServer();
   const {
     data: { user },
   } = await supabase.auth.getUser();

apps/chat-with-pdf/app/actions/auth.ts

@@ -7,7 +7,7 @@ export const verifyOtp = async (data: {
   otp: string;
   type: string;
 }) => {
-  const supabase = createSupabaseServer();
+  const supabase = await createSupabaseServer();
 
   const res = await supabase.auth.verifyOtp({
     email: data.email,

apps/chat-with-pdf/app/actions/delete-chat.ts

@@ -10,7 +10,7 @@ export async function deleteChat(
   chatId: Tables<"Chat">["id"],
   shouldRedirect = true,
 ) {
-  const supabase = createSupabaseServer();
+  const supabase = await createSupabaseServer();
 
   const { data, error } = await supabase
     .from("Chat")

apps/chat-with-pdf/app/actions/edit-chat.ts

@@ -5,7 +5,7 @@ import { Tables } from "@makefy/supabase/types";
 import { revalidatePath, revalidateTag } from "next/cache";
 
 export async function editChat(document: Tables<"Document">, title: string) {
-  const supabase = createSupabaseServer();
+  const supabase = await createSupabaseServer();
 
   const { error } = await supabase
     .from("Document")

apps/chat-with-pdf/app/actions/generate-document-title.ts

@@ -1,6 +1,6 @@
 "use server";
 
-import { getContext } from "@/lib/context";
+import { getContext } from "@/utils/context";
 import { createSupabaseServer } from "@makefy/supabase/server";
 import { google } from "@ai-sdk/google";
 import { generateObject } from "ai";
@@ -22,7 +22,7 @@ export async function generateDocumentTitle(documentId: string) {
   });
 
   if (object.title) {
-    const supabase = createSupabaseServer();
+    const supabase = await createSupabaseServer();
     const { data } = await supabase.auth.getSession();
     revalidatePath(`/chat/${documentId}`);
     revalidateTag(documentId);

apps/chat-with-pdf/app/actions/generate-suggested-questions.ts

@@ -1,6 +1,6 @@
 "use server";
 
-import { getContext } from "@/lib/context";
+import { getContext } from "@/utils/context";
 import { google } from "@ai-sdk/google";
 import { generateObject } from "ai";
 import { revalidatePath } from "next/cache";

apps/chat-with-pdf/app/actions/get-document-by-chat-id.ts

@@ -22,7 +22,7 @@ async function retrieveDocumentByChatId(
 }
 
 export async function getDocumentByChatId(chatId: string) {
-  const supabase = createSupabaseServer();
+  const supabase = await createSupabaseServer();
   const { data, error: errorOnFetchingSession } = await supabase.auth.getUser();
 
   if (errorOnFetchingSession) {

apps/chat-with-pdf/app/actions/login.ts

@@ -10,7 +10,7 @@ type LoginProps = {
 };
 
 export async function login(loginData: LoginProps) {
-  const supabase = createSupabaseServer();
+  const supabase = await createSupabaseServer();
 
   const { error } = await supabase.auth.signInWithPassword(loginData);
 

apps/chat-with-pdf/app/actions/sign-in-with-oauth.ts

@@ -1,14 +1,14 @@
 "use server";
 
-import { getOAuthRedirectUrl } from "@/lib/oauth-redirect-url";
+import { getOAuthRedirectUrl } from "@/utils/oauth-redirect-url";
 import { createSupabaseServer } from "@makefy/supabase/server";
 import { ReadonlyURLSearchParams, redirect } from "next/navigation";
 import type { SignInWithOAuthCredentials } from "@makefy/supabase/types";
 export async function signInWithOAuth(
   provider: SignInWithOAuthCredentials["provider"],
   searchParams: ReadonlyURLSearchParams,
 ) {
-  const supabase = createSupabaseServer();
+  const supabase = await createSupabaseServer();
   const redirectTo = getOAuthRedirectUrl(searchParams);
 
   const { data, error } = await supabase.auth.signInWithOAuth({

apps/chat-with-pdf/app/actions/signup.ts

@@ -10,7 +10,7 @@ type SignUpProps = {
 };
 
 export async function signup(signUpData: SignUpProps) {
-  const supabase = createSupabaseServer();
+  const supabase = await createSupabaseServer();
 
   const baseUrl = process.env.VERCEL_URL || "https://localhost:3000";
   const emailRedirectTo = `${baseUrl}/api/auth/callback`;

apps/chat-with-pdf/app/actions/submit-feedback.ts

@@ -12,7 +12,7 @@ export async function submitFeedback({
     throw new Error("Type and message are required");
   }
 
-  const supabase = createSupabaseServer();
+  const supabase = await createSupabaseServer();
 
   const { data, error } = await supabase.from("Feedback").insert({
     type,

apps/chat-with-pdf/app/actions/update-chat-messages.ts

@@ -15,7 +15,7 @@ export async function updateChatMessages({
   messages,
   documentMetadata,
 }: UpdateChatMessagesParams) {
-  const supabase = createSupabaseServer();
+  const supabase = await createSupabaseServer();
 
   await supabase
     .from("Chat")

apps/chat-with-pdf/app/api/auth/callback/route.ts

@@ -9,7 +9,7 @@ export async function GET(request: Request) {
   const next = searchParams.get("next") ?? "/";
 
   if (code) {
-    const supabase = createSupabaseServer();
+    const supabase = await createSupabaseServer();
     const { error } = await supabase.auth.exchangeCodeForSession(code);
 
     if (!error) {

apps/chat-with-pdf/app/api/auth/confirm/route.ts

@@ -11,7 +11,7 @@ export async function GET(request: NextRequest) {
   const next = searchParams.get("next") ?? "/";
 
   if (token_hash && type) {
-    const supabase = createSupabaseServer();
+    const supabase = await createSupabaseServer();
 
     const { error } = await supabase.auth.verifyOtp({
       type,

apps/chat-with-pdf/app/api/chat/new-chat/route.ts

@@ -1,9 +1,9 @@
 import { deleteChat } from "@/app/actions/delete-chat";
 import { INPUT_NAME } from "@/components/header/document-title/constants/input-names";
-import { embedDocument, prepareDocument } from "@/lib/embed-document";
-import { getLoadingMessages } from "@/lib/get-loading-messages";
-import { getPdfData } from "@/lib/get-pdf-metadata";
-import { rateLimitRequests } from "@/lib/rate-limit-requests";
+import { embedDocument, prepareDocument } from "@/utils/embed-document";
+import { getLoadingMessages } from "@/utils/get-loading-messages";
+import { getPdfData } from "@/utils/get-pdf-metadata";
+import { rateLimitRequests } from "@/utils/rate-limit-requests";
 import { createSupabaseServer } from "@makefy/supabase/server";
 import { WebPDFLoader } from "@langchain/community/document_loaders/web/pdf";
 import { PineconeRecord } from "@pinecone-database/pinecone";
@@ -85,7 +85,7 @@ async function* createNewChat({
   documentUrl: string;
   documentFile?: File;
 }) {
-  const supabase = createSupabaseServer();
+  const supabase = await createSupabaseServer();
   // Fetching PDF data and creating a new chat in the database
   yield getLoadingMessages({
     isViaLink: !!documentUrl,

apps/chat-with-pdf/app/api/chat/route.ts

@@ -1,4 +1,4 @@
-import { rateLimitRequests } from "@/lib/rate-limit-requests";
+import { rateLimitRequests } from "@/utils/rate-limit-requests";
 import { google } from "@ai-sdk/google";
 import { Message, StreamData, convertToCoreMessages, streamText } from "ai";
 import { Tables } from "@makefy/supabase/types";
@@ -77,20 +77,19 @@ export async function POST(req: Request) {
   const data = new StreamData();
   data.append(messageData);
 
-  const result = streamText({
+  const result = await streamText({
     model: google("gemini-1.5-flash-latest"),
     messages: convertToCoreMessages(messages),
     system: systemInstructions,
     maxTokens: 3000,
-    onFinish({ text, toolCalls, toolResults, usage, finishReason, ...rest }) {
+    onFinish({ text, toolCalls, toolResults, usage, finishReason }) {
       console.log({
         onFinish: {
           text,
           toolCalls,
           toolResults,
           usage,
           finishReason,
-          ...rest,
         },
       });
       data.close();

apps/chat-with-pdf/app/auth/callback/route.ts

@@ -9,7 +9,7 @@ export async function GET(request: Request) {
   console.log({ code, next });
 
   if (code) {
-    const supabase = createSupabaseServer();
+    const supabase = await createSupabaseServer();
     const { error } = await supabase.auth.exchangeCodeForSession(code);
     if (!error) {
       return NextResponse.redirect(`${origin}${next}`);

apps/chat-with-pdf/app/components/chat/assistant-message.tsx

@@ -43,7 +43,15 @@ export function AssistantMessage({
       rehypePlugins={[rehypeRaw]}
       className="px-4 py-3"
       components={{
-        p: ({ children }) => <p className="text-sm">{children}</p>,
+        p: ({ children }) => {
+          // Check if the children contains a <div> element
+          const hasDiv = (children as string).includes("<div");
+          return hasDiv ? (
+            <div className="text-sm">{children}</div>
+          ) : (
+            <p className="text-sm">{children}</p>
+          );
+        },
         a: ({ children, href }) => (
           <a href={href} className="text-blue-500 hover:underline">
             {children}

apps/chat-with-pdf/app/components/chat/chat-footer.tsx

@@ -92,12 +92,12 @@ export function ChatFooter() {
 
   return (
     <div className="border-border bg-background relative z-10 flex flex-col gap-2 border-t p-3">
-      <AnimatePresence>
+      <AnimatePresence key="suggested-questions">
         {chatData.suggestedQuestions && (
           <AnimatedSuggestedQuestions questions={chatData.suggestedQuestions} />
         )}
       </AnimatePresence>
-      <AnimatePresence>
+      <AnimatePresence key="quoted-text">
         {(extraData?.quotedText as string) && (
           <motion.div
             initial={{ opacity: 0, height: 0 }}

apps/chat-with-pdf/app/components/chat/chat-footer/suggested-questions.tsx

@@ -91,6 +91,7 @@ export const SuggestedQuestions = forwardRef<
         })}
       >
         <motion.div
+          key="suggested-questions-container"
           className={cn("flex", {
             "space-x-2 overflow-x-auto pb-3": !isSuggestedQuestionsOpen,
             "max-h-full w-full overflow-auto": isSuggestedQuestionsOpen,
@@ -109,6 +110,7 @@ export const SuggestedQuestions = forwardRef<
         >
           {questions.map((question) => (
             <AnimatedButton
+              key={question}
               variant="outline"
               size="sm"
               transition={{

apps/chat-with-pdf/app/components/chat/chat-header/chat-header.tsx

@@ -21,14 +21,7 @@ import dynamic from "next/dynamic";
 import { Message } from "ai";
 import { useState } from "react";
 import { SadFaceIcon } from "icons/sad-face";
-
-// Dynamically import BlobProvider from react-pdf/renderer to avoid SSR issues
-const BlobProvider = dynamic(
-  () => import("@react-pdf/renderer").then((mod) => mod.BlobProvider),
-  {
-    ssr: false,
-  },
-);
+import { BlobProvider } from "@react-pdf/renderer";
 
 export function ChatHeader() {
   const params = useParams();

apps/chat-with-pdf/app/components/chat/message-quick-actions.tsx

@@ -12,7 +12,7 @@ import {
 } from "@makefy/ui";
 import { cn } from "@makefy/ui/lib/utils";
 import { Message } from "ai";
-import { AnimatePresence, CustomDomComponent, motion } from "framer-motion";
+import { AnimatePresence, motion } from "framer-motion";
 import { useGlobalChat } from "hooks/use-global-chat";
 import {
   BookmarkIcon,
@@ -178,9 +178,7 @@ export function MessageQuickActions({
             quickActionIndex,
           ) => {
             const AnimatedIcon = motion(Icon);
-            const AnimatedSucessIcon = (
-              SucessIcon ? motion(SucessIcon) : SucessIcon
-            ) as CustomDomComponent<LucideProps & RefAttributes<SVGSVGElement>>;
+            const AnimatedSucessIcon = motion(SucessIcon ? SucessIcon : "svg");
             const ActiveIcon = active?.Icon;
             if (onlyLastMessage && index !== messages.length - 1) {
               return null;

apps/chat-with-pdf/app/components/header/document-title/new-document-dialog/new-document-dialog-content.tsx

@@ -10,7 +10,7 @@ import {
 import { cn } from "@makefy/ui/lib/utils";
 import { TrashIcon } from "lucide-react";
 import { PDFDocument } from "pdf-lib";
-import { RefObject, useEffect, useState } from "react";
+import { RefObject, useEffect, useState, type JSX } from "react";
 import { DropzoneInputProps, useDropzone } from "react-dropzone";
 import {
   Controller,
@@ -146,7 +146,7 @@ export function NewDocumentDialogContent() {
       INPUT_NAME.FILE
     >,
     reactDropzoneInputProps: DropzoneInputProps & {
-      ref: RefObject<HTMLInputElement>;
+      ref: RefObject<HTMLInputElement | null>;
     },
   ) {
     const {

apps/chat-with-pdf/app/components/header/user-nav/user-nav.tsx

@@ -11,7 +11,7 @@ import { UserNavMenuItems } from "./user-nav-menu-items";
 import { createSupabaseServer } from "@makefy/supabase/server";
 
 export async function UserNav() {
-  const supabase = createSupabaseServer();
+  const supabase = await createSupabaseServer();
   const {
     data: { user },
   } = await supabase.auth.getUser();

apps/chat-with-pdf/app/components/pdf/pdf-viewer.tsx

@@ -12,7 +12,7 @@ import { cn } from "@makefy/ui/lib/utils";
 import { useGlobalChat } from "hooks/use-global-chat";
 import { MessageSquareQuoteIcon } from "lucide-react";
 import { PDFDocument } from "pdf-lib";
-import { useRef, useState } from "react";
+import { RefObject, useRef, useState } from "react";
 import { Document, Page, pdfjs } from "react-pdf";
 import "react-pdf/dist/Page/AnnotationLayer.css";
 import "react-pdf/dist/Page/TextLayer.css";
@@ -53,7 +53,9 @@ export function PdfViewer({ className }: { className?: string }) {
   const {
     globalContext: { chatData, setExtraData, documentState, setDocumentState },
   } = useGlobalChat();
-  useOnClickOutside(popoverRef, () => setSelectedTextOptions(null));
+  useOnClickOutside(popoverRef as RefObject<HTMLDivElement>, () =>
+    setSelectedTextOptions(null),
+  );
   /* Tools */
   const [currentZoom, setCurrentZoom] = useState<number>(1);
   const [enableChangePageOnScroll, setEnableChangePageOnScroll] =

apps/chat-with-pdf/app/components/ui/user-avatar.tsx

@@ -11,7 +11,7 @@ interface UserAvatarProps {
 }
 
 export async function UserAvatar({ className }: UserAvatarProps) {
-  const supabase = createSupabaseServer();
+  const supabase = await createSupabaseServer();
   const {
     data: { user },
     error,

apps/chat-with-pdf/app/private/page.tsx

@@ -2,7 +2,7 @@ import { createSupabaseServer } from "@makefy/supabase/server";
 import { redirect } from "next/navigation";
 
 export default async function PrivatePage() {
-  const supabase = createSupabaseServer();
+  const supabase = await createSupabaseServer();
 
   const { data, error } = await supabase.auth.getUser();
   if (error || !data?.user) {

apps/chat-with-pdf/lib/supabase/queries/get-chat.ts

@@ -41,7 +41,7 @@ async function generateAndUpdateSuggestedQuestions(
 }
 
 export async function getChat(id: string) {
-  const supabase = createSupabaseServer();
+  const supabase = await createSupabaseServer();
   const { data, error: errorOnFetchingSession } = await supabase.auth.getUser();
 
   if (errorOnFetchingSession) {

apps/chat-with-pdf/lib/supabase/queries/get-chats.ts

@@ -13,7 +13,7 @@ async function retrieveChats(supabase: SupabaseClient) {
 }
 
 export async function getChats() {
-  const supabase = createSupabaseServer();
+  const supabase = await createSupabaseServer();
   const { data, error: errorOnFetchingSession } = await supabase.auth.getUser();
 
   if (errorOnFetchingSession) {