Update middlewares

Author: brophdawg11

app/modules/http-utils/ensure-secure.ts

@@ -1,10 +1,8 @@
-import { redirect } from "react-router";
-import type { Route } from "../../+types/root";
+import { redirect, type unstable_MiddlewareFunction } from "react-router";
 
-export const ensureSecure: Route.unstable_MiddlewareFunction = async (
-  { request },
-  next
-) => {
+export const ensureSecure: unstable_MiddlewareFunction = async ({
+  request,
+}) => {
   let proto = request.headers.get("x-forwarded-proto");
   // this indirectly allows `http://localhost` because there is no
   // "x-forwarded-proto" in the local server headers
@@ -13,7 +11,4 @@ export const ensureSecure: Route.unstable_MiddlewareFunction = async (
     secureUrl.protocol = "https:";
     throw redirect(secureUrl.toString());
   }
-  // FIXME: Update RR to auto-bubble the internal response if `next` isn't
-  // called so we can omit the return value
-  return next();
 };

app/modules/http-utils/remove-slashes.ts

@@ -1,16 +1,11 @@
-import { redirect } from "react-router";
-import type { Route } from "../../+types/root";
+import { redirect, type unstable_MiddlewareFunction } from "react-router";
 
-export const removeTrailingSlashes: Route.unstable_MiddlewareFunction = async (
-  { request },
-  next
-) => {
+export const removeTrailingSlashes: unstable_MiddlewareFunction = async ({
+  request,
+}) => {
   let url = new URL(request.url);
   if (url.pathname.endsWith("/") && url.pathname !== "/") {
     url.pathname = url.pathname.slice(0, -1);
     throw redirect(url.toString());
   }
-  // FIXME: Update RR to auto-bubble the internal response if `next` isn't
-  // called so we can omit the return value
-  return next();
 };

app/modules/redirects/.server/index.ts

@@ -1,4 +1,4 @@
-import type { Route } from "../../../+types/root";
+import { type unstable_MiddlewareFunction } from "react-router";
 import { checkUrl } from "./check-url";
 import { getRedirects } from "./get-redirects";
 
@@ -15,15 +15,11 @@ import { getRedirects } from "./get-redirects";
  *
  * @param request Web Fetch Request to possibly redirect
  */
-export const handleRedirects: Route.unstable_MiddlewareFunction = async (
-  { request },
-  next
-) => {
+export const handleRedirects: unstable_MiddlewareFunction = async ({
+  request,
+}) => {
   let redirects = await getRedirects();
   let url = new URL(request.url);
   let response = await checkUrl(url.pathname, redirects);
   if (response) throw response;
-  // FIXME: Update RR to auto-bubble the internal response if `next` isn't
-  // called so we can omit the return value
-  return next();
 };