Nextjs Patch + Clerk Version Leap (#179)

joshuasilva414 · web-flow · commit 5d96c019767d · 2025-04-02T16:16:50.000-05:00
diff --git a/.infisical.json b/.infisical.json
@@ -0,0 +1,5 @@
+{
+    "workspaceId": "317c0122-35fe-4a35-80b8-27f4cefbe17a",
+    "defaultEnvironment": "development",
+    "gitBranchToEnvironmentMapping": null
+}
diff --git a/apps/web/next-env.d.ts b/apps/web/next-env.d.ts
@@ -2,4 +2,4 @@
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited
-// see https://nextjs.org/docs/basic-features/typescript for more information.
+// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information.
diff --git a/apps/web/next.config.mjs b/apps/web/next.config.mjs
@@ -10,17 +10,15 @@ const nextConfig = {
 	swcMinify: true,
 	transpilePackages: ["db"],
 	images: {
-		domains: [
-			"images.clerk.dev",
-			"www.gravatar.com",
-			"img.clerk.com",
-			"api.dicebear.com",
-			"cdn.discordapp.com",
-		],
 		remotePatterns: [
 			{
 				hostname: "**.blob.vercel-storage.com",
 			},
+			{ hostname: "images.clerk.dev" },
+			{ hostname: "www.gravatar.com" },
+			{ hostname: "img.clerk.com" },
+			{ hostname: "api.dicebear.com" },
+			{ hostname: "cdn.discordapp.com" },
 		],
 	},
 	experimental: {
diff --git a/apps/web/package.json b/apps/web/package.json
@@ -13,7 +13,7 @@
     "@aws-sdk/client-s3": "^3.750.0",
     "@aws-sdk/client-ses": "^3.616.0",
     "@aws-sdk/s3-request-presigner": "^3.750.0",
-    "@clerk/nextjs": "^4.29.4",
+    "@clerk/nextjs": "^6.12.12",
     "@gsap/react": "^2.1.1",
     "@hookform/resolvers": "^3.9.0",
     "@internationalized/date": "^3.5.4",
@@ -66,8 +66,9 @@
     "jiti": "^1.21.6",
     "lucide-react": "^0.411.0",
     "nanoid": "^5.0.7",
-    "next": "14.2.5",
+    "next": "14.2.25",
     "next-safe-action": "^7.9.3",
+    "nextjs@4": "link:clerk/nextjs@4",
     "no-profanity": "^1.5.1",
     "pg": "^8.12.0",
     "postcss": "8.4.39",
diff --git a/apps/web/src/actions/user-profile-mod.ts b/apps/web/src/actions/user-profile-mod.ts
@@ -196,12 +196,11 @@ export const updateProfileImage = authenticatedAction
 			const file = await decodeBase64AsFile(fileBase64, fileName);
 			let clerkUser: ClerkUser;
 			try {
-				clerkUser = await clerkClient.users.updateUserProfileImage(
-					userId,
-					{
-						file,
-					},
-				);
+				clerkUser = await (
+					await clerkClient()
+				).users.updateUserProfileImage(userId, {
+					file,
+				});
 			} catch (err) {
 				console.log(`Error updating Clerk profile image: ${err}`);
 				if (
diff --git a/apps/web/src/app/admin/events/page.tsx b/apps/web/src/app/admin/events/page.tsx
@@ -6,10 +6,10 @@ import { Button } from "@/components/shadcn/ui/button";
 import { PlusCircle } from "lucide-react";
 import Link from "next/link";
 import { getAllEvents, getUser } from "db/functions";
-import { auth, redirectToSignIn } from "@clerk/nextjs/server";
+import { auth } from "@clerk/nextjs/server";
 
 export default async function Page() {
-	const { userId } = auth();
+	const { userId, redirectToSignIn } = await auth();
 	if (!userId) {
 		return redirectToSignIn();
 	}
diff --git a/apps/web/src/app/admin/layout.tsx b/apps/web/src/app/admin/layout.tsx
@@ -1,6 +1,6 @@
 import c from "config";
 import Image from "next/image";
-import { auth } from "@clerk/nextjs";
+import { auth } from "@clerk/nextjs/server";
 import Link from "next/link";
 import { Button } from "@/components/shadcn/ui/button";
 import DashNavItem from "@/components/dash/shared/DashNavItem";
@@ -16,7 +16,7 @@ interface AdminLayoutProps {
 }
 
 export default async function AdminLayout({ children }: AdminLayoutProps) {
-	const { userId } = auth();
+	const { userId } = await auth();
 
 	if (!userId) {
 		return redirect("/sign-in");
diff --git a/apps/web/src/app/admin/page.tsx b/apps/web/src/app/admin/page.tsx
@@ -8,12 +8,12 @@ import {
 } from "@/components/shadcn/ui/card";
 import { Users, UserCheck, User2, TimerReset, MailCheck } from "lucide-react";
 import type { User } from "db/types";
-import { auth } from "@clerk/nextjs";
+import { auth } from "@clerk/nextjs/server";
 import { notFound } from "next/navigation";
 import { getAllUsers, getUser } from "db/functions";
 
 export default async function Page() {
-	const { userId } = auth();
+	const { userId } = await auth();
 	if (!userId) return notFound();
 
 	const adminUser = await getUser(userId);
diff --git a/apps/web/src/app/admin/users/[slug]/page.tsx b/apps/web/src/app/admin/users/[slug]/page.tsx
@@ -10,15 +10,15 @@ import {
 	ProfileInfo,
 	TeamInfo,
 } from "@/components/admin/users/ServerSections";
-import { auth } from "@clerk/nextjs";
+import { auth } from "@clerk/nextjs/server";
 import { notFound } from "next/navigation";
 import { isUserAdmin } from "@/lib/utils/server/admin";
 import ApproveUserButton from "@/components/admin/users/ApproveUserButton";
 import c from "config";
 import { getHacker, getUser } from "db/functions";
 
 export default async function Page({ params }: { params: { slug: string } }) {
-	const { userId } = auth();
+	const { userId } = await auth();
 
 	if (!userId) return notFound();
 
diff --git a/apps/web/src/app/api/admin/events/create/route.ts b/apps/web/src/app/api/admin/events/create/route.ts
@@ -1,4 +1,4 @@
-import { auth } from "@clerk/nextjs";
+import { auth } from "@clerk/nextjs/server";
 import { db } from "db";
 import { events } from "db/schema";
 import { newEventFormSchema } from "@/validators/event";
@@ -11,7 +11,7 @@ import { getUser } from "db/functions";
 
 // Make this a server action
 export async function POST(req: Request) {
-	const { userId } = auth();
+	const { userId } = await auth();
 
 	if (!userId) return new Response("Unauthorized", { status: 401 });
 
diff --git a/apps/web/src/app/api/admin/export/route.ts b/apps/web/src/app/api/admin/export/route.ts
@@ -1,4 +1,4 @@
-import { auth } from "@clerk/nextjs";
+import { auth } from "@clerk/nextjs/server";
 import { getAllHackers, getUser } from "db/functions";
 
 function escape(value: any) {
@@ -31,7 +31,7 @@ function jsonToCSV(json: any[]): string {
 }
 
 export async function GET() {
-	const { userId } = auth();
+	const { userId } = await auth();
 
 	if (!userId) return new Response("Unauthorized", { status: 401 });
 
diff --git a/apps/web/src/app/api/team/create/route.ts b/apps/web/src/app/api/team/create/route.ts
@@ -1,4 +1,4 @@
-import { auth } from "@clerk/nextjs";
+import { auth } from "@clerk/nextjs/server";
 import { NextResponse } from "next/server";
 import { db } from "db";
 import { eq } from "db/drizzle";
@@ -10,7 +10,7 @@ import c from "config";
 import { logError } from "@/lib/utils/server/logError";
 
 export async function POST(req: Request) {
-	const { userId } = auth();
+	const { userId } = await auth();
 	if (!userId) return new Response("Unauthorized", { status: 401 });
 
 	const user = await getHacker(userId, false);
diff --git a/apps/web/src/app/api/team/invite/accept/route.ts b/apps/web/src/app/api/team/invite/accept/route.ts
@@ -3,7 +3,7 @@ import { BasicServerValidator } from "@/validators/shared/basic";
 import { db } from "db";
 import { eq, and } from "db/drizzle";
 import { userCommonData, userHackerData, invites, teams } from "db/schema";
-import { auth } from "@clerk/nextjs";
+import { auth } from "@clerk/nextjs/server";
 import { NextResponse } from "next/server";
 import { z } from "zod";
 import c from "config";
diff --git a/apps/web/src/app/api/team/invite/create/route.ts b/apps/web/src/app/api/team/invite/create/route.ts
@@ -1,4 +1,4 @@
-import { auth } from "@clerk/nextjs";
+import { auth } from "@clerk/nextjs/server";
 import { db } from "db";
 import { eq } from "db/drizzle";
 import { userCommonData } from "db/schema";
@@ -12,7 +12,7 @@ import type { serverZodResponse } from "@/lib/utils/server/types";
 export async function POST(
 	req: Request,
 ): serverZodResponse<typeof BasicServerValidator> {
-	const { userId } = auth();
+	const { userId } = await auth();
 	if (!userId) return NextResponse.json("Unauthorized", { status: 401 });
 
 	const user = await getHacker(userId, true);
diff --git a/apps/web/src/app/api/team/invite/decline/route.ts b/apps/web/src/app/api/team/invite/decline/route.ts
@@ -1,4 +1,4 @@
-import { auth } from "@clerk/nextjs";
+import { auth } from "@clerk/nextjs/server";
 import { NextResponse } from "next/server";
 import { z } from "zod";
 import { db } from "db";
diff --git a/apps/web/src/app/api/upload/pfp/route.ts b/apps/web/src/app/api/upload/pfp/route.ts
@@ -1,6 +1,6 @@
 import { getPresignedUploadUrl } from "@/lib/utils/server/s3";
 import { NextResponse } from "next/server";
-import { auth } from "@clerk/nextjs";
+import { auth } from "@clerk/nextjs/server";
 import { staticUploads } from "config";
 
 interface RequestBody {
@@ -13,7 +13,7 @@ export async function POST(request: Request): Promise<NextResponse> {
 	try {
 		const body: RequestBody = (await request.json()) as RequestBody;
 
-		const { userId } = auth();
+		const { userId } = await auth();
 		if (!userId) {
 			return new NextResponse(
 				"You do not have permission to upload files",
diff --git a/apps/web/src/app/api/upload/resume/register/route.ts b/apps/web/src/app/api/upload/resume/register/route.ts
@@ -1,6 +1,6 @@
 import { getPresignedUploadUrl } from "@/lib/utils/server/s3";
 import { NextResponse } from "next/server";
-import { auth } from "@clerk/nextjs";
+import { auth } from "@clerk/nextjs/server";
 import { staticUploads } from "config";
 
 interface RequestBody {
@@ -12,7 +12,7 @@ export async function POST(request: Request): Promise<NextResponse> {
 	try {
 		const body: RequestBody = (await request.json()) as RequestBody;
 
-		const { userId } = auth();
+		const { userId } = await auth();
 		if (!userId) {
 			return new NextResponse(
 				"You do not have permission to upload files",
diff --git a/apps/web/src/app/api/upload/resume/view/route.ts b/apps/web/src/app/api/upload/resume/view/route.ts
@@ -1,10 +1,10 @@
 import { getPresignedViewingUrl } from "@/lib/utils/server/s3";
 import { redirect } from "next/navigation";
 import { staticUploads } from "config";
-import { auth } from "@clerk/nextjs";
+import { auth } from "@clerk/nextjs/server";
 
 export async function GET(request: Request) {
-	const { userId } = auth();
+	const { userId } = await auth();
 	if (!userId) {
 		return new Response("You must be logged in to access this resource", {
 			status: 401,
diff --git a/apps/web/src/app/dash/layout.tsx b/apps/web/src/app/dash/layout.tsx
@@ -1,7 +1,7 @@
 import c from "config";
 import Image from "next/image";
 
-import { currentUser } from "@clerk/nextjs";
+import { currentUser } from "@clerk/nextjs/server";
 import Link from "next/link";
 import { Button } from "@/components/shadcn/ui/button";
 import DashNavItem from "@/components/dash/shared/DashNavItem";
diff --git a/apps/web/src/app/dash/page.tsx b/apps/web/src/app/dash/page.tsx
@@ -1,4 +1,4 @@
-import { auth } from "@clerk/nextjs";
+import { auth } from "@clerk/nextjs/server";
 import c from "config";
 import { createQRpayload } from "@/lib/utils/shared/qr";
 
@@ -13,7 +13,7 @@ import {
 import { getUser } from "db/functions";
 
 export default async function Page() {
-	const { userId } = auth();
+	const { userId } = await auth();
 	if (!userId) return null;
 	const user = await getUser(userId);
 	if (!user) return null;
diff --git a/apps/web/src/app/dash/pass/page.tsx b/apps/web/src/app/dash/pass/page.tsx
@@ -1,5 +1,5 @@
 import QRCode from "react-qr-code";
-import { currentUser } from "@clerk/nextjs";
+import { currentUser } from "@clerk/nextjs/server";
 import Image from "next/image";
 import c from "config";
 import { format } from "date-fns";
diff --git a/apps/web/src/app/dash/team/page.tsx b/apps/web/src/app/dash/team/page.tsx
@@ -1,5 +1,5 @@
 import c from "config";
-import { auth } from "@clerk/nextjs";
+import { auth } from "@clerk/nextjs/server";
 import { db } from "db";
 import { userCommonData } from "db/schema";
 import { eq } from "db/drizzle";
@@ -13,7 +13,7 @@ import { Badge } from "@/components/shadcn/ui/badge";
 import LeaveTeamButton from "@/components/dash/team/LeaveTeamButton";
 
 export default async function Page() {
-	const { userId } = auth();
+	const { userId } = await auth();
 	if (!userId) return null;
 
 	// TODO: make this db query not so bad
diff --git a/apps/web/src/app/discord-verify/page.tsx b/apps/web/src/app/discord-verify/page.tsx
@@ -2,7 +2,7 @@ import { db } from "db";
 import { discordVerification, userCommonData } from "db/schema";
 import { eq, and, or } from "db/drizzle";
 import { notFound, redirect } from "next/navigation";
-import { auth } from "@clerk/nextjs";
+import { auth } from "@clerk/nextjs/server";
 import c from "config";
 import Balancer from "react-wrap-balancer";
 import { MoveRight } from "lucide-react";
@@ -25,7 +25,7 @@ export default async function Page({
 		return notFound();
 	}
 
-	const { userId } = auth();
+	const { userId } = await auth();
 
 	if (!userId) {
 		return redirect("/sign-in");
diff --git a/apps/web/src/app/register/page.tsx b/apps/web/src/app/register/page.tsx
@@ -1,6 +1,6 @@
 import c from "config";
 import RegisterForm from "@/components/registration/RegisterForm";
-import { auth, currentUser } from "@clerk/nextjs";
+import { auth, currentUser } from "@clerk/nextjs/server";
 import { redirect } from "next/navigation";
 import Navbar from "@/components/shared/Navbar";
 import Link from "next/link";
@@ -10,7 +10,7 @@ import { Button } from "@/components/shadcn/ui/button";
 import { getUser } from "db/functions";
 
 export default async function Page() {
-	const { userId } = auth();
+	const { userId } = await auth();
 	if (!userId) return redirect("/sign-up");
 
 	const user = await currentUser();
diff --git a/apps/web/src/app/rsvp/page.tsx b/apps/web/src/app/rsvp/page.tsx
@@ -1,6 +1,6 @@
 import ConfirmDialogue from "@/components/rsvp/ConfirmDialogue";
 import c from "config";
-import { auth } from "@clerk/nextjs";
+import { auth } from "@clerk/nextjs/server";
 import { redirect } from "next/navigation";
 import { count, db } from "db";
 import { eq } from "db/drizzle";
@@ -21,13 +21,13 @@ export default async function RsvpPage({
 }: {
 	searchParams?: { [key: string]: string | string[] | undefined };
 }) {
-	const { userId } = auth();
+	const { userId } = await auth();
 
 	if (!userId) {
 		console.error("No user id");
 		return (
 			<SignedOut>
-				<RedirectToSignIn afterSignInUrl={"/rsvp"} />
+				<RedirectToSignIn signInFallbackRedirectUrl={"/rsvp"} />
 			</SignedOut>
 		);
 	}
diff --git a/apps/web/src/app/settings/layout.tsx b/apps/web/src/app/settings/layout.tsx
@@ -1,4 +1,4 @@
-import { auth, currentUser } from "@clerk/nextjs";
+import { auth, currentUser } from "@clerk/nextjs/server";
 import { redirect } from "next/navigation";
 import type { ReactNode } from "react";
 import SettingsSection from "@/components/settings/SettingsSection";
diff --git a/apps/web/src/app/settings/page.tsx b/apps/web/src/app/settings/page.tsx
@@ -1,12 +1,12 @@
 import AccountSettings from "@/components/settings/AccountSettings";
-import { auth } from "@clerk/nextjs";
+import { auth } from "@clerk/nextjs/server";
 import { redirect } from "next/navigation";
 import ProfileSettings from "@/components/settings/ProfileSettings";
 import RegistrationSettings from "@/components/settings/RegistrationSettings";
 import { getUser } from "db/functions";
 
 export default async function Page() {
-	const { userId } = auth();
+	const { userId } = await auth();
 	if (!userId) return redirect("/sign-in");
 	const user = await getUser(userId);
 	if (!user) return redirect("/sign-in");
diff --git a/apps/web/src/app/settings/registration/page.tsx b/apps/web/src/app/settings/registration/page.tsx
@@ -1,10 +1,10 @@
-import { auth } from "@clerk/nextjs";
+import { auth } from "@clerk/nextjs/server";
 import { redirect } from "next/navigation";
 import RegistrationFormSettings from "@/components/settings/RegistrationForm/RegisterFormSettings";
 import { getHackerData, getUser } from "db/functions";
 
 export default async function Page() {
-	const { userId } = auth();
+	const { userId } = await auth();
 	if (!userId) return redirect("/sign-in");
 	const user = await getUser(userId);
 	if (!user) return redirect("/sign-in");
diff --git a/apps/web/src/app/sign-in/[[...sign-in]]/page.tsx b/apps/web/src/app/sign-in/[[...sign-in]]/page.tsx
diff --git a/apps/web/src/app/sign-up/[[...sign-up]]/page.tsx b/apps/web/src/app/sign-up/[[...sign-up]]/page.tsx
diff --git a/apps/web/src/components/admin/users/ServerSections.tsx b/apps/web/src/components/admin/users/ServerSections.tsx
diff --git a/apps/web/src/components/dash/shared/ProfileButton.tsx b/apps/web/src/components/dash/shared/ProfileButton.tsx
diff --git a/apps/web/src/components/shared/Navbar.tsx b/apps/web/src/components/shared/Navbar.tsx
diff --git a/apps/web/src/components/shared/ProfileButton.tsx b/apps/web/src/components/shared/ProfileButton.tsx
diff --git a/apps/web/src/lib/safe-action.ts b/apps/web/src/lib/safe-action.ts
diff --git a/apps/web/src/middleware.ts b/apps/web/src/middleware.ts
diff --git a/apps/web/src/server/api/trpc.ts b/apps/web/src/server/api/trpc.ts
diff --git a/packages/config/hackkit.config.ts b/packages/config/hackkit.config.ts
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
