From 9b24a5c0950f4948696d59a9c0ee336dc7986c4a Mon Sep 17 00:00:00 2001 From: Bradley Shellnut Date: Fri, 2 Aug 2024 17:48:45 -0700 Subject: [PATCH] Removing get client address for now and using adapter node because vercel breaks. --- .node-version | 2 +- package.json | 3 --- src/hooks.server.ts | 5 ++--- src/routes/(app)/about/+page.ts | 14 +++++++------- svelte.config.js | 2 +- 5 files changed, 11 insertions(+), 15 deletions(-) diff --git a/.node-version b/.node-version index 7d1aef0..2edeafb 100644 --- a/.node-version +++ b/.node-version @@ -1 +1 @@ -22.1.0 \ No newline at end of file +20 \ No newline at end of file diff --git a/package.json b/package.json index 1d103b0..37b8e76 100644 --- a/package.json +++ b/package.json @@ -22,9 +22,6 @@ "site:update": "pnpm update -i -L", "test:unit": "vitest" }, - "engines": { - "node": "22.x" - }, "devDependencies": { "@melt-ui/pp": "^0.3.2", "@melt-ui/svelte": "^0.83.0", diff --git a/src/hooks.server.ts b/src/hooks.server.ts index f1e2dd8..ce495b2 100644 --- a/src/hooks.server.ts +++ b/src/hooks.server.ts @@ -22,19 +22,18 @@ const apiClient: Handle = async ({ event, resolve }) => { const { api } = hc('/', { fetch: event.fetch, headers: { - 'x-forwarded-for': event.getClientAddress(), host: event.request.headers.get('host') || '' } }); /* ----------------------------- Auth functions ----------------------------- */ async function getAuthedUser() { - const { data } = await api.iam.user.$get().then(parseApiResponse) + const { data } = await api.user.me.$get().then(parseApiResponse) return data && data.user; } async function getAuthedUserOrThrow() { - const { data } = await api.iam.user.$get().then(parseApiResponse); + const { data } = await api.user.me.$get().then(parseApiResponse); if (!data || !data.user) throw redirect(StatusCodes.TEMPORARY_REDIRECT, '/'); return data?.user; } diff --git a/src/routes/(app)/about/+page.ts b/src/routes/(app)/about/+page.ts index 763e9db..3e13462 100644 --- a/src/routes/(app)/about/+page.ts +++ b/src/routes/(app)/about/+page.ts @@ -1,9 +1,9 @@ -// import { dev } from '$app/environment'; +import { dev } from '$app/environment'; -// // we don't need any JS on this page, though we'll load -// // it in dev so that we get hot module replacement... -// export const csr = dev; +// we don't need any JS on this page, though we'll load +// it in dev so that we get hot module replacement... +export const csr = dev; -// // since there's no dynamic data here, we can prerender -// // it so that it gets served as a static asset in prod -// export const prerender = true; +// since there's no dynamic data here, we can prerender +// it so that it gets served as a static asset in prod +export const prerender = true; diff --git a/svelte.config.js b/svelte.config.js index 435efb8..e3978f7 100644 --- a/svelte.config.js +++ b/svelte.config.js @@ -1,5 +1,5 @@ import 'reflect-metadata' -import adapter from '@sveltejs/adapter-vercel'; +import adapter from '@sveltejs/adapter-node'; import { vitePreprocess } from '@sveltejs/vite-plugin-svelte'; import { preprocessMeltUI } from '@melt-ui/pp'; import sequence from 'svelte-sequential-preprocessor';