From 76921c364fbc5c0087c7515f6c01f483be0344aa Mon Sep 17 00:00:00 2001 From: Bradley Shellnut Date: Fri, 27 Sep 2024 17:45:26 -0700 Subject: [PATCH 1/2] Change to adapter node --- svelte.config.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/svelte.config.js b/svelte.config.js index c4d0477..3cd3268 100644 --- a/svelte.config.js +++ b/svelte.config.js @@ -1,8 +1,8 @@ import 'reflect-metadata' -import adapter from '@sveltejs/adapter-vercel'; -import { vitePreprocess } from '@sveltejs/vite-plugin-svelte'; -import { preprocessMeltUI } from '@melt-ui/pp'; -import sequence from 'svelte-sequential-preprocessor'; +import { preprocessMeltUI } from '@melt-ui/pp' +import adapter from '@sveltejs/adapter-node' +import { vitePreprocess } from '@sveltejs/vite-plugin-svelte' +import sequence from 'svelte-sequential-preprocessor' /** @type {import('@sveltejs/kit').Config}*/ const config = { @@ -37,6 +37,6 @@ const config = { compilerOptions: { enableSourcemap: true, }, -}; +} -export default config; +export default config From 5849219833a6b9a99ec24a960962c4c537e93748 Mon Sep 17 00:00:00 2001 From: Bradley Shellnut Date: Sun, 29 Sep 2024 15:37:43 -0700 Subject: [PATCH 2/2] Fixing the imports to not use $ since that won't work in seeding --- drizzle.config.ts | 2 +- src/lib/server/api/databases/tables/categories.table.ts | 2 +- src/lib/server/api/databases/tables/collections.ts | 2 +- src/lib/server/api/databases/tables/credentials.table.ts | 2 +- src/lib/server/api/databases/tables/expansions.ts | 2 +- src/lib/server/api/databases/tables/federatedIdentity.table.ts | 2 +- src/lib/server/api/databases/tables/games.ts | 2 +- src/lib/server/api/databases/tables/mechanics.ts | 2 +- src/lib/server/api/databases/tables/publishers.ts | 2 +- src/lib/server/api/databases/tables/recovery-codes.table.ts | 2 +- src/lib/server/api/databases/tables/roles.ts | 2 +- src/lib/server/api/databases/tables/two-factor.table.ts | 2 +- src/lib/server/api/databases/tables/userRoles.ts | 2 +- src/lib/server/api/databases/tables/users.table.ts | 2 +- src/lib/server/api/databases/tables/wishlistItems.ts | 2 +- src/lib/server/api/databases/tables/wishlists.ts | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/drizzle.config.ts b/drizzle.config.ts index f4618ee..d254a3e 100644 --- a/drizzle.config.ts +++ b/drizzle.config.ts @@ -5,7 +5,7 @@ import env from './src/env' export default defineConfig({ dialect: 'postgresql', out: './src/lib/server/api/databases/migrations', - schema: './src/lib/server/api/databases/tables/drizzle.ts', + schema: './src/lib/server/api/databases/tables/index.ts', dbCredentials: { host: env.DATABASE_HOST || 'localhost', port: Number(env.DATABASE_PORT) || 5432, diff --git a/src/lib/server/api/databases/tables/categories.table.ts b/src/lib/server/api/databases/tables/categories.table.ts index eff7cc5..ed69b23 100644 --- a/src/lib/server/api/databases/tables/categories.table.ts +++ b/src/lib/server/api/databases/tables/categories.table.ts @@ -1,7 +1,7 @@ -import { timestamps } from '$lib/server/api/common/utils/table.utils' import { createId as cuid2 } from '@paralleldrive/cuid2' import { type InferSelectModel, relations } from 'drizzle-orm' import { pgTable, text, uuid } from 'drizzle-orm/pg-core' +import { timestamps } from '../../common/utils/table.utils' import { categoriesToExternalIdsTable } from './categoriesToExternalIdsTable' import { categories_to_games_table } from './categoriesToGames' diff --git a/src/lib/server/api/databases/tables/collections.ts b/src/lib/server/api/databases/tables/collections.ts index ed1499e..e6a24ff 100644 --- a/src/lib/server/api/databases/tables/collections.ts +++ b/src/lib/server/api/databases/tables/collections.ts @@ -1,7 +1,7 @@ -import { timestamps } from '$lib/server/api/common/utils/table.utils' import { createId as cuid2 } from '@paralleldrive/cuid2' import { type InferSelectModel, relations } from 'drizzle-orm' import { pgTable, text, uuid } from 'drizzle-orm/pg-core' +import { timestamps } from '../../common/utils/table.utils' import { usersTable } from './users.table' export const collections = pgTable('collections', { diff --git a/src/lib/server/api/databases/tables/credentials.table.ts b/src/lib/server/api/databases/tables/credentials.table.ts index f0204b5..37cac3c 100644 --- a/src/lib/server/api/databases/tables/credentials.table.ts +++ b/src/lib/server/api/databases/tables/credentials.table.ts @@ -1,6 +1,6 @@ -import { timestamps } from '$lib/server/api/common/utils/table.utils' import { type InferSelectModel } from 'drizzle-orm' import { pgTable, text, uuid } from 'drizzle-orm/pg-core' +import { timestamps } from '../../common/utils/table.utils' import { usersTable } from './users.table' export enum CredentialsType { diff --git a/src/lib/server/api/databases/tables/expansions.ts b/src/lib/server/api/databases/tables/expansions.ts index fa6dd26..a5ca59e 100644 --- a/src/lib/server/api/databases/tables/expansions.ts +++ b/src/lib/server/api/databases/tables/expansions.ts @@ -1,7 +1,7 @@ -import { timestamps } from '$lib/server/api/common/utils/table.utils' import { createId as cuid2 } from '@paralleldrive/cuid2' import { type InferSelectModel, relations } from 'drizzle-orm' import { pgTable, text, uuid } from 'drizzle-orm/pg-core' +import { timestamps } from '../../common/utils/table.utils' import { games } from './games' export const expansions = pgTable('expansions', { diff --git a/src/lib/server/api/databases/tables/federatedIdentity.table.ts b/src/lib/server/api/databases/tables/federatedIdentity.table.ts index 311683c..e85232f 100644 --- a/src/lib/server/api/databases/tables/federatedIdentity.table.ts +++ b/src/lib/server/api/databases/tables/federatedIdentity.table.ts @@ -1,6 +1,6 @@ -import { timestamps } from '$lib/server/api/common/utils/table.utils' import { type InferSelectModel } from 'drizzle-orm' import { pgTable, text, uuid } from 'drizzle-orm/pg-core' +import { timestamps } from '../../common/utils/table.utils' import { usersTable } from './users.table' export const federatedIdentityTable = pgTable('federated_identity', { diff --git a/src/lib/server/api/databases/tables/games.ts b/src/lib/server/api/databases/tables/games.ts index 3767bc2..94e75af 100644 --- a/src/lib/server/api/databases/tables/games.ts +++ b/src/lib/server/api/databases/tables/games.ts @@ -1,7 +1,7 @@ -import { timestamps } from '$lib/server/api/common/utils/table.utils' import { createId as cuid2 } from '@paralleldrive/cuid2' import { type InferSelectModel, relations, sql } from 'drizzle-orm' import { index, integer, pgTable, text, timestamp, uuid } from 'drizzle-orm/pg-core' +import { timestamps } from '../../common/utils/table.utils' import { categories_to_games_table } from './categoriesToGames' import { gamesToExternalIds } from './gamesToExternalIds' import { mechanics_to_games } from './mechanicsToGames' diff --git a/src/lib/server/api/databases/tables/mechanics.ts b/src/lib/server/api/databases/tables/mechanics.ts index b017a7b..f5d4ced 100644 --- a/src/lib/server/api/databases/tables/mechanics.ts +++ b/src/lib/server/api/databases/tables/mechanics.ts @@ -1,4 +1,4 @@ -import { timestamps } from '$lib/server/api/common/utils/table.utils' +import { timestamps } from '../../common/utils/table.utils' import { createId as cuid2 } from '@paralleldrive/cuid2' import { type InferSelectModel, relations } from 'drizzle-orm' import { pgTable, text, uuid } from 'drizzle-orm/pg-core' diff --git a/src/lib/server/api/databases/tables/publishers.ts b/src/lib/server/api/databases/tables/publishers.ts index e501f4c..3000625 100644 --- a/src/lib/server/api/databases/tables/publishers.ts +++ b/src/lib/server/api/databases/tables/publishers.ts @@ -1,4 +1,4 @@ -import { timestamps } from '$lib/server/api/common/utils/table.utils' +import { timestamps } from '../../common/utils/table.utils' import { createId as cuid2 } from '@paralleldrive/cuid2' import { type InferSelectModel, relations } from 'drizzle-orm' import { pgTable, text, uuid } from 'drizzle-orm/pg-core' diff --git a/src/lib/server/api/databases/tables/recovery-codes.table.ts b/src/lib/server/api/databases/tables/recovery-codes.table.ts index 1429da0..683df9a 100644 --- a/src/lib/server/api/databases/tables/recovery-codes.table.ts +++ b/src/lib/server/api/databases/tables/recovery-codes.table.ts @@ -1,4 +1,4 @@ -import { timestamps } from '$lib/server/api/common/utils/table.utils' +import { timestamps } from '../../common/utils/table.utils' import type { InferSelectModel } from 'drizzle-orm' import { boolean, pgTable, text, uuid } from 'drizzle-orm/pg-core' import { usersTable } from './users.table' diff --git a/src/lib/server/api/databases/tables/roles.ts b/src/lib/server/api/databases/tables/roles.ts index 0630396..1807480 100644 --- a/src/lib/server/api/databases/tables/roles.ts +++ b/src/lib/server/api/databases/tables/roles.ts @@ -1,4 +1,4 @@ -import { timestamps } from '$lib/server/api/common/utils/table.utils' +import { timestamps } from '../../common/utils/table.utils' import { createId as cuid2 } from '@paralleldrive/cuid2' import { type InferSelectModel, relations } from 'drizzle-orm' import { pgTable, text, uuid } from 'drizzle-orm/pg-core' diff --git a/src/lib/server/api/databases/tables/two-factor.table.ts b/src/lib/server/api/databases/tables/two-factor.table.ts index a8ce4d7..1c6fd5f 100644 --- a/src/lib/server/api/databases/tables/two-factor.table.ts +++ b/src/lib/server/api/databases/tables/two-factor.table.ts @@ -1,4 +1,4 @@ -import { timestamps } from '$lib/server/api/common/utils/table.utils' +import { timestamps } from '../../common/utils/table.utils' import { createId as cuid2 } from '@paralleldrive/cuid2' import { type InferSelectModel, relations } from 'drizzle-orm' import { boolean, pgTable, text, timestamp, uuid } from 'drizzle-orm/pg-core' diff --git a/src/lib/server/api/databases/tables/userRoles.ts b/src/lib/server/api/databases/tables/userRoles.ts index 265bf88..198a807 100644 --- a/src/lib/server/api/databases/tables/userRoles.ts +++ b/src/lib/server/api/databases/tables/userRoles.ts @@ -1,4 +1,4 @@ -import { timestamps } from '$lib/server/api/common/utils/table.utils' +import { timestamps } from '../../common/utils/table.utils' import { createId as cuid2 } from '@paralleldrive/cuid2' import { type InferSelectModel, relations } from 'drizzle-orm' import { boolean, pgTable, text, uuid } from 'drizzle-orm/pg-core' diff --git a/src/lib/server/api/databases/tables/users.table.ts b/src/lib/server/api/databases/tables/users.table.ts index 93850c0..53e244c 100644 --- a/src/lib/server/api/databases/tables/users.table.ts +++ b/src/lib/server/api/databases/tables/users.table.ts @@ -1,4 +1,4 @@ -import { timestamps } from '$lib/server/api/common/utils/table.utils' +import { timestamps } from '../../common/utils/table.utils' import { createId as cuid2 } from '@paralleldrive/cuid2' import { type InferSelectModel, relations } from 'drizzle-orm' import { boolean, pgTable, text, uuid } from 'drizzle-orm/pg-core' diff --git a/src/lib/server/api/databases/tables/wishlistItems.ts b/src/lib/server/api/databases/tables/wishlistItems.ts index e9d57c8..e4e7545 100644 --- a/src/lib/server/api/databases/tables/wishlistItems.ts +++ b/src/lib/server/api/databases/tables/wishlistItems.ts @@ -1,4 +1,4 @@ -import { timestamps } from '$lib/server/api/common/utils/table.utils' +import { timestamps } from '../../common/utils/table.utils' import { createId as cuid2 } from '@paralleldrive/cuid2' import { type InferSelectModel, relations } from 'drizzle-orm' import { pgTable, text, uuid } from 'drizzle-orm/pg-core' diff --git a/src/lib/server/api/databases/tables/wishlists.ts b/src/lib/server/api/databases/tables/wishlists.ts index 10dbec9..deec3b5 100644 --- a/src/lib/server/api/databases/tables/wishlists.ts +++ b/src/lib/server/api/databases/tables/wishlists.ts @@ -1,4 +1,4 @@ -import { timestamps } from '$lib/server/api/common/utils/table.utils' +import { timestamps } from '../../common/utils/table.utils' import { createId as cuid2 } from '@paralleldrive/cuid2' import { type InferSelectModel, relations } from 'drizzle-orm' import { pgTable, text, uuid } from 'drizzle-orm/pg-core'