all tests passing (with some node_modules changes in remix-utils)

kentcdodds · kentcdodds · commit 093faa752c41 · 2023-08-24T16:37:22.000-06:00
diff --git a/app/root.tsx b/app/root.tsx
@@ -6,7 +6,7 @@ import {
 	type DataFunctionArgs,
 	type HeadersFunction,
 	type LinksFunction,
-	type V2_MetaFunction,
+	type MetaFunction,
 } from '@remix-run/node'
 import {
 	Form,
@@ -59,7 +59,7 @@ import { type Theme, setTheme, getTheme } from './utils/theme.server.ts'
 import { makeTimings, time } from './utils/timing.server.ts'
 import { getToast } from './utils/toast.server.ts'
 import { useOptionalUser, useUser } from './utils/user.ts'
- 
+
 const RemixDevTools =
 	process.env.NODE_ENV === 'development'
 		? lazy(() => import('remix-development-tools'))
@@ -93,7 +93,7 @@ export const links: LinksFunction = () => {
 	].filter(Boolean)
 }
 
-export const meta: V2_MetaFunction<typeof loader> = ({ data }) => {
+export const meta: MetaFunction<typeof loader> = ({ data }) => {
 	return [
 		{ title: data ? 'Epic Notes' : 'Error | Epic Notes' },
 		{ name: 'description', content: `Your own captain's log` },
@@ -282,8 +282,8 @@ function App() {
 					<ThemeSwitch userPreference={data.requestInfo.userPrefs.theme} />
 				</div>
 			</div>
-		<Confetti id={data.confettiId} />
-		<EpicToaster toast={data.toast} />
+			<Confetti id={data.confettiId} />
+			<EpicToaster toast={data.toast} />
 			{RemixDevTools ? (
 				<Suspense>
 					<RemixDevTools />
diff --git a/app/routes/_auth+/forgot-password.tsx b/app/routes/_auth+/forgot-password.tsx
@@ -5,7 +5,7 @@ import {
 	json,
 	redirect,
 	type DataFunctionArgs,
-	type V2_MetaFunction,
+	type MetaFunction,
 } from '@remix-run/node'
 import { Link, useFetcher } from '@remix-run/react'
 import { z } from 'zod'
@@ -108,7 +108,7 @@ function ForgotPasswordEmail({
 	)
 }
 
-export const meta: V2_MetaFunction = () => {
+export const meta: MetaFunction = () => {
 	return [{ title: 'Password Recovery for Epic Notes' }]
 }
 
diff --git a/app/routes/_auth+/login.tsx b/app/routes/_auth+/login.tsx
@@ -4,7 +4,7 @@ import {
 	json,
 	redirect,
 	type DataFunctionArgs,
-	type V2_MetaFunction,
+	type MetaFunction,
 } from '@remix-run/node'
 import { Form, Link, useActionData, useSearchParams } from '@remix-run/react'
 import { safeRedirect } from 'remix-utils'
@@ -81,9 +81,8 @@ export async function handleNewSession(
 			combineResponseInits(
 				{
 					headers: {
-						'set-cookie': await verifySessionStorage.commitSession(
-							verifySession,
-						),
+						'set-cookie':
+							await verifySessionStorage.commitSession(verifySession),
 					},
 				},
 				responseInit,
@@ -346,7 +345,7 @@ export default function LoginPage() {
 	)
 }
 
-export const meta: V2_MetaFunction = () => {
+export const meta: MetaFunction = () => {
 	return [{ title: 'Login to Epic Notes' }]
 }
 
diff --git a/app/routes/_auth+/onboarding.tsx b/app/routes/_auth+/onboarding.tsx
@@ -4,7 +4,7 @@ import {
 	json,
 	redirect,
 	type DataFunctionArgs,
-	type V2_MetaFunction,
+	type MetaFunction,
 } from '@remix-run/node'
 import {
 	Form,
@@ -142,7 +142,7 @@ export async function handleVerification({
 	})
 }
 
-export const meta: V2_MetaFunction = () => {
+export const meta: MetaFunction = () => {
 	return [{ title: 'Setup Epic Notes Account' }]
 }
 
diff --git a/app/routes/_auth+/onboarding_.$provider.tsx b/app/routes/_auth+/onboarding_.$provider.tsx
@@ -4,7 +4,7 @@ import {
 	json,
 	redirect,
 	type DataFunctionArgs,
-	type V2_MetaFunction,
+	type MetaFunction,
 } from '@remix-run/node'
 import {
 	Form,
@@ -182,7 +182,7 @@ export async function handleVerification({
 	})
 }
 
-export const meta: V2_MetaFunction = () => {
+export const meta: MetaFunction = () => {
 	return [{ title: 'Setup Epic Notes Account' }]
 }
 
diff --git a/app/routes/_auth+/reset-password.tsx b/app/routes/_auth+/reset-password.tsx
@@ -4,7 +4,7 @@ import {
 	json,
 	redirect,
 	type DataFunctionArgs,
-	type V2_MetaFunction,
+	type MetaFunction,
 } from '@remix-run/node'
 import { Form, useActionData, useLoaderData } from '@remix-run/react'
 import { z } from 'zod'
@@ -102,7 +102,7 @@ export async function action({ request }: DataFunctionArgs) {
 	})
 }
 
-export const meta: V2_MetaFunction = () => {
+export const meta: MetaFunction = () => {
 	return [{ title: 'Reset Password | Epic Notes' }]
 }
 
diff --git a/app/routes/_auth+/signup.tsx b/app/routes/_auth+/signup.tsx
@@ -5,7 +5,7 @@ import {
 	json,
 	redirect,
 	type DataFunctionArgs,
-	type V2_MetaFunction,
+	type MetaFunction,
 } from '@remix-run/node'
 import { Form, useActionData, useSearchParams } from '@remix-run/react'
 import { z } from 'zod'
@@ -100,7 +100,7 @@ export function SignupEmail({
 	)
 }
 
-export const meta: V2_MetaFunction = () => {
+export const meta: MetaFunction = () => {
 	return [{ title: 'Sign Up | Epic Notes' }]
 }
 
diff --git a/app/routes/_marketing+/index.tsx b/app/routes/_marketing+/index.tsx
@@ -1,4 +1,4 @@
-import { type V2_MetaFunction } from '@remix-run/node'
+import { type MetaFunction } from '@remix-run/node'
 import {
 	Tooltip,
 	TooltipContent,
@@ -7,7 +7,7 @@ import {
 } from '#app/components/ui/tooltip.tsx'
 import { logos, stars } from './logos/logos.ts'
 
-export const meta: V2_MetaFunction = () => [{ title: 'Epic Notes' }]
+export const meta: MetaFunction = () => [{ title: 'Epic Notes' }]
 
 export default function Index() {
 	return (
diff --git a/app/routes/settings+/profile.tsx b/app/routes/settings+/profile.tsx
@@ -6,6 +6,7 @@ import { requireUserId } from '#app/utils/auth.server.ts'
 import { prisma } from '#app/utils/db.server.ts'
 import { cn, invariantResponse } from '#app/utils/misc.tsx'
 import { useUser } from '#app/utils/user.ts'
+import { z } from 'zod'
 
 export const handle = {
 	breadcrumb: <Icon name="file-text">Edit Profile</Icon>,
@@ -21,17 +22,23 @@ export async function loader({ request }: DataFunctionArgs) {
 	return json({})
 }
 
+const BreadcrumbHandleMatch = z.object({
+	handle: z.object({ breadcrumb: z.any() }),
+})
+
 export default function EditUserProfile() {
 	const user = useUser()
 	const matches = useMatches()
 	const breadcrumbs = matches
-		.map(m =>
-			m.handle?.breadcrumb ? (
+		.map(m => {
+			const result = BreadcrumbHandleMatch.safeParse(m)
+			if (!result.success) return null
+			return (
 				<Link key={m.id} to={m.pathname} className="flex items-center">
-					{m.handle.breadcrumb}
+					{result.data.handle.breadcrumb}
 				</Link>
-			) : null,
-		)
+			)
+		})
 		.filter(Boolean)
 
 	return (
diff --git a/app/routes/users+/$username.tsx b/app/routes/users+/$username.tsx
@@ -1,10 +1,5 @@
 import { json, type DataFunctionArgs } from '@remix-run/node'
-import {
-	Form,
-	Link,
-	useLoaderData,
-	type V2_MetaFunction,
-} from '@remix-run/react'
+import { Form, Link, useLoaderData, type MetaFunction } from '@remix-run/react'
 import { GeneralErrorBoundary } from '#app/components/error-boundary.tsx'
 import { Spacer } from '#app/components/spacer.tsx'
 import { Button } from '#app/components/ui/button.tsx'
@@ -102,7 +97,7 @@ export default function ProfileRoute() {
 	)
 }
 
-export const meta: V2_MetaFunction<typeof loader> = ({ data, params }) => {
+export const meta: MetaFunction<typeof loader> = ({ data, params }) => {
 	const displayName = data?.user.name ?? params.username
 	return [
 		{ title: `${displayName} | Epic Notes` },
diff --git a/app/routes/users+/$username_+/notes.$noteId.tsx b/app/routes/users+/$username_+/notes.$noteId.tsx
@@ -6,7 +6,7 @@ import {
 	Link,
 	useActionData,
 	useLoaderData,
-	type V2_MetaFunction,
+	type MetaFunction,
 } from '@remix-run/react'
 import { formatDistanceToNow } from 'date-fns'
 import { z } from 'zod'
@@ -191,7 +191,7 @@ export function DeleteNote({ id }: { id: string }) {
 	)
 }
 
-export const meta: V2_MetaFunction<
+export const meta: MetaFunction<
 	typeof loader,
 	{ 'routes/users+/$username_+/notes': typeof notesLoader }
 > = ({ data, params, matches }) => {
diff --git a/app/routes/users+/$username_+/notes.index.tsx b/app/routes/users+/$username_+/notes.index.tsx
@@ -1,4 +1,4 @@
-import { type V2_MetaFunction } from '@remix-run/react'
+import { type MetaFunction } from '@remix-run/react'
 import { type loader as notesLoader } from './notes.tsx'
 
 export default function NotesIndexRoute() {
@@ -9,7 +9,7 @@ export default function NotesIndexRoute() {
 	)
 }
 
-export const meta: V2_MetaFunction<
+export const meta: MetaFunction<
 	null,
 	{ 'routes/users+/$username_+/notes': typeof notesLoader }
 > = ({ params, matches }) => {
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
diff --git a/remix.config.js b/remix.config.js
diff --git a/tests/mocks/index.ts b/tests/mocks/index.ts

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import {`
`5`	`5`	`json,`
`6`	`6`	`redirect,`
`7`	`7`	`type DataFunctionArgs,`
`8`		`- type V2_MetaFunction,`
	`8`	`+ type MetaFunction,`
`9`	`9`	`} from '@remix-run/node'`
`10`	`10`	`import { Link, useFetcher } from '@remix-run/react'`
`11`	`11`	`import { z } from 'zod'`
`@@ -108,7 +108,7 @@ function ForgotPasswordEmail({`
`108`	`108`	`)`
`109`	`109`	`}`
`110`	`110`
`111`		`-export const meta: V2_MetaFunction = () => {`
	`111`	`+export const meta: MetaFunction = () => {`
`112`	`112`	`return [{ title: 'Password Recovery for Epic Notes' }]`
`113`	`113`	`}`
`114`	`114`