Merge remote-tracking branch 'origin/main' into css-rework

# Conflicts:
#	app/components/SubNav.tsx
#	app/components/layout/UserItem.tsx
#	app/features/build-analyzer/routes/analyzer.tsx
#	app/features/map-planner/components/Planner.tsx
#	app/features/object-damage-calculator/routes/object-damage-calculator.tsx
#	app/features/plus-voting/routes/plus.voting.tsx
#	app/root.tsx
#	knip.json

.gitignore

@@ -3,6 +3,7 @@ node_modules
 /.cache*
 /build
 /public/build
+.react-router/
 .env
 translation-progress.md
 

app/components/BuildCard.tsx

@@ -1,6 +1,6 @@
-import { Link } from "@remix-run/react";
 import clsx from "clsx";
 import { useTranslation } from "react-i18next";
+import { Link } from "react-router";
 import type { GearType, Tables, UserWithPlusTier } from "~/db/tables";
 import { useUser } from "~/features/auth/core/user";
 import type { BuildWeaponWithTop500Info } from "~/features/builds/builds-types";

app/components/Catcher.tsx

@@ -1,9 +1,9 @@
+import * as React from "react";
 import {
 	isRouteErrorResponse,
 	useRevalidator,
 	useRouteError,
-} from "@remix-run/react";
-import * as React from "react";
+} from "react-router";
 import { useLocation } from "react-use";
 import { useUser } from "~/features/auth/core/user";
 import {

app/components/FormErrors.tsx

@@ -1,5 +1,5 @@
-import { useActionData } from "@remix-run/react";
 import { useTranslation } from "react-i18next";
+import { useActionData } from "react-router";
 import type { Namespace } from "~/modules/i18n/resources.server";
 import styles from "./FormErrors.module.css";
 

app/components/FormWithConfirm.tsx

@@ -1,13 +1,18 @@
-import { type FetcherWithComponents, useFetcher } from "@remix-run/react";
 import * as React from "react";
 import { createPortal } from "react-dom";
 import { useTranslation } from "react-i18next";
+import { type FetcherWithComponents, useFetcher } from "react-router";
 import type { SendouButtonProps } from "~/components/elements/Button";
 import { SendouDialog } from "~/components/elements/Dialog";
 import { useIsMounted } from "~/hooks/useIsMounted";
 import invariant from "~/utils/invariant";
 import { SubmitButton } from "./SubmitButton";
 
+interface ChildProps {
+	onPress?: () => void;
+	type?: "button";
+}
+
 export function FormWithConfirm({
 	fields,
 	children,
@@ -22,7 +27,7 @@ export function FormWithConfirm({
 		| [name: string, value: string | number]
 		| readonly [name: string, value: string | number]
 	)[];
-	children: React.ReactNode;
+	children: React.ReactElement<ChildProps>;
 	dialogHeading: string;
 	submitButtonText?: string;
 	action?: string;

app/components/FriendCodeInput.tsx

@@ -1,7 +1,7 @@
-import { useFetcher } from "@remix-run/react";
 import clsx from "clsx";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
+import { useFetcher } from "react-router";
 import { Input } from "~/components/Input";
 import { Label } from "~/components/Label";
 import { SubmitButton } from "~/components/SubmitButton";

app/components/Main.tsx

@@ -1,6 +1,6 @@
-import { isRouteErrorResponse, useRouteError } from "@remix-run/react";
 import clsx from "clsx";
 import type * as React from "react";
+import { isRouteErrorResponse, useRouteError } from "react-router";
 import { useHasRole } from "~/modules/permissions/hooks";
 import styles from "./Main.module.css";
 

app/components/Redirect.tsx

@@ -1,5 +1,5 @@
-import { useNavigate } from "@remix-run/react";
 import * as React from "react";
+import { useNavigate } from "react-router";
 
 export function Redirect({ to }: { to: string }) {
 	const navigate = useNavigate();

app/components/SubNav.tsx

@@ -1,7 +1,7 @@
-import type { LinkProps } from "@remix-run/react";
-import { NavLink } from "@remix-run/react";
 import clsx from "clsx";
 import type * as React from "react";
+import type { LinkProps } from "react-router";
+import { NavLink } from "react-router";
 import styles from "./SubNav.module.css";
 
 export function SubNav({

app/components/SubmitButton.tsx

@@ -1,4 +1,4 @@
-import { type FetcherWithComponents, useNavigation } from "@remix-run/react";
+import { type FetcherWithComponents, useNavigation } from "react-router";
 import { SendouButton, type SendouButtonProps } from "./elements/Button";
 
 interface SubmitButtonProps extends SendouButtonProps {

app/components/elements/Button.tsx

@@ -1,10 +1,11 @@
-import { Link, type LinkProps } from "@remix-run/react";
 import clsx from "clsx";
+import type { JSX } from "react";
 import * as React from "react";
 import {
 	Button as ReactAriaButton,
 	type ButtonProps as ReactAriaButtonProps,
 } from "react-aria-components";
+import { Link, type LinkProps } from "react-router";
 import { assertUnreachable } from "~/utils/types";
 import styles from "./Button.module.css";
 

app/components/elements/Dialog.tsx

@@ -1,4 +1,3 @@
-import { useNavigate } from "@remix-run/react";
 import clsx from "clsx";
 import type { ModalOverlayProps } from "react-aria-components";
 import {
@@ -8,6 +7,7 @@ import {
 	Modal,
 	ModalOverlay,
 } from "react-aria-components";
+import { useNavigate } from "react-router";
 import { SendouButton } from "~/components/elements/Button";
 import { CrossIcon } from "~/components/icons/Cross";
 import styles from "./Dialog.module.css";

app/components/elements/TournamentSearch.tsx

@@ -1,4 +1,3 @@
-import { useFetcher } from "@remix-run/react";
 import clsx from "clsx";
 import { format, sub } from "date-fns";
 import * as React from "react";
@@ -16,6 +15,7 @@ import {
 	SelectValue,
 } from "react-aria-components";
 import { useTranslation } from "react-i18next";
+import { useFetcher } from "react-router";
 import { useDebounce } from "react-use";
 import { SendouBottomTexts } from "~/components/elements/BottomTexts";
 import { SendouLabel } from "~/components/elements/Label";

app/components/elements/UserSearch.tsx

@@ -1,4 +1,3 @@
-import { useFetcher } from "@remix-run/react";
 import clsx from "clsx";
 import * as React from "react";
 import {
@@ -15,6 +14,7 @@ import {
 	SelectValue,
 } from "react-aria-components";
 import { useTranslation } from "react-i18next";
+import { useFetcher } from "react-router";
 import { useDebounce } from "react-use";
 import { SendouBottomTexts } from "~/components/elements/BottomTexts";
 import { SendouLabel } from "~/components/elements/Label";

app/components/form/SendouForm.tsx

@@ -1,9 +1,9 @@
 import { standardSchemaResolver } from "@hookform/resolvers/standard-schema";
-import { useFetcher } from "@remix-run/react";
 import * as React from "react";
 import { type DefaultValues, FormProvider, useForm } from "react-hook-form";
 import { useTranslation } from "react-i18next";
-import type { z } from "zod/v4";
+import { useFetcher } from "react-router";
+import type { z } from "zod";
 import { logger } from "~/utils/logger";
 import type { ActionError } from "~/utils/remix.server";
 import { LinkButton } from "../elements/Button";
@@ -27,7 +27,7 @@ export function SendouForm<T extends z.ZodTypeAny>({
 	const { t } = useTranslation(["common"]);
 	const fetcher = useFetcher<any>();
 	const methods = useForm({
-		resolver: standardSchemaResolver(schema),
+		resolver: standardSchemaResolver(schema as any),
 		defaultValues,
 	});
 

app/components/layout/Footer.tsx

@@ -1,5 +1,5 @@
-import { Link } from "@remix-run/react";
 import { useTranslation } from "react-i18next";
+import { Link } from "react-router";
 import { usePatrons } from "~/hooks/swr";
 import {
 	API_PAGE,

app/components/layout/LogInButtonContainer.tsx

@@ -1,6 +1,6 @@
-import { useSearchParams } from "@remix-run/react";
 import { createPortal } from "react-dom";
 import { useTranslation } from "react-i18next";
+import { useSearchParams } from "react-router";
 import { SendouDialog } from "~/components/elements/Dialog";
 import { useIsMounted } from "~/hooks/useIsMounted";
 import { LOG_IN_URL, SENDOU_INK_DISCORD_URL } from "~/utils/urls";

app/components/layout/NavDialog.tsx

@@ -1,5 +1,5 @@
-import { Link } from "@remix-run/react";
 import { useTranslation } from "react-i18next";
+import { Link } from "react-router";
 import { SendouDialog } from "~/components/elements/Dialog";
 import { navItems } from "~/components/layout/nav-items";
 import { useUser } from "~/features/auth/core/user";

app/components/layout/NotificationPopover.tsx

@@ -1,8 +1,8 @@
-import { useLocation, useMatches, useRevalidator } from "@remix-run/react";
 import clsx from "clsx";
 import * as React from "react";
 import { Button } from "react-aria-components";
 import { useTranslation } from "react-i18next";
+import { useLocation, useMatches, useRevalidator } from "react-router";
 import {
 	NotificationItem,
 	NotificationItemDivider,

app/components/layout/UserItem.tsx

@@ -1,6 +1,6 @@
-import { Link } from "@remix-run/react";
 import clsx from "clsx";
 import { useTranslation } from "react-i18next";
+import { Link } from "react-router";
 import { useUser } from "~/features/auth/core/user";
 import { userPage } from "~/utils/urls";
 import { Avatar } from "../Avatar";

app/components/layout/index.tsx

@@ -1,7 +1,7 @@
-import { Link, useLocation, useMatches } from "@remix-run/react";
 import clsx from "clsx";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
+import { Link, useLocation, useMatches } from "react-router";
 import type { RootLoaderData } from "~/root";
 import type { Breadcrumb, SendouRouteHandle } from "~/utils/remix.server";
 import { SendouButton } from "../elements/Button";

app/components/ramp/Ramp.tsx

@@ -1,5 +1,5 @@
-import { useLocation } from "@remix-run/react";
 import { useEffect, useState } from "react";
+import { useLocation } from "react-router";
 import { logger } from "../../utils/logger";
 
 declare global {

app/entry.client.tsx

@@ -1,7 +1,7 @@
-import { RemixBrowser } from "@remix-run/react";
 import i18next from "i18next";
 import { hydrateRoot } from "react-dom/client";
 import { I18nextProvider } from "react-i18next";
+import { HydratedRouter } from "react-router/dom";
 import { i18nLoader } from "./modules/i18n/loader";
 import { logger } from "./utils/logger";
 
@@ -17,7 +17,7 @@ i18nLoader()
 		hydrateRoot(
 			document,
 			<I18nextProvider i18n={i18next}>
-				<RemixBrowser />
+				<HydratedRouter />
 			</I18nextProvider>,
 		),
 	)

app/entry.server.tsx

@@ -1,27 +1,25 @@
 import { PassThrough } from "node:stream";
-import {
-	createReadableStreamFromReadable,
-	type EntryContext,
-} from "@remix-run/node";
-import { RemixServer } from "@remix-run/react";
+import { createReadableStreamFromReadable } from "@react-router/node";
 import { createInstance } from "i18next";
 import { isbot } from "isbot";
 import cron from "node-cron";
 import { renderToPipeableStream } from "react-dom/server";
 import { I18nextProvider, initReactI18next } from "react-i18next";
+import { type EntryContext, ServerRouter } from "react-router";
 import { config } from "~/modules/i18n/config"; // your i18n configuration file
 import { i18next } from "~/modules/i18n/i18next.server";
 import { resources } from "./modules/i18n/resources.server";
 import { daily, everyHourAt00, everyHourAt30 } from "./routines/list.server";
 import { logger } from "./utils/logger";
 
-const ABORT_DELAY = 5000;
+// Reject/cancel all pending promises after 5 seconds
+export const streamTimeout = 5000;
 
 export default async function handleRequest(
 	request: Request,
 	responseStatusCode: number,
 	responseHeaders: Headers,
-	remixContext: EntryContext,
+	reactRouterContext: EntryContext,
 ) {
 	const callbackName = isbot(request.headers.get("user-agent"))
 		? "onAllReady"
@@ -29,7 +27,7 @@ export default async function handleRequest(
 
 	const instance = createInstance();
 	const lng = await i18next.getLocale(request);
-	const ns = i18next.getRouteNamespaces(remixContext);
+	const ns = i18next.getRouteNamespaces(reactRouterContext);
 
 	await instance
 		.use(initReactI18next) // Tell our instance to use react-i18next
@@ -45,7 +43,7 @@ export default async function handleRequest(
 
 		const { pipe, abort } = renderToPipeableStream(
 			<I18nextProvider i18n={instance}>
-				<RemixServer context={remixContext} url={request.url} />
+				<ServerRouter context={reactRouterContext} url={request.url} />
 			</I18nextProvider>,
 			{
 				[callbackName]: () => {
@@ -73,7 +71,9 @@ export default async function handleRequest(
 			},
 		);
 
-		setTimeout(abort, ABORT_DELAY);
+		// Automatically timeout the React renderer after 6 seconds, which ensures
+		// React has enough time to flush down the rejected boundary contents
+		setTimeout(abort, streamTimeout + 1000);
 	});
 }
 

app/features/admin/AdminRepository.server.ts

@@ -86,6 +86,11 @@ export function migrate(args: { newUserId: number; oldUserId: number }) {
 			.where("submitterUserId", "=", args.newUserId)
 			.set({ submitterUserId: args.oldUserId })
 			.execute();
+		await trx
+			.updateTable("ModNote")
+			.where("userId", "=", args.newUserId)
+			.set({ userId: args.oldUserId })
+			.execute();
 
 		// special case: delete same team membership to avoid unique constraint violation
 		await trx

app/features/admin/actions/admin.server.ts

@@ -1,5 +1,5 @@
-import type { ActionFunctionArgs } from "@remix-run/node";
-import { z } from "zod/v4";
+import type { ActionFunctionArgs } from "react-router";
+import { z } from "zod";
 import * as AdminRepository from "~/features/admin/AdminRepository.server";
 import { requireUser } from "~/features/auth/core/user.server";
 import { refreshBannedCache } from "~/features/ban/core/banned.server";

app/features/admin/admin-schemas.ts

@@ -1,4 +1,4 @@
-import { z } from "zod/v4";
+import { z } from "zod";
 import { friendCode } from "~/utils/zod";
 
 export const adminActionSearchParamsSchema = z.object({

app/features/admin/loaders/admin.server.ts

@@ -1,4 +1,4 @@
-import type { LoaderFunctionArgs } from "@remix-run/node";
+import type { LoaderFunctionArgs } from "react-router";
 import { isImpersonating, requireUser } from "~/features/auth/core/user.server";
 import * as UserRepository from "~/features/user-page/UserRepository.server";
 import { requireRole } from "~/modules/permissions/guards.server";

app/features/admin/routes/admin.tsx

@@ -1,4 +1,5 @@
-import type { MetaFunction } from "@remix-run/node";
+import * as React from "react";
+import type { MetaFunction } from "react-router";
 import {
 	Form,
 	Link,
@@ -6,8 +7,7 @@ import {
 	useLoaderData,
 	useNavigation,
 	useSearchParams,
-} from "@remix-run/react";
-import * as React from "react";
+} from "react-router";
 import { Avatar } from "~/components/Avatar";
 import { Catcher } from "~/components/Catcher";
 import { SendouButton } from "~/components/elements/Button";

app/features/api-private/routes/patrons.ts

@@ -1,4 +1,4 @@
-import type { ActionFunction, LoaderFunctionArgs } from "@remix-run/node";
+import type { ActionFunction, LoaderFunctionArgs } from "react-router";
 import * as UserRepository from "~/features/user-page/UserRepository.server";
 import { updatePatreonData } from "~/modules/patreon";
 import {

app/features/api-private/routes/seed.ts

@@ -1,5 +1,5 @@
-import type { ActionFunction } from "@remix-run/node";
-import { z } from "zod/v4";
+import type { ActionFunction } from "react-router";
+import { z } from "zod";
 import { seed } from "~/db/seed";
 import { DANGEROUS_CAN_ACCESS_DEV_CONTROLS } from "~/features/admin/core/dev-controls";
 import { SEED_VARIATIONS } from "~/features/api-private/constants";
@@ -28,5 +28,5 @@ export const action: ActionFunction = async ({ request }) => {
 
 	await refreshSendouQInstance();
 
-	return null;
+	return Response.json(null);
 };

app/features/api-private/routes/users.ts

@@ -1,4 +1,4 @@
-import type { ActionFunction } from "@remix-run/node";
+import type { ActionFunction } from "react-router";
 import * as UserRepository from "~/features/user-page/UserRepository.server";
 import { canAccessLohiEndpoint } from "~/utils/remix.server";
 

app/features/api-public/routes/calendar.$year.$week.ts

@@ -1,6 +1,6 @@
-import { json, type LoaderFunctionArgs } from "@remix-run/node";
+import type { LoaderFunctionArgs } from "react-router";
 import { cors } from "remix-utils/cors";
-import { z } from "zod/v4";
+import { z } from "zod";
 import { db } from "~/db/sql";
 import {
 	databaseTimestampToDate,
@@ -39,7 +39,7 @@ export const loader = async ({ params, request }: LoaderFunctionArgs) => {
 			: null,
 	}));
 
-	return await cors(request, json(result));
+	return await cors(request, Response.json(result));
 };
 
 function fetchEventsOfWeek(args: { week: number; year: number }) {

app/features/api-public/routes/org.$id.ts

@@ -1,7 +1,7 @@
-import { json, type LoaderFunctionArgs } from "@remix-run/node";
 import { jsonArrayFrom } from "kysely/helpers/sqlite";
+import type { LoaderFunctionArgs } from "react-router";
 import { cors } from "remix-utils/cors";
-import { z } from "zod/v4";
+import { z } from "zod";
 import { db } from "~/db/sql";
 import { concatUserSubmittedImagePrefix } from "~/utils/kysely.server";
 import { notFoundIfFalsy, parseParams } from "~/utils/remix.server";
@@ -73,5 +73,5 @@ export const loader = async ({ params, request }: LoaderFunctionArgs) => {
 		})),
 	};
 
-	return await cors(request, json(result));
+	return await cors(request, Response.json(result));
 };

app/features/api-public/routes/sendouq.active-match.$userId.ts

@@ -1,6 +1,6 @@
-import { json, type LoaderFunctionArgs } from "@remix-run/node";
+import type { LoaderFunctionArgs } from "react-router";
 import { cors } from "remix-utils/cors";
-import { z } from "zod/v4";
+import { z } from "zod";
 import { SendouQ } from "~/features/sendouq/core/SendouQ.server";
 import { parseParams } from "~/utils/remix.server";
 import { id } from "~/utils/zod";
@@ -29,5 +29,5 @@ export const loader = async ({ params, request }: LoaderFunctionArgs) => {
 		matchId: current?.matchId ?? null,
 	};
 
-	return await cors(request, json(result));
+	return await cors(request, Response.json(result));
 };

app/features/api-public/routes/sendouq.match.$matchId.ts

@@ -1,6 +1,6 @@
-import { json, type LoaderFunctionArgs } from "@remix-run/node";
+import type { LoaderFunctionArgs } from "react-router";
 import { cors } from "remix-utils/cors";
-import { z } from "zod/v4";
+import { z } from "zod";
 import * as SQMatchRepository from "~/features/sendouq-match/SQMatchRepository.server";
 import { i18next } from "~/modules/i18n/i18next.server";
 import { notFoundIfFalsy, parseParams } from "~/utils/remix.server";
@@ -84,5 +84,5 @@ export const loader = async ({ params, request }: LoaderFunctionArgs) => {
 		},
 	};
 
-	return await cors(request, json(result));
+	return await cors(request, Response.json(result));
 };

app/features/api-public/routes/team.$id.ts

@@ -1,6 +1,6 @@
-import { json, type LoaderFunctionArgs } from "@remix-run/node";
+import type { LoaderFunctionArgs } from "react-router";
 import { cors } from "remix-utils/cors";
-import { z } from "zod/v4";
+import { z } from "zod";
 import { db } from "~/db/sql";
 import { concatUserSubmittedImagePrefix } from "~/utils/kysely.server";
 import { notFoundIfFalsy, parseParams } from "~/utils/remix.server";
@@ -48,5 +48,5 @@ export const loader = async ({ params, request }: LoaderFunctionArgs) => {
 		teamPageUrl: `https://sendou.ink/t/${team.customUrl}`,
 	};
 
-	return await cors(request, json(result));
+	return await cors(request, Response.json(result));
 };

app/features/api-public/routes/tournament-match.$id.ts

@@ -1,7 +1,7 @@
-import { json, type LoaderFunctionArgs } from "@remix-run/node";
 import { jsonArrayFrom } from "kysely/helpers/sqlite";
+import type { LoaderFunctionArgs } from "react-router";
 import { cors } from "remix-utils/cors";
-import { z } from "zod/v4";
+import { z } from "zod";
 import { db } from "~/db/sql";
 import * as TournamentRepository from "~/features/tournament/TournamentRepository.server";
 import * as TournamentTeamRepository from "~/features/tournament/TournamentTeamRepository.server";
@@ -181,5 +181,5 @@ export const loader = async ({ params, request }: LoaderFunctionArgs) => {
 		roundName: roundNameWithoutMatchIdentifier ?? null,
 	};
 
-	return await cors(request, json(result));
+	return await cors(request, Response.json(result));
 };

app/features/api-public/routes/tournament.$id.brackets.$bidx.standings.ts

@@ -1,6 +1,6 @@
-import { json, type LoaderFunctionArgs } from "@remix-run/node";
+import type { LoaderFunctionArgs } from "react-router";
 import { cors } from "remix-utils/cors";
-import { z } from "zod/v4";
+import { z } from "zod";
 import { tournamentFromDB } from "~/features/tournament-bracket/core/Tournament.server";
 import { notFoundIfFalsy, parseParams } from "~/utils/remix.server";
 import { id } from "~/utils/zod";
@@ -37,5 +37,5 @@ export const loader = async ({ params, request }: LoaderFunctionArgs) => {
 		})),
 	};
 
-	return await cors(request, json(result));
+	return await cors(request, Response.json(result));
 };

app/features/api-public/routes/tournament.$id.brackets.$bidx.ts

@@ -1,6 +1,6 @@
-import { json, type LoaderFunctionArgs } from "@remix-run/node";
+import type { LoaderFunctionArgs } from "react-router";
 import { cors } from "remix-utils/cors";
-import { z } from "zod/v4";
+import { z } from "zod";
 import type { Bracket } from "~/features/tournament-bracket/core/Bracket";
 import { tournamentFromDB } from "~/features/tournament-bracket/core/Tournament.server";
 import { notFoundIfFalsy, parseParams } from "~/utils/remix.server";
@@ -51,7 +51,7 @@ export const loader = async ({ params, request }: LoaderFunctionArgs) => {
 		},
 	};
 
-	return await cors(request, json(result));
+	return await cors(request, Response.json(result));
 };
 
 function teams(bracket: Bracket) {

app/features/api-public/routes/tournament.$id.casted.ts

@@ -1,6 +1,6 @@
-import { json, type LoaderFunctionArgs } from "@remix-run/node";
+import type { LoaderFunctionArgs } from "react-router";
 import { cors } from "remix-utils/cors";
-import { z } from "zod/v4";
+import { z } from "zod";
 import { db } from "~/db/sql";
 import { notFoundIfFalsy, parseParams } from "~/utils/remix.server";
 import { id } from "~/utils/zod";
@@ -47,5 +47,5 @@ export const loader = async ({ params, request }: LoaderFunctionArgs) => {
 			})) ?? [],
 	};
 
-	return await cors(request, json(result));
+	return await cors(request, Response.json(result));
 };

app/features/api-public/routes/tournament.$id.players.ts

@@ -1,6 +1,6 @@
-import { json, type LoaderFunctionArgs } from "@remix-run/node";
+import type { LoaderFunctionArgs } from "react-router";
 import { cors } from "remix-utils/cors";
-import { z } from "zod/v4";
+import { z } from "zod";
 import * as TournamentMatchRepository from "~/features/tournament-bracket/TournamentMatchRepository.server";
 import { parseParams } from "~/utils/remix.server";
 import { id } from "~/utils/zod";
@@ -26,5 +26,5 @@ export const loader = async ({ params, request }: LoaderFunctionArgs) => {
 	const participants: GetTournamentPlayersResponse =
 		await TournamentMatchRepository.userParticipationByTournamentId(id);
 
-	return cors(request, json(participants));
+	return cors(request, Response.json(participants));
 };

app/features/api-public/routes/tournament.$id.teams.ts

@@ -1,7 +1,7 @@
-import { json, type LoaderFunctionArgs } from "@remix-run/node";
 import { jsonArrayFrom, jsonObjectFrom } from "kysely/helpers/sqlite";
+import type { LoaderFunctionArgs } from "react-router";
 import { cors } from "remix-utils/cors";
-import { z } from "zod/v4";
+import { z } from "zod";
 import { db } from "~/db/sql";
 import { ordinalToSp } from "~/features/mmr/mmr-utils";
 import * as TournamentRepository from "~/features/tournament/TournamentRepository.server";
@@ -168,7 +168,7 @@ export const loader = async ({ params, request }: LoaderFunctionArgs) => {
 		};
 	});
 
-	return await cors(request, json(result));
+	return await cors(request, Response.json(result));
 };
 
 function toSeedingPowerSP(ordinals: (number | null)[]) {

app/features/api-public/routes/tournament.$id.ts

@@ -1,7 +1,7 @@
-import { json, type LoaderFunctionArgs } from "@remix-run/node";
 import { jsonArrayFrom } from "kysely/helpers/sqlite";
+import type { LoaderFunctionArgs } from "react-router";
 import { cors } from "remix-utils/cors";
-import { z } from "zod/v4";
+import { z } from "zod";
 import { db } from "~/db/sql";
 import { databaseTimestampToDate } from "~/utils/dates";
 import { notFoundIfFalsy, parseParams } from "~/utils/remix.server";
@@ -84,5 +84,5 @@ export const loader = async ({ params, request }: LoaderFunctionArgs) => {
 		isFinalized: Boolean(tournament.isFinalized),
 	};
 
-	return await cors(request, json(result));
+	return await cors(request, Response.json(result));
 };

app/features/api-public/routes/user.$identifier.ids.ts

@@ -1,4 +1,4 @@
-import { json, type LoaderFunctionArgs } from "@remix-run/node";
+import type { LoaderFunctionArgs } from "react-router";
 import { cors } from "remix-utils/cors";
 import { z } from "zod/v4";
 import { identifierToUserIdQuery } from "~/features/user-page/UserRepository.server";
@@ -27,5 +27,5 @@ export const loader = async ({ params, request }: LoaderFunctionArgs) => {
 		customUrl: user.customUrl,
 	};
 
-	return await cors(request, json(result));
+	return await cors(request, Response.json(result));
 };

app/features/api-public/routes/user.$identifier.ts

@@ -1,7 +1,7 @@
-import { json, type LoaderFunctionArgs } from "@remix-run/node";
 import { jsonArrayFrom } from "kysely/helpers/sqlite";
+import type { LoaderFunctionArgs } from "react-router";
 import { cors } from "remix-utils/cors";
-import { z } from "zod/v4";
+import { z } from "zod";
 import { db } from "~/db/sql";
 import * as Seasons from "~/features/mmr/core/Seasons";
 import { userSkills as _userSkills } from "~/features/mmr/tiered.server";
@@ -144,5 +144,5 @@ export const loader = async ({ params, request }: LoaderFunctionArgs) => {
 		})),
 	};
 
-	return await cors(request, json(result));
+	return await cors(request, Response.json(result));
 };

app/features/api/actions/api.server.ts

@@ -1,5 +1,5 @@
-import type { ActionFunctionArgs } from "@remix-run/node";
-import { z } from "zod/v4";
+import type { ActionFunctionArgs } from "react-router";
+import { z } from "zod";
 import { refreshApiTokensCache } from "~/features/api-public/api-public-utils.server";
 import { requireUser } from "~/features/auth/core/user.server";
 import { parseRequestPayload, successToast } from "~/utils/remix.server";

app/features/api/loaders/api.server.ts

@@ -1,4 +1,4 @@
-import type { LoaderFunctionArgs } from "@remix-run/node";
+import type { LoaderFunctionArgs } from "react-router";
 import { requireUser } from "~/features/auth/core/user.server";
 import * as ApiRepository from "../ApiRepository.server";
 import { checkUserHasApiAccess } from "../core/perms";

app/features/api/routes/api.tsx

@@ -1,6 +1,6 @@
-import type { MetaFunction } from "@remix-run/node";
-import { useLoaderData } from "@remix-run/react";
 import { Trans, useTranslation } from "react-i18next";
+import type { MetaFunction } from "react-router";
+import { useLoaderData } from "react-router";
 import { CopyToClipboardPopover } from "~/components/CopyToClipboardPopover";
 import { SendouButton } from "~/components/elements/Button";
 import { FormMessage } from "~/components/FormMessage";

app/features/art/actions/art.new.server.ts

@@ -1,14 +1,11 @@
-import type { ActionFunction } from "@remix-run/node";
-import {
-	unstable_composeUploadHandlers as composeUploadHandlers,
-	unstable_createMemoryUploadHandler as createMemoryUploadHandler,
-	unstable_parseMultipartFormData as parseMultipartFormData,
-	redirect,
-} from "@remix-run/node";
+import type { FileUpload } from "@remix-run/form-data-parser";
+import { parseFormData as parseMultipartFormData } from "@remix-run/form-data-parser";
 import { nanoid } from "nanoid";
+import type { ActionFunction } from "react-router";
+import { redirect } from "react-router";
 import * as ArtRepository from "~/features/art/ArtRepository.server";
 import { requireUser } from "~/features/auth/core/user.server";
-import { s3UploadHandler } from "~/features/img-upload/s3.server";
+import { uploadStreamToS3 } from "~/features/img-upload/s3.server";
 import { notify } from "~/features/notifications/core/notify.server";
 import { requireRole } from "~/modules/permissions/guards.server";
 import { dateToDatabaseTimestamp } from "~/utils/dates";
@@ -69,10 +66,26 @@ export const action: ActionFunction = async ({ request }) => {
 			},
 		});
 	} else {
-		const uploadHandler = composeUploadHandlers(
-			s3UploadHandler(`art-${nanoid()}-${Date.now()}`),
-			createMemoryUploadHandler(),
-		);
+		const preDecidedFilename = `art-${nanoid()}-${Date.now()}`;
+
+		const uploadHandler = async (fileUpload: FileUpload) => {
+			if (
+				fileUpload.fieldName === "img" ||
+				fileUpload.fieldName === "smallImg"
+			) {
+				const [, ending] = fileUpload.name.split(".");
+				invariant(ending);
+				const newFilename = `${preDecidedFilename}${fileUpload.fieldName === "smallImg" ? "-small" : ""}.${ending}`;
+
+				const uploadedFileLocation = await uploadStreamToS3(
+					fileUpload.stream(),
+					newFilename,
+				);
+				return uploadedFileLocation;
+			}
+			return null;
+		};
+
 		const formData = await parseMultipartFormData(request, uploadHandler);
 		const imgSrc = formData.get("img") as string | null;
 		invariant(imgSrc);

app/features/art/art-schemas.server.ts

@@ -1,4 +1,4 @@
-import { z } from "zod/v4";
+import { z } from "zod";
 import {
 	_action,
 	checkboxValueToDbBoolean,

app/features/art/components/ArtGrid.tsx

@@ -1,7 +1,7 @@
-import { Link } from "@remix-run/react";
 import clsx from "clsx";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
+import { Link } from "react-router";
 import { Avatar } from "~/components/Avatar";
 import { LinkButton, SendouButton } from "~/components/elements/Button";
 import { SendouDialog } from "~/components/elements/Dialog";

app/features/art/loaders/art.new.server.ts

@@ -1,4 +1,4 @@
-import type { LoaderFunctionArgs } from "@remix-run/node";
+import type { LoaderFunctionArgs } from "react-router";
 import { requireUser } from "~/features/auth/core/user.server";
 import * as ArtRepository from "../ArtRepository.server";
 import { NEW_ART_EXISTING_SEARCH_PARAM_KEY } from "../art-constants";

app/features/art/loaders/art.server.ts

@@ -1,5 +1,5 @@
 import cachified from "@epic-web/cachified";
-import type { LoaderFunctionArgs } from "@remix-run/node";
+import type { LoaderFunctionArgs } from "react-router";
 import { cache, IN_MILLISECONDS, ttl } from "~/utils/cache.server";
 import * as ArtRepository from "../ArtRepository.server";
 import { FILTERED_TAG_KEY_SEARCH_PARAM_KEY } from "../art-constants";

app/features/art/routes/art.new.tsx

@@ -1,9 +1,9 @@
-import type { MetaFunction } from "@remix-run/node";
-import { Form, useFetcher, useLoaderData } from "@remix-run/react";
 import Compressor from "compressorjs";
 import { nanoid } from "nanoid";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
+import type { MetaFunction } from "react-router";
+import { Form, useFetcher, useLoaderData } from "react-router";
 import { Alert } from "~/components/Alert";
 import { SendouButton } from "~/components/elements/Button";
 import { SendouSwitch } from "~/components/elements/Switch";

app/features/art/routes/art.tsx

@@ -1,9 +1,8 @@
-import type { MetaFunction, SerializeFrom } from "@remix-run/node";
-import type { ShouldRevalidateFunction } from "@remix-run/react";
-import { useLoaderData, useSearchParams } from "@remix-run/react";
 import clsx from "clsx";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
+import type { MetaFunction, ShouldRevalidateFunction } from "react-router";
+import { useLoaderData, useSearchParams } from "react-router";
 import { AddNewButton } from "~/components/AddNewButton";
 import { SendouButton } from "~/components/elements/Button";
 import { SendouSwitch } from "~/components/elements/Switch";
@@ -18,7 +17,7 @@ import { Label } from "~/components/Label";
 import { Main } from "~/components/Main";
 import type { SendouRouteHandle } from "~/utils/remix.server";
 import { artPage, navIconUrl, newArtPage } from "~/utils/urls";
-import { metaTags } from "../../../utils/remix";
+import { metaTags, type SerializeFrom } from "../../../utils/remix";
 import { FILTERED_TAG_KEY_SEARCH_PARAM_KEY } from "../art-constants";
 import { ArtGrid } from "../components/ArtGrid";
 import { TagSelect } from "../components/TagSelect";

app/features/articles/articles-schemas.server.ts

@@ -1,4 +1,4 @@
-import { z } from "zod/v4";
+import { z } from "zod";
 
 const authorName = z.string().min(1);
 

app/features/articles/core/bySlug.server.ts

@@ -1,7 +1,7 @@
 import fs from "node:fs";
 import path from "node:path";
 import matter from "gray-matter";
-import { ZodError, type z } from "zod/v4";
+import { ZodError, type z } from "zod";
 import { ARTICLES_FOLDER_PATH } from "../articles-constants";
 import { articleDataSchema } from "../articles-schemas.server";
 

app/features/articles/loaders/a.$slug.server.ts

@@ -1,4 +1,4 @@
-import type { LoaderFunctionArgs } from "@remix-run/node";
+import type { LoaderFunctionArgs } from "react-router";
 import invariant from "~/utils/invariant";
 import { notFoundIfFalsy } from "~/utils/remix.server";
 import { articleBySlug } from "../core/bySlug.server";

app/features/articles/routes/a.$slug.tsx

@@ -1,7 +1,7 @@
-import type { MetaFunction, SerializeFrom } from "@remix-run/node";
-import { Link, useLoaderData } from "@remix-run/react";
 import Markdown from "markdown-to-jsx";
 import * as React from "react";
+import type { MetaFunction } from "react-router";
+import { Link, useLoaderData } from "react-router";
 import { Main } from "~/components/Main";
 import invariant from "~/utils/invariant";
 import type { SendouRouteHandle } from "~/utils/remix.server";
@@ -11,7 +11,7 @@ import {
 	articlePreviewUrl,
 	navIconUrl,
 } from "~/utils/urls";
-import { metaTags } from "../../../utils/remix";
+import { metaTags, type SerializeFrom } from "../../../utils/remix";
 
 import { loader } from "../loaders/a.$slug.server";
 export { loader };

app/features/articles/routes/a.tsx

@@ -1,6 +1,6 @@
-import type { MetaFunction } from "@remix-run/node";
-import { Link, useLoaderData } from "@remix-run/react";
 import { useTranslation } from "react-i18next";
+import type { MetaFunction } from "react-router";
+import { Link, useLoaderData } from "react-router";
 import { Main } from "~/components/Main";
 import type { SendouRouteHandle } from "~/utils/remix.server";
 import { ARTICLES_MAIN_PAGE, articlePage, navIconUrl } from "~/utils/urls";

app/features/associations/actions/associations.new.server.ts

@@ -1,4 +1,4 @@
-import { type ActionFunctionArgs, redirect } from "@remix-run/node";
+import { type ActionFunctionArgs, redirect } from "react-router";
 import { ASSOCIATION } from "~/features/associations/associations-constants";
 import { createNewAssociationSchema } from "~/features/associations/associations-schemas";
 import { requireUser } from "~/features/auth/core/user.server";

app/features/associations/actions/associations.server.ts

@@ -1,4 +1,4 @@
-import type { ActionFunctionArgs } from "@remix-run/node";
+import type { ActionFunctionArgs } from "react-router";
 import { ASSOCIATION } from "~/features/associations/associations-constants";
 import { associationsPageActionSchema } from "~/features/associations/associations-schemas";
 import { requireUser } from "~/features/auth/core/user.server";

app/features/associations/associations-schemas.ts

@@ -1,4 +1,4 @@
-import { z } from "zod/v4";
+import { z } from "zod";
 import { _action, id, inviteCode, safeStringSchema } from "~/utils/zod";
 import { ASSOCIATION } from "./associations-constants";
 

app/features/associations/loaders/associations.server.ts

@@ -1,4 +1,4 @@
-import type { LoaderFunctionArgs } from "@remix-run/node";
+import type { LoaderFunctionArgs } from "react-router";
 import { requireUserId } from "~/features/auth/core/user.server";
 import type { SerializeFrom } from "~/utils/remix";
 import { parseSafeSearchParams } from "~/utils/remix.server";

app/features/associations/routes/associations.new.tsx

@@ -1,5 +1,5 @@
 import { useTranslation } from "react-i18next";
-import type { z } from "zod/v4";
+import type { z } from "zod";
 import { SendouDialog } from "~/components/elements/Dialog";
 import { InputFormField } from "~/components/form/InputFormField";
 import { SendouForm } from "~/components/form/SendouForm";

app/features/associations/routes/associations.tsx

@@ -1,6 +1,6 @@
-import { Link, Outlet, useFetcher, useLoaderData } from "@remix-run/react";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
+import { Link, Outlet, useFetcher, useLoaderData } from "react-router";
 import { useCopyToClipboard } from "react-use";
 import { AddNewButton } from "~/components/AddNewButton";
 import { Avatar } from "~/components/Avatar";

app/features/auth/core/DiscordStrategy.server.ts

@@ -1,5 +1,5 @@
 import { OAuth2Strategy } from "remix-auth-oauth2";
-import { z } from "zod/v4";
+import { z } from "zod";
 import * as UserRepository from "~/features/user-page/UserRepository.server";
 import invariant from "~/utils/invariant";
 import { logger } from "~/utils/logger";

app/features/auth/core/routes.server.ts

@@ -1,7 +1,7 @@
-import type { ActionFunction, LoaderFunction } from "@remix-run/node";
-import { redirect } from "@remix-run/node";
 import { isbot } from "isbot";
-import { z } from "zod/v4";
+import type { ActionFunction, LoaderFunction } from "react-router";
+import { redirect } from "react-router";
+import { z } from "zod";
 import { DANGEROUS_CAN_ACCESS_DEV_CONTROLS } from "~/features/admin/core/dev-controls";
 import * as UserRepository from "~/features/user-page/UserRepository.server";
 import { requireRole } from "~/modules/permissions/guards.server";

app/features/auth/core/session.server.ts

@@ -1,4 +1,4 @@
-import { createCookieSessionStorage } from "@remix-run/node";
+import { createCookieSessionStorage } from "react-router";
 import { IS_E2E_TEST_RUN } from "~/utils/e2e";
 import invariant from "~/utils/invariant";
 

app/features/auth/core/user.server.ts

@@ -1,4 +1,4 @@
-import { redirect } from "@remix-run/node";
+import { redirect } from "react-router";
 import type { Tables } from "~/db/tables";
 import { userIsBanned } from "~/features/ban/core/banned.server";
 import * as UserRepository from "~/features/user-page/UserRepository.server";

app/features/auth/core/user.ts

@@ -1,4 +1,4 @@
-import { useMatches } from "@remix-run/react";
+import { useMatches } from "react-router";
 import type { RootLoaderData } from "~/root";
 
 export function useUser() {

app/features/badges/actions/badges.$id.edit.server.ts

@@ -1,6 +1,6 @@
-import type { ActionFunction } from "@remix-run/node";
-import { redirect } from "@remix-run/node";
-import { z } from "zod/v4";
+import type { ActionFunction } from "react-router";
+import { redirect } from "react-router";
+import { z } from "zod";
 import { requireUser } from "~/features/auth/core/user.server";
 import { notify } from "~/features/notifications/core/notify.server";
 import {

app/features/badges/badges-schemas.server.ts

@@ -1,4 +1,4 @@
-import { z } from "zod/v4";
+import { z } from "zod";
 import { _action, id, noDuplicates, safeJSONParse } from "~/utils/zod";
 
 export const editBadgeActionSchema = z.union([

app/features/badges/loaders/badges.$id.server.ts

@@ -1,4 +1,4 @@
-import type { LoaderFunctionArgs } from "@remix-run/node";
+import type { LoaderFunctionArgs } from "react-router";
 import type { SerializeFrom } from "~/utils/remix";
 import { notFoundIfFalsy, parseParams } from "~/utils/remix.server";
 import { idObject } from "~/utils/zod";

app/features/badges/loaders/badges.server.ts

@@ -1,4 +1,4 @@
-import type { SerializeFrom } from "@remix-run/node";
+import type { SerializeFrom } from "~/utils/remix";
 import * as BadgeRepository from "../BadgeRepository.server";
 
 export type BadgesLoaderData = SerializeFrom<typeof loader>;

app/features/badges/routes/badges.$id.edit.tsx

@@ -1,5 +1,5 @@
-import { Form, useMatches, useOutletContext } from "@remix-run/react";
 import * as React from "react";
+import { Form, useMatches, useOutletContext } from "react-router";
 import { Divider } from "~/components/Divider";
 import { SendouButton } from "~/components/elements/Button";
 import { SendouDialog } from "~/components/elements/Dialog";

app/features/badges/routes/badges.$id.tsx

@@ -1,6 +1,6 @@
-import { Link, Outlet, useLoaderData } from "@remix-run/react";
 import clsx from "clsx";
 import { Trans, useTranslation } from "react-i18next";
+import { Link, Outlet, useLoaderData } from "react-router";
 import { Badge } from "~/components/Badge";
 import { LinkButton } from "~/components/elements/Button";
 import { useHasPermission, useHasRole } from "~/modules/permissions/hooks";

app/features/badges/routes/badges.tsx

@@ -1,7 +1,7 @@
-import type { MetaFunction } from "@remix-run/node";
-import { NavLink, Outlet, useLoaderData } from "@remix-run/react";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
+import type { MetaFunction } from "react-router";
+import { NavLink, Outlet, useLoaderData } from "react-router";
 import { Badge } from "~/components/Badge";
 import { Divider } from "~/components/Divider";
 import { Input } from "~/components/Input";

app/features/ban/loaders/suspended.server.ts

@@ -1,4 +1,4 @@
-import { type LoaderFunctionArgs, redirect } from "@remix-run/node";
+import { type LoaderFunctionArgs, redirect } from "react-router";
 import * as AdminRepository from "~/features/admin/AdminRepository.server";
 import {
 	IMPERSONATED_SESSION_KEY,

app/features/ban/routes/suspended.tsx

@@ -1,4 +1,4 @@
-import { useLoaderData } from "@remix-run/react";
+import { useLoaderData } from "react-router";
 import { Main } from "~/components/Main";
 import { useTimeFormat } from "~/hooks/useTimeFormat";
 import { databaseTimestampToDate } from "~/utils/dates";

app/features/build-analyzer/analyzer-hooks.ts

@@ -1,4 +1,4 @@
-import { useSearchParams } from "@remix-run/react";
+import { useSearchParams } from "react-router";
 import { abilities } from "~/modules/in-game-lists/abilities";
 import type {
 	Ability,

app/features/build-analyzer/routes/analyzer.tsx

@@ -1,9 +1,8 @@
-import type { MetaFunction } from "@remix-run/node";
-import type { ShouldRevalidateFunction } from "@remix-run/react";
-import { Link } from "@remix-run/react";
 import clsx from "clsx";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
+import type { MetaFunction, ShouldRevalidateFunction } from "react-router";
+import { Link } from "react-router";
 import * as R from "remeda";
 import { AbilitiesSelector } from "~/components/AbilitiesSelector";
 import { Ability } from "~/components/Ability";

app/features/build-stats/loaders/builds.$slug.popular.server.ts

@@ -1,5 +1,5 @@
 import { cachified } from "@epic-web/cachified";
-import type { LoaderFunctionArgs } from "@remix-run/node";
+import type { LoaderFunctionArgs } from "react-router";
 import * as BuildRepository from "~/features/builds/BuildRepository.server";
 import { i18next } from "~/modules/i18n/i18next.server";
 import { cache, IN_MILLISECONDS, ttl } from "~/utils/cache.server";

app/features/build-stats/loaders/builds.$slug.stats.server.ts

@@ -1,5 +1,5 @@
 import { cachified } from "@epic-web/cachified";
-import type { LoaderFunctionArgs } from "@remix-run/node";
+import type { LoaderFunctionArgs } from "react-router";
 import * as BuildRepository from "~/features/builds/BuildRepository.server";
 import { i18next } from "~/modules/i18n/i18next.server";
 import { cache } from "~/utils/cache.server";

app/features/build-stats/routes/builds.$slug.popular.tsx

@@ -1,7 +1,7 @@
-import type { MetaFunction, SerializeFrom } from "@remix-run/node";
-import { useLoaderData } from "@remix-run/react";
 import clsx from "clsx";
 import { useTranslation } from "react-i18next";
+import type { MetaFunction } from "react-router";
+import { useLoaderData } from "react-router";
 import { Ability } from "~/components/Ability";
 import { Main } from "~/components/Main";
 import type { SendouRouteHandle } from "~/utils/remix.server";
@@ -11,7 +11,7 @@ import {
 	outlinedMainWeaponImageUrl,
 	weaponBuildPage,
 } from "~/utils/urls";
-import { metaTags } from "../../../utils/remix";
+import { metaTags, type SerializeFrom } from "../../../utils/remix";
 
 import { loader } from "../loaders/builds.$slug.popular.server";
 export { loader };

app/features/build-stats/routes/builds.$slug.stats.tsx

@@ -1,6 +1,6 @@
-import type { MetaFunction, SerializeFrom } from "@remix-run/node";
-import { useLoaderData } from "@remix-run/react";
 import { useTranslation } from "react-i18next";
+import type { MetaFunction } from "react-router";
+import { useLoaderData } from "react-router";
 import { Ability } from "~/components/Ability";
 import { WeaponImage } from "~/components/Image";
 import { Main } from "~/components/Main";
@@ -11,7 +11,7 @@ import {
 	outlinedMainWeaponImageUrl,
 	weaponBuildPage,
 } from "~/utils/urls";
-import { metaTags } from "../../../utils/remix";
+import { metaTags, type SerializeFrom } from "../../../utils/remix";
 
 import { loader } from "../loaders/builds.$slug.stats.server";
 export { loader };

app/features/builds/builds-schemas.server.ts

@@ -1,4 +1,4 @@
-import { z } from "zod/v4";
+import { z } from "zod";
 import { ability, modeShort, safeJSONParse } from "~/utils/zod";
 import { MAX_BUILD_FILTERS } from "./builds-constants";
 

app/features/builds/loaders/builds.$slug.server.ts

@@ -1,4 +1,4 @@
-import type { LoaderFunctionArgs } from "@remix-run/node";
+import type { LoaderFunctionArgs } from "react-router";
 import { getUser } from "~/features/auth/core/user.server";
 import { i18next } from "~/modules/i18n/i18next.server";
 import { weaponIdToType } from "~/modules/in-game-lists/weapon-ids";

app/features/builds/routes/builds.$slug.tsx

@@ -1,12 +1,12 @@
-import type { MetaFunction, SerializeFrom } from "@remix-run/node";
+import { nanoid } from "nanoid";
+import * as React from "react";
+import { useTranslation } from "react-i18next";
+import type { MetaFunction } from "react-router";
 import {
 	type ShouldRevalidateFunction,
 	useLoaderData,
 	useSearchParams,
-} from "@remix-run/react";
-import { nanoid } from "nanoid";
-import * as React from "react";
-import { useTranslation } from "react-i18next";
+} from "react-router";
 import * as R from "remeda";
 import { BuildCard } from "~/components/BuildCard";
 import { LinkButton, SendouButton } from "~/components/elements/Button";
@@ -19,7 +19,7 @@ import { FireIcon } from "~/components/icons/Fire";
 import { MapIcon } from "~/components/icons/Map";
 import { Main } from "~/components/Main";
 import { safeJSONParse } from "~/utils/json";
-import { isRevalidation, metaTags } from "~/utils/remix";
+import { isRevalidation, metaTags, type SerializeFrom } from "~/utils/remix";
 import type { SendouRouteHandle } from "~/utils/remix.server";
 import type { Unpacked } from "~/utils/types";
 import {

app/features/builds/routes/builds.tsx

@@ -1,7 +1,7 @@
-import type { MetaFunction } from "@remix-run/node";
-import { Link } from "@remix-run/react";
 import * as React from "react";
 import { useTranslation } from "react-i18next";
+import type { MetaFunction } from "react-router";
+import { Link } from "react-router";
 import { AddNewButton } from "~/components/AddNewButton";
 import { Image } from "~/components/Image";
 import { Main } from "~/components/Main";

app/features/calendar/actions/calendar.$id.report-winners.server.ts

@@ -1,5 +1,5 @@
-import type { ActionFunction } from "@remix-run/node";
-import { redirect } from "@remix-run/node";
+import type { ActionFunction } from "react-router";
+import { redirect } from "react-router";
 import { requireUserId } from "~/features/auth/core/user.server";
 import * as CalendarRepository from "~/features/calendar/CalendarRepository.server";
 import {

app/features/calendar/actions/calendar.$id.server.ts

@@ -1,6 +1,6 @@
-import type { ActionFunction } from "@remix-run/node";
-import { redirect } from "@remix-run/node";
-import { z } from "zod/v4";
+import type { ActionFunction } from "react-router";
+import { redirect } from "react-router";
+import { z } from "zod";
 import { requireUserId } from "~/features/auth/core/user.server";
 import * as CalendarRepository from "~/features/calendar/CalendarRepository.server";
 import * as ShowcaseTournaments from "~/features/front-page/core/ShowcaseTournaments.server";

app/features/calendar/actions/calendar.new.server.ts

@@ -1,5 +1,5 @@
-import type { ActionFunction } from "@remix-run/node";
-import { redirect } from "@remix-run/node";
+import type { ActionFunction } from "react-router";
+import { redirect } from "react-router";
 import type { CalendarEventTag } from "~/db/tables";
 import { requireUser } from "~/features/auth/core/user.server";
 import * as BadgeRepository from "~/features/badges/BadgeRepository.server";

app/features/calendar/actions/calendar.tsx

@@ -1,4 +1,4 @@
-import { type ActionFunctionArgs, redirect } from "@remix-run/node";
+import { type ActionFunctionArgs, redirect } from "react-router";
 import { requireUserId } from "~/features/auth/core/user.server";
 import { calendarFiltersSearchParamsSchema } from "~/features/calendar/calendar-schemas";
 import * as UserRepository from "~/features/user-page/UserRepository.server";

app/features/calendar/calendar-schemas.server.ts

@@ -1,4 +1,4 @@
-import { z } from "zod/v4";
+import { z } from "zod";
 import * as CalendarRepository from "~/features/calendar/CalendarRepository.server";
 import {
 	bracketProgressionSchema,

app/features/calendar/calendar-schemas.ts

@@ -1,4 +1,4 @@
-import { z } from "zod/v4";
+import { z } from "zod";
 import { type CalendarEventTag, TOURNAMENT_STAGE_TYPES } from "~/db/tables";
 import { TOURNAMENT } from "~/features/tournament/tournament-constants";
 import * as Progression from "~/features/tournament-bracket/core/Progression";

app/features/calendar/calendar-types.ts

@@ -1,4 +1,4 @@
-import type { z } from "zod/v4";
+import type { z } from "zod";
 import type { CalendarEventTag, Tables } from "~/db/tables";
 import type { calendarFiltersSearchParamsSchema } from "~/features/calendar/calendar-schemas";
 import type { ModeShortWithSpecial } from "~/modules/in-game-lists/types";

app/features/calendar/components/FiltersDialog.tsx

@@ -1,8 +1,8 @@
 import { standardSchemaResolver } from "@hookform/resolvers/standard-schema";
-import { useFetcher, useSearchParams } from "@remix-run/react";
 import * as React from "react";
 import { FormProvider, useForm } from "react-hook-form";
 import { useTranslation } from "react-i18next";
+import { useFetcher, useSearchParams } from "react-router";
 import { SendouButton } from "~/components/elements/Button";
 import { SendouDialog } from "~/components/elements/Dialog";
 import { InputFormField } from "~/components/form/InputFormField";

app/features/calendar/components/TournamentCard.tsx

@@ -1,6 +1,6 @@
-import { Link } from "@remix-run/react";
 import clsx from "clsx";
 import { useTranslation } from "react-i18next";
+import { Link } from "react-router";
 import { SendouButton } from "~/components/elements/Button";
 import { SendouPopover } from "~/components/elements/Popover";
 import { Flag } from "~/components/Flag";