diff --git a/package.json b/package.json index a7ba487..fa23064 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "dev": "nuxt dev --host", "generate": "nuxt generate", "preview": "nuxt preview", - "postinstall": "prisma generate --no-engine && nuxt prepare", + "postinstall": "prisma generate && nuxt prepare", "lint": "eslint .", "lint:fix": "eslint . --fix" }, @@ -17,7 +17,6 @@ "@nuxt/ui": "2.11.1", "@pinia/nuxt": "0.5.1", "@prisma/client": "^5.7.0", - "@prisma/extension-accelerate": "^0.6.2", "@vercel/analytics": "1.1.1", "@vueuse/motion": "2.0.0", "pinia": "2.1.7", diff --git a/src/server/api/announcement.get.ts b/src/server/api/announcement.get.ts index 7eb9677..c7e5993 100644 --- a/src/server/api/announcement.get.ts +++ b/src/server/api/announcement.get.ts @@ -1,6 +1,6 @@ export default defineEventHandler(async () => { return await usePrisma().announcement.findFirst({ - ororderBy: { + orderBy: { createdAt: 'desc', }, }) diff --git a/src/server/api/article.post.ts b/src/server/api/article.post.ts index 9dc2d07..99d7166 100644 --- a/src/server/api/article.post.ts +++ b/src/server/api/article.post.ts @@ -5,9 +5,6 @@ const PostSchema = z.object({ slug: z.string() }).parse export default defineEventHandler(async (event) => { const { slug } = await readValidatedBody(event, PostSchema) return await usePrisma().post.upsert({ - cacheStrategy: { - swr: 60 * 5, - }, where: { slug, }, diff --git a/src/server/api/bookmarks.get.ts b/src/server/api/bookmarks.get.ts index 31bd6db..ebe4112 100644 --- a/src/server/api/bookmarks.get.ts +++ b/src/server/api/bookmarks.get.ts @@ -26,9 +26,6 @@ export default defineEventHandler(async (event) => { } return await prisma.bookmark.findMany({ - cacheStrategy: { - ttl: 60 * 3, - }, where: whereClause, orderBy: { name: 'asc', diff --git a/src/server/api/categories.get.ts b/src/server/api/categories.get.ts index 505a9cd..0d415c0 100644 --- a/src/server/api/categories.get.ts +++ b/src/server/api/categories.get.ts @@ -3,9 +3,6 @@ import type { CategoryType } from '@prisma/client' export default defineEventHandler(async (event) => { const { type } = getQuery<{ type: CategoryType }>(event) return await usePrisma().category.findMany({ - cacheStrategy: { - ttl: 60 * 3, - }, where: { type, }, diff --git a/src/server/api/maintenance.get.ts b/src/server/api/maintenance.get.ts index 1a02b90..273a166 100644 --- a/src/server/api/maintenance.get.ts +++ b/src/server/api/maintenance.get.ts @@ -3,10 +3,6 @@ export default defineEventHandler(async () => { orderBy: { createdAt: 'desc', }, - cacheStrategy: { - ttl: 60 * 60 * 24, - swr: 60 * 5, - }, }) let enabled = true if (process.env.NODE_ENV === 'development') { diff --git a/src/server/api/messages.get.ts b/src/server/api/messages.get.ts index 3aa7327..7333a77 100644 --- a/src/server/api/messages.get.ts +++ b/src/server/api/messages.get.ts @@ -1,9 +1,5 @@ export default defineEventHandler(async () => { return await usePrisma().guestbookMessage.findMany({ - cacheStrategy: { - ttl: 60 * 60, - swr: 60 * 5, - }, orderBy: { updatedAt: 'desc', }, diff --git a/src/server/api/talents.get.ts b/src/server/api/talents.get.ts index c4f7319..c601439 100644 --- a/src/server/api/talents.get.ts +++ b/src/server/api/talents.get.ts @@ -26,9 +26,6 @@ export default defineEventHandler(async (event) => { } return await prisma.talent.findMany({ - cacheStrategy: { - ttl: 60 * 3, - }, where: whereClause, orderBy: { name: 'asc', diff --git a/src/server/utils/prisma.ts b/src/server/utils/prisma.ts index 2304d64..de51d66 100644 --- a/src/server/utils/prisma.ts +++ b/src/server/utils/prisma.ts @@ -1,14 +1,12 @@ import { PrismaClient } from '@prisma/client/edge' -import { PrismaClientExtends } from '@prisma/client/scripts/default-index' -import { withAccelerate } from '@prisma/extension-accelerate' -let prisma: any +let prisma: PrismaClient | undefined export function usePrisma() { if (!prisma) { prisma = new PrismaClient({ log: ['warn', 'info', 'error'], - }).$extends(withAccelerate()) + }) } return prisma