Latest dependencies

app/routes/_auth/auth.$provider/callback.test.ts

@@ -19,6 +19,12 @@ import { loader } from './callback.ts'
 
 const ROUTE_PATH = '/auth/github/callback'
 const PARAMS = { provider: 'github' }
+const UNSTABLE_PATTERN = '/auth/:provider/callback'
+const baseLoaderArgs = {
+	params: PARAMS,
+	context: {} as AppLoadContext,
+	unstable_pattern: UNSTABLE_PATTERN,
+}
 
 afterEach(async () => {
 	await deleteGitHubUsers()
@@ -28,8 +34,7 @@ test('a new user goes to onboarding', async () => {
 	const request = await setupRequest()
 	const response = await loader({
 		request,
-		params: PARAMS,
-		context: {} as AppLoadContext,
+		...baseLoaderArgs,
 	}).catch((e) => e)
 	expect(response).toHaveRedirect('/onboarding/github')
 })
@@ -44,8 +49,7 @@ test('when auth fails, send the user to login with a toast', async () => {
 	const request = await setupRequest()
 	const response = await loader({
 		request,
-		params: PARAMS,
-		context: {} as AppLoadContext,
+		...baseLoaderArgs,
 	}).catch((e) => e)
 	invariant(response instanceof Response, 'response should be a Response')
 	expect(response).toHaveRedirect('/login')
@@ -67,8 +71,7 @@ test('when a user is logged in, it creates the connection', async () => {
 	})
 	const response = await loader({
 		request,
-		params: PARAMS,
-		context: {} as AppLoadContext,
+		...baseLoaderArgs,
 	})
 	expect(response).toHaveRedirect('/settings/profile/connections')
 	await expect(response).toSendToast(
@@ -107,8 +110,7 @@ test(`when a user is logged in and has already connected, it doesn't do anything
 	})
 	const response = await loader({
 		request,
-		params: PARAMS,
-		context: {} as AppLoadContext,
+		...baseLoaderArgs,
 	})
 	expect(response).toHaveRedirect('/settings/profile/connections')
 	await expect(response).toSendToast(
@@ -126,8 +128,7 @@ test('when a user exists with the same email, create connection and make session
 	const request = await setupRequest({ code: githubUser.code })
 	const response = await loader({
 		request,
-		params: PARAMS,
-		context: {} as AppLoadContext,
+		...baseLoaderArgs,
 	})
 
 	expect(response).toHaveRedirect('/')
@@ -174,8 +175,7 @@ test('gives an error if the account is already connected to another user', async
 	})
 	const response = await loader({
 		request,
-		params: PARAMS,
-		context: {} as AppLoadContext,
+		...baseLoaderArgs,
 	})
 	expect(response).toHaveRedirect('/settings/profile/connections')
 	await expect(response).toSendToast(
@@ -201,8 +201,7 @@ test('if a user is not logged in, but the connection exists, make a session', as
 	const request = await setupRequest({ code: githubUser.code })
 	const response = await loader({
 		request,
-		params: PARAMS,
-		context: {} as AppLoadContext,
+		...baseLoaderArgs,
 	})
 	expect(response).toHaveRedirect('/')
 	await expect(response).toHaveSessionForUser(userId)
@@ -229,8 +228,7 @@ test('if a user is not logged in, but the connection exists and they have enable
 	const request = await setupRequest({ code: githubUser.code })
 	const response = await loader({
 		request,
-		params: PARAMS,
-		context: {} as AppLoadContext,
+		...baseLoaderArgs,
 	})
 	const searchParams = new URLSearchParams({
 		type: twoFAVerificationType,

app/routes/_auth/forgot-password.tsx

@@ -1,5 +1,5 @@
 import { getFormProps, getInputProps, useForm } from '@conform-to/react'
-import { getZodConstraint, parseWithZod } from '@conform-to/zod'
+import { getZodConstraint, parseWithZod } from '@conform-to/zod/v4'
 import { type SEOHandle } from '@nasa-gcn/remix-seo'
 import * as E from '@react-email/components'
 import { data, redirect, Link, useFetcher } from 'react-router'

app/routes/_auth/login.tsx

@@ -1,5 +1,5 @@
 import { getFormProps, getInputProps, useForm } from '@conform-to/react'
-import { getZodConstraint, parseWithZod } from '@conform-to/zod'
+import { getZodConstraint, parseWithZod } from '@conform-to/zod/v4'
 import { type SEOHandle } from '@nasa-gcn/remix-seo'
 import { startAuthentication } from '@simplewebauthn/browser'
 import { useOptimistic, useState, useTransition } from 'react'

app/routes/_auth/onboarding/$provider.tsx

@@ -4,7 +4,7 @@ import {
 	useForm,
 	type SubmissionResult,
 } from '@conform-to/react'
-import { getZodConstraint, parseWithZod } from '@conform-to/zod'
+import { getZodConstraint, parseWithZod } from '@conform-to/zod/v4'
 import {
 	redirect,
 	data,
@@ -39,9 +39,12 @@ const SignupFormSchema = z.object({
 	imageUrl: z.string().optional(),
 	username: UsernameSchema,
 	name: NameSchema,
-	agreeToTermsOfServiceAndPrivacyPolicy: z.boolean({
-		required_error: 'You must agree to the terms of service and privacy policy',
-	}),
+	agreeToTermsOfServiceAndPrivacyPolicy: z
+		.coerce
+		.boolean()
+		.refine((value) => value, {
+			message: 'You must agree to the terms of service and privacy policy',
+		}),
 	remember: z.boolean().optional(),
 	redirectTo: z.string().optional(),
 })

app/routes/_auth/onboarding/index.tsx

@@ -1,5 +1,5 @@
 import { getFormProps, getInputProps, useForm } from '@conform-to/react'
-import { getZodConstraint, parseWithZod } from '@conform-to/zod'
+import { getZodConstraint, parseWithZod } from '@conform-to/zod/v4'
 import { data, redirect, Form, useSearchParams } from 'react-router'
 import { HoneypotInputs } from 'remix-utils/honeypot/react'
 import { safeRedirect } from 'remix-utils/safe-redirect'
@@ -32,10 +32,12 @@ const SignupFormSchema = z
 	.object({
 		username: UsernameSchema,
 		name: NameSchema,
-		agreeToTermsOfServiceAndPrivacyPolicy: z.boolean({
-			required_error:
-				'You must agree to the terms of service and privacy policy',
-		}),
+		agreeToTermsOfServiceAndPrivacyPolicy: z
+			.coerce
+			.boolean()
+			.refine((value) => value, {
+				message: 'You must agree to the terms of service and privacy policy',
+			}),
 		remember: z.boolean().optional(),
 		redirectTo: z.string().optional(),
 	})

app/routes/_auth/reset-password.tsx

@@ -1,5 +1,5 @@
 import { getFormProps, getInputProps, useForm } from '@conform-to/react'
-import { getZodConstraint, parseWithZod } from '@conform-to/zod'
+import { getZodConstraint, parseWithZod } from '@conform-to/zod/v4'
 import { type SEOHandle } from '@nasa-gcn/remix-seo'
 import { data, redirect, Form } from 'react-router'
 import { GeneralErrorBoundary } from '#app/components/error-boundary.tsx'

app/routes/_auth/signup.tsx

@@ -1,5 +1,5 @@
 import { getFormProps, getInputProps, useForm } from '@conform-to/react'
-import { getZodConstraint, parseWithZod } from '@conform-to/zod'
+import { getZodConstraint, parseWithZod } from '@conform-to/zod/v4'
 import { type SEOHandle } from '@nasa-gcn/remix-seo'
 import * as E from '@react-email/components'
 import { data, redirect, Form, useSearchParams } from 'react-router'

app/routes/_auth/verify.server.ts

@@ -1,5 +1,5 @@
 import { type Submission } from '@conform-to/react'
-import { parseWithZod } from '@conform-to/zod'
+import { parseWithZod } from '@conform-to/zod/v4'
 import { data } from 'react-router'
 import { z } from 'zod'
 import { handleVerification as handleChangeEmailVerification } from '#app/routes/settings/profile/change-email.server.tsx'

app/routes/_auth/verify.tsx

@@ -1,5 +1,5 @@
 import { getFormProps, getInputProps, useForm } from '@conform-to/react'
-import { getZodConstraint, parseWithZod } from '@conform-to/zod'
+import { getZodConstraint, parseWithZod } from '@conform-to/zod/v4'
 import { type SEOHandle } from '@nasa-gcn/remix-seo'
 import { Form, useSearchParams } from 'react-router'
 import { HoneypotInputs } from 'remix-utils/honeypot/react'

app/routes/resources/theme-switch.tsx

@@ -1,5 +1,5 @@
 import { useForm, getFormProps } from '@conform-to/react'
-import { parseWithZod } from '@conform-to/zod'
+import { parseWithZod } from '@conform-to/zod/v4'
 import { invariantResponse } from '@epic-web/invariant'
 import { data, redirect, useFetcher, useFetchers } from 'react-router'
 import { ServerOnly } from 'remix-utils/server-only'

app/routes/settings/profile/change-email.tsx

@@ -1,5 +1,5 @@
 import { getFormProps, getInputProps, useForm } from '@conform-to/react'
-import { getZodConstraint, parseWithZod } from '@conform-to/zod'
+import { getZodConstraint, parseWithZod } from '@conform-to/zod/v4'
 import { type SEOHandle } from '@nasa-gcn/remix-seo'
 import { data, redirect, Form } from 'react-router'
 import { z } from 'zod'

app/routes/settings/profile/index.tsx

@@ -1,5 +1,5 @@
 import { getFormProps, getInputProps, useForm } from '@conform-to/react'
-import { getZodConstraint, parseWithZod } from '@conform-to/zod'
+import { getZodConstraint, parseWithZod } from '@conform-to/zod/v4'
 import { invariantResponse } from '@epic-web/invariant'
 import { type SEOHandle } from '@nasa-gcn/remix-seo'
 import { Img } from 'openimg/react'

app/routes/settings/profile/password.tsx

@@ -1,5 +1,5 @@
 import { getFormProps, getInputProps, useForm } from '@conform-to/react'
-import { getZodConstraint, parseWithZod } from '@conform-to/zod'
+import { getZodConstraint, parseWithZod } from '@conform-to/zod/v4'
 import { type SEOHandle } from '@nasa-gcn/remix-seo'
 import { data, redirect, Form, Link } from 'react-router'
 import { z } from 'zod'

app/routes/settings/profile/password_.create.tsx

@@ -1,5 +1,5 @@
 import { getFormProps, getInputProps, useForm } from '@conform-to/react'
-import { getZodConstraint, parseWithZod } from '@conform-to/zod'
+import { getZodConstraint, parseWithZod } from '@conform-to/zod/v4'
 import { type SEOHandle } from '@nasa-gcn/remix-seo'
 import { data, redirect, Form, Link } from 'react-router'
 import { ErrorList, Field } from '#app/components/forms.tsx'

app/routes/settings/profile/photo.tsx

@@ -1,5 +1,5 @@
 import { getFormProps, getInputProps, useForm } from '@conform-to/react'
-import { getZodConstraint, parseWithZod } from '@conform-to/zod'
+import { getZodConstraint, parseWithZod } from '@conform-to/zod/v4'
 import { invariantResponse } from '@epic-web/invariant'
 import { parseFormData } from '@mjackson/form-data-parser'
 import { type SEOHandle } from '@nasa-gcn/remix-seo'

app/routes/settings/profile/two-factor/verify.tsx

@@ -1,5 +1,5 @@
 import { getFormProps, getInputProps, useForm } from '@conform-to/react'
-import { getZodConstraint, parseWithZod } from '@conform-to/zod'
+import { getZodConstraint, parseWithZod } from '@conform-to/zod/v4'
 import { type SEOHandle } from '@nasa-gcn/remix-seo'
 import * as QRCode from 'qrcode'
 import { data, redirect, Form, useNavigation } from 'react-router'
@@ -73,7 +73,7 @@ export async function action({ request }: Route.ActionArgs) {
 	const submission = await parseWithZod(formData, {
 		schema: () =>
 			ActionSchema.superRefine(async (data, ctx) => {
-				if (data.intent === 'cancel') return null
+				if (data.intent === 'cancel') return
 				const codeIsValid = await isCodeValid({
 					code: data.code,
 					type: twoFAVerifyVerificationType,

app/routes/users/$username/notes/$noteId.tsx

@@ -1,5 +1,5 @@
 import { getFormProps, useForm } from '@conform-to/react'
-import { parseWithZod } from '@conform-to/zod'
+import { parseWithZod } from '@conform-to/zod/v4'
 import { invariantResponse } from '@epic-web/invariant'
 import { formatDistanceToNow } from 'date-fns'
 import { Img } from 'openimg/react'

app/routes/users/$username/notes/+shared/note-editor.server.tsx

@@ -1,4 +1,4 @@
-import { parseWithZod } from '@conform-to/zod'
+import { parseWithZod } from '@conform-to/zod/v4'
 import { parseFormData } from '@mjackson/form-data-parser'
 import { createId as cuid } from '@paralleldrive/cuid2'
 import { data, redirect, type ActionFunctionArgs } from 'react-router'

app/routes/users/$username/notes/+shared/note-editor.tsx

@@ -7,7 +7,7 @@ import {
 	useForm,
 	type FieldMetadata,
 } from '@conform-to/react'
-import { getZodConstraint, parseWithZod } from '@conform-to/zod'
+import { getZodConstraint, parseWithZod } from '@conform-to/zod/v4'
 import { Img } from 'openimg/react'
 import { useState } from 'react'
 import { Form } from 'react-router'

app/routes/users/index.tsx

@@ -15,7 +15,7 @@ export async function loader({ request }: Route.LoaderArgs) {
 	}
 
 	const like = `%${searchTerm ?? ''}%`
-	const users = await prisma.$queryRawTyped(searchUsers(like))
+	const users = await prisma.$queryRawTyped(searchUsers(like, like))
 	return { status: 'idle', users } as const
 }