From 833fe7c7b716c079af0dc30cc837c4029d792d2f Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Wed, 11 Oct 2023 23:53:54 +0100 Subject: [PATCH] fix(prisma): don't declare prisma as a global object and explicitly import it (#11839) --- apps/web/playwright/oauth-provider.e2e.ts | 1 + packages/app-store/salesforce/lib/CalendarService.ts | 1 + packages/prisma/index.ts | 10 +++------- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/apps/web/playwright/oauth-provider.e2e.ts b/apps/web/playwright/oauth-provider.e2e.ts index 31f1fb20e8..701cabae92 100644 --- a/apps/web/playwright/oauth-provider.e2e.ts +++ b/apps/web/playwright/oauth-provider.e2e.ts @@ -2,6 +2,7 @@ import { expect } from "@playwright/test"; import { randomBytes } from "crypto"; import { WEBAPP_URL } from "@calcom/lib/constants"; +import { prisma } from "@calcom/prisma"; import { generateSecret } from "@calcom/trpc/server/routers/viewer/oAuth/addClient.handler"; import { test } from "./lib/fixtures"; diff --git a/packages/app-store/salesforce/lib/CalendarService.ts b/packages/app-store/salesforce/lib/CalendarService.ts index 41c0dd39da..9b18277f93 100644 --- a/packages/app-store/salesforce/lib/CalendarService.ts +++ b/packages/app-store/salesforce/lib/CalendarService.ts @@ -7,6 +7,7 @@ import { getLocation } from "@calcom/lib/CalEventParser"; import { WEBAPP_URL } from "@calcom/lib/constants"; import { HttpError } from "@calcom/lib/http-error"; import logger from "@calcom/lib/logger"; +import { prisma } from "@calcom/prisma"; import type { Calendar, CalendarEvent, diff --git a/packages/prisma/index.ts b/packages/prisma/index.ts index c95d9ad0b4..071f6fdbbe 100644 --- a/packages/prisma/index.ts +++ b/packages/prisma/index.ts @@ -4,11 +4,6 @@ import { withAccelerate } from "@prisma/extension-accelerate"; import { bookingReferenceMiddleware } from "./middleware"; -declare global { - // eslint-disable-next-line no-var - var prisma: typeof prismaWithClientExtensions; -} - const prismaOptions: Prisma.PrismaClientOptions = {}; if (!!process.env.NEXT_PUBLIC_DEBUG) prismaOptions.log = ["query", "error", "warn"]; @@ -57,10 +52,11 @@ const prismaWithClientExtensions = prismaWithoutClientExtensions // const prismaWithClientExtensions = prismaWithoutClientExtensions; -export const prisma = (globalThis.prisma as typeof prismaWithClientExtensions) || prismaWithClientExtensions; +export const prisma = + ((globalThis as any).prisma as typeof prismaWithClientExtensions) || prismaWithClientExtensions; if (process.env.NODE_ENV !== "production") { - globalThis.prisma = prisma; + (globalThis as any).prisma = prisma; } export type PrismaClient = typeof prismaWithClientExtensions;