Upgrade SolidStart to v1

package.json

@@ -13,5 +13,8 @@
 		"prettier": "^3.0.3",
 		"prettier-plugin-astro": "^0.12.0",
 		"prettier-plugin-svelte": "^3.0.3"
+	},
+	"dependencies": {
+		"typescript": "^5.4.5"
 	}
 }

solidstart/github-oauth/vite.config.ts → solidstart/github-oauth/app.config.ts

@@ -1,7 +1,5 @@
 import { defineConfig } from "@solidjs/start/config";
 
 export default defineConfig({
-	start: {
-		middleware: "./src/middleware.ts"
-	}
+	middleware: "./src/middleware.ts"
 });

solidstart/github-oauth/package.json

@@ -7,20 +7,18 @@
 		"start": "node ./.output/server/index.mjs"
 	},
 	"dependencies": {
-		"@lucia-auth/adapter-sqlite": "^3.0.0",
-		"@solidjs/router": "^0.10.5",
-		"@solidjs/start": "^0.4.2",
-		"arctic": "^0.10.2",
-		"better-sqlite3": "^9.2.2",
-		"lucia": "^3.0.1",
-		"oslo": "^1.0.3",
-		"solid-js": "^1.8.7",
-		"vinxi": "0.0.54"
+		"@lucia-auth/adapter-sqlite": "^3.0.1",
+		"@solidjs/router": "^0.13.3",
+		"@solidjs/start": "^1.0.0",
+		"@types/better-sqlite3": "^7.6.10",
+		"arctic": "^1.9.0",
+		"better-sqlite3": "^10.0.0",
+		"lucia": "^3.2.0",
+		"oslo": "^1.2.0",
+		"solid-js": "^1.8.17",
+		"vinxi": "0.3.11"
 	},
 	"engines": {
 		"node": ">=18"
-	},
-	"devDependencies": {
-		"@types/better-sqlite3": "^7.6.8"
 	}
 }

solidstart/github-oauth/src/app.tsx

@@ -1,5 +1,5 @@
 import { Router } from "@solidjs/router";
-import { FileRoutes } from "@solidjs/start";
+import { FileRoutes } from "@solidjs/start/router";
 import { Suspense } from "solid-js";
 
 export default function App() {

solidstart/github-oauth/src/entry-client.tsx

@@ -1,3 +1,5 @@
+// @refresh reload
 import { mount, StartClient } from "@solidjs/start/client";
 
-mount(() => <StartClient />, document.getElementById("app"));
+const root = document.getElementById("app");
+if (root) mount(() => <StartClient />, root);

solidstart/github-oauth/src/entry-server.tsx

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

solidstart/github-oauth/src/global.d.ts

@@ -1 +1,10 @@
 /// <reference types="@solidjs/start/env" />
+
+import { User, Session } from "lucia";
+
+declare module "@solidjs/start/server" {
+	export interface RequestEventLocals {
+		user?: User | null;
+		session?: Session | null;
+	}
+}

solidstart/github-oauth/src/lib/auth.ts

@@ -4,6 +4,7 @@ import { db } from "./db";
 import { GitHub } from "arctic";
 
 import type { DatabaseUser } from "./db";
+import { isDev } from "solid-js/web";
 
 // import { webcrypto } from "crypto";
 // globalThis.crypto = webcrypto as Crypto;
@@ -16,7 +17,7 @@ const adapter = new BetterSqlite3Adapter(db, {
 export const lucia = new Lucia(adapter, {
 	sessionCookie: {
 		attributes: {
-			secure: import.meta.env.PROD
+			secure: !isDev
 		}
 	},
 	getUserAttributes: (attributes) => {

solidstart/github-oauth/src/lib/utils.ts

@@ -4,8 +4,8 @@ import { getRequestEvent } from "solid-js/web";
 export const getAuthenticatedUser = cache(async () => {
 	"use server";
 	const event = getRequestEvent()!;
-	if (!event.context.user) {
+	if (!event.locals.user) {
 		throw redirect("/login");
 	}
-	return event.context.user;
+	return event.locals.user;
 }, "user");

solidstart/github-oauth/src/middleware.ts

@@ -1,40 +1,30 @@
-import { createMiddleware, appendHeader, getCookie, getHeader } from "@solidjs/start/server";
-import { Session, User, verifyRequestOrigin } from "lucia";
+import { createMiddleware } from "@solidjs/start/middleware";
+import { getCookie, setCookie } from "vinxi/http";
 import { lucia } from "./lib/auth";
 
 export default createMiddleware({
-	onRequest: async (event) => {
-		if (event.node.req.method !== "GET") {
-			const originHeader = getHeader(event, "Origin") ?? null;
-			const hostHeader = getHeader(event, "Host") ?? null;
-			if (!originHeader || !hostHeader || !verifyRequestOrigin(originHeader, [hostHeader])) {
-				event.node.res.writeHead(403).end();
-				return;
-			}
-		}
+	onRequest: async (e) => {
+		const sessionId = getCookie(lucia.sessionCookieName);
 
-		const sessionId = getCookie(event, lucia.sessionCookieName) ?? null;
 		if (!sessionId) {
-			event.context.session = null;
-			event.context.user = null;
 			return;
 		}
 
 		const { session, user } = await lucia.validateSession(sessionId);
-		if (session && session.fresh) {
-			appendHeader(event, "Set-Cookie", lucia.createSessionCookie(session.id).serialize());
+
+		if (session?.fresh) {
+			const cookie = lucia.createSessionCookie(session.id);
+
+			setCookie(cookie.name, cookie.value, cookie.attributes);
 		}
+
 		if (!session) {
-			appendHeader(event, "Set-Cookie", lucia.createBlankSessionCookie().serialize());
+			const cookie = lucia.createBlankSessionCookie();
+
+			setCookie(cookie.name, cookie.value, cookie.attributes);
 		}
-		event.context.session = session;
-		event.context.user = user;
-	}
-});
 
-declare module "vinxi/server" {
-	interface H3EventContext {
-		user: User | null;
-		session: Session | null;
+		e.locals.user = user;
+		e.locals.session = session;
 	}
-}
+});

solidstart/github-oauth/src/routes/index.tsx

@@ -1,11 +1,11 @@
 import { action, createAsync, redirect } from "@solidjs/router";
 import { getRequestEvent } from "solid-js/web";
-import { appendHeader } from "@solidjs/start/server";
+import { setCookie } from "vinxi/http";
 import { lucia } from "~/lib/auth";
 import { getAuthenticatedUser } from "~/lib/utils";
 
 export default function Index() {
-	const user = createAsync(getAuthenticatedUser);
+	const user = createAsync(() => getAuthenticatedUser());
 	return (
 		<>
 			<h1>Hi, {user()?.username}!</h1>
@@ -20,10 +20,12 @@ export default function Index() {
 const logout = action(async () => {
 	"use server";
 	const event = getRequestEvent()!;
-	if (!event.context.session) {
+	if (!event.locals.session) {
 		return new Error("Unauthorized");
 	}
-	await lucia.invalidateSession(event.context.session.id);
-	appendHeader(event, "Set-Cookie", lucia.createBlankSessionCookie().serialize());
+	await lucia.invalidateSession(event.locals.session.id);
+	const cookie = lucia.createSessionCookie(event.locals.session.id);
+
+	setCookie(cookie.name, cookie.value, cookie.attributes);
 	throw redirect("/login");
 });

solidstart/github-oauth/src/routes/login/github/callback.ts

@@ -1,23 +1,16 @@
-import {
-	getQuery,
-	createError,
-	getCookie,
-	appendHeader,
-	sendRedirect
-} from "@solidjs/start/server";
 import { OAuth2RequestError } from "arctic";
 import { generateId } from "lucia";
 import { github, lucia } from "~/lib/auth";
 import { db } from "~/lib/db";
 
-import type { APIEvent } from "@solidjs/start/server";
 import type { DatabaseUser } from "~/lib/db";
+import { createError, getCookie, getQuery, setCookie } from "vinxi/http";
 
-export async function GET(event: APIEvent) {
-	const query = getQuery(event);
+export async function GET() {
+	const query = getQuery();
 	const code = query.code?.toString() ?? null;
 	const state = query.state?.toString() ?? null;
-	const storedState = getCookie(event, "github_oauth_state") ?? null;
+	const storedState = getCookie("github_oauth_state") ?? null;
 	if (!code || !state || !storedState || state !== storedState) {
 		throw createError({
 			status: 400
@@ -38,8 +31,9 @@ export async function GET(event: APIEvent) {
 
 		if (existingUser) {
 			const session = await lucia.createSession(existingUser.id, {});
-			appendHeader(event, "Set-Cookie", lucia.createSessionCookie(session.id).serialize());
-			return sendRedirect(event, "/");
+			const cookie = lucia.createSessionCookie(session.id);
+
+			setCookie(cookie.name, cookie.value, cookie.attributes);
 		}
 
 		const userId = generateId(15);
@@ -49,8 +43,10 @@ export async function GET(event: APIEvent) {
 			githubUser.login
 		);
 		const session = await lucia.createSession(userId, {});
-		appendHeader(event, "Set-Cookie", lucia.createSessionCookie(session.id).serialize());
-		return sendRedirect(event, "/");
+		const cookie = lucia.createSessionCookie(session.id);
+
+		setCookie(cookie.name, cookie.value, cookie.attributes);
+		return Response.redirect("/");
 	} catch (e) {
 		if (e instanceof OAuth2RequestError && e.message === "bad_verification_code") {
 			// invalid code

solidstart/github-oauth/src/routes/login/github/index.ts

@@ -1,19 +1,19 @@
-import { sendRedirect, setCookie } from "@solidjs/start/server";
 import { generateState } from "arctic";
 import { github } from "~/lib/auth";
 
 import type { APIEvent } from "@solidjs/start/server";
+import { setCookie } from "vinxi/http";
 
 export async function GET(event: APIEvent) {
 	const state = generateState();
 	const url = await github.createAuthorizationURL(state);
 
-	setCookie(event, "github_oauth_state", state, {
+	setCookie("github_oauth_state", state, {
 		path: "/",
 		secure: process.env.NODE_ENV === "production",
 		httpOnly: true,
 		maxAge: 60 * 10,
 		sameSite: "lax"
 	});
-	return sendRedirect(event, url.toString());
+	return Response.redirect(url.toString());
 }

solidstart/username-and-password/app.config.ts

@@ -0,0 +1,5 @@
+import { defineConfig } from "@solidjs/start/config";
+
+export default defineConfig({
+  middleware: "./src/middleware.ts",
+});

solidstart/username-and-password/package.json

@@ -7,19 +7,17 @@
 		"start": "node ./.output/server/index.mjs"
 	},
 	"dependencies": {
-		"@lucia-auth/adapter-sqlite": "^3.0.0",
-		"@solidjs/router": "^0.10.5",
-		"@solidjs/start": "^0.4.2",
-		"better-sqlite3": "^9.2.2",
-		"lucia": "^3.0.1",
-		"oslo": "^1.0.3",
-		"solid-js": "^1.8.7",
-		"vinxi": "0.0.54"
+		"@lucia-auth/adapter-sqlite": "^3.0.1",
+		"@solidjs/router": "^0.13.3",
+		"@solidjs/start": "^1.0.0",
+		"@types/better-sqlite3": "^7.6.10",
+		"better-sqlite3": "^9.4.3",
+		"lucia": "^3.2.0",
+		"oslo": "^1.2.0",
+		"solid-js": "^1.8.17",
+		"vinxi": "0.3.11"
 	},
 	"engines": {
 		"node": ">=18"
-	},
-	"devDependencies": {
-		"@types/better-sqlite3": "^7.6.8"
 	}
 }

solidstart/username-and-password/src/app.tsx

@@ -1,5 +1,5 @@
 import { Router } from "@solidjs/router";
-import { FileRoutes } from "@solidjs/start";
+import { FileRoutes } from "@solidjs/start/router";
 import { Suspense } from "solid-js";
 
 export default function App() {

solidstart/username-and-password/src/entry-client.tsx

@@ -1,3 +1,5 @@
+// @refresh reload
 import { mount, StartClient } from "@solidjs/start/client";
 
-mount(() => <StartClient />, document.getElementById("app"));
+const root = document.getElementById("app");
+if (root) mount(() => <StartClient />, root);

solidstart/username-and-password/src/entry-server.tsx

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

solidstart/username-and-password/src/global.d.ts

@@ -1 +1,10 @@
 /// <reference types="@solidjs/start/env" />
+
+import { User, Session } from "lucia";
+
+declare module "@solidjs/start/server" {
+  export interface RequestEventLocals {
+    user?: User | null;
+    session?: Session | null;
+  }
+}

solidstart/username-and-password/src/lib/auth.ts

@@ -3,6 +3,7 @@ import { BetterSqlite3Adapter } from "@lucia-auth/adapter-sqlite";
 import { db } from "./db";
 
 import type { DatabaseUser } from "./db";
+import { isDev } from "solid-js/web";
 
 // import { webcrypto } from "crypto";
 // globalThis.crypto = webcrypto as Crypto;
@@ -15,7 +16,7 @@ const adapter = new BetterSqlite3Adapter(db, {
 export const lucia = new Lucia(adapter, {
 	sessionCookie: {
 		attributes: {
-			secure: process.env.NODE_ENV === "production"
+			secure: !isDev
 		}
 	},
 	getUserAttributes: (attributes) => {

solidstart/username-and-password/src/lib/utils.ts

@@ -4,8 +4,8 @@ import { getRequestEvent } from "solid-js/web";
 export const getAuthenticatedUser = cache(async () => {
 	"use server";
 	const event = getRequestEvent()!;
-	if (!event.context.user) {
+	if (!event.locals.user) {
 		throw redirect("/login");
 	}
-	return event.context.user;
+	return event.locals.user;
 }, "user");