fix: wrap useSearchParams pages in Suspense for prerender

Next.js 15 static prerender bails out when useSearchParams is used
outside a Suspense boundary. Extract the hook-using component into
an inner child and wrap it in Suspense at the page root.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
Matt Ciaccio
2026-04-22 02:06:39 +02:00
parent b9b3f942a6
commit 9d815c4dcc
2 changed files with 34 additions and 6 deletions

View File

@@ -1,6 +1,6 @@
'use client'; 'use client';
import { useState } from 'react'; import { Suspense, useState } from 'react';
import { useRouter, useSearchParams } from 'next/navigation'; import { useRouter, useSearchParams } from 'next/navigation';
import { useForm } from 'react-hook-form'; import { useForm } from 'react-hook-form';
import { zodResolver } from '@hookform/resolvers/zod'; import { zodResolver } from '@hookform/resolvers/zod';
@@ -44,7 +44,7 @@ const requirements: Requirement[] = [
{ label: 'Special character', test: (v) => /[^A-Za-z0-9]/.test(v) }, { label: 'Special character', test: (v) => /[^A-Za-z0-9]/.test(v) },
]; ];
export default function SetPasswordPage() { function SetPasswordInner() {
const router = useRouter(); const router = useRouter();
const searchParams = useSearchParams(); const searchParams = useSearchParams();
const token = searchParams.get('token'); const token = searchParams.get('token');
@@ -154,8 +154,7 @@ export default function SetPasswordPage() {
autoComplete="new-password" autoComplete="new-password"
disabled={isLoading} disabled={isLoading}
className={cn( className={cn(
errors.confirmPassword && errors.confirmPassword && 'border-destructive focus-visible:ring-destructive',
'border-destructive focus-visible:ring-destructive',
)} )}
{...register('confirmPassword')} {...register('confirmPassword')}
/> />
@@ -174,3 +173,18 @@ export default function SetPasswordPage() {
</div> </div>
); );
} }
export default function SetPasswordPage() {
return (
<Suspense
fallback={
<div
className="min-h-screen flex items-center justify-center px-4"
style={{ backgroundColor: '#1e2844' }}
/>
}
>
<SetPasswordInner />
</Suspense>
);
}

View File

@@ -1,10 +1,10 @@
'use client'; 'use client';
import { useEffect, useRef } from 'react'; import { Suspense, useEffect, useRef } from 'react';
import { useRouter, useSearchParams } from 'next/navigation'; import { useRouter, useSearchParams } from 'next/navigation';
import { Loader2 } from 'lucide-react'; import { Loader2 } from 'lucide-react';
export default function PortalVerifyPage() { function PortalVerifyInner() {
const router = useRouter(); const router = useRouter();
const searchParams = useSearchParams(); const searchParams = useSearchParams();
const calledRef = useRef(false); const calledRef = useRef(false);
@@ -33,3 +33,17 @@ export default function PortalVerifyPage() {
</div> </div>
); );
} }
export default function PortalVerifyPage() {
return (
<Suspense
fallback={
<div className="min-h-screen flex items-center justify-center bg-gray-50">
<Loader2 className="h-8 w-8 animate-spin text-[#1e2844]" />
</div>
}
>
<PortalVerifyInner />
</Suspense>
);
}