move server only libraries into $lib/server

Fixes okupter#12
jdoconnor · Feb 17, 2024 · 938f1d8 · 938f1d8
1 parent 324fd4b
commit 938f1d8
Show file tree

Hide file tree

Showing 38 changed files with 51 additions and 53 deletions.
diff --git a/starter/src/app.d.ts b/starter/src/app.d.ts
@@ -2,10 +2,10 @@
 
 declare global {
 	namespace Lucia {
-		type Auth = import('$lib/lucia/mysql').Auth;
+		type Auth = import('$lib/server/lucia/mysql').Auth;
 		type DatabaseUserAttributes = {
 			email: string;
-			email_verified: boolean
+			email_verified: boolean;
 			github_username?: string;
 		};
 		type DatabaseSessionAttributes = object;
@@ -21,5 +21,4 @@ declare global {
 	}
 }
 
-export { };
-
+export {};
diff --git a/starter/src/hooks.server.ts b/starter/src/hooks.server.ts
@@ -1,4 +1,4 @@
-import { auth } from '$lib/lucia/mysql';
+import { auth } from '$lib/server/lucia/mysql';
 
 export const handle = async ({ event, resolve }) => {
 	event.locals.auth = auth.handleRequest(event);

diff --git a/starter/src/lib/drizzle/mysql/client.ts → ...er/src/lib/server/drizzle/mysql/client.ts b/starter/src/lib/drizzle/mysql/client.ts → ...er/src/lib/server/drizzle/mysql/client.ts
diff --git a/...r/src/lib/drizzle/mysql/drizzle.config.ts → ...ib/server/drizzle/mysql/drizzle.config.ts b/...r/src/lib/drizzle/mysql/drizzle.config.ts → ...ib/server/drizzle/mysql/drizzle.config.ts
diff --git a/...c/lib/drizzle/mysql/migrations/migrate.ts → ...erver/drizzle/mysql/migrations/migrate.ts b/...c/lib/drizzle/mysql/migrations/migrate.ts → ...erver/drizzle/mysql/migrations/migrate.ts
diff --git a/...er/src/lib/drizzle/mysql/models/tokens.ts → ...lib/server/drizzle/mysql/models/tokens.ts b/...er/src/lib/drizzle/mysql/models/tokens.ts → ...lib/server/drizzle/mysql/models/tokens.ts
@@ -1,5 +1,5 @@
-import { drizzleClient } from '$lib/drizzle/mysql/client';
-import { emailVerification, passwordResetToken } from '$lib/drizzle/mysql/schema';
+import { drizzleClient } from '$lib/server/drizzle/mysql/client';
+import { emailVerification, passwordResetToken } from '$lib/server/drizzle/mysql/schema';
 import { eq } from 'drizzle-orm';
 import { generateRandomString, isWithinExpiration } from 'lucia/utils';
 

diff --git a/...ter/src/lib/drizzle/mysql/models/users.ts → .../lib/server/drizzle/mysql/models/users.ts b/...ter/src/lib/drizzle/mysql/models/users.ts → .../lib/server/drizzle/mysql/models/users.ts
@@ -1,5 +1,5 @@
-import { drizzleClient } from '$lib/drizzle/mysql/client';
-import { user, userProfile } from '$lib/drizzle/mysql/schema';
+import { drizzleClient } from '$lib/server/drizzle/mysql/client';
+import { user, userProfile } from '$lib/server/drizzle/mysql/schema';
 import { eq } from 'drizzle-orm';
 
 const getUserByEmail = async (email: string | undefined) => {

diff --git a/starter/src/lib/drizzle/mysql/schema.ts → ...er/src/lib/server/drizzle/mysql/schema.ts b/starter/src/lib/drizzle/mysql/schema.ts → ...er/src/lib/server/drizzle/mysql/schema.ts
diff --git a/starter/src/lib/drizzle/postgres/client.ts → ...src/lib/server/drizzle/postgres/client.ts b/starter/src/lib/drizzle/postgres/client.ts → ...src/lib/server/drizzle/postgres/client.ts
diff --git a/...rc/lib/drizzle/postgres/drizzle.config.ts → ...server/drizzle/postgres/drizzle.config.ts b/...rc/lib/drizzle/postgres/drizzle.config.ts → ...server/drizzle/postgres/drizzle.config.ts
diff --git a/...ib/drizzle/postgres/migrations/migrate.ts → ...er/drizzle/postgres/migrations/migrate.ts b/...ib/drizzle/postgres/migrations/migrate.ts → ...er/drizzle/postgres/migrations/migrate.ts
diff --git a/...src/lib/drizzle/postgres/models/tokens.ts → .../server/drizzle/postgres/models/tokens.ts b/...src/lib/drizzle/postgres/models/tokens.ts → .../server/drizzle/postgres/models/tokens.ts
@@ -1,5 +1,5 @@
-import { drizzleClient } from '$lib/drizzle/postgres/client';
-import { emailVerification, passwordResetToken } from '$lib/drizzle/postgres/schema';
+import { drizzleClient } from '$lib/server/drizzle/postgres/client';
+import { emailVerification, passwordResetToken } from '$lib/server/drizzle/postgres/schema';
 import { eq } from 'drizzle-orm';
 import { generateRandomString, isWithinExpiration } from 'lucia/utils';
 
@@ -114,9 +114,8 @@ const validatePasswordResetToken = async (token: string) => {
 };
 
 export {
-    generateEmailVerificationToken,
-    generatePasswordResetToken,
-    validateEmailVerificationToken,
-    validatePasswordResetToken
+	generateEmailVerificationToken,
+	generatePasswordResetToken,
+	validateEmailVerificationToken,
+	validatePasswordResetToken
 };
-
diff --git a/.../src/lib/drizzle/postgres/models/users.ts → ...b/server/drizzle/postgres/models/users.ts b/.../src/lib/drizzle/postgres/models/users.ts → ...b/server/drizzle/postgres/models/users.ts
@@ -1,5 +1,5 @@
-import { drizzleClient } from '$lib/drizzle/postgres/client';
-import { user, userProfile } from '$lib/drizzle/postgres/schema';
+import { drizzleClient } from '$lib/server/drizzle/postgres/client';
+import { user, userProfile } from '$lib/server/drizzle/postgres/schema';
 import { eq } from 'drizzle-orm';
 
 const getUserByEmail = async (email: string | undefined) => {

diff --git a/starter/src/lib/drizzle/postgres/schema.ts → ...src/lib/server/drizzle/postgres/schema.ts b/starter/src/lib/drizzle/postgres/schema.ts → ...src/lib/server/drizzle/postgres/schema.ts
diff --git a/starter/src/lib/drizzle/turso/client.ts → ...er/src/lib/server/drizzle/turso/client.ts b/starter/src/lib/drizzle/turso/client.ts → ...er/src/lib/server/drizzle/turso/client.ts
diff --git a/...r/src/lib/drizzle/turso/drizzle.config.ts → ...ib/server/drizzle/turso/drizzle.config.ts b/...r/src/lib/drizzle/turso/drizzle.config.ts → ...ib/server/drizzle/turso/drizzle.config.ts
diff --git a/...c/lib/drizzle/turso/migrations/migrate.ts → ...erver/drizzle/turso/migrations/migrate.ts b/...c/lib/drizzle/turso/migrations/migrate.ts → ...erver/drizzle/turso/migrations/migrate.ts
diff --git a/...er/src/lib/drizzle/turso/models/tokens.ts → ...lib/server/drizzle/turso/models/tokens.ts b/...er/src/lib/drizzle/turso/models/tokens.ts → ...lib/server/drizzle/turso/models/tokens.ts
@@ -1,5 +1,5 @@
-import { drizzleClient } from '$lib/drizzle/turso/client';
-import { emailVerification, passwordResetToken } from '$lib/drizzle/turso/schema';
+import { drizzleClient } from '$lib/server/drizzle/turso/client';
+import { emailVerification, passwordResetToken } from '$lib/server/drizzle/turso/schema';
 import { eq } from 'drizzle-orm';
 import { generateRandomString, isWithinExpiration } from 'lucia/utils';
 

diff --git a/...ter/src/lib/drizzle/turso/models/users.ts → .../lib/server/drizzle/turso/models/users.ts b/...ter/src/lib/drizzle/turso/models/users.ts → .../lib/server/drizzle/turso/models/users.ts
@@ -1,5 +1,5 @@
-import { drizzleClient } from '$lib/drizzle/turso/client';
-import { user, userProfile } from '$lib/drizzle/turso/schema';
+import { drizzleClient } from '$lib/server/drizzle/turso/client';
+import { user, userProfile } from '$lib/server/drizzle/turso/schema';
 import { eq } from 'drizzle-orm';
 
 const getUserByEmail = async (email: string | undefined) => {

diff --git a/starter/src/lib/drizzle/turso/schema.ts → ...er/src/lib/server/drizzle/turso/schema.ts b/starter/src/lib/drizzle/turso/schema.ts → ...er/src/lib/server/drizzle/turso/schema.ts
diff --git a/starter/src/lib/emails/mailhog.ts → starter/src/lib/server/emails/mailhog.ts b/starter/src/lib/emails/mailhog.ts → starter/src/lib/server/emails/mailhog.ts
diff --git a/starter/src/lib/emails/resend.ts → starter/src/lib/server/emails/resend.ts b/starter/src/lib/emails/resend.ts → starter/src/lib/server/emails/resend.ts
diff --git a/starter/src/lib/emails/send.ts → starter/src/lib/server/emails/send.ts b/starter/src/lib/emails/send.ts → starter/src/lib/server/emails/send.ts
@@ -1,6 +1,6 @@
 import { dev } from '$app/environment';
-import { sendTestEmail } from '$lib/emails/mailhog';
-import { sendResendEmail } from '$lib/emails/resend';
+import { sendTestEmail } from '$lib/server/emails/mailhog';
+import { sendResendEmail } from '$lib/server/emails/resend';
 
 const sendEmail = async (options: { from: string; to: string; subject: string; html: string }) => {
 	if (!dev) {

diff --git a/starter/src/lib/lucia/mysql.ts → starter/src/lib/server/lucia/mysql.ts b/starter/src/lib/lucia/mysql.ts → starter/src/lib/server/lucia/mysql.ts
@@ -1,11 +1,11 @@
 import { dev } from '$app/environment';
-import { connectionPool } from '$lib/drizzle/mysql/client';
+import { connectionPool } from '$lib/server/drizzle/mysql/client';
 import {
 	adapterOptions,
 	generateUserAttributes,
 	githubAuthOptions,
 	googleAuthOptions
-} from '$lib/lucia/utils';
+} from '$lib/server/lucia/utils';
 import { mysql2 } from '@lucia-auth/adapter-mysql';
 import { github, google } from '@lucia-auth/oauth/providers';
 import { lucia } from 'lucia';

diff --git a/starter/src/lib/lucia/postgres.ts → starter/src/lib/server/lucia/postgres.ts b/starter/src/lib/lucia/postgres.ts → starter/src/lib/server/lucia/postgres.ts
@@ -1,11 +1,11 @@
 import { dev } from '$app/environment';
-import { connection } from '$lib/drizzle/postgres/client';
+import { connection } from '$lib/server/drizzle/postgres/client';
 import {
 	adapterOptions,
 	generateUserAttributes,
 	githubAuthOptions,
 	googleAuthOptions
-} from '$lib/lucia/utils';
+} from '$lib/server/lucia/utils';
 import { postgres } from '@lucia-auth/adapter-postgresql';
 import { github, google } from '@lucia-auth/oauth/providers';
 import { lucia } from 'lucia';

diff --git a/starter/src/lib/lucia/turso.ts → starter/src/lib/server/lucia/turso.ts b/starter/src/lib/lucia/turso.ts → starter/src/lib/server/lucia/turso.ts
@@ -1,11 +1,11 @@
 import { dev } from '$app/environment';
-import { dbClient } from '$lib/drizzle/turso/client';
+import { dbClient } from '$lib/server/drizzle/turso/client';
 import {
 	adapterOptions,
 	generateUserAttributes,
 	githubAuthOptions,
 	googleAuthOptions
-} from '$lib/lucia/utils';
+} from '$lib/server/lucia/utils';
 import { libsql } from '@lucia-auth/adapter-sqlite';
 import { github, google } from '@lucia-auth/oauth/providers';
 import { lucia } from 'lucia';

diff --git a/starter/src/lib/lucia/utils.ts → starter/src/lib/server/lucia/utils.ts b/starter/src/lib/lucia/utils.ts → starter/src/lib/server/lucia/utils.ts
diff --git a/starter/src/routes/(app)/app/email-verification/+page.server.ts b/starter/src/routes/(app)/app/email-verification/+page.server.ts
@@ -1,7 +1,7 @@
 import { TRANSACTIONAL_EMAILS_ADDRESS, TRANSACTIONAL_EMAILS_SENDER } from '$env/static/private';
-import { generateEmailVerificationToken } from '$lib/drizzle/mysql/models/tokens';
-import { getUserByEmail, getUserProfileData } from '$lib/drizzle/mysql/models/users';
-import { sendEmail } from '$lib/emails/send';
+import { generateEmailVerificationToken } from '$lib/server/drizzle/mysql/models/tokens';
+import { getUserByEmail, getUserProfileData } from '$lib/server/drizzle/mysql/models/users';
+import { sendEmail } from '$lib/server/emails/send';
 import { getFeedbackObjects } from '$lib/utils';
 import { fail, redirect } from '@sveltejs/kit';
 
@@ -59,7 +59,7 @@ export const actions = {
 					feedbacks: verificationEmail
 				});
 			}
-		} catch(e) {
+		} catch (e) {
 			const feedbacks = getFeedbackObjects([
 				{
 					type: 'error',

diff --git a/starter/src/routes/(app)/app/email-verification/[token]/+server.ts b/starter/src/routes/(app)/app/email-verification/[token]/+server.ts
@@ -1,5 +1,5 @@
-import { validateEmailVerificationToken } from '$lib/drizzle/mysql/models/tokens';
-import { auth } from '$lib/lucia/mysql';
+import { validateEmailVerificationToken } from '$lib/server/drizzle/mysql/models/tokens';
+import { auth } from '$lib/server/lucia/mysql';
 
 export const GET = async ({ params, locals }) => {
 	const { token } = params;

diff --git a/starter/src/routes/(app)/app/profile/+page.server.ts b/starter/src/routes/(app)/app/profile/+page.server.ts
@@ -1,4 +1,4 @@
-import { getUserProfileData } from '$lib/drizzle/mysql/models/users';
+import { getUserProfileData } from '$lib/server/drizzle/mysql/models/users';
 import { redirect } from '@sveltejs/kit';
 
 export const load = async ({ locals }) => {

diff --git a/starter/src/routes/(auth)/auth/login/+page.server.ts b/starter/src/routes/(auth)/auth/login/+page.server.ts
@@ -1,4 +1,4 @@
-import { auth } from '$lib/lucia/mysql';
+import { auth } from '$lib/server/lucia/mysql';
 import { getFeedbackObjects } from '$lib/utils';
 import { fail, redirect } from '@sveltejs/kit';
 import { LuciaError } from 'lucia';

diff --git a/starter/src/routes/(auth)/auth/signup/+page.server.ts b/starter/src/routes/(auth)/auth/signup/+page.server.ts
@@ -1,8 +1,8 @@
 import { TRANSACTIONAL_EMAILS_ADDRESS, TRANSACTIONAL_EMAILS_SENDER } from '$env/static/private';
-import { generateEmailVerificationToken } from '$lib/drizzle/mysql/models/tokens';
-import { updateUserProfileData } from '$lib/drizzle/mysql/models/users';
-import { sendEmail } from '$lib/emails/send';
-import { auth } from '$lib/lucia/mysql';
+import { generateEmailVerificationToken } from '$lib/server/drizzle/mysql/models/tokens';
+import { updateUserProfileData } from '$lib/server/drizzle/mysql/models/users';
+import { sendEmail } from '$lib/server/emails/send';
+import { auth } from '$lib/server/lucia/mysql';
 import { getFeedbackObjects } from '$lib/utils';
 import { fail, redirect } from '@sveltejs/kit';
 import { nanoid } from 'nanoid';

diff --git a/starter/src/routes/(auth)/password-reset/+page.server.ts b/starter/src/routes/(auth)/password-reset/+page.server.ts
@@ -1,7 +1,7 @@
 import { TRANSACTIONAL_EMAILS_ADDRESS, TRANSACTIONAL_EMAILS_SENDER } from '$env/static/private';
-import { generatePasswordResetToken } from '$lib/drizzle/mysql/models/tokens';
-import { getUserByEmail, getUserProfileData } from '$lib/drizzle/mysql/models/users';
-import { sendEmail } from '$lib/emails/send';
+import { generatePasswordResetToken } from '$lib/server/drizzle/mysql/models/tokens';
+import { getUserByEmail, getUserProfileData } from '$lib/server/drizzle/mysql/models/users';
+import { sendEmail } from '$lib/server/emails/send';
 import { getFeedbackObjects } from '$lib/utils';
 import { fail } from '@sveltejs/kit';
 import { z } from 'zod';

diff --git a/starter/src/routes/(auth)/password-reset/[token]/+page.server.ts b/starter/src/routes/(auth)/password-reset/[token]/+page.server.ts
@@ -1,5 +1,5 @@
-import { validatePasswordResetToken } from '$lib/drizzle/mysql/models/tokens';
-import { auth } from '$lib/lucia/mysql';
+import { validatePasswordResetToken } from '$lib/server/drizzle/mysql/models/tokens';
+import { auth } from '$lib/server/lucia/mysql';
 import { getFeedbackObjects } from '$lib/utils';
 import { fail, redirect } from '@sveltejs/kit';
 import { z } from 'zod';

diff --git a/starter/src/routes/api/oauth/github/+server.ts b/starter/src/routes/api/oauth/github/+server.ts
@@ -1,5 +1,5 @@
 import { dev } from '$app/environment';
-import { githubAuth } from '$lib/lucia/mysql';
+import { githubAuth } from '$lib/server/lucia/mysql';
 import { redirect } from '@sveltejs/kit';
 
 export const GET = async ({ cookies }) => {

diff --git a/starter/src/routes/api/oauth/github/callback/+server.ts b/starter/src/routes/api/oauth/github/callback/+server.ts
@@ -1,5 +1,5 @@
-import { getUserByEmail } from '$lib/drizzle/mysql/models/users';
-import { auth, githubAuth } from '$lib/lucia/mysql';
+import { getUserByEmail } from '$lib/server/drizzle/mysql/models/users';
+import { auth, githubAuth } from '$lib/server/lucia/mysql';
 import { getGitHubPrimaryEmailAddress } from '$lib/utils';
 import { OAuthRequestError } from '@lucia-auth/oauth';
 import { error } from '@sveltejs/kit';

diff --git a/starter/src/routes/api/oauth/google/+server.ts b/starter/src/routes/api/oauth/google/+server.ts
@@ -1,5 +1,5 @@
 import { dev } from '$app/environment';
-import { googleAuth } from '$lib/lucia/mysql';
+import { googleAuth } from '$lib/server/lucia/mysql';
 import { redirect } from '@sveltejs/kit';
 
 export const GET = async ({ cookies }) => {

diff --git a/starter/src/routes/api/oauth/google/callback/+server.ts b/starter/src/routes/api/oauth/google/callback/+server.ts
@@ -2,8 +2,8 @@ import {
 	getUserByEmail,
 	getUserProfileData,
 	updateUserProfileData
-} from '$lib/drizzle/mysql/models/users';
-import { auth, googleAuth } from '$lib/lucia/mysql';
+} from '$lib/server/drizzle/mysql/models/users';
+import { auth, googleAuth } from '$lib/server/lucia/mysql';
 import { OAuthRequestError } from '@lucia-auth/oauth';
 import { error } from '@sveltejs/kit';
 import { nanoid } from 'nanoid';