Type fixes

apps/web/ee/lib/stripe/server.ts

@@ -2,7 +2,8 @@ import { PaymentType, Prisma } from "@prisma/client";
 import Stripe from "stripe";
 import { v4 as uuidv4 } from "uuid";
 
-import { CalendarEvent } from "@lib/apps/calendar/interfaces/Calendar";
+import type { CalendarEvent } from "@calcom/types/CalendarEvent";
+
 import { sendAwaitingPaymentEmail, sendOrganizerPaymentRefundFailedEmail } from "@lib/emails/email-manager";
 import { getErrorFromUnknown } from "@lib/errors";
 import prisma from "@lib/prisma";

apps/web/ee/pages/api/integrations/stripepayment/webhook.ts

@@ -2,9 +2,9 @@ import { buffer } from "micro";
 import type { NextApiRequest, NextApiResponse } from "next";
 import Stripe from "stripe";
 
+import type { CalendarEvent } from "@calcom/types/CalendarEvent";
 import stripe from "@ee/lib/stripe/server";
 
-import { CalendarEvent } from "@lib/apps/calendar/interfaces/Calendar";
 import { IS_PRODUCTION } from "@lib/config/constants";
 import { HttpError as HttpCode } from "@lib/core/http/error";
 import { getErrorFromUnknown } from "@lib/errors";

apps/web/lib/CalEventParser.ts

@@ -2,9 +2,10 @@ import { Person } from "ics";
 import short from "short-uuid";
 import { v5 as uuidv5 } from "uuid";
 
+import type { CalendarEvent } from "@calcom/types/CalendarEvent";
+
 import { getAppName } from "@lib/apps/utils/AppUtils";
 
-import { CalendarEvent } from "./apps/calendar/interfaces/Calendar";
 import { BASE_URL } from "./config/constants";
 
 const translator = short();

apps/web/lib/apps/calendar/managers/CalendarManager.ts

@@ -1,8 +1,10 @@
 import { Credential, SelectedCalendar } from "@prisma/client";
 import _ from "lodash";
 
+import { getErrorFromUnknown } from "@calcom/lib/errors";
+import type { CalendarEvent } from "@calcom/types/CalendarEvent";
+
 import { getUid } from "@lib/CalEventParser";
-import { getErrorFromUnknown } from "@lib/errors";
 import { EventResult } from "@lib/events/EventManager";
 import logger from "@lib/logger";
 import notEmpty from "@lib/notEmpty";
@@ -13,7 +15,7 @@ import GoogleCalendarService from "../../google_calendar/services/CalendarServic
 import Office365CalendarService from "../../office365_calendar/services/CalendarService";
 import { APPS } from "../config";
 import { APPS_TYPES } from "../constants/general";
-import { Calendar, CalendarEvent } from "../interfaces/Calendar";
+import { Calendar } from "../interfaces/Calendar";
 import { CalendarServiceType, EventBusyDate } from "../types/CalendarTypes";
 
 const CALENDARS: Record<string, CalendarServiceType> = {

apps/web/lib/apps/calendar/services/CalendarService.ts

@@ -16,6 +16,8 @@ import {
 } from "tsdav";
 import { v4 as uuidv4 } from "uuid";
 
+import type { CalendarEvent } from "@calcom/types/CalendarEvent";
+
 import { getLocation, getRichDescription } from "@lib/CalEventParser";
 import { symmetricDecrypt } from "@lib/crypto";
 import type { Event } from "@lib/events/EventManager";
@@ -23,7 +25,7 @@ import logger from "@lib/logger";
 
 import { TIMEZONE_FORMAT } from "../constants/format";
 import { DEFAULT_CALENDAR_TYPE } from "../constants/general";
-import { Calendar, CalendarEvent, IntegrationCalendar } from "../interfaces/Calendar";
+import { Calendar, IntegrationCalendar } from "../interfaces/Calendar";
 import { CalendarEventType, EventBusyDate, NewCalendarEventType } from "../types/CalendarTypes";
 import { convertDate, getAttendees, getDuration } from "../utils/CalendarUtils";
 

apps/web/lib/apps/google_calendar/services/CalendarService.ts

@@ -2,12 +2,14 @@ import { Credential, Prisma } from "@prisma/client";
 import { GetTokenResponse } from "google-auth-library/build/src/auth/oauth2client";
 import { Auth, calendar_v3, google } from "googleapis";
 
+import type { CalendarEvent } from "@calcom/types/CalendarEvent";
+
 import { getLocation, getRichDescription } from "@lib/CalEventParser";
 import logger from "@lib/logger";
 import prisma from "@lib/prisma";
 
 import { APPS_TYPES } from "../../calendar/constants/general";
-import { Calendar, CalendarEvent, IntegrationCalendar } from "../../calendar/interfaces/Calendar";
+import { Calendar, IntegrationCalendar } from "../../calendar/interfaces/Calendar";
 import CalendarService from "../../calendar/services/CalendarService";
 import { EventBusyDate, NewCalendarEventType } from "../../calendar/types/CalendarTypes";
 

apps/web/lib/apps/office365_calendar/services/CalendarService.ts

@@ -1,13 +1,15 @@
 import { Calendar as OfficeCalendar } from "@microsoft/microsoft-graph-types-beta";
 import { Credential } from "@prisma/client";
 
+import type { CalendarEvent } from "@calcom/types/CalendarEvent";
+
 import { getLocation, getRichDescription } from "@lib/CalEventParser";
 import { handleErrorsJson, handleErrorsRaw } from "@lib/errors";
 import logger from "@lib/logger";
 import prisma from "@lib/prisma";
 
 import { APPS_TYPES } from "../../calendar/constants/general";
-import { Calendar, CalendarEvent, IntegrationCalendar } from "../../calendar/interfaces/Calendar";
+import { Calendar, IntegrationCalendar } from "../../calendar/interfaces/Calendar";
 import { BatchResponse, EventBusyDate, NewCalendarEventType } from "../../calendar/types/CalendarTypes";
 import { BufferedBusyTime, O365AuthCredentials } from "../types/Office365Calendar";
 

apps/web/lib/emails/email-manager.ts

@@ -1,4 +1,5 @@
-import { CalendarEvent } from "@lib/apps/calendar/interfaces/Calendar";
+import type { CalendarEvent } from "@calcom/types/CalendarEvent";
+
 import AttendeeAwaitingPaymentEmail from "@lib/emails/templates/attendee-awaiting-payment-email";
 import AttendeeCancelledEmail from "@lib/emails/templates/attendee-cancelled-email";
 import AttendeeDeclinedEmail from "@lib/emails/templates/attendee-declined-email";

apps/web/lib/emails/templates/attendee-scheduled-email.ts

@@ -6,10 +6,12 @@ import utc from "dayjs/plugin/utc";
 import { createEvent, DateArray } from "ics";
 import nodemailer from "nodemailer";
 
+import { getErrorFromUnknown } from "@calcom/lib/errors";
+import type { CalendarEvent } from "@calcom/types/CalendarEvent";
+
 import { getCancelLink, getRichDescription } from "@lib/CalEventParser";
-import { CalendarEvent } from "@lib/apps/calendar/interfaces/Calendar";
+import type { Person } from "@lib/apps/calendar/types/CalendarTypes";
 import { getAppName } from "@lib/apps/utils/AppUtils";
-import { getErrorFromUnknown, Person } from "@lib/errors";
 import { serverConfig } from "@lib/serverConfig";
 
 import {

apps/web/lib/emails/templates/organizer-scheduled-email.ts

@@ -6,8 +6,9 @@ import utc from "dayjs/plugin/utc";
 import { createEvent, DateArray, Person } from "ics";
 import nodemailer from "nodemailer";
 
+import type { CalendarEvent } from "@calcom/types/CalendarEvent";
+
 import { getCancelLink, getRichDescription } from "@lib/CalEventParser";
-import { CalendarEvent } from "@lib/apps/calendar/interfaces/Calendar";
 import { getAppName } from "@lib/apps/utils/AppUtils";
 import { getErrorFromUnknown } from "@lib/errors";
 import { serverConfig } from "@lib/serverConfig";

apps/web/lib/events/EventManager.ts

@@ -3,15 +3,17 @@ import async from "async";
 import merge from "lodash/merge";
 import { v5 as uuidv5 } from "uuid";
 
+import type { CalendarEvent } from "@calcom/types/CalendarEvent";
 import type { PartialReference } from "@calcom/types/EventManager";
+import type { VideoCallData } from "@calcom/types/VideoApiAdapter";
 
 import { FAKE_DAILY_CREDENTIAL } from "@lib/integrations/Daily/DailyVideoApiAdapter";
 import { FAKE_HUDDLE_CREDENTIAL } from "@lib/integrations/Huddle01/Huddle01VideoApiAdapter";
 import { LocationType } from "@lib/location";
 import prisma from "@lib/prisma";
-import { createMeeting, updateMeeting, VideoCallData } from "@lib/videoClient";
+import { createMeeting, updateMeeting } from "@lib/videoClient";
 
-import { AdditionInformation, CalendarEvent } from "../apps/calendar/interfaces/Calendar";
+import { AdditionInformation } from "../apps/calendar/interfaces/Calendar";
 import { createEvent, updateEvent } from "../apps/calendar/managers/CalendarManager";
 
 export type Event = AdditionInformation & VideoCallData;

apps/web/lib/integrations/Daily/DailyVideoApiAdapter.ts

@@ -1,12 +1,12 @@
 import { Credential } from "@prisma/client";
 
+import type { CalendarEvent } from "@calcom/types/CalendarEvent";
+import type { PartialReference } from "@calcom/types/EventManager";
+import type { VideoApiAdapter, VideoCallData } from "@calcom/types/VideoApiAdapter";
+
 import { BASE_URL } from "@lib/config/constants";
 import { handleErrorsJson } from "@lib/errors";
-import { PartialReference } from "@lib/events/EventManager";
 import prisma from "@lib/prisma";
-import { VideoApiAdapter, VideoCallData } from "@lib/videoClient";
-
-import { CalendarEvent } from "../calendar/interfaces/Calendar";
 
 export interface DailyReturnType {
   /** Long UID string ie: 987b5eb5-d116-4a4e-8e2c-14fcb5710966 */

apps/web/lib/integrations/Huddle01/Huddle01VideoApiAdapter.ts

@@ -1,9 +1,10 @@
 import { Credential } from "@prisma/client";
 
+import type { PartialReference } from "@calcom/types/EventManager";
+import type { VideoApiAdapter, VideoCallData } from "@calcom/types/VideoApiAdapter";
+
 import { handleErrorsJson } from "@lib/errors";
-import { PartialReference } from "@lib/events/EventManager";
 import { randomString } from "@lib/random";
-import { VideoApiAdapter, VideoCallData } from "@lib/videoClient";
 
 export const FAKE_HUDDLE_CREDENTIAL: Credential = {
   id: +new Date().getTime(),

apps/web/lib/integrations/Jitsi/JitsiVideoApiAdapter.ts

@@ -1,7 +1,7 @@
 import { v4 as uuidv4 } from "uuid";
 
-import { PartialReference } from "@lib/events/EventManager";
-import { VideoApiAdapter, VideoCallData } from "@lib/videoClient";
+import type { PartialReference } from "@calcom/types/EventManager";
+import type { VideoApiAdapter, VideoCallData } from "@calcom/types/VideoApiAdapter";
 
 const JitsiVideoApiAdapter = (): VideoApiAdapter => {
   return {

apps/web/lib/integrations/Tandem/TandemVideoApiAdapter.ts

@@ -1,11 +1,11 @@
 import { Credential } from "@prisma/client";
 
-import { handleErrorsJson, handleErrorsRaw } from "@lib/errors";
-import { PartialReference } from "@lib/events/EventManager";
-import prisma from "@lib/prisma";
-import { VideoApiAdapter, VideoCallData } from "@lib/videoClient";
+import type { CalendarEvent } from "@calcom/types/CalendarEvent";
+import type { PartialReference } from "@calcom/types/EventManager";
+import type { VideoApiAdapter, VideoCallData } from "@calcom/types/VideoApiAdapter";
 
-import { CalendarEvent } from "../calendar/interfaces/Calendar";
+import { handleErrorsJson, handleErrorsRaw } from "@lib/errors";
+import prisma from "@lib/prisma";
 
 interface TandemToken {
   expires_in?: number;

apps/web/lib/webhooks/sendPayload.tsx

@@ -1,6 +1,6 @@
 import { compile } from "handlebars";
 
-import { CalendarEvent } from "@lib/apps/calendar/interfaces/Calendar";
+import type { CalendarEvent } from "@calcom/types/CalendarEvent";
 
 type ContentType = "application/json" | "application/x-www-form-urlencoded";
 

apps/web/pages/api/book/confirm.ts

@@ -1,9 +1,10 @@
 import { Prisma, User, Booking, SchedulingType, BookingStatus } from "@prisma/client";
 import type { NextApiRequest, NextApiResponse } from "next";
 
+import type { CalendarEvent } from "@calcom/types/CalendarEvent";
 import { refund } from "@ee/lib/stripe/server";
 
-import { CalendarEvent, AdditionInformation } from "@lib/apps/calendar/interfaces/Calendar";
+import { AdditionInformation } from "@lib/apps/calendar/interfaces/Calendar";
 import { asStringOrNull } from "@lib/asStringOrNull";
 import { getSession } from "@lib/auth";
 import { sendDeclinedEmails } from "@lib/emails/email-manager";

apps/web/pages/api/book/event.ts

@@ -9,9 +9,11 @@ import type { NextApiRequest, NextApiResponse } from "next";
 import short from "short-uuid";
 import { v5 as uuidv5 } from "uuid";
 
+import type { CalendarEvent } from "@calcom/types/CalendarEvent";
+import type { PartialReference } from "@calcom/types/EventManager";
 import { handlePayment } from "@ee/lib/stripe/server";
 
-import { CalendarEvent, AdditionInformation } from "@lib/apps/calendar/interfaces/Calendar";
+import { AdditionInformation } from "@lib/apps/calendar/interfaces/Calendar";
 import { getBusyCalendarTimes } from "@lib/apps/calendar/managers/CalendarManager";
 import { BufferedBusyTime } from "@lib/apps/office365_calendar/types/Office365Calendar";
 import {
@@ -22,7 +24,7 @@ import {
 import { ensureArray } from "@lib/ensureArray";
 import { getErrorFromUnknown } from "@lib/errors";
 import { getEventName } from "@lib/event";
-import EventManager, { EventResult, PartialReference } from "@lib/events/EventManager";
+import EventManager, { EventResult } from "@lib/events/EventManager";
 import logger from "@lib/logger";
 import notEmpty from "@lib/notEmpty";
 import prisma from "@lib/prisma";

apps/web/pages/api/cancel.ts

@@ -3,9 +3,9 @@ import async from "async";
 import dayjs from "dayjs";
 import { NextApiRequest, NextApiResponse } from "next";
 
+import type { CalendarEvent } from "@calcom/types/CalendarEvent";
 import { refund } from "@ee/lib/stripe/server";
 
-import { CalendarEvent } from "@lib/apps/calendar/interfaces/Calendar";
 import { getCalendar } from "@lib/apps/calendar/managers/CalendarManager";
 import { asStringOrNull } from "@lib/asStringOrNull";
 import { getSession } from "@lib/auth";

apps/web/pages/api/cron/bookingReminder.ts

@@ -2,7 +2,8 @@ import { ReminderType } from "@prisma/client";
 import dayjs from "dayjs";
 import type { NextApiRequest, NextApiResponse } from "next";
 
-import { CalendarEvent } from "@lib/apps/calendar/interfaces/Calendar";
+import type { CalendarEvent } from "@calcom/types/CalendarEvent";
+
 import { sendOrganizerRequestReminderEmail } from "@lib/emails/email-manager";
 import prisma from "@lib/prisma";
 

apps/web/tsconfig.json

@@ -10,7 +10,7 @@
       "@apps/*": ["lib/apps/*"]
     },
     "typeRoots": ["./types", "@calcom/types"],
-    "types": ["@types/jest", "@calcom/types/*.d.ts"]
+    "types": ["@types/jest"]
   },
   "include": [
     "next-env.d.ts",