From 47888de5f26cacf414e71ffd041b8fce39c32ab9 Mon Sep 17 00:00:00 2001
From: Jacob Paris <jacob@jacobparis.com>
Date: Sun, 22 Sep 2024 17:38:53 +0800
Subject: [PATCH 1/2] Update from upstream

---
 .github/workflows/deploy.yml                  |   6 --
 .../assets}/favicons/apple-touch-icon.png     | Bin
 {public => app/assets}/favicons/favicon.svg   |   0
 app/components/error-boundary.tsx             |   2 +-
 app/components/forms.tsx                      |   8 +--
 app/components/search-bar.tsx                 |   2 +-
 app/components/ui/input-otp.tsx               |   2 +-
 app/components/ui/input.tsx                   |   2 +-
 app/components/ui/textarea.tsx                |   2 +-
 app/entry.server.tsx                          |  14 ++--
 app/root.tsx                                  |  13 ++--
 app/routes/_seo+/sitemap[.]xml.ts             |   4 +-
 app/routes/resources+/healthcheck.tsx         |   2 +-
 app/routes/resources+/theme-switch.tsx        |  25 ++++---
 app/utils/cache.server.ts                     |  16 ++---
 app/utils/misc.tsx                            |  20 +++---
 app/utils/misc.use-double-check.test.tsx      |   3 +-
 app/utils/timing.server.ts                    |   4 +-
 app/utils/user.ts                             |   6 +-
 fly.toml                                      |   6 +-
 index.js                                      |   2 +-
 ...{.dockerignore => Dockerfile.dockerignore} |   0
 other/build-icons.ts                          |  10 +--
 other/build-server.ts                         |   4 +-
 package.json                                  |   8 ++-
 playwright.config.ts                          |   2 +-
 prisma/seed.ts                                |   4 +-
 public/favicons/README.md                     |   7 +-
 public/favicons/favicon-16x16.png             | Bin 669 -> 0 bytes
 public/favicons/favicon-32x32.png             | Bin 1435 -> 0 bytes
 public/favicons/mask-icon.svg                 |   1 -
 server/index.ts                               |  38 ++++++----
 tests/playwright-utils.ts                     |  18 +++--
 tests/setup/custom-matchers.ts                |  16 ++---
 tests/setup/setup-test-env.ts                 |   3 -
 vite.config.ts                                |  66 ++++++++++++------
 vitest.config.ts                              |  19 -----
 37 files changed, 174 insertions(+), 161 deletions(-)
 rename {public => app/assets}/favicons/apple-touch-icon.png (100%)
 rename {public => app/assets}/favicons/favicon.svg (100%)
 rename other/{.dockerignore => Dockerfile.dockerignore} (100%)
 delete mode 100644 public/favicons/favicon-16x16.png
 delete mode 100644 public/favicons/favicon-32x32.png
 delete mode 100644 public/favicons/mask-icon.svg
 delete mode 100644 vitest.config.ts

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index dd0cf06..bb32785 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -156,12 +156,6 @@ jobs:
           file: 'fly.toml'
           field: 'app'
 
-      # move Dockerfile to root
-      - name: 🚚 Move Dockerfile
-        run: |
-          mv ./other/Dockerfile ./Dockerfile
-          mv ./other/.dockerignore ./.dockerignore
-
       - name: 🎈 Setup Fly
         uses: superfly/flyctl-actions/setup-flyctl@1.5
 
diff --git a/public/favicons/apple-touch-icon.png b/app/assets/favicons/apple-touch-icon.png
similarity index 100%
rename from public/favicons/apple-touch-icon.png
rename to app/assets/favicons/apple-touch-icon.png
diff --git a/public/favicons/favicon.svg b/app/assets/favicons/favicon.svg
similarity index 100%
rename from public/favicons/favicon.svg
rename to app/assets/favicons/favicon.svg
diff --git a/app/components/error-boundary.tsx b/app/components/error-boundary.tsx
index 715b8c8..573b412 100644
--- a/app/components/error-boundary.tsx
+++ b/app/components/error-boundary.tsx
@@ -19,7 +19,7 @@ export function GeneralErrorBoundary({
 		</p>
 	),
 	statusHandlers,
-	unexpectedErrorHandler = error => <p>{getErrorMessage(error)}</p>,
+	unexpectedErrorHandler = (error) => <p>{getErrorMessage(error)}</p>,
 }: {
 	defaultStatusHandler?: StatusHandler
 	statusHandlers?: Record<number, StatusHandler>
diff --git a/app/components/forms.tsx b/app/components/forms.tsx
index 7e6651a..326fd2b 100644
--- a/app/components/forms.tsx
+++ b/app/components/forms.tsx
@@ -29,7 +29,7 @@ export function ErrorList({
 	if (!errorsToRender?.length) return null
 	return (
 		<ul id={id} className="flex flex-col gap-1">
-			{errorsToRender.map(e => (
+			{errorsToRender.map((e) => (
 				<li key={e} className="text-[10px] text-foreground-destructive">
 					{e}
 				</li>
@@ -214,15 +214,15 @@ export function CheckboxField({
 					aria-invalid={errorId ? true : undefined}
 					aria-describedby={errorId}
 					checked={input.value === checkedValue}
-					onCheckedChange={state => {
+					onCheckedChange={(state) => {
 						input.change(state.valueOf() ? checkedValue : '')
 						buttonProps.onCheckedChange?.(state)
 					}}
-					onFocus={event => {
+					onFocus={(event) => {
 						input.focus()
 						buttonProps.onFocus?.(event)
 					}}
-					onBlur={event => {
+					onBlur={(event) => {
 						input.blur()
 						buttonProps.onBlur?.(event)
 					}}
diff --git a/app/components/search-bar.tsx b/app/components/search-bar.tsx
index 816950e..30c77d3 100644
--- a/app/components/search-bar.tsx
+++ b/app/components/search-bar.tsx
@@ -32,7 +32,7 @@ export function SearchBar({
 			method="GET"
 			action="/users"
 			className="flex flex-wrap items-center justify-center gap-2"
-			onChange={e => autoSubmit && handleFormChange(e.currentTarget)}
+			onChange={(e) => autoSubmit && handleFormChange(e.currentTarget)}
 		>
 			<div className="flex-1">
 				<Label htmlFor={id} className="sr-only">
diff --git a/app/components/ui/input-otp.tsx b/app/components/ui/input-otp.tsx
index 0f9678c..99916d9 100644
--- a/app/components/ui/input-otp.tsx
+++ b/app/components/ui/input-otp.tsx
@@ -40,7 +40,7 @@ const InputOTPSlot = React.forwardRef<
 		<div
 			ref={ref}
 			className={cn(
-				'relative flex h-10 w-10 items-center justify-center border-y border-r border-input text-sm transition-all first:rounded-l-md first:border-l last:rounded-r-md',
+				'relative flex h-10 w-10 items-center justify-center border-y border-r border-input text-base md:text-sm transition-all first:rounded-l-md first:border-l last:rounded-r-md',
 				isActive && 'z-10 ring-2 ring-ring ring-offset-background',
 				className,
 			)}
diff --git a/app/components/ui/input.tsx b/app/components/ui/input.tsx
index 18801dc..b3089e8 100644
--- a/app/components/ui/input.tsx
+++ b/app/components/ui/input.tsx
@@ -11,7 +11,7 @@ const Input = React.forwardRef<HTMLInputElement, InputProps>(
 			<input
 				type={type}
 				className={cn(
-					'flex h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 aria-[invalid]:border-input-invalid',
+					'flex h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-base md:text-sm ring-offset-background file:border-0 file:bg-transparent file:text-base md:file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 aria-[invalid]:border-input-invalid',
 					className,
 				)}
 				ref={ref}
diff --git a/app/components/ui/textarea.tsx b/app/components/ui/textarea.tsx
index f7719e8..a9d3b9c 100644
--- a/app/components/ui/textarea.tsx
+++ b/app/components/ui/textarea.tsx
@@ -10,7 +10,7 @@ const Textarea = React.forwardRef<HTMLTextAreaElement, TextareaProps>(
 		return (
 			<textarea
 				className={cn(
-					'flex min-h-[80px] w-full rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 aria-[invalid]:border-input-invalid',
+					'flex min-h-[80px] w-full rounded-md border border-input bg-background px-3 py-2 text-base md:text-sm ring-offset-background placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 aria-[invalid]:border-input-invalid',
 					className,
 				)}
 				ref={ref}
diff --git a/app/entry.server.tsx b/app/entry.server.tsx
index b1c2113..8d8d266 100644
--- a/app/entry.server.tsx
+++ b/app/entry.server.tsx
@@ -1,4 +1,4 @@
-import { PassThrough } from 'stream'
+import { PassThrough } from 'node:stream'
 import {
 	createReadableStreamFromReadable,
 	type LoaderFunctionArgs,
@@ -10,19 +10,17 @@ import * as Sentry from '@sentry/remix'
 import chalk from 'chalk'
 import { isbot } from 'isbot'
 import { renderToPipeableStream } from 'react-dom/server'
-import { init as initCron } from './utils/cron.server.ts'
-import { getEnv, init as initEnv } from './utils/env.server.ts'
+import { init } from './utils/env.server.ts'
+import { getEnv } from './utils/env.server.ts'
 import { getInstanceInfo } from './utils/litefs.server.ts'
 import { NonceProvider } from './utils/nonce-provider.ts'
 import { makeTimings } from './utils/timing.server.ts'
 
 const ABORT_DELAY = 5000
 
-initEnv()
+init()
 global.ENV = getEnv()
 
-void initCron()
-
 type DocRequestArgs = Parameters<HandleDocumentRequestFunction>
 
 export default async function handleRequest(...args: DocRequestArgs) {
@@ -99,8 +97,6 @@ export function handleError(
 	error: unknown,
 	{ request }: LoaderFunctionArgs | ActionFunctionArgs,
 ): void {
-	// Skip capturing if the request is aborted as Remix docs suggest
-	// Ref: https://remix.run/docs/en/main/file-conventions/entry.server#handleerror
 	if (request.signal.aborted) {
 		return
 	}
@@ -113,7 +109,7 @@ export function handleError(
 			true,
 		)
 	} else {
-		console.error(chalk.red(error))
+		console.error(error)
 		Sentry.captureException(error)
 	}
 }
diff --git a/app/root.tsx b/app/root.tsx
index 4637c54..9b72f53 100644
--- a/app/root.tsx
+++ b/app/root.tsx
@@ -15,6 +15,8 @@ import {
 } from '@remix-run/react'
 import { withSentry } from '@sentry/remix'
 import { HoneypotProvider } from 'remix-utils/honeypot/react'
+import appleTouchIconAssetUrl from './assets/favicons/apple-touch-icon.png'
+import faviconAssetUrl from './assets/favicons/favicon.svg'
 import { GeneralErrorBoundary } from './components/error-boundary.tsx'
 import { EpicProgress } from './components/progress-bar.tsx'
 import { useToast } from './components/toaster.tsx'
@@ -38,19 +40,18 @@ export const links: LinksFunction = () => {
 	return [
 		// Preload svg sprite as a resource to avoid render blocking
 		{ rel: 'preload', href: iconsHref, as: 'image' },
-		{ rel: 'mask-icon', href: '/favicons/mask-icon.svg' },
 		{
-			rel: 'alternate icon',
-			type: 'image/png',
-			href: '/favicons/favicon-32x32.png',
+			rel: 'icon',
+			href: '/favicon.ico',
+			sizes: '48x48',
 		},
-		{ rel: 'apple-touch-icon', href: '/favicons/apple-touch-icon.png' },
+		{ rel: 'icon', type: 'image/svg+xml', href: faviconAssetUrl },
+		{ rel: 'apple-touch-icon', href: appleTouchIconAssetUrl },
 		{
 			rel: 'manifest',
 			href: '/site.webmanifest',
 			crossOrigin: 'use-credentials',
 		} as const, // necessary to make typescript happy
-		{ rel: 'icon', type: 'image/svg+xml', href: '/favicons/favicon.svg' },
 		{ rel: 'stylesheet', href: tailwindStyleSheetUrl },
 	].filter(Boolean)
 }
diff --git a/app/routes/_seo+/sitemap[.]xml.ts b/app/routes/_seo+/sitemap[.]xml.ts
index 22721c3..a3ebb26 100644
--- a/app/routes/_seo+/sitemap[.]xml.ts
+++ b/app/routes/_seo+/sitemap[.]xml.ts
@@ -3,8 +3,8 @@ import { type ServerBuild, type LoaderFunctionArgs } from '@remix-run/node'
 import { getDomainUrl } from '#app/utils/misc.tsx'
 
 export async function loader({ request, context }: LoaderFunctionArgs) {
-	const serverBuild = (await context.serverBuild) as ServerBuild
-	return generateSitemap(request, serverBuild.routes, {
+	const serverBuild = (await context.serverBuild) as { build: ServerBuild }
+	return generateSitemap(request, serverBuild.build.routes, {
 		siteUrl: getDomainUrl(request),
 		headers: {
 			'Cache-Control': `public, max-age=${60 * 5}`,
diff --git a/app/routes/resources+/healthcheck.tsx b/app/routes/resources+/healthcheck.tsx
index b00574c..435a247 100644
--- a/app/routes/resources+/healthcheck.tsx
+++ b/app/routes/resources+/healthcheck.tsx
@@ -14,7 +14,7 @@ export async function loader({ request }: LoaderFunctionArgs) {
 			fetch(`${new URL(request.url).protocol}${host}`, {
 				method: 'HEAD',
 				headers: { 'X-Healthcheck': 'true' },
-			}).then(r => {
+			}).then((r) => {
 				if (!r.ok) return Promise.reject(r)
 			}),
 		])
diff --git a/app/routes/resources+/theme-switch.tsx b/app/routes/resources+/theme-switch.tsx
index 8f9e641..5b39d52 100644
--- a/app/routes/resources+/theme-switch.tsx
+++ b/app/routes/resources+/theme-switch.tsx
@@ -2,7 +2,8 @@ import { useForm, getFormProps } from '@conform-to/react'
 import { parseWithZod } from '@conform-to/zod'
 import { invariantResponse } from '@epic-web/invariant'
 import { json, type ActionFunctionArgs } from '@remix-run/node'
-import { useFetcher, useFetchers } from '@remix-run/react'
+import { redirect, useFetcher, useFetchers } from '@remix-run/react'
+import { ServerOnly } from 'remix-utils/server-only'
 import { z } from 'zod'
 import { Icon } from '#app/components/ui/icon.tsx'
 import { useHints } from '#app/utils/client-hints.tsx'
@@ -11,6 +12,8 @@ import { type Theme, setTheme } from '#app/utils/theme.server.ts'
 
 const ThemeFormSchema = z.object({
 	theme: z.enum(['system', 'light', 'dark']),
+	// this is useful for progressive enhancement
+	redirectTo: z.string().optional(),
 })
 
 export async function action({ request }: ActionFunctionArgs) {
@@ -21,12 +24,16 @@ export async function action({ request }: ActionFunctionArgs) {
 
 	invariantResponse(submission.status === 'success', 'Invalid theme received')
 
-	const { theme } = submission.value
+	const { theme, redirectTo } = submission.value
 
 	const responseInit = {
 		headers: { 'set-cookie': setTheme(theme) },
 	}
-	return json({ result: submission.reply() }, responseInit)
+	if (redirectTo) {
+		return redirect(redirectTo, responseInit)
+	} else {
+		return json({ result: submission.reply() }, responseInit)
+	}
 }
 
 export function ThemeSwitch({
@@ -35,6 +42,7 @@ export function ThemeSwitch({
 	userPreference?: Theme | null
 }) {
 	const fetcher = useFetcher<typeof action>()
+	const requestInfo = useRequestInfo()
 
 	const [form] = useForm({
 		id: 'theme-switch',
@@ -69,6 +77,11 @@ export function ThemeSwitch({
 			{...getFormProps(form)}
 			action="/resources/theme-switch"
 		>
+			<ServerOnly>
+				{() => (
+					<input type="hidden" name="redirectTo" value={requestInfo.path} />
+				)}
+			</ServerOnly>
 			<input type="hidden" name="theme" value={nextMode} />
 			<div className="flex gap-2">
 				<button
@@ -82,14 +95,10 @@ export function ThemeSwitch({
 	)
 }
 
-/**
- * If the user's changing their theme mode preference, this will return the
- * value it's being changed to.
- */
 export function useOptimisticThemeMode() {
 	const fetchers = useFetchers()
 	const themeFetcher = fetchers.find(
-		f => f.formAction === '/resources/theme-switch',
+		(f) => f.formAction === '/resources/theme-switch',
 	)
 
 	if (themeFetcher && themeFetcher.formData) {
diff --git a/app/utils/cache.server.ts b/app/utils/cache.server.ts
index e0cdc25..279e5d0 100644
--- a/app/utils/cache.server.ts
+++ b/app/utils/cache.server.ts
@@ -1,4 +1,4 @@
-import fs from 'fs'
+import fs from 'node:fs'
 import {
 	cachified as baseCachified,
 	verboseReporter,
@@ -64,8 +64,8 @@ export const lruCache = {
 		})
 		return value
 	},
-	get: key => lru.get(key),
-	delete: key => lru.delete(key),
+	get: (key) => lru.get(key),
+	delete: (key) => lru.delete(key),
 } satisfies Cache
 
 const cacheEntrySchema = z.object({
@@ -116,7 +116,7 @@ export const cache: CachifiedCache = {
 			void updatePrimaryCacheValue({
 				key,
 				cacheValue: entry,
-			}).then(response => {
+			}).then((response) => {
 				if (!response.ok) {
 					console.error(
 						`Error updating cache value for key "${key}" on primary instance (${primaryInstance}): ${response.status} ${response.statusText}`,
@@ -135,7 +135,7 @@ export const cache: CachifiedCache = {
 			void updatePrimaryCacheValue({
 				key,
 				cacheValue: undefined,
-			}).then(response => {
+			}).then((response) => {
 				if (!response.ok) {
 					console.error(
 						`Error deleting cache value for key "${key}" on primary instance (${primaryInstance}): ${response.status} ${response.statusText}`,
@@ -151,7 +151,7 @@ export async function getAllCacheKeys(limit: number) {
 		sqlite: cacheDb
 			.prepare('SELECT key FROM cache LIMIT ?')
 			.all(limit)
-			.map(row => (row as { key: string }).key),
+			.map((row) => (row as { key: string }).key),
 		lru: [...lru.keys()],
 	}
 }
@@ -161,8 +161,8 @@ export async function searchCacheKeys(search: string, limit: number) {
 		sqlite: cacheDb
 			.prepare('SELECT key FROM cache WHERE key LIKE ? LIMIT ?')
 			.all(`%${search}%`, limit)
-			.map(row => (row as { key: string }).key),
-		lru: [...lru.keys()].filter(key => key.includes(search)),
+			.map((row) => (row as { key: string }).key),
+		lru: [...lru.keys()].filter((key) => key.includes(search)),
 	}
 }
 
diff --git a/app/utils/misc.tsx b/app/utils/misc.tsx
index ab93e32..d60f15b 100644
--- a/app/utils/misc.tsx
+++ b/app/utils/misc.tsx
@@ -25,7 +25,7 @@ function formatColors() {
 		if (typeof color === 'string') {
 			colors.push(key)
 		} else {
-			const colorGroup = Object.keys(color).map(subKey =>
+			const colorGroup = Object.keys(color).map((subKey) =>
 				subKey === 'DEFAULT' ? '' : subKey,
 			)
 			colors.push({ [key]: colorGroup })
@@ -184,7 +184,7 @@ export function useDelayedIsPending({
 function callAll<Args extends Array<unknown>>(
 	...fns: Array<((...args: Args) => unknown) | undefined>
 ) {
-	return (...args: Args) => fns.forEach(fn => fn?.(...args))
+	return (...args: Args) => fns.forEach((fn) => fn?.(...args))
 }
 
 /**
@@ -225,23 +225,23 @@ export function useDoubleCheck({
 			() => setDoubleCheck(false)
 
 		const onClick: React.ButtonHTMLAttributes<HTMLButtonElement>['onClick'] =
-			doubleCheck && canClick
+			doubleCheck
 				? undefined
-				: e => {
+				: (e) => {
 						e.preventDefault()
 						setDoubleCheck(true)
 					}
 
-		const onKeyUp: React.ButtonHTMLAttributes<HTMLButtonElement>['onKeyUp'] =
-			e => {
-				if (e.key === 'Escape') {
-					setDoubleCheck(false)
-				}
+		const onKeyUp: React.ButtonHTMLAttributes<HTMLButtonElement>['onKeyUp'] = (
+			e,
+		) => {
+			if (e.key === 'Escape') {
+				setDoubleCheck(false)
 			}
+		}
 
 		return {
 			...props,
-			'data-safe-delay': doubleCheck && !canClick,
 			onBlur: callAll(onBlur, props?.onBlur),
 			onClick: callAll(onClick, props?.onClick),
 			onKeyUp: callAll(onKeyUp, props?.onKeyUp),
diff --git a/app/utils/misc.use-double-check.test.tsx b/app/utils/misc.use-double-check.test.tsx
index 5da786c..2d44080 100644
--- a/app/utils/misc.use-double-check.test.tsx
+++ b/app/utils/misc.use-double-check.test.tsx
@@ -17,7 +17,8 @@ function TestComponent({ safeDelayMs = 0 }: { safeDelayMs?: number }) {
 			<output>Default Prevented: {defaultPrevented}</output>
 			<button
 				{...dc.getButtonProps({
-					onClick: e => setDefaultPrevented(e.defaultPrevented ? 'yes' : 'no'),
+					onClick: (e) =>
+						setDefaultPrevented(e.defaultPrevented ? 'yes' : 'no'),
 				})}
 			>
 				{dc.doubleCheck ? 'You sure?' : 'Click me'}
diff --git a/app/utils/timing.server.ts b/app/utils/timing.server.ts
index f70a19e..3904647 100644
--- a/app/utils/timing.server.ts
+++ b/app/utils/timing.server.ts
@@ -70,7 +70,7 @@ export function getServerTimeHeader(timings?: Timings) {
 				}, 0)
 				.toFixed(1)
 			const desc = timingInfos
-				.map(t => t.desc)
+				.map((t) => t.desc)
 				.filter(Boolean)
 				.join(' & ')
 			return [
@@ -101,7 +101,7 @@ export function cachifiedTimingReporter<Value>(
 			`${key} cache retrieval`,
 		)
 		let getFreshValueTimer: ReturnType<typeof createTimer> | undefined
-		return event => {
+		return (event) => {
 			switch (event.name) {
 				case 'getFreshValueStart':
 					getFreshValueTimer = createTimer(
diff --git a/app/utils/user.ts b/app/utils/user.ts
index 62269af..7b57d54 100644
--- a/app/utils/user.ts
+++ b/app/utils/user.ts
@@ -50,9 +50,9 @@ export function userHasPermission(
 ) {
 	if (!user) return false
 	const { action, entity, access } = parsePermissionString(permission)
-	return user.roles.some(role =>
+	return user.roles.some((role) =>
 		role.permissions.some(
-			permission =>
+			(permission) =>
 				permission.entity === entity &&
 				permission.action === action &&
 				(!access || access.includes(permission.access)),
@@ -65,5 +65,5 @@ export function userHasRole(
 	role: string,
 ) {
 	if (!user) return false
-	return user.roles.some(r => r.name === role)
+	return user.roles.some((r) => r.name === role)
 }
diff --git a/fly.toml b/fly.toml
index 33208b9..4d7c8bc 100644
--- a/fly.toml
+++ b/fly.toml
@@ -13,6 +13,10 @@ auto_rollback = true
 source = "data"
 destination = "/data"
 
+[build]
+dockerfile = "/other/Dockerfile"
+ignorefile = "/other/Dockerfile.dockerignore"
+
 [[statics]]
   guest_path = "/myapp/build/client/assets"
   url_prefix = "/assets"
@@ -26,7 +30,7 @@ destination = "/data"
   url_prefix = "/favicons"
 
 [[services]]
-internal_port = 8_080
+internal_port = 8080
 processes = [ "app" ]
 protocol = "tcp"
 script_checks = [ ]
diff --git a/index.js b/index.js
index ef699b6..bc7c79f 100644
--- a/index.js
+++ b/index.js
@@ -1,5 +1,5 @@
 import 'dotenv/config'
-import * as fs from 'fs'
+import * as fs from 'node:fs'
 import chalk from 'chalk'
 import closeWithGrace from 'close-with-grace'
 import sourceMapSupport from 'source-map-support'
diff --git a/other/.dockerignore b/other/Dockerfile.dockerignore
similarity index 100%
rename from other/.dockerignore
rename to other/Dockerfile.dockerignore
diff --git a/other/build-icons.ts b/other/build-icons.ts
index f8e7586..ccaaf1a 100644
--- a/other/build-icons.ts
+++ b/other/build-icons.ts
@@ -35,12 +35,12 @@ async function generateIconFiles() {
 		.readFile(typeOutputFilepath, 'utf8')
 		.catch(() => '')
 
-	const iconNames = files.map(file => iconName(file))
+	const iconNames = files.map((file) => iconName(file))
 
-	const spriteUpToDate = iconNames.every(name =>
+	const spriteUpToDate = iconNames.every((name) =>
 		currentSprite.includes(`id=${name}`),
 	)
-	const typesUpToDate = iconNames.every(name =>
+	const typesUpToDate = iconNames.every((name) =>
 		currentTypes.includes(`"${name}"`),
 	)
 
@@ -62,7 +62,7 @@ async function generateIconFiles() {
 	}
 	logVerbose(`Saved to ${path.relative(cwd, spriteFilepath)}`)
 
-	const stringifiedIconNames = iconNames.map(name => JSON.stringify(name))
+	const stringifiedIconNames = iconNames.map((name) => JSON.stringify(name))
 
 	const typeOutputContent = `// This file is generated by npm run build:icons
 
@@ -109,7 +109,7 @@ async function generateSvgSprite({
 }) {
 	// Each SVG becomes a symbol and we wrap them all in a single SVG
 	const symbols = await Promise.all(
-		files.map(async file => {
+		files.map(async (file) => {
 			const input = await fsExtra.readFile(path.join(inputDir, file), 'utf8')
 			const root = parse(input)
 
diff --git a/other/build-server.ts b/other/build-server.ts
index 0e03bf4..896b0f6 100644
--- a/other/build-server.ts
+++ b/other/build-server.ts
@@ -1,5 +1,5 @@
-import path from 'path'
-import { fileURLToPath } from 'url'
+import path from 'node:path'
+import { fileURLToPath } from 'node:url'
 import esbuild from 'esbuild'
 import fsExtra from 'fs-extra'
 import { globSync } from 'glob'
diff --git a/package.json b/package.json
index a8f6894..84ba390 100644
--- a/package.json
+++ b/package.json
@@ -78,7 +78,6 @@
     "crypto-js": "^4.2.0",
     "date-fns": "^3.6.0",
     "dotenv": "^16.4.5",
-    "eslint-plugin-remix-react-routes": "^1.0.5",
     "execa": "^9.3.0",
     "express": "^4.19.2",
     "express-rate-limit": "^7.3.1",
@@ -105,6 +104,7 @@
     "tailwindcss": "^3.4.6",
     "tailwindcss-animate": "^1.0.7",
     "tailwindcss-radix": "^3.0.3",
+    "vite-env-only": "^3.0.3",
     "zod": "^3.23.8"
   },
   "devDependencies": {
@@ -112,7 +112,6 @@
     "@faker-js/faker": "^8.4.1",
     "@playwright/test": "^1.45.2",
     "@remix-run/dev": "2.10.3",
-    "@remix-run/serve": "2.10.3",
     "@remix-run/testing": "2.10.3",
     "@sentry/vite-plugin": "^2.21.1",
     "@sly-cli/sly": "^1.13.0",
@@ -160,7 +159,10 @@
   "engines": {
     "node": "20"
   },
-  "epic-stack": true,
+  "epic-stack": {
+    "head": "1f76cd816c07c9bc0ab73bd339a02c98ff34f7ae",
+    "date": "2024-09-17T22:17:16Z"
+  },
   "prisma": {
     "seed": "tsx prisma/seed.ts"
   }
diff --git a/playwright.config.ts b/playwright.config.ts
index 28b3d59..94e65df 100644
--- a/playwright.config.ts
+++ b/playwright.config.ts
@@ -31,7 +31,7 @@ export default defineConfig({
 	webServer: {
 		command: process.env.CI ? 'npm run start:mocks' : 'npm run dev',
 		port: Number(PORT),
-		reuseExistingServer: !process.env.CI,
+		reuseExistingServer: true,
 		stdout: 'pipe',
 		stderr: 'pipe',
 		env: {
diff --git a/prisma/seed.ts b/prisma/seed.ts
index 3eb6fb5..a1a45ef 100644
--- a/prisma/seed.ts
+++ b/prisma/seed.ts
@@ -93,7 +93,7 @@ async function seed() {
 					},
 				},
 			})
-			.catch(e => {
+			.catch((e) => {
 				console.error('Error creating a user:', e)
 				return null
 			})
@@ -239,7 +239,7 @@ async function seed() {
 }
 
 seed()
-	.catch(e => {
+	.catch((e) => {
 		console.error(e)
 		process.exit(1)
 	})
diff --git a/public/favicons/README.md b/public/favicons/README.md
index 94870db..ee77416 100644
--- a/public/favicons/README.md
+++ b/public/favicons/README.md
@@ -1,9 +1,10 @@
 # Favicon
 
-This directory has a few versions of icons to account for different devices. In
-some cases, we cannot reliably detect light/dark mode preference. Hence some of
-the icons in here should not have a transparent background. These icons are
+This directory has the icons used for android devices. In
+some cases, we cannot reliably detect light/dark mode preference. Hence these icons should not have a transparent background. These icons are
 referenced in the `site.webmanifest` file.
 
+The icons used by modern browsers and Apple devices are in `app/assets/favicons` as they can be imported with a fingerprint to bust the browser cache.
+
 Note, there's also a `favicon.ico` in the root of `/public` which some older
 browsers will request automatically. This is a fallback for those browsers.
diff --git a/public/favicons/favicon-16x16.png b/public/favicons/favicon-16x16.png
deleted file mode 100644
index c61907752ef08dbc305585c937cc3e1e139eac73..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 669
zcmV;O0%HA%P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px%S4l)cR5(vvlg&?4K@`P*qmLckfzXY#EY!p(2=0un#uysHMon6Qoe0nP(JDyj
ze?S*}1R6}M)|H@bA}i4vHW*w=C}D#vXsZk9|4<w=Gw;zCX7Ltp=AL`*Ip>NNUq~Wp
z93enT1Yo}EI1kKE&z(fHG>7Ftq@SPLThwYbG@5?s7CQhQ;Py5@y;pkpT>PQ{LehW6
zPd1$)znUlisX)D6=R_afy2-ML-ivboZj8~m&0*~j(c%kBMR_<ng#BQQ%AYE8>3K@K
zCBxid(|x&{iKhty9YHehvMlF6Ak>hq23C_rZYf8wBcSVw>t9LDq(BIgFQ@3c72y<u
z^6xSuj~^PA0yBa$9^IF^SeRKrNWtFz9(LT;LcUICxNz<~QVO0=#@XK8al{pf*5;6w
zShE$798c02=w!L@o{h~-P4mX}FoV%y%9R7A=TgU}C<+?j*hMY8u~8q7i{{GQHKg$X
z2=}$8-qT9gYNpy=7eZ;^3rnF;l^_zP^aw##3M*{<_^w&pycT9KHpD@tLTYx}i03fX
zBD(ClE-Dchb+^6!U)axV4g6*?t3~`LC5g!drDG9Y7l6~2MefyGf*nDf#^U-nQnM*d
zJ2^2$<aR`NEmxI|qtuU7*d(IW7m{kO;piat$QYGsmAR#PN;@T^iqZs7K^lMZg5cSJ
z4w4#CS!|-*<|n(5;p1wa!fL@m_b!eR(6TIID#~|aj3yp6qCC*o&(`)9e`|-HwRCJ#
z{k_`?w70c$wWpW0;+m60cVSO#ZzBh;b?%B8aOK*6ZI%4-t{%3g00000NkvXXu0mjf
Dzsov@

diff --git a/public/favicons/favicon-32x32.png b/public/favicons/favicon-32x32.png
deleted file mode 100644
index 51f2ff1c4d48d299b073bd27a1b7b6a9037ca179..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1435
zcmV;M1!Ve(P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px)RY^oaR9HuqSKUusMHK(t3%*d6(1fN`1*%e`ZCXK0Lto%Q4N##8HZDp(l&|Gm
zT*PSqf|8W7p)3Mhw$&D^Kw4Bv3&nS^7DP?a+8REZwCD@y3Qz2gnVEa<&fI%<!TYp3
zbLPzX_?>fpqa?-W5GV>j00jV12-rve^JOSR0RiFr^gol+WFYVH!`4qfYbeovD9ix;
zlWvHlDw=llo}iFAX53_$1H*vAf;VtyW*W<XE;B7*5ltywV3856)It@-R<oYuoymA5
zGYi+pM%gWf0d&K6t``H>1~71S5E~mC;hPl#?tsNC)71*imytqoGd4CBB}bhod9wtr
z_p3EWsR52$0>Td+bC#l}yc!Ej3pnfbVD{&qw5*G&{!gB`Y{r2MG&i`hJ8d_5{Jpp`
zc*TgZgaK-$|I<D^oAwNXgy7b9<LLJHU}a^+>ZuM#DYvrN_QdU|t*k-bYk5!<1@nvZ
zsHm&dqRWj_cEsms{`12b`wyVw%sHAJRt0|t0yuxshmo;Sgo44y5EtMOqpBz@D1xi3
z3J!;ZLk9#+ElrsHg+?`udbtX;^;0dUQ1E&l2Z@%1x!>mC>1@Zn2lpif0<_us^XYrg
z+~~&M7xrpl=HfRe#&EjrwCn(dOj3NVSRYIvF)<PSeV38oNYEPrQx*&cF+4I1|K}I5
zw!S7Q+ZGpxijx&6K2nUBm>6M?;GaMM$16`_b=90oW<a<Ph!{U|xCkvxA4*>6T4|}i
z{oXqWg+gp!RTX^o*_WV|WcQuzXu~%*Mzo01WC%&HZA1W6MMam#i+wN3p`=Hrf1HN<
zlV<5IPis4}GP5lA-~IJ2>OW{e2;5k6%B&a=WcECl4qvCw6jGqe*Ts5;_>~+jLA|R^
zTB9j*HM(&Bj|T#pWD^Vw2+dKlvZ1B{&f>QO+ycicPhjcc67xs@Qc_aU-*-vyQo-Qx
z5WGEJ+q4*U5Ke*F1pYrRE)EyFFW~X=V@!TOg{dDVvG{PwR%u#FDzXnA!l8rN*p<8s
zWwqs4Utj04w!NK%K^U#cs;UYS3K`&`#VJEc0F@R$^O;Ctu<ZjDVXeg*qgWG&l(wib
zmo^pJ33Ev#Z#Gw?H7cVW+r=jO0JB8EPMn65*SzV|BO^qJCmXCcNM{7a5}}d$fQ`#K
z2p=s!!qn|4Ox~Vi6`)^apg{prpQa$pW*~er`6-mum1BKP?wICTDve`1v>Iio0|3Br
ztqetbQ&ZB=fBuqg7uy>AdI;X`P0P?U3k<FYq(^8(USAgmEse;DdRM(>6Sp=P48he{
z#Trr6DzMGF(Tew3&Q8zH!2PjXTKBYikd^teMV7T<cLPEsj3M#9h-Ju!QHwMUb?x#n
zqJUGiVYJhBc(rx3;afJ0EcGi-Lw%o(WB+9&#3u+I5f;+O<9Hh?-YrLQQFt74PxWzp
z0;{X5)<Ux51DufL3y%O`?%o{QJKOQQL`bZe<%FbJBP9Ah!HtP=w2Fj8$C|keGxooP
zjx!yM!_nRw_%{F_rDQj+BNU?GlBT&0X$9066-D`laFw~jl#CEGePpI&CPG3<X`e<)
zY3IK+F^=xO9;{F%W4sGwuOsz2x}Hc$X;lsKUbQ2oT#p38QfDb@E2=TSxPW#>%V({q
ziC9qKfoC>Kq~*Q-UVLFk%lX5k2LsoJFmQDM8^H}Tc@eJO?15sn`-#|CI4utoAp(W@
zhjC|S2Fri(r<q;JL~(x0TgKCDe3U<clN>p07)mMDr$v-U$Chuja1nWkD?1!HB>Xb5
pA&nx=w-|X_<D~Y-pOEyO`ycs}OXfGqLIVH*002ovPDHLkV1hoPomBt;

diff --git a/public/favicons/mask-icon.svg b/public/favicons/mask-icon.svg
deleted file mode 100644
index ae74d48..0000000
--- a/public/favicons/mask-icon.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="512" height="512" fill="none" viewBox="0 0 65 65"><path fill="#6A24FF" d="M39.445 25.555 37 17.163 65 0 47.821 28l-8.376-2.445Zm-13.89 0L28 17.163 0 0l17.179 28 8.376-2.445Zm13.89 13.89L37 47.837 65 65 47.821 37l-8.376 2.445Zm-13.89 0L28 47.837 0 65l17.179-28 8.376 2.445Z"></path></svg>
\ No newline at end of file
diff --git a/server/index.ts b/server/index.ts
index 5bf5d91..1fc16d1 100644
--- a/server/index.ts
+++ b/server/index.ts
@@ -1,6 +1,6 @@
-import crypto from 'crypto'
+import crypto from 'node:crypto'
 import { createRequestHandler } from '@remix-run/express'
-import { type ServerBuild, installGlobals } from '@remix-run/node'
+import { type ServerBuild } from '@remix-run/node'
 import { ip as ipAddress } from 'address'
 import chalk from 'chalk'
 import closeWithGrace from 'close-with-grace'
@@ -11,8 +11,6 @@ import getPort, { portNumbers } from 'get-port'
 import helmet from 'helmet'
 import morgan from 'morgan'
 
-installGlobals()
-
 const MODE = process.env.NODE_ENV ?? 'development'
 const IS_PROD = MODE === 'production'
 const IS_DEV = MODE === 'development'
@@ -40,6 +38,7 @@ app.set('trust proxy', true)
 
 // ensure HTTPS only (X-Forwarded-Proto comes from Fly)
 app.use((req, res, next) => {
+	if (req.method !== 'GET') return next()
 	const proto = req.get('X-Forwarded-Proto')
 	const host = getHost(req)
 	if (proto === 'http') {
@@ -143,7 +142,7 @@ const maxMultiple =
 	!IS_PROD || process.env.PLAYWRIGHT_TEST_BASE_URL ? 10_000 : 1
 const rateLimitDefault = {
 	windowMs: 60 * 1000,
-	max: 500 * maxMultiple,
+	max: 1000 * maxMultiple,
 	standardHeaders: true,
 	legacyHeaders: false,
 	validate: { trustProxy: false },
@@ -198,13 +197,19 @@ app.use((req, res, next) => {
 })
 
 async function getBuild() {
-	const build = viteDevServer
-		? viteDevServer.ssrLoadModule('virtual:remix/server-build')
-		: // @ts-ignore this should exist before running the server
-			// but it may not exist just yet.
-			await import('../build/server/index.js')
-	// not sure how to make this happy 🤷‍♂️
-	return build as unknown as ServerBuild
+	try {
+		const build = viteDevServer
+			? await viteDevServer.ssrLoadModule('virtual:remix/server-build')
+			: // @ts-expect-error - the file might not exist yet but it will
+				// eslint-disable-next-line import/no-unresolved
+				await import('../build/server/index.js')
+
+		return { build: build as unknown as ServerBuild, error: null }
+	} catch (error) {
+		// Catch error and return null to make express happy and avoid an unrecoverable crash
+		console.error('Error creating build:', error)
+		return { error: error, build: null as unknown as ServerBuild }
+	}
 }
 
 if (!ALLOW_INDEXING) {
@@ -222,7 +227,14 @@ app.all(
 			serverBuild: getBuild(),
 		}),
 		mode: MODE,
-		build: getBuild,
+		build: async () => {
+			const { error, build } = await getBuild()
+			// gracefully "catch" the error
+			if (error) {
+				throw error
+			}
+			return build
+		},
 	}),
 )
 
diff --git a/tests/playwright-utils.ts b/tests/playwright-utils.ts
index cb9d596..9453e76 100644
--- a/tests/playwright-utils.ts
+++ b/tests/playwright-utils.ts
@@ -65,7 +65,7 @@ export const test = base.extend<{
 }>({
 	insertNewUser: async ({}, use) => {
 		let userId: string | undefined = undefined
-		await use(async options => {
+		await use(async (options) => {
 			const user = await getOrInsertUser(options)
 			userId = user.id
 			return user
@@ -74,7 +74,7 @@ export const test = base.extend<{
 	},
 	login: async ({ page }, use) => {
 		let userId: string | undefined = undefined
-		await use(async options => {
+		await use(async (options) => {
 			const user = await getOrInsertUser(options)
 			userId = user.id
 			const session = await prisma.session.create({
@@ -89,10 +89,14 @@ export const test = base.extend<{
 			authSession.set(sessionKey, session.id)
 			const cookieConfig = setCookieParser.parseString(
 				await authSessionStorage.commitSession(authSession),
-			) as any
-			await page
-				.context()
-				.addCookies([{ ...cookieConfig, domain: 'localhost' }])
+			)
+			const newConfig = {
+				...cookieConfig,
+				domain: 'localhost',
+				expires: cookieConfig.expires?.getTime(),
+				sameSite: cookieConfig.sameSite as 'Strict' | 'Lax' | 'None',
+			}
+			await page.context().addCookies([newConfig])
 			return user
 		})
 		await prisma.user.deleteMany({ where: { id: userId } })
@@ -123,7 +127,7 @@ export async function waitFor<ReturnValue>(
 		} catch (e: unknown) {
 			lastError = e
 		}
-		await new Promise(r => setTimeout(r, 100))
+		await new Promise((r) => setTimeout(r, 100))
 	}
 	throw lastError
 }
diff --git a/tests/setup/custom-matchers.ts b/tests/setup/custom-matchers.ts
index 8944714..82017ad 100644
--- a/tests/setup/custom-matchers.ts
+++ b/tests/setup/custom-matchers.ts
@@ -74,9 +74,9 @@ expect.extend({
 		}
 	},
 	async toHaveSessionForUser(response: Response, userId: string) {
-		const setCookies = getSetCookie(response.headers)
+		const setCookies = response.headers.getSetCookie()
 		const sessionSetCookie = setCookies.find(
-			c => setCookieParser.parseString(c).name === 'en_session',
+			(c) => setCookieParser.parseString(c).name === 'en_session',
 		)
 
 		if (!sessionSetCookie) {
@@ -115,9 +115,9 @@ expect.extend({
 		}
 	},
 	async toSendToast(response: Response, toast: ToastInput) {
-		const setCookies = getSetCookie(response.headers)
+		const setCookies = response.headers.getSetCookie()
 		const toastSetCookie = setCookies.find(
-			c => setCookieParser.parseString(c).name === 'en_toast',
+			(c) => setCookieParser.parseString(c).name === 'en_toast',
 		)
 
 		if (!toastSetCookie) {
@@ -164,11 +164,3 @@ declare module 'vitest' {
 	interface Assertion<T = any> extends CustomMatchers<T> {}
 	interface AsymmetricMatchersContaining extends CustomMatchers {}
 }
-
-function getSetCookie(headers: Headers) {
-	// this is a sort of polyfill for headers.getSetCookie
-	// https://github.com/microsoft/TypeScript/issues/55270
-	// https://github.com/remix-run/remix/issues/7067
-	// @ts-expect-error see the two issues above
-	return headers.getAll('set-cookie') as Array<string>
-}
diff --git a/tests/setup/setup-test-env.ts b/tests/setup/setup-test-env.ts
index c5bd2b0..18e2066 100644
--- a/tests/setup/setup-test-env.ts
+++ b/tests/setup/setup-test-env.ts
@@ -3,14 +3,11 @@ import './db-setup.ts'
 import '#app/utils/env.server.ts'
 // we need these to be imported first 👆
 
-import { installGlobals } from '@remix-run/node'
 import { cleanup } from '@testing-library/react'
 import { afterEach, beforeEach, vi, type MockInstance } from 'vitest'
 import { server } from '#tests/mocks/index.ts'
 import './custom-matchers.ts'
 
-installGlobals()
-
 afterEach(() => server.resetHandlers())
 afterEach(() => cleanup())
 
diff --git a/vite.config.ts b/vite.config.ts
index 0418240..242db83 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -3,6 +3,7 @@ import { sentryVitePlugin } from '@sentry/vite-plugin'
 import { glob } from 'glob'
 import { flatRoutes } from 'remix-flat-routes'
 import { defineConfig } from 'vite'
+import { envOnlyMacros } from 'vite-env-only'
 
 const MODE = process.env.NODE_ENV
 
@@ -11,11 +12,15 @@ export default defineConfig({
 		cssMinify: MODE === 'production',
 
 		rollupOptions: {
-			external: [/node:.*/, 'stream', 'crypto', 'fsevents'],
+			external: [/node:.*/, 'fsevents'],
 		},
 
 		assetsInlineLimit: (source: string) => {
-			if (source.endsWith('sprite.svg')) {
+			if (
+				source.endsWith('sprite.svg') ||
+				source.endsWith('favicon.svg') ||
+				source.endsWith('apple-touch-icon.png')
+			) {
 				return false
 			}
 		},
@@ -28,27 +33,32 @@ export default defineConfig({
 		},
 	},
 	plugins: [
-		remix({
-			ignoredRouteFiles: ['**/*'],
-			serverModuleFormat: 'esm',
-			routes: async defineRoutes => {
-				return flatRoutes('routes', defineRoutes, {
-					ignoredRouteFiles: [
-						'.*',
-						'**/*.css',
-						'**/*.test.{js,jsx,ts,tsx}',
-						'**/__*.*',
-						// This is for server-side utilities you want to colocate
-						// next to your routes without making an additional
-						// directory. If you need a route that includes "server" or
-						// "client" in the filename, use the escape brackets like:
-						// my-route.[server].tsx
-						'**/*.server.*',
-						'**/*.client.*',
-					],
-				})
-			},
-		}),
+		envOnlyMacros(),
+		// it would be really nice to have this enabled in tests, but we'll have to
+		// wait until https://github.com/remix-run/remix/issues/9871 is fixed
+		process.env.NODE_ENV === 'test'
+			? null
+			: remix({
+					ignoredRouteFiles: ['**/*'],
+					serverModuleFormat: 'esm',
+					routes: async (defineRoutes) => {
+						return flatRoutes('routes', defineRoutes, {
+							ignoredRouteFiles: [
+								'.*',
+								'**/*.css',
+								'**/*.test.{js,jsx,ts,tsx}',
+								'**/__*.*',
+								// This is for server-side utilities you want to colocate
+								// next to your routes without making an additional
+								// directory. If you need a route that includes "server" or
+								// "client" in the filename, use the escape brackets like:
+								// my-route.[server].tsx
+								'**/*.server.*',
+								'**/*.client.*',
+							],
+						})
+					},
+				}),
 		process.env.SENTRY_AUTH_TOKEN
 			? sentryVitePlugin({
 					disable: MODE !== 'production',
@@ -70,4 +80,14 @@ export default defineConfig({
 				})
 			: null,
 	],
+	test: {
+		include: ['./app/**/*.test.{ts,tsx}'],
+		setupFiles: ['./tests/setup/setup-test-env.ts'],
+		globalSetup: ['./tests/setup/global-setup.ts'],
+		restoreMocks: true,
+		coverage: {
+			include: ['app/**/*.{ts,tsx}'],
+			all: true,
+		},
+	},
 })
diff --git a/vitest.config.ts b/vitest.config.ts
deleted file mode 100644
index a4cd13b..0000000
--- a/vitest.config.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-/// <reference types="vitest" />
-
-import react from '@vitejs/plugin-react'
-import { defineConfig } from 'vite'
-
-export default defineConfig({
-	plugins: [react()],
-	css: { postcss: { plugins: [] } },
-	test: {
-		include: ['./app/**/*.test.{ts,tsx}'],
-		setupFiles: ['./tests/setup/setup-test-env.ts'],
-		globalSetup: ['./tests/setup/global-setup.ts'],
-		restoreMocks: true,
-		coverage: {
-			include: ['app/**/*.{ts,tsx}'],
-			all: true,
-		},
-	},
-})

From 205c4398066cecc2b483a4fcc8bdefb9f8bfbc07 Mon Sep 17 00:00:00 2001
From: Jacob Paris <jacob@jacobparis.com>
Date: Sun, 22 Sep 2024 17:48:39 +0800
Subject: [PATCH 2/2] lint and package-lock

---
 app/entry.server.tsx |   3 +-
 package-lock.json    | 306 ++++++-------------------------------------
 2 files changed, 44 insertions(+), 265 deletions(-)

diff --git a/app/entry.server.tsx b/app/entry.server.tsx
index 8d8d266..ed2c198 100644
--- a/app/entry.server.tsx
+++ b/app/entry.server.tsx
@@ -10,8 +10,7 @@ import * as Sentry from '@sentry/remix'
 import chalk from 'chalk'
 import { isbot } from 'isbot'
 import { renderToPipeableStream } from 'react-dom/server'
-import { init } from './utils/env.server.ts'
-import { getEnv } from './utils/env.server.ts'
+import { init, getEnv } from './utils/env.server.ts'
 import { getInstanceInfo } from './utils/litefs.server.ts'
 import { NonceProvider } from './utils/nonce-provider.ts'
 import { makeTimings } from './utils/timing.server.ts'
diff --git a/package-lock.json b/package-lock.json
index 47750ce..705c216 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -45,7 +45,6 @@
         "crypto-js": "^4.2.0",
         "date-fns": "^3.6.0",
         "dotenv": "^16.4.5",
-        "eslint-plugin-remix-react-routes": "^1.0.5",
         "execa": "^9.3.0",
         "express": "^4.19.2",
         "express-rate-limit": "^7.3.1",
@@ -72,6 +71,7 @@
         "tailwindcss": "^3.4.6",
         "tailwindcss-animate": "^1.0.7",
         "tailwindcss-radix": "^3.0.3",
+        "vite-env-only": "^3.0.3",
         "zod": "^3.23.8"
       },
       "devDependencies": {
@@ -79,7 +79,6 @@
         "@faker-js/faker": "^8.4.1",
         "@playwright/test": "^1.45.2",
         "@remix-run/dev": "2.10.3",
-        "@remix-run/serve": "2.10.3",
         "@remix-run/testing": "2.10.3",
         "@sentry/vite-plugin": "^2.21.1",
         "@sly-cli/sly": "^1.13.0",
@@ -150,7 +149,6 @@
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
       "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
-      "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
         "@jridgewell/gen-mapping": "^0.3.5",
@@ -164,7 +162,6 @@
       "version": "7.24.6",
       "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.6.tgz",
       "integrity": "sha512-ZJhac6FkEd1yhG2AHOmfcXG4ceoLltoCVJjN5XsWN9BifBQr+cHJbWi0h68HZuSORq+3WtJ2z0hwF2NG1b5kcA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/highlight": "^7.24.6",
@@ -178,7 +175,6 @@
       "version": "7.24.6",
       "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.6.tgz",
       "integrity": "sha512-aC2DGhBq5eEdyXWqrDInSqQjO0k8xtPRf5YylULqx8MCd6jBtzqfta/3ETMRpuKIc5hyswfO80ObyA1MvkCcUQ==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
@@ -188,7 +184,6 @@
       "version": "7.24.6",
       "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.6.tgz",
       "integrity": "sha512-qAHSfAdVyFmIvl0VHELib8xar7ONuSHrE2hLnsaWkYNTI68dmi1x8GYDhJjMI/e7XWal9QBlZkwbOnkcw7Z8gQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
@@ -219,7 +214,6 @@
       "version": "6.3.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
@@ -229,7 +223,6 @@
       "version": "7.24.6",
       "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.6.tgz",
       "integrity": "sha512-S7m4eNa6YAPJRHmKsLHIDJhNAGNKoWNiWefz1MBbpnt8g9lvMDl1hir4P9bo/57bQEmuwEhnRU/AMWsD0G/Fbg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/types": "^7.24.6",
@@ -245,7 +238,6 @@
       "version": "2.5.2",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
       "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-      "dev": true,
       "license": "MIT",
       "bin": {
         "jsesc": "bin/jsesc"
@@ -271,7 +263,6 @@
       "version": "7.24.6",
       "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.6.tgz",
       "integrity": "sha512-VZQ57UsDGlX/5fFA7GkVPplZhHsVc+vuErWgdOiysI9Ksnw0Pbbd6pnPiR/mmJyKHgyIW0c7KT32gmhiF+cirg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/compat-data": "^7.24.6",
@@ -288,7 +279,6 @@
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
       "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-      "dev": true,
       "license": "ISC",
       "dependencies": {
         "yallist": "^3.0.2"
@@ -298,7 +288,6 @@
       "version": "6.3.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
       "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
@@ -308,7 +297,6 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
       "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-      "dev": true,
       "license": "ISC"
     },
     "node_modules/@babel/helper-create-class-features-plugin": {
@@ -349,7 +337,6 @@
       "version": "7.24.6",
       "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.6.tgz",
       "integrity": "sha512-Y50Cg3k0LKLMjxdPjIl40SdJgMB85iXn27Vk/qbHZCFx/o5XO3PSnpi675h1KEmmDb6OFArfd5SCQEQ5Q4H88g==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
@@ -359,7 +346,6 @@
       "version": "7.24.6",
       "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.24.6.tgz",
       "integrity": "sha512-xpeLqeeRkbxhnYimfr2PC+iA0Q7ljX/d1eZ9/inYbmfG2jpl8Lu3DyXvpOAnrS5kxkfOWJjioIMQsaMBXFI05w==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/template": "^7.24.6",
@@ -373,7 +359,6 @@
       "version": "7.24.6",
       "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.24.6.tgz",
       "integrity": "sha512-SF/EMrC3OD7dSta1bLJIlrsVxwtd0UpjRJqLno6125epQMJ/kyFmpTT4pbvPbdQHzCHg+biQ7Syo8lnDtbR+uA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/types": "^7.24.6"
@@ -399,7 +384,6 @@
       "version": "7.24.6",
       "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.6.tgz",
       "integrity": "sha512-a26dmxFJBF62rRO9mmpgrfTLsAuyHk4e1hKTUkD/fcMfynt8gvEKwQPQDVxWhca8dHoDck+55DFt42zV0QMw5g==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/types": "^7.24.6"
@@ -412,7 +396,6 @@
       "version": "7.24.6",
       "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.24.6.tgz",
       "integrity": "sha512-Y/YMPm83mV2HJTbX1Qh2sjgjqcacvOlhbzdCCsSlblOKjSYmQqEbO6rUniWQyRo9ncyfjT8hnUjlG06RXDEmcA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-environment-visitor": "^7.24.6",
@@ -473,7 +456,6 @@
       "version": "7.24.6",
       "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.6.tgz",
       "integrity": "sha512-nZzcMMD4ZhmB35MOOzQuiGO5RzL6tJbsT37Zx8M5L/i9KSrukGXWTjLe1knIbb/RmxoJE9GON9soq0c0VEMM5g==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/types": "^7.24.6"
@@ -499,7 +481,6 @@
       "version": "7.24.6",
       "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.6.tgz",
       "integrity": "sha512-CvLSkwXGWnYlF9+J3iZUvwgAxKiYzK3BWuo+mLzD/MDGOZDj7Gq8+hqaOkMxmJwmlv0iu86uH5fdADd9Hxkymw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/types": "^7.24.6"
@@ -512,7 +493,6 @@
       "version": "7.24.6",
       "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.6.tgz",
       "integrity": "sha512-WdJjwMEkmBicq5T9fm/cHND3+UlFa2Yj8ALLgmoSQAJZysYbBjw+azChSGPN4DSPLXOcooGRvDwZWMcF/mLO2Q==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
@@ -522,7 +502,6 @@
       "version": "7.24.6",
       "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.6.tgz",
       "integrity": "sha512-4yA7s865JHaqUdRbnaxarZREuPTHrjpDT+pXoAZ1yhyo6uFnIEpS8VMu16siFOHDpZNKYv5BObhsB//ycbICyw==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
@@ -532,7 +511,6 @@
       "version": "7.24.6",
       "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.6.tgz",
       "integrity": "sha512-Jktc8KkF3zIkePb48QO+IapbXlSapOW9S+ogZZkcO6bABgYAxtZcjZ/O005111YLf+j4M84uEgwYoidDkXbCkQ==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
@@ -542,7 +520,6 @@
       "version": "7.24.6",
       "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.6.tgz",
       "integrity": "sha512-V2PI+NqnyFu1i0GyTd/O/cTpxzQCYioSkUIRmgo7gFEHKKCg5w46+r/A6WeUR1+P3TeQ49dspGPNd/E3n9AnnA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/template": "^7.24.6",
@@ -556,7 +533,6 @@
       "version": "7.24.6",
       "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.6.tgz",
       "integrity": "sha512-2YnuOp4HAk2BsBrJJvYCbItHx0zWscI1C3zgWkz+wDyD9I7GIVrfnLyrR4Y1VR+7p+chAEcrgRQYZAGIKMV7vQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-validator-identifier": "^7.24.6",
@@ -572,7 +548,6 @@
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
       "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "ansi-styles": "^3.2.1",
@@ -587,7 +562,6 @@
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
       "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.8.0"
@@ -597,7 +571,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
       "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=4"
@@ -607,7 +580,6 @@
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
       "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "has-flag": "^3.0.0"
@@ -620,7 +592,6 @@
       "version": "7.24.6",
       "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.6.tgz",
       "integrity": "sha512-eNZXdfU35nJC2h24RznROuOpO94h6x8sg9ju0tT9biNtLZ2vuP8SduLqqV+/8+cebSLV9SJEAN5Z3zQbJG/M+Q==",
-      "dev": true,
       "license": "MIT",
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -782,7 +753,6 @@
       "version": "7.24.6",
       "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.6.tgz",
       "integrity": "sha512-3vgazJlLwNXi9jhrR1ef8qiB65L1RK90+lEQwv4OxveHnqC3BfmnHdgySwRLzf6akhlOYenT+b7AfWq+a//AHw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "^7.24.6",
@@ -797,7 +767,6 @@
       "version": "7.24.6",
       "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.6.tgz",
       "integrity": "sha512-OsNjaJwT9Zn8ozxcfoBc+RaHdj3gFmCmYoQLUII1o6ZrUwku0BMg80FoOTPx+Gi6XhcQxAYE4xyjPTo4SxEQqw==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "^7.24.6",
@@ -819,7 +788,6 @@
       "version": "11.12.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
       "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=4"
@@ -829,7 +797,6 @@
       "version": "7.24.6",
       "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.6.tgz",
       "integrity": "sha512-WaMsgi6Q8zMgMth93GvWPXkhAIEobfsIkLTacoVZoK1J0CevIPGYY2Vo5YvJGqyHqXM6P4ppOYGsIRU8MM9pFQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-string-parser": "^7.24.6",
@@ -1356,6 +1323,7 @@
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
       "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "eslint-visitor-keys": "^3.3.0"
@@ -1371,6 +1339,7 @@
       "version": "3.4.3",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
       "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
+      "dev": true,
       "license": "Apache-2.0",
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -2554,18 +2523,6 @@
         "node": ">=14"
       }
     },
-    "node_modules/@pkgr/core": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.1.1.tgz",
-      "integrity": "sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==",
-      "license": "MIT",
-      "engines": {
-        "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/unts"
-      }
-    },
     "node_modules/@playwright/test": {
       "version": "1.45.2",
       "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.45.2.tgz",
@@ -4579,42 +4536,6 @@
         "node": ">=14.0.0"
       }
     },
-    "node_modules/@remix-run/serve": {
-      "version": "2.10.3",
-      "resolved": "https://registry.npmjs.org/@remix-run/serve/-/serve-2.10.3.tgz",
-      "integrity": "sha512-UZyBdob26/e9cECDH4uspDw3xQyZSzHY+iNFVpRO1Iyk1NW1JDW4ImmHGXQSzq4ZKYNLV/ZktLkhY0f91Azt8Q==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@remix-run/express": "2.10.3",
-        "@remix-run/node": "2.10.3",
-        "chokidar": "^3.5.3",
-        "compression": "^1.7.4",
-        "express": "^4.19.2",
-        "get-port": "5.1.1",
-        "morgan": "^1.10.0",
-        "source-map-support": "^0.5.21"
-      },
-      "bin": {
-        "remix-serve": "dist/cli.js"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      }
-    },
-    "node_modules/@remix-run/serve/node_modules/get-port": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/get-port/-/get-port-5.1.1.tgz",
-      "integrity": "sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/@remix-run/server-runtime": {
       "version": "2.10.3",
       "resolved": "https://registry.npmjs.org/@remix-run/server-runtime/-/server-runtime-2.10.3.tgz",
@@ -6737,6 +6658,7 @@
       "version": "7.0.15",
       "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
       "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/jsonfile": {
@@ -6901,6 +6823,7 @@
       "version": "7.5.8",
       "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz",
       "integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/send": {
@@ -8319,7 +8242,6 @@
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
       "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "color-convert": "^1.9.0"
@@ -8430,6 +8352,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
       "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -8624,6 +8547,17 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/babel-dead-code-elimination": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/babel-dead-code-elimination/-/babel-dead-code-elimination-1.0.6.tgz",
+      "integrity": "sha512-JxFi9qyRJpN0LjEbbjbN8g0ux71Qppn9R8Qe3k6QzHg2CaKsbUQtbn307LQGiDLGjV6JCtEFqfxzVig9MyDCHQ==",
+      "dependencies": {
+        "@babel/core": "^7.23.7",
+        "@babel/parser": "^7.23.6",
+        "@babel/traverse": "^7.23.7",
+        "@babel/types": "^7.23.6"
+      }
+    },
     "node_modules/bail": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/bail/-/bail-2.0.2.tgz",
@@ -8821,7 +8755,6 @@
       "version": "4.23.0",
       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.0.tgz",
       "integrity": "sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==",
-      "dev": true,
       "funding": [
         {
           "type": "opencollective",
@@ -9045,7 +8978,6 @@
       "version": "1.0.30001625",
       "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001625.tgz",
       "integrity": "sha512-4KE9N2gcRH+HQhpeiRZXd+1niLB/XNLAhSy4z7fI8EzcbcPoAqjNInxVHTiTwWfTIV4w096XG8OtCOCQQKPv3w==",
-      "dev": true,
       "funding": [
         {
           "type": "opencollective",
@@ -9712,7 +9644,6 @@
       "version": "1.9.3",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
       "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "color-name": "1.1.3"
@@ -9722,7 +9653,6 @@
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
       "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/combined-stream": {
@@ -9870,7 +9800,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
       "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/cookie": {
@@ -10399,6 +10328,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
       "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "path-type": "^4.0.0"
@@ -10573,7 +10503,6 @@
       "version": "1.4.784",
       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.784.tgz",
       "integrity": "sha512-9CZwh+sDrhDAeOEFh8s3PqwduzTyYIeYwZolc1b9ENAUt3ePu7R1sJSCWr/820ISssRxCJUyHI9Wb7j+0Uo1AA==",
-      "dev": true,
       "license": "ISC"
     },
     "node_modules/emoji-regex": {
@@ -11133,159 +11062,6 @@
         "semver": "bin/semver.js"
       }
     },
-    "node_modules/eslint-plugin-remix-react-routes": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-remix-react-routes/-/eslint-plugin-remix-react-routes-1.0.5.tgz",
-      "integrity": "sha512-POEKJilXHuFbjUdH3//M03n8BqX8bd6pbq4PEp/iWucuyXs6BmX1sDT0cj9xDi4RADzZnCauOG6ru8ssCrXUjw==",
-      "license": "ISC",
-      "dependencies": {
-        "@typescript-eslint/utils": "^5.44.0",
-        "chokidar": "^3.5.3",
-        "semver": "^7.3.8",
-        "synckit": "^0.8.4"
-      },
-      "engines": {
-        "node": "^14.17.0 || ^16.0.0 || >= 18.0.0"
-      },
-      "peerDependencies": {
-        "@remix-run/dev": "^1.5.1",
-        "eslint": ">=7"
-      }
-    },
-    "node_modules/eslint-plugin-remix-react-routes/node_modules/@typescript-eslint/scope-manager": {
-      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz",
-      "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==",
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/types": "5.62.0",
-        "@typescript-eslint/visitor-keys": "5.62.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/eslint-plugin-remix-react-routes/node_modules/@typescript-eslint/types": {
-      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz",
-      "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==",
-      "license": "MIT",
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/eslint-plugin-remix-react-routes/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz",
-      "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==",
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "@typescript-eslint/types": "5.62.0",
-        "@typescript-eslint/visitor-keys": "5.62.0",
-        "debug": "^4.3.4",
-        "globby": "^11.1.0",
-        "is-glob": "^4.0.3",
-        "semver": "^7.3.7",
-        "tsutils": "^3.21.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/eslint-plugin-remix-react-routes/node_modules/@typescript-eslint/utils": {
-      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz",
-      "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@eslint-community/eslint-utils": "^4.2.0",
-        "@types/json-schema": "^7.0.9",
-        "@types/semver": "^7.3.12",
-        "@typescript-eslint/scope-manager": "5.62.0",
-        "@typescript-eslint/types": "5.62.0",
-        "@typescript-eslint/typescript-estree": "5.62.0",
-        "eslint-scope": "^5.1.1",
-        "semver": "^7.3.7"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
-      }
-    },
-    "node_modules/eslint-plugin-remix-react-routes/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz",
-      "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==",
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/types": "5.62.0",
-        "eslint-visitor-keys": "^3.3.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/eslint-plugin-remix-react-routes/node_modules/eslint-scope": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
-      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/eslint-plugin-remix-react-routes/node_modules/eslint-visitor-keys": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
-      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
-      "license": "Apache-2.0",
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/eslint-plugin-remix-react-routes/node_modules/estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "license": "BSD-2-Clause",
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
     "node_modules/eslint-plugin-testing-library": {
       "version": "6.2.2",
       "resolved": "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-6.2.2.tgz",
@@ -11624,6 +11400,7 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
       "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
         "estraverse": "^5.2.0"
@@ -11636,6 +11413,7 @@
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
       "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true,
       "license": "BSD-2-Clause",
       "engines": {
         "node": ">=4.0"
@@ -12360,7 +12138,6 @@
       "version": "1.0.0-beta.2",
       "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
       "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
@@ -12573,6 +12350,7 @@
       "version": "11.1.0",
       "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
       "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "array-union": "^2.1.0",
@@ -12957,6 +12735,7 @@
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz",
       "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 4"
@@ -13937,7 +13716,6 @@
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
       "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
-      "dev": true,
       "license": "MIT",
       "bin": {
         "json5": "lib/cli.js"
@@ -15859,7 +15637,6 @@
       "version": "2.0.14",
       "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz",
       "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/node-sql-parser": {
@@ -16792,6 +16569,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
       "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -18985,6 +18763,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
       "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
@@ -19653,22 +19432,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/synckit": {
-      "version": "0.8.8",
-      "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.8.8.tgz",
-      "integrity": "sha512-HwOKAP7Wc5aRGYdKH+dw0PRRpbO841v2DENBtjnR5HFWoiNByAl7vrx3p0G/rCyYXQsrxqtX48TImFtPcIHSpQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@pkgr/core": "^0.1.0",
-        "tslib": "^2.6.2"
-      },
-      "engines": {
-        "node": "^14.18.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/unts"
-      }
-    },
     "node_modules/tailwind-merge": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.4.0.tgz",
@@ -20037,7 +19800,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
       "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=4"
@@ -20175,6 +19937,7 @@
       "version": "3.21.0",
       "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
       "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "tslib": "^1.8.1"
@@ -20190,6 +19953,7 @@
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
       "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true,
       "license": "0BSD"
     },
     "node_modules/tsx": {
@@ -21135,7 +20899,6 @@
       "version": "1.0.16",
       "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.16.tgz",
       "integrity": "sha512-KVbTxlBYlckhF5wgfyZXTWnMn7MMZjMu9XG8bPlliUOP9ThaF4QnhP8qrjrH7DRzHfSk0oQv1wToW+iA5GajEQ==",
-      "dev": true,
       "funding": [
         {
           "type": "opencollective",
@@ -21399,6 +21162,23 @@
         }
       }
     },
+    "node_modules/vite-env-only": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/vite-env-only/-/vite-env-only-3.0.3.tgz",
+      "integrity": "sha512-iAb7cTXRrvFShaF1n+G8f6Yqq7sRJcxipNYNQQu0DN5N9P55vJMmLG5lNU5moYGpd+ZH1WhBHdkWi5WjrfImHg==",
+      "dependencies": {
+        "@babel/core": "^7.23.7",
+        "@babel/generator": "^7.23.6",
+        "@babel/parser": "^7.23.6",
+        "@babel/traverse": "^7.23.7",
+        "@babel/types": "^7.23.6",
+        "babel-dead-code-elimination": "^1.0.6",
+        "micromatch": "^4.0.5"
+      },
+      "peerDependencies": {
+        "vite": "*"
+      }
+    },
     "node_modules/vite-node": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-1.6.0.tgz",