diff --git a/apps/api/v2/src/ee/event-types/event-types_2024_06_14/constants/constants.ts b/apps/api/v2/src/ee/event-types/event-types_2024_06_14/constants/constants.ts index ad1343e84d..32a85c8c5c 100644 --- a/apps/api/v2/src/ee/event-types/event-types_2024_06_14/constants/constants.ts +++ b/apps/api/v2/src/ee/event-types/event-types_2024_06_14/constants/constants.ts @@ -1,4 +1,4 @@ -import { OrganizerIntegrationLocation } from "@calcom/lib"; +import { OrganizerIntegrationLocation } from "@calcom/lib/event-types/transformers/internal/locations"; type BaseEventType = { length: number; diff --git a/apps/web/app/api/cron/bookingReminder/route.ts b/apps/web/app/api/cron/bookingReminder/route.ts index 4b23416507..a70199956d 100644 --- a/apps/web/app/api/cron/bookingReminder/route.ts +++ b/apps/web/app/api/cron/bookingReminder/route.ts @@ -5,7 +5,8 @@ import { NextResponse } from "next/server"; import dayjs from "@calcom/dayjs"; import { sendOrganizerRequestReminderEmail } from "@calcom/emails"; import { getCalEventResponses } from "@calcom/features/bookings/lib/getCalEventResponses"; -import { isPrismaObjOrUndefined, parseRecurringEvent } from "@calcom/lib"; +import { isPrismaObjOrUndefined } from "@calcom/lib/isPrismaObj"; +import { parseRecurringEvent } from "@calcom/lib/isRecurringEvent"; import { getTranslation } from "@calcom/lib/server/i18n"; import prisma, { bookingMinimalSelect } from "@calcom/prisma"; import { BookingStatus, ReminderType } from "@calcom/prisma/enums"; diff --git a/apps/web/modules/bookings/views/bookings-single-view.getServerSideProps.tsx b/apps/web/modules/bookings/views/bookings-single-view.getServerSideProps.tsx index cb3f2423ca..d31935137b 100644 --- a/apps/web/modules/bookings/views/bookings-single-view.getServerSideProps.tsx +++ b/apps/web/modules/bookings/views/bookings-single-view.getServerSideProps.tsx @@ -5,8 +5,8 @@ import { z } from "zod"; import { orgDomainConfig } from "@calcom/ee/organizations/lib/orgDomains"; import { getServerSession } from "@calcom/features/auth/lib/getServerSession"; import getBookingInfo from "@calcom/features/bookings/lib/getBookingInfo"; -import { parseRecurringEvent } from "@calcom/lib"; import { getDefaultEvent } from "@calcom/lib/defaultEvents"; +import { parseRecurringEvent } from "@calcom/lib/isRecurringEvent"; import { markdownToSafeHTML } from "@calcom/lib/markdownToSafeHTML"; import { maybeGetBookingUidFromSeat } from "@calcom/lib/server/maybeGetBookingUidFromSeat"; import { BookingRepository } from "@calcom/lib/server/repository/booking"; diff --git a/apps/web/modules/event-types/views/event-types-listing-view.tsx b/apps/web/modules/event-types/views/event-types-listing-view.tsx index a75e148679..04b64dde57 100644 --- a/apps/web/modules/event-types/views/event-types-listing-view.tsx +++ b/apps/web/modules/event-types/views/event-types-listing-view.tsx @@ -15,7 +15,6 @@ import { EventTypeDescription } from "@calcom/features/eventtypes/components"; import CreateEventTypeDialog from "@calcom/features/eventtypes/components/CreateEventTypeDialog"; import { DuplicateDialog } from "@calcom/features/eventtypes/components/DuplicateDialog"; import { InfiniteSkeletonLoader } from "@calcom/features/eventtypes/components/SkeletonLoader"; -import { parseEventTypeColor } from "@calcom/lib"; import { APP_NAME, WEBSITE_URL } from "@calcom/lib/constants"; import { useCopy } from "@calcom/lib/hooks/useCopy"; import { useDebounce } from "@calcom/lib/hooks/useDebounce"; @@ -24,6 +23,7 @@ import { useLocale } from "@calcom/lib/hooks/useLocale"; import { useGetTheme } from "@calcom/lib/hooks/useTheme"; import { useTypedQuery } from "@calcom/lib/hooks/useTypedQuery"; import { HttpError } from "@calcom/lib/http-error"; +import { parseEventTypeColor } from "@calcom/lib/isEventTypeColor"; import type { MembershipRole } from "@calcom/prisma/enums"; import { SchedulingType } from "@calcom/prisma/enums"; import type { RouterOutputs } from "@calcom/trpc/react"; diff --git a/packages/app-store/test-setup.ts b/packages/app-store/test-setup.ts index ff205a97f2..696855e7d7 100644 --- a/packages/app-store/test-setup.ts +++ b/packages/app-store/test-setup.ts @@ -26,8 +26,8 @@ vi.mock("@calcom/atoms/hooks/useIsPlatform", () => ({ return false; }, })); -vi.mock("@calcom/lib", () => ({ - classNames: (...args: string[]) => { +vi.mock("@calcom/ui/classNames", () => ({ + default: (...args: string[]) => { return args.filter(Boolean).join(" "); }, })); diff --git a/packages/features/bookings/lib/handleCancelBooking.ts b/packages/features/bookings/lib/handleCancelBooking.ts index 73c7e80eda..24105548a8 100644 --- a/packages/features/bookings/lib/handleCancelBooking.ts +++ b/packages/features/bookings/lib/handleCancelBooking.ts @@ -12,12 +12,13 @@ import getWebhooks from "@calcom/features/webhooks/lib/getWebhooks"; import { deleteWebhookScheduledTriggers } from "@calcom/features/webhooks/lib/scheduleTrigger"; import sendPayload from "@calcom/features/webhooks/lib/sendOrSchedulePayload"; import type { EventTypeInfo } from "@calcom/features/webhooks/lib/sendPayload"; -import { isPrismaObjOrUndefined, parseRecurringEvent } from "@calcom/lib"; import EventManager from "@calcom/lib/EventManager"; import { getBookerBaseUrl } from "@calcom/lib/getBookerUrl/server"; import getOrgIdFromMemberOrTeamId from "@calcom/lib/getOrgIdFromMemberOrTeamId"; import { getTeamIdFromEventType } from "@calcom/lib/getTeamIdFromEventType"; import { HttpError } from "@calcom/lib/http-error"; +import { isPrismaObjOrUndefined } from "@calcom/lib/isPrismaObj"; +import { parseRecurringEvent } from "@calcom/lib/isRecurringEvent"; import logger from "@calcom/lib/logger"; import { processPaymentRefund } from "@calcom/lib/payment/processPaymentRefund"; import { safeStringify } from "@calcom/lib/safeStringify"; diff --git a/packages/features/bookings/lib/handleNewBooking/createBooking.ts b/packages/features/bookings/lib/handleNewBooking/createBooking.ts index ebacb09af0..2534ecde11 100644 --- a/packages/features/bookings/lib/handleNewBooking/createBooking.ts +++ b/packages/features/bookings/lib/handleNewBooking/createBooking.ts @@ -4,7 +4,7 @@ import type { z } from "zod"; import type { routingFormResponseInDbSchema } from "@calcom/app-store/routing-forms/zod"; import dayjs from "@calcom/dayjs"; -import { isPrismaObjOrUndefined } from "@calcom/lib"; +import { isPrismaObjOrUndefined } from "@calcom/lib/isPrismaObj"; import { withReporting } from "@calcom/lib/sentryWrapper"; import prisma from "@calcom/prisma"; import { BookingStatus } from "@calcom/prisma/enums"; diff --git a/packages/features/bookings/lib/handleNewBooking/getEventTypesFromDB.ts b/packages/features/bookings/lib/handleNewBooking/getEventTypesFromDB.ts index 475c7bb9ec..afadd85833 100644 --- a/packages/features/bookings/lib/handleNewBooking/getEventTypesFromDB.ts +++ b/packages/features/bookings/lib/handleNewBooking/getEventTypesFromDB.ts @@ -1,8 +1,8 @@ import type { LocationObject } from "@calcom/app-store/locations"; import { workflowSelect } from "@calcom/ee/workflows/lib/getAllWorkflows"; import { getBookingFieldsWithSystemFields } from "@calcom/features/bookings/lib/getBookingFields"; -import { parseRecurringEvent } from "@calcom/lib"; import type { DefaultEvent } from "@calcom/lib/defaultEvents"; +import { parseRecurringEvent } from "@calcom/lib/isRecurringEvent"; import { withSelectedCalendars } from "@calcom/lib/server/repository/user"; import prisma, { userSelect } from "@calcom/prisma"; import { credentialForCalendarServiceSelect } from "@calcom/prisma/selects/credential"; diff --git a/packages/features/credentials/handleDeleteCredential.ts b/packages/features/credentials/handleDeleteCredential.ts index b8ced4e222..a2e84903d3 100644 --- a/packages/features/credentials/handleDeleteCredential.ts +++ b/packages/features/credentials/handleDeleteCredential.ts @@ -6,8 +6,9 @@ import { appStoreMetadata } from "@calcom/app-store/appStoreMetaData"; import { sendCancelledEmailsAndSMS } from "@calcom/emails"; import { getCalEventResponses } from "@calcom/features/bookings/lib/getCalEventResponses"; import { deleteWebhookScheduledTriggers } from "@calcom/features/webhooks/lib/scheduleTrigger"; -import { isPrismaObjOrUndefined, parseRecurringEvent } from "@calcom/lib"; import { buildNonDelegationCredential } from "@calcom/lib/delegationCredential/server"; +import { isPrismaObjOrUndefined } from "@calcom/lib/isPrismaObj"; +import { parseRecurringEvent } from "@calcom/lib/isRecurringEvent"; import { DailyLocationType } from "@calcom/lib/location"; import { deletePayment } from "@calcom/lib/payment/deletePayment"; import { getTranslation } from "@calcom/lib/server/i18n"; diff --git a/packages/features/ee/billing/credit-service.test.ts b/packages/features/ee/billing/credit-service.test.ts index 723fbf6216..72728184bb 100644 --- a/packages/features/ee/billing/credit-service.test.ts +++ b/packages/features/ee/billing/credit-service.test.ts @@ -22,6 +22,17 @@ vi.mock("@calcom/lib/constants", async () => { }; }); +vi.mock("@calcom/prisma/enums", async (importOriginal) => { + const actual = await importOriginal(); + return { + ...actual, + CreditType: { + MONTHLY: "MONTHLY", + ADDITIONAL: "ADDITIONAL", + }, + }; +}); + vi.mock("@calcom/lib/server/repository/credits"); vi.mock("@calcom/lib/server/repository/membership"); vi.mock("@calcom/lib/server/repository/team"); diff --git a/packages/features/ee/round-robin/roundRobinManualReassignment.ts b/packages/features/ee/round-robin/roundRobinManualReassignment.ts index 5f2a39c1c4..759e51a90d 100644 --- a/packages/features/ee/round-robin/roundRobinManualReassignment.ts +++ b/packages/features/ee/round-robin/roundRobinManualReassignment.ts @@ -19,12 +19,12 @@ import { deleteScheduledEmailReminder, } from "@calcom/features/ee/workflows/lib/reminders/emailReminderManager"; import { scheduleWorkflowReminders } from "@calcom/features/ee/workflows/lib/reminders/reminderScheduler"; -import { isPrismaObjOrUndefined } from "@calcom/lib"; import { getVideoCallUrlFromCalEvent } from "@calcom/lib/CalEventParser"; import { SENDER_NAME } from "@calcom/lib/constants"; import { enrichUserWithDelegationCredentialsWithoutOrgId } from "@calcom/lib/delegationCredential/server"; import { getEventName } from "@calcom/lib/event"; import { getBookerBaseUrl } from "@calcom/lib/getBookerUrl/server"; +import { isPrismaObjOrUndefined } from "@calcom/lib/isPrismaObj"; import logger from "@calcom/lib/logger"; import { getTranslation } from "@calcom/lib/server/i18n"; import { getTimeFormatStringFromUserTimeFormat } from "@calcom/lib/timeFormat"; diff --git a/packages/features/ee/round-robin/roundRobinReassignment.ts b/packages/features/ee/round-robin/roundRobinReassignment.ts index c320a4c4dd..d8173ef4ea 100644 --- a/packages/features/ee/round-robin/roundRobinReassignment.ts +++ b/packages/features/ee/round-robin/roundRobinReassignment.ts @@ -21,7 +21,6 @@ import { deleteScheduledEmailReminder, } from "@calcom/features/ee/workflows/lib/reminders/emailReminderManager"; import { scheduleWorkflowReminders } from "@calcom/features/ee/workflows/lib/reminders/reminderScheduler"; -import { isPrismaObjOrUndefined } from "@calcom/lib"; import { getVideoCallUrlFromCalEvent } from "@calcom/lib/CalEventParser"; import { SENDER_NAME } from "@calcom/lib/constants"; import { @@ -30,6 +29,7 @@ import { } from "@calcom/lib/delegationCredential/server"; import { getEventName } from "@calcom/lib/event"; import { getBookerBaseUrl } from "@calcom/lib/getBookerUrl/server"; +import { isPrismaObjOrUndefined } from "@calcom/lib/isPrismaObj"; import logger from "@calcom/lib/logger"; import { getLuckyUser } from "@calcom/lib/server/getLuckyUser"; import { getTranslation } from "@calcom/lib/server/i18n"; diff --git a/packages/features/ee/workflows/lib/getiCalEventAsString.ts b/packages/features/ee/workflows/lib/getiCalEventAsString.ts index 68c05228b6..3d9b5a9385 100644 --- a/packages/features/ee/workflows/lib/getiCalEventAsString.ts +++ b/packages/features/ee/workflows/lib/getiCalEventAsString.ts @@ -4,7 +4,7 @@ import { RRule } from "rrule"; import { v4 as uuidv4 } from "uuid"; import dayjs from "@calcom/dayjs"; -import { parseRecurringEvent } from "@calcom/lib"; +import { parseRecurringEvent } from "@calcom/lib/isRecurringEvent"; import type { Prisma, User } from "@calcom/prisma/client"; type Booking = Prisma.BookingGetPayload<{ diff --git a/packages/features/eventtypes/components/EventTypeDescription.tsx b/packages/features/eventtypes/components/EventTypeDescription.tsx index 8fbef8f0ba..b3c5c833ad 100644 --- a/packages/features/eventtypes/components/EventTypeDescription.tsx +++ b/packages/features/eventtypes/components/EventTypeDescription.tsx @@ -4,9 +4,9 @@ import type { z } from "zod"; import { Price } from "@calcom/features/bookings/components/event-meta/Price"; import { PriceIcon } from "@calcom/features/bookings/components/event-meta/PriceIcon"; -import { parseRecurringEvent } from "@calcom/lib"; import { getPaymentAppData } from "@calcom/lib/getPaymentAppData"; import { useLocale } from "@calcom/lib/hooks/useLocale"; +import { parseRecurringEvent } from "@calcom/lib/isRecurringEvent"; import { markdownToSafeHTML } from "@calcom/lib/markdownToSafeHTML"; import type { baseEventTypeSelect } from "@calcom/prisma"; import { SchedulingType } from "@calcom/prisma/enums"; diff --git a/packages/features/eventtypes/lib/getPublicEvent.ts b/packages/features/eventtypes/lib/getPublicEvent.ts index c032097651..3d70383295 100644 --- a/packages/features/eventtypes/lib/getPublicEvent.ts +++ b/packages/features/eventtypes/lib/getPublicEvent.ts @@ -7,12 +7,12 @@ import { getAppFromSlug } from "@calcom/app-store/utils"; import dayjs from "@calcom/dayjs"; import { getBookingFieldsWithSystemFields } from "@calcom/features/bookings/lib/getBookingFields"; import { getSlugOrRequestedSlug } from "@calcom/features/ee/organizations/lib/orgDomains"; -import { isRecurringEvent, parseRecurringEvent } from "@calcom/lib"; import { getOrgOrTeamAvatar } from "@calcom/lib/defaultAvatarImage"; import { getPlaceholderAvatar } from "@calcom/lib/defaultAvatarImage"; import { getDefaultEvent, getUsernameList } from "@calcom/lib/defaultEvents"; import { getUserAvatarUrl } from "@calcom/lib/getAvatarUrl"; import { getBookerBaseUrlSync } from "@calcom/lib/getBookerUrl/client"; +import { isRecurringEvent, parseRecurringEvent } from "@calcom/lib/isRecurringEvent"; import { markdownToSafeHTML } from "@calcom/lib/markdownToSafeHTML"; import { UserRepository } from "@calcom/lib/server/repository/user"; import type { PrismaClient } from "@calcom/prisma"; diff --git a/packages/features/instant-meeting/handleInstantMeeting.ts b/packages/features/instant-meeting/handleInstantMeeting.ts index 2585651421..5388e42316 100644 --- a/packages/features/instant-meeting/handleInstantMeeting.ts +++ b/packages/features/instant-meeting/handleInstantMeeting.ts @@ -13,9 +13,9 @@ import { getEventTypesFromDB } from "@calcom/features/bookings/lib/handleNewBook import { getFullName } from "@calcom/features/form-builder/utils"; import { sendNotification } from "@calcom/features/notifications/sendNotification"; import { sendGenericWebhookPayload } from "@calcom/features/webhooks/lib/sendPayload"; -import { isPrismaObjOrUndefined } from "@calcom/lib"; import { WEBAPP_URL } from "@calcom/lib/constants"; import getOrgIdFromMemberOrTeamId from "@calcom/lib/getOrgIdFromMemberOrTeamId"; +import { isPrismaObjOrUndefined } from "@calcom/lib/isPrismaObj"; import logger from "@calcom/lib/logger"; import { getTranslation } from "@calcom/lib/server/i18n"; import { createInstantMeetingWithCalVideo } from "@calcom/lib/videoClient"; diff --git a/packages/lib/event-types/getEventTypeById.ts b/packages/lib/event-types/getEventTypeById.ts index ea605e39a9..1fe1300b7d 100644 --- a/packages/lib/event-types/getEventTypeById.ts +++ b/packages/lib/event-types/getEventTypeById.ts @@ -4,10 +4,11 @@ import { Prisma } from "@prisma/client"; import { getLocationGroupedOptions } from "@calcom/app-store/server"; import { getEventTypeAppData } from "@calcom/app-store/utils"; import { getBookingFieldsWithSystemFields } from "@calcom/features/bookings/lib/getBookingFields"; -import { parseRecurringEvent, parseEventTypeColor } from "@calcom/lib"; import { getUserAvatarUrl } from "@calcom/lib/getAvatarUrl"; import { parseBookingLimit } from "@calcom/lib/intervalLimits/isBookingLimits"; import { parseDurationLimit } from "@calcom/lib/intervalLimits/isDurationLimits"; +import { parseEventTypeColor } from "@calcom/lib/isEventTypeColor"; +import { parseRecurringEvent } from "@calcom/lib/isRecurringEvent"; import type { LocationObject } from "@calcom/lib/location"; import { getTranslation } from "@calcom/lib/server/i18n"; import { EventTypeRepository } from "@calcom/lib/server/repository/eventType"; diff --git a/packages/lib/index.ts b/packages/lib/index.ts deleted file mode 100644 index 02f2b50620..0000000000 --- a/packages/lib/index.ts +++ /dev/null @@ -1,4 +0,0 @@ -export { default as isPrismaObj, isPrismaObjOrUndefined } from "./isPrismaObj"; -export * from "./isRecurringEvent"; -export * from "./isEventTypeColor"; -export * from "./event-types"; diff --git a/packages/lib/package.json b/packages/lib/package.json index 944def4c5f..7b54d8595b 100644 --- a/packages/lib/package.json +++ b/packages/lib/package.json @@ -3,8 +3,6 @@ "private": true, "sideEffects": false, "version": "0.0.0", - "main": "./index.ts", - "types": "./index.ts", "license": "MIT", "scripts": { "lint": "eslint . --ext .ts,.js,.tsx,.jsx", diff --git a/packages/lib/payment/getBooking.ts b/packages/lib/payment/getBooking.ts index c50444cb9e..595861f95c 100644 --- a/packages/lib/payment/getBooking.ts +++ b/packages/lib/payment/getBooking.ts @@ -1,7 +1,8 @@ import { workflowSelect } from "@calcom/ee/workflows/lib/getAllWorkflows"; import { getCalEventResponses } from "@calcom/features/bookings/lib/getCalEventResponses"; -import { isPrismaObjOrUndefined, parseRecurringEvent } from "@calcom/lib"; import { HttpError as HttpCode } from "@calcom/lib/http-error"; +import { isPrismaObjOrUndefined } from "@calcom/lib/isPrismaObj"; +import { parseRecurringEvent } from "@calcom/lib/isRecurringEvent"; import { getTranslation } from "@calcom/lib/server/i18n"; import { getTimeFormatStringFromUserTimeFormat } from "@calcom/lib/timeFormat"; import { bookingMinimalSelect, prisma } from "@calcom/prisma"; diff --git a/packages/trpc/server/routers/loggedInViewer/connectAndJoin.handler.ts b/packages/trpc/server/routers/loggedInViewer/connectAndJoin.handler.ts index 200216afda..8d2c00000b 100644 --- a/packages/trpc/server/routers/loggedInViewer/connectAndJoin.handler.ts +++ b/packages/trpc/server/routers/loggedInViewer/connectAndJoin.handler.ts @@ -1,6 +1,6 @@ import { sendScheduledEmailsAndSMS } from "@calcom/emails"; import { getCalEventResponses } from "@calcom/features/bookings/lib/getCalEventResponses"; -import { isPrismaObjOrUndefined } from "@calcom/lib"; +import { isPrismaObjOrUndefined } from "@calcom/lib/isPrismaObj"; import { getTranslation } from "@calcom/lib/server/i18n"; import { getTimeFormatStringFromUserTimeFormat } from "@calcom/lib/timeFormat"; import { prisma } from "@calcom/prisma"; diff --git a/packages/trpc/server/routers/viewer/availability/schedule/update.handler.ts b/packages/trpc/server/routers/viewer/availability/schedule/update.handler.ts index 49aaaac7f8..44ea40b9db 100644 --- a/packages/trpc/server/routers/viewer/availability/schedule/update.handler.ts +++ b/packages/trpc/server/routers/viewer/availability/schedule/update.handler.ts @@ -1,6 +1,6 @@ import { getAvailabilityFromSchedule } from "@calcom/lib/availability"; import { hasEditPermissionForUserID } from "@calcom/lib/hasEditPermissionForUser"; -import { transformScheduleToAvailabilityForAtom } from "@calcom/lib/schedules/transformers"; +import { transformScheduleToAvailabilityForAtom } from "@calcom/lib/schedules/transformers/for-atom"; import { prisma } from "@calcom/prisma"; import { TRPCError } from "@trpc/server"; diff --git a/packages/trpc/server/routers/viewer/bookings/addGuests.handler.ts b/packages/trpc/server/routers/viewer/bookings/addGuests.handler.ts index fc8419e51a..54a03c5173 100644 --- a/packages/trpc/server/routers/viewer/bookings/addGuests.handler.ts +++ b/packages/trpc/server/routers/viewer/bookings/addGuests.handler.ts @@ -1,7 +1,7 @@ import dayjs from "@calcom/dayjs"; import { sendAddGuestsEmails } from "@calcom/emails"; -import { parseRecurringEvent } from "@calcom/lib"; import EventManager from "@calcom/lib/EventManager"; +import { parseRecurringEvent } from "@calcom/lib/isRecurringEvent"; import { getUsersCredentials } from "@calcom/lib/server/getUsersCredentials"; import { getTranslation } from "@calcom/lib/server/i18n"; import { isTeamAdmin, isTeamOwner } from "@calcom/lib/server/queries/teams"; diff --git a/packages/trpc/server/routers/viewer/bookings/confirm.handler.ts b/packages/trpc/server/routers/viewer/bookings/confirm.handler.ts index e05aa51615..376a1a0b78 100644 --- a/packages/trpc/server/routers/viewer/bookings/confirm.handler.ts +++ b/packages/trpc/server/routers/viewer/bookings/confirm.handler.ts @@ -10,10 +10,11 @@ import { handleWebhookTrigger } from "@calcom/features/bookings/lib/handleWebhoo import { workflowSelect } from "@calcom/features/ee/workflows/lib/getAllWorkflows"; import type { GetSubscriberOptions } from "@calcom/features/webhooks/lib/getWebhooks"; import type { EventPayloadType, EventTypeInfo } from "@calcom/features/webhooks/lib/sendPayload"; -import { isPrismaObjOrUndefined, parseRecurringEvent } from "@calcom/lib"; import { getBookerBaseUrl } from "@calcom/lib/getBookerUrl/server"; import getOrgIdFromMemberOrTeamId from "@calcom/lib/getOrgIdFromMemberOrTeamId"; import { getTeamIdFromEventType } from "@calcom/lib/getTeamIdFromEventType"; +import { isPrismaObjOrUndefined } from "@calcom/lib/isPrismaObj"; +import { parseRecurringEvent } from "@calcom/lib/isRecurringEvent"; import { processPaymentRefund } from "@calcom/lib/payment/processPaymentRefund"; import { getUsersCredentials } from "@calcom/lib/server/getUsersCredentials"; import { getTranslation } from "@calcom/lib/server/i18n"; diff --git a/packages/trpc/server/routers/viewer/bookings/get.handler.ts b/packages/trpc/server/routers/viewer/bookings/get.handler.ts index 7da2882f5b..58ab6f34a4 100644 --- a/packages/trpc/server/routers/viewer/bookings/get.handler.ts +++ b/packages/trpc/server/routers/viewer/bookings/get.handler.ts @@ -7,8 +7,9 @@ import dayjs from "@calcom/dayjs"; import { isTextFilterValue } from "@calcom/features/data-table/lib/utils"; import type { DB } from "@calcom/kysely"; import kysely from "@calcom/kysely"; -import { parseRecurringEvent, parseEventTypeColor } from "@calcom/lib"; import getAllUserBookings from "@calcom/lib/bookings/getAllUserBookings"; +import { parseEventTypeColor } from "@calcom/lib/isEventTypeColor"; +import { parseRecurringEvent } from "@calcom/lib/isRecurringEvent"; import logger from "@calcom/lib/logger"; import { safeStringify } from "@calcom/lib/safeStringify"; import type { PrismaClient } from "@calcom/prisma"; diff --git a/packages/trpc/server/routers/viewer/bookings/requestReschedule.handler.ts b/packages/trpc/server/routers/viewer/bookings/requestReschedule.handler.ts index eb1fb4c43c..cb10174070 100644 --- a/packages/trpc/server/routers/viewer/bookings/requestReschedule.handler.ts +++ b/packages/trpc/server/routers/viewer/bookings/requestReschedule.handler.ts @@ -8,13 +8,13 @@ import { getCalEventResponses } from "@calcom/features/bookings/lib/getCalEventR import getWebhooks from "@calcom/features/webhooks/lib/getWebhooks"; import { deleteWebhookScheduledTriggers } from "@calcom/features/webhooks/lib/scheduleTrigger"; import sendPayload from "@calcom/features/webhooks/lib/sendOrSchedulePayload"; -import { isPrismaObjOrUndefined } from "@calcom/lib"; import { CalendarEventBuilder } from "@calcom/lib/builders/CalendarEvent/builder"; import { CalendarEventDirector } from "@calcom/lib/builders/CalendarEvent/director"; import { getDelegationCredentialOrRegularCredential } from "@calcom/lib/delegationCredential/server"; import { getBookerBaseUrl } from "@calcom/lib/getBookerUrl/server"; import getOrgIdFromMemberOrTeamId from "@calcom/lib/getOrgIdFromMemberOrTeamId"; import { getTeamIdFromEventType } from "@calcom/lib/getTeamIdFromEventType"; +import { isPrismaObjOrUndefined } from "@calcom/lib/isPrismaObj"; import logger from "@calcom/lib/logger"; import { safeStringify } from "@calcom/lib/safeStringify"; import { getUsersCredentials } from "@calcom/lib/server/getUsersCredentials"; diff --git a/packages/ui/components/test-setup.tsx b/packages/ui/components/test-setup.tsx index beb3908a42..237b587cd0 100644 --- a/packages/ui/components/test-setup.tsx +++ b/packages/ui/components/test-setup.tsx @@ -82,8 +82,8 @@ vi.mock("@calcom/atoms/hooks/useIsPlatform", () => ({ vi.mock("@calcom/lib/event-types/getEventTypesByViewer", () => ({})); vi.mock("@calcom/lib/event-types/getEventTypesPublic", () => ({})); -vi.mock("@calcom/lib", () => ({ - classNames: (...args: string[]) => { +vi.mock("@calcom/ui/classNames", () => ({ + default: (...args: string[]) => { return args.filter(Boolean).join(" "); }, }));