Fix: Resolve errors from untested previous commit

src/app.tsx

@@ -2,7 +2,7 @@
 import "@fortawesome/fontawesome-svg-core/styles.css";
 import { Meta, MetaProvider, Title } from "@solidjs/meta";
 import { Router } from "@solidjs/router";
-import { FileRoutes } from "@solidjs/start";
+import { FileRoutes } from "@solidjs/start/router";
 import { Suspense } from "solid-js";
 import "./styles/global.scss";
 

src/entry-server.tsx

@@ -1,3 +1,4 @@
+// @refresh reload
 import { StartServer, createHandler } from "@solidjs/start/server";
 
 export default createHandler(() => (

src/middleware.ts

@@ -12,8 +12,8 @@ let started: boolean = false;
 export default createMiddleware({
   onRequest: async (event) => {
     if (event.nativeEvent.node.req.method !== "GET") {
-      const originHeader = getHeader(event, "Origin") ?? null;
-      const hostHeader = getHeader(event, "Host") ?? null;
+      const originHeader = getHeader(event.nativeEvent, "Origin") ?? null;
+      const hostHeader = getHeader(event.nativeEvent, "Host") ?? null;
       if (
         !originHeader ||
         !hostHeader ||
@@ -24,7 +24,8 @@ export default createMiddleware({
       }
     }
 
-    const sessionId = getCookie(event, lucia.sessionCookieName) ?? null;
+    const sessionId =
+      getCookie(event.nativeEvent, lucia.sessionCookieName) ?? null;
     if (!sessionId) {
       event.nativeEvent.context.session = null;
       event.nativeEvent.context.user = null;
@@ -34,18 +35,19 @@ export default createMiddleware({
     const { session, user } = await lucia.validateSession(sessionId);
     if (session && session.fresh) {
       appendHeader(
-        event,
+        event.nativeEvent,
         "Set-Cookie",
         lucia.createSessionCookie(session.id).serialize(),
       );
     }
     if (!session) {
       appendHeader(
-        event,
+        event.nativeEvent,
         "Set-Cookie",
         lucia.createBlankSessionCookie().serialize(),
       );
     }
+    console.log(3);
     event.nativeEvent.context.session = session;
     event.nativeEvent.context.user = user;
   },

src/routes/api/[guildId]/config.ts

@@ -1,4 +1,4 @@
-import { APIEvent } from "@solidjs/start/server/types";
+import { APIEvent } from "@solidjs/start/server";
 import { eq } from "drizzle-orm";
 import db from "~/drizzle";
 import { guilds } from "~/drizzle/schema";

src/routes/api/[guildId]/matches.ts

@@ -1,4 +1,4 @@
-import { APIEvent } from "@solidjs/start/server/types";
+import { APIEvent } from "@solidjs/start/server";
 import { eq } from "drizzle-orm";
 import db from "~/drizzle";
 import { guilds, matches } from "~/drizzle/schema";
@@ -40,8 +40,6 @@ export const GET = async (
 
   if (!guild) return ErrorResponse("NOT_FOUND");
 
-  if (guild.matches.length < 1) return Res("NO_CONTENT", null);
-
   return Res("OK", {
     matches: buildMatches(guild.matches),
     timezone: guild.timezone,

src/routes/api/[guildId]/timePlanning.ts

@@ -1,4 +1,4 @@
-import { APIEvent } from "@solidjs/start/server/types";
+import { APIEvent } from "@solidjs/start/server";
 import { and, eq } from "drizzle-orm";
 import db from "~/drizzle";
 import { guilds, tpMessages } from "~/drizzle/schema";

src/routes/api/auth/callback/discord.ts

@@ -1,5 +1,5 @@
 import { createId } from "@paralleldrive/cuid2";
-import { APIEvent } from "@solidjs/start/server/types";
+import { APIEvent } from "@solidjs/start/server";
 import { OAuth2RequestError } from "arctic";
 import { eq } from "drizzle-orm";
 import httpStatus from "http-status";

src/routes/api/auth/login.ts

@@ -1,4 +1,4 @@
-import { APIEvent } from "@solidjs/start/server/types";
+import { APIEvent } from "@solidjs/start/server";
 import { generateState } from "arctic";
 import httpStatus from "http-status";
 import { setCookie } from "vinxi/http";

src/routes/api/auth/logout.ts

@@ -1,4 +1,4 @@
-import { APIEvent } from "@solidjs/start/server/types";
+import { APIEvent } from "@solidjs/start/server";
 import httpStatus from "http-status";
 import { appendHeader } from "vinxi/http";
 import { lucia } from "~/lib/auth";

src/routes/api/boot.ts

@@ -1,4 +1,4 @@
-import { APIEvent } from "@solidjs/start/server/types";
+import { APIEvent } from "@solidjs/start/server";
 import { eq } from "drizzle-orm";
 import db from "~/drizzle";
 import { guilds } from "~/drizzle/schema";