Merge branch 'main'

Author: IgnisDa

apps/frontend/app/lib/utilities.server.ts

@@ -1,7 +1,6 @@
 import { parseWithZod } from "@conform-to/zod";
 import { $path } from "@ignisda/remix-routes";
 import {
-	json,
 	redirect,
 	unstable_composeUploadHandlers,
 	unstable_createMemoryUploadHandler,
@@ -141,9 +140,11 @@ export const processSubmission = <Schema extends ZodTypeAny>(
 ): output<Schema> => {
 	const submission = parseWithZod(formData, { schema });
 	if (submission.status !== "success")
-		throw json({ status: "idle", submission } as const);
+		throw Response.json({ status: "idle", submission } as const);
 	if (!submission.value)
-		throw json({ status: "error", submission } as const, { status: 400 });
+		throw Response.json({ status: "error", submission } as const, {
+			status: 400,
+		});
 	return submission.value;
 };
 

apps/frontend/app/root.tsx

@@ -12,9 +12,8 @@ import "@mantine/core/styles.css";
 import "@mantine/notifications/styles.css";
 import {
 	type LinksFunction,
-	type LoaderFunctionArgs,
 	type MetaFunction,
-	json,
+	unstable_defineLoader,
 } from "@remix-run/node";
 import {
 	Links,
@@ -92,17 +91,17 @@ export const links: LinksFunction = () => {
 	];
 };
 
-export const loader = async ({ request }: LoaderFunctionArgs) => {
+export const loader = unstable_defineLoader(async ({ request }) => {
 	const { toast, headers: toastHeaders } = await getToast(request);
 	const colorScheme = await colorSchemeCookie.parse(
 		request.headers.get("cookie") || "",
 	);
 	const defaultColorScheme = colorScheme || "light";
-	return json(
+	return Response.json(
 		{ toast, defaultColorScheme },
 		{ headers: combineHeaders(toastHeaders) },
 	);
-};
+});
 
 const queryClient = new QueryClient();
 

apps/frontend/app/routes/_dashboard._index.tsx

@@ -60,8 +60,8 @@ import {
 
 const cookieName = CurrentWorkoutKey;
 
-const getTake = (prefs: UserPreferences, el: DashboardElementLot) => {
-	const t = prefs.general.dashboard.find(
+const getTake = (preferences: UserPreferences, el: DashboardElementLot) => {
+	const t = preferences.general.dashboard.find(
 		(de) => de.section === el,
 	)?.numElements;
 	invariant(typeof t === "number", `No take found for ${el}`);

apps/frontend/app/routes/_dashboard.media.$action.$lot.tsx

@@ -108,7 +108,7 @@ const metadataMapping = {
 	[MediaLot.Movie]: [MediaSource.Tmdb],
 	[MediaLot.Show]: [MediaSource.Tmdb],
 	[MediaLot.VisualNovel]: [MediaSource.Vndb],
-} as const;
+};
 
 export const loader = unstable_defineLoader(async ({ request, params }) => {
 	const [

apps/frontend/app/routes/actions.tsx

@@ -197,7 +197,11 @@ export const action = unstable_defineAction(async ({ request, response }) => {
 		response.headers.append("Location", redirectTo.toString());
 		response.status = 302;
 	}
-	return returnData;
+	// FIXME Once https://discord.com/channels/770287896669978684/1251219797098762290 is resolved
+	return Response.json(returnData, {
+		headers: response.headers,
+		status: response.status,
+	});
 });
 
 const commitMediaSchema = z.object({

apps/frontend/app/routes/api.auth.tsx

@@ -1,5 +1,5 @@
 import { $path } from "@ignisda/remix-routes";
-import { type LoaderFunctionArgs, redirect } from "@remix-run/node";
+import { redirect, unstable_defineLoader } from "@remix-run/node";
 import {
 	CoreDetailsDocument,
 	GetOidcTokenDocument,
@@ -19,7 +19,7 @@ const searchParamsSchema = z.object({ code: z.string() });
 
 export type SearchParams = z.infer<typeof searchParamsSchema>;
 
-export const loader = async ({ request }: LoaderFunctionArgs) => {
+export const loader = unstable_defineLoader(async ({ request }) => {
 	const input = zx.parseQuery(request, searchParamsSchema);
 	const { getOidcToken } = await gqlClient.request(GetOidcTokenDocument, input);
 	const oidcInput = {
@@ -43,5 +43,5 @@ export const loader = async ({ request }: LoaderFunctionArgs) => {
 			),
 		});
 	}
-	return Response.json({ input });
-};
+	return { input };
+});

apps/frontend/app/routes/api.fitness.exercises.$id.tsx

@@ -1,12 +1,12 @@
-import type { LoaderFunctionArgs } from "@remix-run/node";
+import { unstable_defineLoader } from "@remix-run/node";
 import {
 	ExerciseDetailsDocument,
 	UserExerciseDetailsDocument,
 } from "@ryot/generated/graphql/backend/graphql";
 import invariant from "tiny-invariant";
 import { getAuthorizationHeader, gqlClient } from "~/lib/utilities.server";
 
-export const loader = async ({ request, params }: LoaderFunctionArgs) => {
+export const loader = unstable_defineLoader(async ({ request, params }) => {
 	const exerciseId = params.id;
 	invariant(exerciseId, "No exercise ID provided");
 	const [{ exerciseDetails }, { userExerciseDetails }] = await Promise.all([
@@ -21,4 +21,4 @@ export const loader = async ({ request, params }: LoaderFunctionArgs) => {
 		details: { images: exerciseDetails.attributes.images },
 		history: userExerciseDetails.history,
 	};
-};
+});