diff --git a/packages/app-store/applecalendar/api/add.ts b/packages/app-store/applecalendar/api/add.ts index ac0e6c6fe141f5..2cbf562c57a892 100644 --- a/packages/app-store/applecalendar/api/add.ts +++ b/packages/app-store/applecalendar/api/add.ts @@ -5,7 +5,7 @@ import logger from "@calcom/lib/logger"; import prisma from "@calcom/prisma"; import getInstalledAppPath from "../../_utils/getInstalledAppPath"; -import { CalendarService } from "../lib"; +import CalendarService from "../lib/CalendarService"; export default async function handler(req: NextApiRequest, res: NextApiResponse) { if (req.method === "POST") { diff --git a/packages/app-store/caldavcalendar/api/add.ts b/packages/app-store/caldavcalendar/api/add.ts index 6148254c7fc131..f9083b62ebf638 100644 --- a/packages/app-store/caldavcalendar/api/add.ts +++ b/packages/app-store/caldavcalendar/api/add.ts @@ -5,7 +5,7 @@ import logger from "@calcom/lib/logger"; import prisma from "@calcom/prisma"; import getInstalledAppPath from "../../_utils/getInstalledAppPath"; -import { CalendarService } from "../lib"; +import CalendarService from "../lib/CalendarService"; export default async function handler(req: NextApiRequest, res: NextApiResponse) { if (req.method === "POST") { diff --git a/packages/app-store/exchange2013calendar/api/add.ts b/packages/app-store/exchange2013calendar/api/add.ts index 95287b06bcf1eb..a36fb6c9e5c45e 100644 --- a/packages/app-store/exchange2013calendar/api/add.ts +++ b/packages/app-store/exchange2013calendar/api/add.ts @@ -8,7 +8,7 @@ import { defaultResponder } from "@calcom/lib/server/defaultResponder"; import prisma from "@calcom/prisma"; import getInstalledAppPath from "../../_utils/getInstalledAppPath"; -import { CalendarService } from "../lib"; +import CalendarService from "../lib/CalendarService"; const bodySchema = z .object({ diff --git a/packages/app-store/exchange2016calendar/api/add.ts b/packages/app-store/exchange2016calendar/api/add.ts index a8ce3398aebb2e..5de553111fc25c 100644 --- a/packages/app-store/exchange2016calendar/api/add.ts +++ b/packages/app-store/exchange2016calendar/api/add.ts @@ -8,7 +8,7 @@ import { defaultResponder } from "@calcom/lib/server/defaultResponder"; import prisma from "@calcom/prisma"; import getInstalledAppPath from "../../_utils/getInstalledAppPath"; -import { CalendarService } from "../lib"; +import CalendarService from "../lib/CalendarService"; const bodySchema = z .object({ diff --git a/packages/app-store/exchangecalendar/api/_postAdd.ts b/packages/app-store/exchangecalendar/api/_postAdd.ts index fbb93a703f9041..bb37be7d768068 100644 --- a/packages/app-store/exchangecalendar/api/_postAdd.ts +++ b/packages/app-store/exchangecalendar/api/_postAdd.ts @@ -10,7 +10,7 @@ import prisma from "@calcom/prisma"; import checkSession from "../../_utils/auth"; import { ExchangeAuthentication, ExchangeVersion } from "../enums"; -import { CalendarService } from "../lib"; +import CalendarService from "../lib/CalendarService"; const formSchema = z .object({ diff --git a/packages/app-store/ics-feedcalendar/api/add.ts b/packages/app-store/ics-feedcalendar/api/add.ts index 90d8cd0758109e..34e54acb235baf 100644 --- a/packages/app-store/ics-feedcalendar/api/add.ts +++ b/packages/app-store/ics-feedcalendar/api/add.ts @@ -6,7 +6,7 @@ import prisma from "@calcom/prisma"; import getInstalledAppPath from "../../_utils/getInstalledAppPath"; import appConfig from "../config.json"; -import { CalendarService } from "../lib"; +import CalendarService from "../lib/CalendarService"; export default async function handler(req: NextApiRequest, res: NextApiResponse) { if (req.method === "POST") { diff --git a/packages/app-store/stripepayment/lib/PaymentService.ts b/packages/app-store/stripepayment/lib/PaymentService.ts index 0e48dc560a09ff..30fd28a32c8c76 100644 --- a/packages/app-store/stripepayment/lib/PaymentService.ts +++ b/packages/app-store/stripepayment/lib/PaymentService.ts @@ -16,7 +16,7 @@ import type { CalendarEvent } from "@calcom/types/Calendar"; import type { IAbstractPaymentService } from "@calcom/types/PaymentService"; import { paymentOptionEnum } from "../zod"; -import { createPaymentLink } from "./client"; +import { createPaymentLink } from "./client/createPaymentLink"; import { retrieveOrCreateStripeCustomerByEmail } from "./customer"; import type { StripePaymentData, StripeSetupIntentData } from "./server"; diff --git a/packages/app-store/vital/api/webhook.ts b/packages/app-store/vital/api/webhook.ts index 73599a104c5528..fe8692a24d106a 100644 --- a/packages/app-store/vital/api/webhook.ts +++ b/packages/app-store/vital/api/webhook.ts @@ -10,7 +10,7 @@ import prisma from "@calcom/prisma"; import type { Prisma } from "@calcom/prisma/client"; import { BookingStatus } from "@calcom/prisma/enums"; -import { Reschedule } from "../lib"; +import Reschedule from "../lib/reschedule"; import { initVitalClient, vitalEnv } from "../lib/client"; interface EventType { diff --git a/packages/app-store/wipemycalother/api/wipe.ts b/packages/app-store/wipemycalother/api/wipe.ts index 9a200c3914b9b1..694d3cc6612993 100644 --- a/packages/app-store/wipemycalother/api/wipe.ts +++ b/packages/app-store/wipemycalother/api/wipe.ts @@ -5,7 +5,7 @@ import { z, ZodError } from "zod"; import prisma from "@calcom/prisma"; import { BookingStatus } from "@calcom/prisma/enums"; -import { Reschedule } from "../lib"; +import Reschedule from "../lib/reschedule"; const wipeMyCalendarBodySchema = z.object({ initialDate: z.string(), diff --git a/packages/app-store/zoomvideo/api/add.ts b/packages/app-store/zoomvideo/api/add.ts index 7b70919c3a97b8..fee094ff30cd5d 100644 --- a/packages/app-store/zoomvideo/api/add.ts +++ b/packages/app-store/zoomvideo/api/add.ts @@ -7,7 +7,7 @@ import { defaultResponder } from "@calcom/lib/server/defaultResponder"; import prisma from "@calcom/prisma"; import { encodeOAuthState } from "../../_utils/oauth/encodeOAuthState"; -import { getZoomAppKeys } from "../lib"; +import { getZoomAppKeys } from "../lib/getZoomAppKeys"; async function handler(req: NextApiRequest) { // Get user diff --git a/packages/app-store/zoomvideo/api/callback.ts b/packages/app-store/zoomvideo/api/callback.ts index 02756ac448d8f2..c11e6bbeb9ecd4 100644 --- a/packages/app-store/zoomvideo/api/callback.ts +++ b/packages/app-store/zoomvideo/api/callback.ts @@ -7,7 +7,7 @@ import prisma from "@calcom/prisma"; import getInstalledAppPath from "../../_utils/getInstalledAppPath"; import createOAuthAppCredential from "../../_utils/oauth/createOAuthAppCredential"; import { decodeOAuthState } from "../../_utils/oauth/decodeOAuthState"; -import { getZoomAppKeys } from "../lib"; +import { getZoomAppKeys } from "../lib/getZoomAppKeys"; export default async function handler(req: NextApiRequest, res: NextApiResponse) { const state = decodeOAuthState(req); diff --git a/packages/features/calAIPhone/initializeRegistry.ts b/packages/features/calAIPhone/initializeRegistry.ts index cfc8f6a7c40aa7..0e92d13612f5d0 100644 --- a/packages/features/calAIPhone/initializeRegistry.ts +++ b/packages/features/calAIPhone/initializeRegistry.ts @@ -1,6 +1,6 @@ import { AIPhoneServiceRegistry } from "./AIPhoneServiceRegistry"; import { AIPhoneServiceProviderType } from "./interfaces/AIPhoneService.interface"; -import { RetellAIPhoneServiceProviderFactory } from "./providers/retellAI"; +import { RetellAIPhoneServiceProviderFactory } from "./providers/retellAI/RetellAIPhoneServiceProviderFactory"; /** * Initialize the AI Phone Service Registry diff --git a/packages/features/ee/workflows/lib/actionHelperFunctions.ts b/packages/features/ee/workflows/lib/actionHelperFunctions.ts index dc0d1f79f9d429..47af61ddc54c04 100644 --- a/packages/features/ee/workflows/lib/actionHelperFunctions.ts +++ b/packages/features/ee/workflows/lib/actionHelperFunctions.ts @@ -3,12 +3,10 @@ import type { TFunction } from "i18next"; import type { TimeFormat } from "@calcom/lib/timeFormat"; import { WorkflowActions, WorkflowTemplates, WorkflowTriggerEvents } from "@calcom/prisma/enums"; -import { - whatsappEventCancelledTemplate, - whatsappEventCompletedTemplate, - whatsappEventRescheduledTemplate, - whatsappReminderTemplate, -} from "../lib/reminders/templates/whatsapp"; +import { whatsappEventCancelledTemplate } from "../lib/reminders/templates/whatsapp/whatsappEventCancelledTemplate"; +import { whatsappEventCompletedTemplate } from "../lib/reminders/templates/whatsapp/whatsappEventCompletedTemplate"; +import { whatsappEventRescheduledTemplate } from "../lib/reminders/templates/whatsapp/whatsappEventRescheduledTemplate"; +import { whatsappReminderTemplate } from "../lib/reminders/templates/whatsapp/whatsappEventReminderTemplate"; import { FORM_TRIGGER_WORKFLOW_EVENTS } from "./constants"; import emailRatingTemplate from "./reminders/templates/emailRatingTemplate"; import emailReminderTemplate from "./reminders/templates/emailReminderTemplate"; diff --git a/packages/features/ee/workflows/lib/reminders/whatsappReminderManager.ts b/packages/features/ee/workflows/lib/reminders/whatsappReminderManager.ts index 24b6b550d83b58..c2d8925fadade6 100644 --- a/packages/features/ee/workflows/lib/reminders/whatsappReminderManager.ts +++ b/packages/features/ee/workflows/lib/reminders/whatsappReminderManager.ts @@ -17,12 +17,10 @@ import { } from "../reminders/templates/whatsapp/ContentSidMapping"; import { scheduleSmsOrFallbackEmail, sendSmsOrFallbackEmail } from "./messageDispatcher"; import type { BookingInfo, ScheduleTextReminderArgs, timeUnitLowerCase } from "./smsReminderManager"; -import { - whatsappEventCancelledTemplate, - whatsappEventCompletedTemplate, - whatsappEventRescheduledTemplate, - whatsappReminderTemplate, -} from "./templates/whatsapp"; +import { whatsappEventCancelledTemplate } from "./templates/whatsapp/whatsappEventCancelledTemplate"; +import { whatsappEventCompletedTemplate } from "./templates/whatsapp/whatsappEventCompletedTemplate"; +import { whatsappEventRescheduledTemplate } from "./templates/whatsapp/whatsappEventRescheduledTemplate"; +import { whatsappReminderTemplate } from "./templates/whatsapp/whatsappEventReminderTemplate"; const log = logger.getSubLogger({ prefix: ["[whatsappReminderManager]"] }); diff --git a/packages/features/watchlist/operations/check-if-email-in-watchlist.controller.test.ts b/packages/features/watchlist/operations/check-if-email-in-watchlist.controller.test.ts index 8d6337fedb88df..14db2f9eb47480 100644 --- a/packages/features/watchlist/operations/check-if-email-in-watchlist.controller.test.ts +++ b/packages/features/watchlist/operations/check-if-email-in-watchlist.controller.test.ts @@ -3,7 +3,7 @@ import { describe, test, expect, vi, beforeEach } from "vitest"; import { WatchlistType } from "@calcom/prisma/enums"; import { WatchlistFeature } from "../lib/facade/WatchlistFeature"; -import type { SpanFn } from "../lib/telemetry"; +import { SpanFn } from "../lib/telemetry/types"; import { checkIfEmailIsBlockedInWatchlistController } from "./check-if-email-in-watchlist.controller"; // Mock the DI container diff --git a/packages/features/watchlist/operations/check-if-email-in-watchlist.controller.ts b/packages/features/watchlist/operations/check-if-email-in-watchlist.controller.ts index 2b9ee6ef2321ad..d3560b55d88f85 100644 --- a/packages/features/watchlist/operations/check-if-email-in-watchlist.controller.ts +++ b/packages/features/watchlist/operations/check-if-email-in-watchlist.controller.ts @@ -1,6 +1,6 @@ import { getWatchlistFeature } from "@calcom/features/di/watchlist/containers/watchlist"; -import type { SpanFn } from "../lib/telemetry"; +import { SpanFn } from "../lib/telemetry/types"; import { normalizeEmail } from "../lib/utils/normalization"; interface CheckEmailBlockedParams { diff --git a/packages/features/watchlist/operations/check-if-users-are-blocked.controller.test.ts b/packages/features/watchlist/operations/check-if-users-are-blocked.controller.test.ts index c4a9c86d4d8be8..6706ccef61e791 100644 --- a/packages/features/watchlist/operations/check-if-users-are-blocked.controller.test.ts +++ b/packages/features/watchlist/operations/check-if-users-are-blocked.controller.test.ts @@ -2,7 +2,7 @@ import { describe, test, expect, vi, beforeEach } from "vitest"; import { WatchlistType } from "@calcom/prisma/enums"; -import type { SpanFn } from "../lib/telemetry"; +import { SpanFn } from "../lib/telemetry/types"; import { checkIfUsersAreBlocked } from "./check-if-users-are-blocked.controller"; // Mock the DI container diff --git a/packages/features/watchlist/operations/list-all-system-entries.controller.test.ts b/packages/features/watchlist/operations/list-all-system-entries.controller.test.ts index 7e67c33c7757db..1ff605c9676076 100644 --- a/packages/features/watchlist/operations/list-all-system-entries.controller.test.ts +++ b/packages/features/watchlist/operations/list-all-system-entries.controller.test.ts @@ -2,7 +2,7 @@ import { describe, test, expect, vi, beforeEach } from "vitest"; import { WatchlistType, WatchlistAction, WatchlistSource } from "@calcom/prisma/enums"; -import type { SpanFn } from "../lib/telemetry"; +import { SpanFn } from "../lib/telemetry/types"; import { listAllSystemEntriesController } from "./list-all-system-entries.controller"; // Mock the DI container diff --git a/packages/features/watchlist/operations/list-all-system-entries.controller.ts b/packages/features/watchlist/operations/list-all-system-entries.controller.ts index 43bd224019e5a1..21d05655a9705e 100644 --- a/packages/features/watchlist/operations/list-all-system-entries.controller.ts +++ b/packages/features/watchlist/operations/list-all-system-entries.controller.ts @@ -1,6 +1,6 @@ import { getWatchlistFeature } from "@calcom/features/di/watchlist/containers/watchlist"; -import type { SpanFn } from "../lib/telemetry"; +import { SpanFn } from "../lib/telemetry/types"; import type { WatchlistEntry } from "../lib/types"; interface ListAllSystemEntriesParams {