From 07a6d21c30b3a0aca51c7a282f44db9b39729f3e Mon Sep 17 00:00:00 2001
From: Jacob Paris <jacob@jacobparis.com>
Date: Sat, 21 Sep 2024 22:24:00 +0800
Subject: [PATCH] Update from upstream

---
 .../assets}/favicons/apple-touch-icon.png     | Bin
 .../assets}/favicons/favicon.svg              |   0
 heat-stack/app/components/ui/input-otp.tsx    |   4 +-
 heat-stack/app/components/ui/input.tsx        |   2 +-
 heat-stack/app/components/ui/textarea.tsx     |   2 +-
 heat-stack/app/entry.server.tsx               |   4 +-
 heat-stack/app/root.tsx                       |  15 ++--
 heat-stack/app/routes/_seo+/sitemap[.]xml.ts  |   4 +-
 heat-stack/app/utils/cache.server.ts          |   2 +-
 heat-stack/index.js                           |   2 +-
 heat-stack/other/build-server.ts              |   4 +-
 heat-stack/package.json                       |   4 +-
 heat-stack/public/favicons/README.md          |   7 +-
 heat-stack/public/favicons/favicon-16x16.png  | Bin 669 -> 0 bytes
 heat-stack/public/favicons/favicon-32x32.png  | Bin 1435 -> 0 bytes
 heat-stack/public/favicons/mask-icon.svg      |   1 -
 heat-stack/server/index.ts                    |  32 ++++++---
 heat-stack/tests/e2e/note-images.test.ts      |   2 +-
 heat-stack/vite.config.ts                     |  64 +++++++++++-------
 heat-stack/vitest.config.ts                   |  19 ------
 20 files changed, 86 insertions(+), 82 deletions(-)
 rename heat-stack/{public => app/assets}/favicons/apple-touch-icon.png (100%)
 rename heat-stack/{public => app/assets}/favicons/favicon.svg (100%)
 delete mode 100644 heat-stack/public/favicons/favicon-16x16.png
 delete mode 100644 heat-stack/public/favicons/favicon-32x32.png
 delete mode 100644 heat-stack/public/favicons/mask-icon.svg
 delete mode 100644 heat-stack/vitest.config.ts

diff --git a/heat-stack/public/favicons/apple-touch-icon.png b/heat-stack/app/assets/favicons/apple-touch-icon.png
similarity index 100%
rename from heat-stack/public/favicons/apple-touch-icon.png
rename to heat-stack/app/assets/favicons/apple-touch-icon.png
diff --git a/heat-stack/public/favicons/favicon.svg b/heat-stack/app/assets/favicons/favicon.svg
similarity index 100%
rename from heat-stack/public/favicons/favicon.svg
rename to heat-stack/app/assets/favicons/favicon.svg
diff --git a/heat-stack/app/components/ui/input-otp.tsx b/heat-stack/app/components/ui/input-otp.tsx
index 0f9678c1..01806465 100644
--- a/heat-stack/app/components/ui/input-otp.tsx
+++ b/heat-stack/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,
 			)}
@@ -67,4 +67,4 @@ const InputOTPSeparator = React.forwardRef<
 ))
 InputOTPSeparator.displayName = 'InputOTPSeparator'
 
-export { InputOTP, InputOTPGroup, InputOTPSlot, InputOTPSeparator }
+export { InputOTP, InputOTPGroup, InputOTPSlot, InputOTPSeparator }
\ No newline at end of file
diff --git a/heat-stack/app/components/ui/input.tsx b/heat-stack/app/components/ui/input.tsx
index 18801dca..b3089e82 100644
--- a/heat-stack/app/components/ui/input.tsx
+++ b/heat-stack/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/heat-stack/app/components/ui/textarea.tsx b/heat-stack/app/components/ui/textarea.tsx
index f7719e85..a9d3b9c5 100644
--- a/heat-stack/app/components/ui/textarea.tsx
+++ b/heat-stack/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/heat-stack/app/entry.server.tsx b/heat-stack/app/entry.server.tsx
index 9f17da84..ed4e4b81 100644
--- a/heat-stack/app/entry.server.tsx
+++ b/heat-stack/app/entry.server.tsx
@@ -1,4 +1,4 @@
-import { PassThrough } from 'stream'
+import { PassThrough } from 'node:stream'
 import {
 	createReadableStreamFromReadable,
 	type LoaderFunctionArgs,
@@ -110,7 +110,7 @@ export function handleError(
 			true,
 		)
 	} else {
-		console.error(chalk.red(error))
+		console.error(error)
 		Sentry.captureException(error)
 	}
 }
diff --git a/heat-stack/app/root.tsx b/heat-stack/app/root.tsx
index ecf62f66..0d2a7e47 100644
--- a/heat-stack/app/root.tsx
+++ b/heat-stack/app/root.tsx
@@ -20,7 +20,8 @@ import {
 import { withSentry } from '@sentry/remix'
 import { useRef } from 'react'
 import { HoneypotProvider } from 'remix-utils/honeypot/react'
-// import { z } from 'zod'
+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 { SearchBar } from './components/search-bar.tsx'
@@ -35,7 +36,6 @@ import {
 } from './components/ui/dropdown-menu.tsx'
 import { Icon, href as iconsHref } from './components/ui/icon.tsx'
 import { EpicToaster } from './components/ui/sonner.tsx'
-// import { ThemeSwitch, useTheme } from './routes/resources+/theme-switch.tsx'
 import tailwindStyleSheetUrl from './styles/tailwind.css?url'
 import { getUserId, logout } from './utils/auth.server.ts'
 import { ClientHintCheck, getHints } from './utils/client-hints.tsx'
@@ -44,7 +44,6 @@ import { getEnv } from './utils/env.server.ts'
 import { honeypot } from './utils/honeypot.server.ts'
 import { combineHeaders, getDomainUrl, getUserImgSrc } from './utils/misc.tsx'
 import { useNonce } from './utils/nonce-provider.ts'
-// import { type Theme, 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'
@@ -53,19 +52,13 @@ 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: '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/heat-stack/app/routes/_seo+/sitemap[.]xml.ts b/heat-stack/app/routes/_seo+/sitemap[.]xml.ts
index 22721c36..a3ebb264 100644
--- a/heat-stack/app/routes/_seo+/sitemap[.]xml.ts
+++ b/heat-stack/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/heat-stack/app/utils/cache.server.ts b/heat-stack/app/utils/cache.server.ts
index 19be1ea6..618f5a04 100644
--- a/heat-stack/app/utils/cache.server.ts
+++ b/heat-stack/app/utils/cache.server.ts
@@ -1,4 +1,4 @@
-import fs from 'fs'
+import fs from 'node:fs'
 import {
 	cachified as baseCachified,
 	verboseReporter,
diff --git a/heat-stack/index.js b/heat-stack/index.js
index ef699b60..bc7c79f5 100644
--- a/heat-stack/index.js
+++ b/heat-stack/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/heat-stack/other/build-server.ts b/heat-stack/other/build-server.ts
index 0e03bf48..896b0f62 100644
--- a/heat-stack/other/build-server.ts
+++ b/heat-stack/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/heat-stack/package.json b/heat-stack/package.json
index 4070435a..2f7eb5e0 100644
--- a/heat-stack/package.json
+++ b/heat-stack/package.json
@@ -161,8 +161,8 @@
     "node": "20"
   },
   "epic-stack": {
-    "head": "b2f899fec54a76c1e0e863dadad6e9340af5ca1b",
-    "date": "2024-08-15T23:19:44Z"
+    "head": "1f76cd816c07c9bc0ab73bd339a02c98ff34f7ae",
+    "date": "2024-09-17T22:17:16Z"
   },
   "prisma": {
     "seed": "tsx prisma/seed.ts"
diff --git a/heat-stack/public/favicons/README.md b/heat-stack/public/favicons/README.md
index 94870db0..ee77416b 100644
--- a/heat-stack/public/favicons/README.md
+++ b/heat-stack/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/heat-stack/public/favicons/favicon-16x16.png b/heat-stack/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/heat-stack/public/favicons/favicon-32x32.png b/heat-stack/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/heat-stack/public/favicons/mask-icon.svg b/heat-stack/public/favicons/mask-icon.svg
deleted file mode 100644
index ae74d481..00000000
--- a/heat-stack/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/heat-stack/server/index.ts b/heat-stack/server/index.ts
index 6239a820..036e61dc 100644
--- a/heat-stack/server/index.ts
+++ b/heat-stack/server/index.ts
@@ -1,4 +1,4 @@
-import crypto from 'crypto'
+import crypto from 'node:crypto'
 import { createRequestHandler } from '@remix-run/express'
 import { type ServerBuild } from '@remix-run/node'
 import { ip as ipAddress } from 'address'
@@ -39,7 +39,6 @@ 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') {
@@ -199,13 +198,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) {
@@ -223,7 +228,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/heat-stack/tests/e2e/note-images.test.ts b/heat-stack/tests/e2e/note-images.test.ts
index 44ba5a96..5b1addcb 100644
--- a/heat-stack/tests/e2e/note-images.test.ts
+++ b/heat-stack/tests/e2e/note-images.test.ts
@@ -1,4 +1,4 @@
-import fs from 'fs'
+import fs from 'node:fs'
 import { faker } from '@faker-js/faker'
 import { type NoteImage, type Note } from '@prisma/client'
 import { prisma } from '#app/utils/db.server.ts'
diff --git a/heat-stack/vite.config.ts b/heat-stack/vite.config.ts
index 9b93fa2d..242db830 100644
--- a/heat-stack/vite.config.ts
+++ b/heat-stack/vite.config.ts
@@ -12,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
 			}
 		},
@@ -30,27 +34,31 @@ export default defineConfig({
 	},
 	plugins: [
 		envOnlyMacros(),
-		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.*',
-					],
-				})
-			},
-		}),
+		// 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',
@@ -72,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/heat-stack/vitest.config.ts b/heat-stack/vitest.config.ts
deleted file mode 100644
index a4cd13b4..00000000
--- a/heat-stack/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,
-		},
-	},
-})