diff --git a/apps/web/lib/getTemporaryOrgRedirect.ts b/apps/web/lib/getTemporaryOrgRedirect.ts index 11c4578f5d..cdacf74e0b 100644 --- a/apps/web/lib/getTemporaryOrgRedirect.ts +++ b/apps/web/lib/getTemporaryOrgRedirect.ts @@ -2,7 +2,7 @@ import logger from "@calcom/lib/logger"; import { safeStringify } from "@calcom/lib/safeStringify"; import type { RedirectType } from "@calcom/prisma/client"; -const log = logger.getChildLogger({ prefix: ["lib", "getTemporaryOrgRedirect"] }); +const log = logger.getSubLogger({ prefix: ["lib", "getTemporaryOrgRedirect"] }); export const getTemporaryOrgRedirect = async ({ slug, redirectType, diff --git a/apps/web/pages/_error.tsx b/apps/web/pages/_error.tsx index 65da284e7d..50dce26a41 100644 --- a/apps/web/pages/_error.tsx +++ b/apps/web/pages/_error.tsx @@ -26,7 +26,7 @@ type AugmentedNextPageContext = Omit & { err: AugmentedError; }; -const log = logger.getChildLogger({ prefix: ["[error]"] }); +const log = logger.getSubLogger({ prefix: ["[error]"] }); const CustomError: NextPage = (props) => { const { statusCode, err, message, hasGetInitialPropsRun } = props; diff --git a/apps/web/pages/api/cron/syncAppMeta.ts b/apps/web/pages/api/cron/syncAppMeta.ts index fbb9383bc3..9b64919c39 100644 --- a/apps/web/pages/api/cron/syncAppMeta.ts +++ b/apps/web/pages/api/cron/syncAppMeta.ts @@ -6,7 +6,7 @@ import { prisma } from "@calcom/prisma"; import type { AppCategories, Prisma } from "@calcom/prisma/client"; const isDryRun = process.env.CRON_ENABLE_APP_SYNC !== "true"; -const log = logger.getChildLogger({ +const log = logger.getSubLogger({ prefix: ["[api/cron/syncAppMeta]", ...(isDryRun ? ["(dry-run)"] : [])], }); diff --git a/apps/web/pages/api/logo.ts b/apps/web/pages/api/logo.ts index c7cd820765..d55bbef417 100644 --- a/apps/web/pages/api/logo.ts +++ b/apps/web/pages/api/logo.ts @@ -16,7 +16,7 @@ import { } from "@calcom/lib/constants"; import logger from "@calcom/lib/logger"; -const log = logger.getChildLogger({ prefix: ["[api/logo]"] }); +const log = logger.getSubLogger({ prefix: ["[api/logo]"] }); function removePort(url: string) { return url.replace(/:\d+$/, ""); diff --git a/apps/web/test/utils/bookingScenario/bookingScenario.ts b/apps/web/test/utils/bookingScenario/bookingScenario.ts index 4b023574ad..f8ddc1c735 100644 --- a/apps/web/test/utils/bookingScenario/bookingScenario.ts +++ b/apps/web/test/utils/bookingScenario/bookingScenario.ts @@ -23,8 +23,8 @@ import type { EventBusyDate } from "@calcom/types/Calendar"; import { getMockPaymentService } from "./MockPaymentService"; -logger.setSettings({ minLevel: "silly" }); -const log = logger.getChildLogger({ prefix: ["[bookingScenario]"] }); +logger.settings.minLevel = 0; +const log = logger.getSubLogger({ prefix: ["[bookingScenario]"] }); type InputWebhook = { appId: string | null; diff --git a/packages/app-store/_utils/getCalendar.ts b/packages/app-store/_utils/getCalendar.ts index 2524fe5ba6..8192db1d33 100644 --- a/packages/app-store/_utils/getCalendar.ts +++ b/packages/app-store/_utils/getCalendar.ts @@ -10,7 +10,7 @@ interface CalendarApp { }; } -const log = logger.getChildLogger({ prefix: ["CalendarManager"] }); +const log = logger.getSubLogger({ prefix: ["CalendarManager"] }); /** * @see [Using type predicates](https://www.typescriptlang.org/docs/handbook/2/narrowing.html#using-type-predicates) diff --git a/packages/app-store/basecamp3/lib/CalendarService.ts b/packages/app-store/basecamp3/lib/CalendarService.ts index 983f8d0fdf..783373ac96 100644 --- a/packages/app-store/basecamp3/lib/CalendarService.ts +++ b/packages/app-store/basecamp3/lib/CalendarService.ts @@ -63,7 +63,7 @@ export default class BasecampCalendarService implements Calendar { this.userAgent = user_agent as string; }); this.auth = this.basecampAuth(credential).then((c) => c); - this.log = logger.getChildLogger({ prefix: [`[[lib] ${this.integrationName}`] }); + this.log = logger.getSubLogger({ prefix: [`[[lib] ${this.integrationName}`] }); } private basecampAuth = async (credential: CredentialPayload) => { diff --git a/packages/app-store/closecom/lib/CalendarService.ts b/packages/app-store/closecom/lib/CalendarService.ts index 854eb3853c..a53fc403c1 100644 --- a/packages/app-store/closecom/lib/CalendarService.ts +++ b/packages/app-store/closecom/lib/CalendarService.ts @@ -58,7 +58,7 @@ export default class CloseComCalendarService implements Calendar { constructor(credential: CredentialPayload) { this.integrationName = "closecom_other_calendar"; - this.log = logger.getChildLogger({ prefix: [`[[lib] ${this.integrationName}`] }); + this.log = logger.getSubLogger({ prefix: [`[[lib] ${this.integrationName}`] }); const parsedCredentialKey = apiKeySchema.safeParse(credential.key); diff --git a/packages/app-store/closecom/test/globals.ts b/packages/app-store/closecom/test/globals.ts index 357d308a35..f3d68dbb42 100644 --- a/packages/app-store/closecom/test/globals.ts +++ b/packages/app-store/closecom/test/globals.ts @@ -2,7 +2,7 @@ import { vi } from "vitest"; vi.mock("@calcom/lib/logger", () => ({ default: { - getChildLogger: () => ({ + getSubLogger: () => ({ debug: vi.fn(), error: vi.fn(), log: vi.fn(), diff --git a/packages/app-store/exchange2013calendar/lib/CalendarService.ts b/packages/app-store/exchange2013calendar/lib/CalendarService.ts index b0a2b4be6a..1b89229499 100644 --- a/packages/app-store/exchange2013calendar/lib/CalendarService.ts +++ b/packages/app-store/exchange2013calendar/lib/CalendarService.ts @@ -43,7 +43,7 @@ export default class ExchangeCalendarService implements Calendar { constructor(credential: CredentialPayload) { this.integrationName = "exchange2013_calendar"; - this.log = logger.getChildLogger({ prefix: [`[[lib] ${this.integrationName}`] }); + this.log = logger.getSubLogger({ prefix: [`[[lib] ${this.integrationName}`] }); const decryptedCredential = JSON.parse( symmetricDecrypt(credential.key?.toString() || "", process.env.CALENDSO_ENCRYPTION_KEY || "") diff --git a/packages/app-store/exchange2016calendar/lib/CalendarService.ts b/packages/app-store/exchange2016calendar/lib/CalendarService.ts index ff1d20dd62..5b4c57fca3 100644 --- a/packages/app-store/exchange2016calendar/lib/CalendarService.ts +++ b/packages/app-store/exchange2016calendar/lib/CalendarService.ts @@ -44,7 +44,7 @@ export default class ExchangeCalendarService implements Calendar { // this.integrationName = CALENDAR_INTEGRATIONS_TYPES.exchange; this.integrationName = "exchange2016_calendar"; - this.log = logger.getChildLogger({ prefix: [`[[lib] ${this.integrationName}`] }); + this.log = logger.getSubLogger({ prefix: [`[[lib] ${this.integrationName}`] }); const decryptedCredential = JSON.parse( symmetricDecrypt(credential.key?.toString() || "", process.env.CALENDSO_ENCRYPTION_KEY || "") diff --git a/packages/app-store/exchangecalendar/lib/CalendarService.ts b/packages/app-store/exchangecalendar/lib/CalendarService.ts index 9ba5823457..cf1934b8b3 100644 --- a/packages/app-store/exchangecalendar/lib/CalendarService.ts +++ b/packages/app-store/exchangecalendar/lib/CalendarService.ts @@ -48,7 +48,7 @@ export default class ExchangeCalendarService implements Calendar { constructor(credential: CredentialPayload) { this.integrationName = "exchange_calendar"; - this.log = logger.getChildLogger({ prefix: [`[[lib] ${this.integrationName}`] }); + this.log = logger.getSubLogger({ prefix: [`[[lib] ${this.integrationName}`] }); this.payload = JSON.parse( symmetricDecrypt(credential.key?.toString() || "", process.env.CALENDSO_ENCRYPTION_KEY || "") ); diff --git a/packages/app-store/googlecalendar/lib/CalendarService.ts b/packages/app-store/googlecalendar/lib/CalendarService.ts index fa7dec8e7a..fa726e6047 100644 --- a/packages/app-store/googlecalendar/lib/CalendarService.ts +++ b/packages/app-store/googlecalendar/lib/CalendarService.ts @@ -68,7 +68,7 @@ export default class GoogleCalendarService implements Calendar { this.integrationName = "google_calendar"; this.credential = credential; this.auth = this.googleAuth(credential); - this.log = logger.getChildLogger({ prefix: [`[[lib] ${this.integrationName}`] }); + this.log = logger.getSubLogger({ prefix: [`[[lib] ${this.integrationName}`] }); this.credential = credential; } diff --git a/packages/app-store/hubspot/lib/CalendarService.ts b/packages/app-store/hubspot/lib/CalendarService.ts index f2c41c8a36..2d1cf3bdd3 100644 --- a/packages/app-store/hubspot/lib/CalendarService.ts +++ b/packages/app-store/hubspot/lib/CalendarService.ts @@ -45,7 +45,7 @@ export default class HubspotCalendarService implements Calendar { this.auth = this.hubspotAuth(credential).then((r) => r); - this.log = logger.getChildLogger({ prefix: [`[[lib] ${this.integrationName}`] }); + this.log = logger.getSubLogger({ prefix: [`[[lib] ${this.integrationName}`] }); } private hubspotContactCreate = async (attendees: Person[]) => { diff --git a/packages/app-store/intercom/api/callback.ts b/packages/app-store/intercom/api/callback.ts index 8aa0004395..7bb265a8b1 100644 --- a/packages/app-store/intercom/api/callback.ts +++ b/packages/app-store/intercom/api/callback.ts @@ -9,7 +9,7 @@ import getAppKeysFromSlug from "../../_utils/getAppKeysFromSlug"; import getInstalledAppPath from "../../_utils/getInstalledAppPath"; import createOAuthAppCredential from "../../_utils/oauth/createOAuthAppCredential"; -const log = logger.getChildLogger({ prefix: [`[[intercom/api/callback]`] }); +const log = logger.getSubLogger({ prefix: [`[[intercom/api/callback]`] }); let client_id = ""; let client_secret = ""; diff --git a/packages/app-store/larkcalendar/api/callback.ts b/packages/app-store/larkcalendar/api/callback.ts index 9178e06c78..b0ce73b934 100644 --- a/packages/app-store/larkcalendar/api/callback.ts +++ b/packages/app-store/larkcalendar/api/callback.ts @@ -12,7 +12,7 @@ import { LARK_HOST } from "../common"; import { getAppAccessToken } from "../lib/AppAccessToken"; import type { LarkAuthCredentials } from "../types/LarkCalendar"; -const log = logger.getChildLogger({ prefix: [`[[lark/api/callback]`] }); +const log = logger.getSubLogger({ prefix: [`[[lark/api/callback]`] }); const callbackQuerySchema = z.object({ code: z.string().min(1), diff --git a/packages/app-store/larkcalendar/api/events.ts b/packages/app-store/larkcalendar/api/events.ts index 12246ae146..d570241cf7 100644 --- a/packages/app-store/larkcalendar/api/events.ts +++ b/packages/app-store/larkcalendar/api/events.ts @@ -8,7 +8,7 @@ import prisma from "@calcom/prisma"; import { getAppKeys } from "../common"; import { sendPostMsg } from "../lib/BotService"; -const log = logger.getChildLogger({ prefix: [`[lark/api/events]`] }); +const log = logger.getSubLogger({ prefix: [`[lark/api/events]`] }); const larkKeysSchema = z.object({ open_verification_token: z.string(), diff --git a/packages/app-store/larkcalendar/lib/AppAccessToken.ts b/packages/app-store/larkcalendar/lib/AppAccessToken.ts index a0aa2040e8..4d96010ad7 100644 --- a/packages/app-store/larkcalendar/lib/AppAccessToken.ts +++ b/packages/app-store/larkcalendar/lib/AppAccessToken.ts @@ -5,7 +5,7 @@ import prisma from "@calcom/prisma"; import { LARK_HOST, getAppKeys, isExpired } from "../common"; -const log = logger.getChildLogger({ prefix: [`[[LarkAppCredential]`] }); +const log = logger.getSubLogger({ prefix: [`[[LarkAppCredential]`] }); function makePoolingPromise( promiseCreator: () => Promise, diff --git a/packages/app-store/larkcalendar/lib/BotService.ts b/packages/app-store/larkcalendar/lib/BotService.ts index d509cd0670..b88e45ffe9 100644 --- a/packages/app-store/larkcalendar/lib/BotService.ts +++ b/packages/app-store/larkcalendar/lib/BotService.ts @@ -3,7 +3,7 @@ import logger from "@calcom/lib/logger"; import { LARK_HOST } from "../common"; import { getAppAccessToken } from "./AppAccessToken"; -const log = logger.getChildLogger({ prefix: [`[[LarkTenantCredential]`] }); +const log = logger.getSubLogger({ prefix: [`[[LarkTenantCredential]`] }); const msg = { en_us: { diff --git a/packages/app-store/larkcalendar/lib/CalendarService.ts b/packages/app-store/larkcalendar/lib/CalendarService.ts index 8c19c40868..bc98c81de4 100644 --- a/packages/app-store/larkcalendar/lib/CalendarService.ts +++ b/packages/app-store/larkcalendar/lib/CalendarService.ts @@ -40,7 +40,7 @@ export default class LarkCalendarService implements Calendar { constructor(credential: CredentialPayload) { this.integrationName = "lark_calendar"; this.auth = this.larkAuth(credential); - this.log = logger.getChildLogger({ prefix: [`[[lib] ${this.integrationName}`] }); + this.log = logger.getSubLogger({ prefix: [`[[lib] ${this.integrationName}`] }); this.credential = credential; } diff --git a/packages/app-store/office365calendar/lib/CalendarService.ts b/packages/app-store/office365calendar/lib/CalendarService.ts index 627ce3807d..2242a2210f 100644 --- a/packages/app-store/office365calendar/lib/CalendarService.ts +++ b/packages/app-store/office365calendar/lib/CalendarService.ts @@ -70,7 +70,7 @@ export default class Office365CalendarService implements Calendar { this.integrationName = "office365_calendar"; this.auth = this.o365Auth(credential); this.credential = credential; - this.log = logger.getChildLogger({ prefix: [`[[lib] ${this.integrationName}`] }); + this.log = logger.getSubLogger({ prefix: [`[[lib] ${this.integrationName}`] }); } async createEvent(event: CalendarEvent, credentialId: number): Promise { diff --git a/packages/app-store/routing-forms/pages/router/[...appPages].tsx b/packages/app-store/routing-forms/pages/router/[...appPages].tsx index 68c51d9935..8a96d67d5f 100644 --- a/packages/app-store/routing-forms/pages/router/[...appPages].tsx +++ b/packages/app-store/routing-forms/pages/router/[...appPages].tsx @@ -15,7 +15,7 @@ import { processRoute } from "../../lib/processRoute"; import transformResponse from "../../lib/transformResponse"; import type { Response } from "../../types/types"; -const log = logger.getChildLogger({ prefix: ["[routing-forms]", "[router]"] }); +const log = logger.getSubLogger({ prefix: ["[routing-forms]", "[router]"] }); export default function Router({ form, message }: inferSSRProps) { return ( <> diff --git a/packages/app-store/routing-forms/trpc/forms.handler.ts b/packages/app-store/routing-forms/trpc/forms.handler.ts index 2cff781e76..7ccad4a38e 100644 --- a/packages/app-store/routing-forms/trpc/forms.handler.ts +++ b/packages/app-store/routing-forms/trpc/forms.handler.ts @@ -16,7 +16,7 @@ interface FormsHandlerOptions { }; input: TFormSchema; } -const log = logger.getChildLogger({ prefix: ["[formsHandler]"] }); +const log = logger.getSubLogger({ prefix: ["[formsHandler]"] }); export const formsHandler = async ({ ctx, input }: FormsHandlerOptions) => { const { prisma, user } = ctx; diff --git a/packages/app-store/salesforce/lib/CalendarService.ts b/packages/app-store/salesforce/lib/CalendarService.ts index 9b18277f93..4ba50ec028 100644 --- a/packages/app-store/salesforce/lib/CalendarService.ts +++ b/packages/app-store/salesforce/lib/CalendarService.ts @@ -57,7 +57,7 @@ export default class SalesforceCalendarService implements Calendar { constructor(credential: CredentialPayload) { this.integrationName = "salesforce_other_calendar"; this.conn = this.getClient(credential).then((c) => c); - this.log = logger.getChildLogger({ prefix: [`[[lib] ${this.integrationName}`] }); + this.log = logger.getSubLogger({ prefix: [`[[lib] ${this.integrationName}`] }); } private getClient = async (credential: CredentialPayload) => { diff --git a/packages/app-store/sendgrid/lib/CalendarService.ts b/packages/app-store/sendgrid/lib/CalendarService.ts index c1d1443f09..fa2480206f 100644 --- a/packages/app-store/sendgrid/lib/CalendarService.ts +++ b/packages/app-store/sendgrid/lib/CalendarService.ts @@ -33,7 +33,7 @@ export default class CloseComCalendarService implements Calendar { constructor(credential: CredentialPayload) { this.integrationName = "sendgrid_other_calendar"; - this.log = logger.getChildLogger({ prefix: [`[[lib] ${this.integrationName}`] }); + this.log = logger.getSubLogger({ prefix: [`[[lib] ${this.integrationName}`] }); const parsedCredentialKey = apiKeySchema.safeParse(credential.key); diff --git a/packages/app-store/zoho-bigin/lib/CalendarService.ts b/packages/app-store/zoho-bigin/lib/CalendarService.ts index fb3c56c7ad..163c74b86f 100644 --- a/packages/app-store/zoho-bigin/lib/CalendarService.ts +++ b/packages/app-store/zoho-bigin/lib/CalendarService.ts @@ -42,7 +42,7 @@ export default class BiginCalendarService implements Calendar { constructor(credential: CredentialPayload) { this.auth = this.biginAuth(credential); - this.log = logger.getChildLogger({ prefix: [`[[lib] ${this.integrationName}`] }); + this.log = logger.getSubLogger({ prefix: [`[[lib] ${this.integrationName}`] }); } /*** diff --git a/packages/app-store/zohocalendar/api/callback.ts b/packages/app-store/zohocalendar/api/callback.ts index 52b2652a6d..81ea1edf79 100644 --- a/packages/app-store/zohocalendar/api/callback.ts +++ b/packages/app-store/zohocalendar/api/callback.ts @@ -14,7 +14,7 @@ import config from "../config.json"; import type { ZohoAuthCredentials } from "../types/ZohoCalendar"; import { appKeysSchema as zohoKeysSchema } from "../zod"; -const log = logger.getChildLogger({ prefix: [`[[zohocalendar/api/callback]`] }); +const log = logger.getSubLogger({ prefix: [`[[zohocalendar/api/callback]`] }); const OAUTH_BASE_URL = "https://accounts.zoho.com/oauth/v2"; diff --git a/packages/app-store/zohocalendar/lib/CalendarService.ts b/packages/app-store/zohocalendar/lib/CalendarService.ts index 993c2aceee..a245a1e78c 100644 --- a/packages/app-store/zohocalendar/lib/CalendarService.ts +++ b/packages/app-store/zohocalendar/lib/CalendarService.ts @@ -30,7 +30,7 @@ export default class ZohoCalendarService implements Calendar { constructor(credential: CredentialPayload) { this.integrationName = "zoho_calendar"; this.auth = this.zohoAuth(credential); - this.log = logger.getChildLogger({ + this.log = logger.getSubLogger({ prefix: [`[[lib] ${this.integrationName}`], }); } diff --git a/packages/app-store/zohocrm/lib/CalendarService.ts b/packages/app-store/zohocrm/lib/CalendarService.ts index 3ba36f3750..79b6d343c1 100644 --- a/packages/app-store/zohocrm/lib/CalendarService.ts +++ b/packages/app-store/zohocrm/lib/CalendarService.ts @@ -61,7 +61,7 @@ export default class ZohoCrmCalendarService implements Calendar { constructor(credential: CredentialPayload) { this.integrationName = "zohocrm_other_calendar"; this.auth = this.zohoCrmAuth(credential).then((r) => r); - this.log = logger.getChildLogger({ prefix: [`[[lib] ${this.integrationName}`] }); + this.log = logger.getSubLogger({ prefix: [`[[lib] ${this.integrationName}`] }); } private createContacts = async (attendees: Person[]) => { diff --git a/packages/core/CalendarManager.ts b/packages/core/CalendarManager.ts index c6ce7eccb7..5d9f0252ee 100644 --- a/packages/core/CalendarManager.ts +++ b/packages/core/CalendarManager.ts @@ -21,7 +21,7 @@ import type { EventResult } from "@calcom/types/EventManager"; import getCalendarsEvents from "./getCalendarsEvents"; -const log = logger.getChildLogger({ prefix: ["CalendarManager"] }); +const log = logger.getSubLogger({ prefix: ["CalendarManager"] }); export const getCalendarCredentials = (credentials: Array) => { const calendarCredentials = getApps(credentials, true) diff --git a/packages/core/EventManager.ts b/packages/core/EventManager.ts index 2fea2ad8ca..3a16f1a43d 100644 --- a/packages/core/EventManager.ts +++ b/packages/core/EventManager.ts @@ -33,7 +33,7 @@ import type { import { createEvent, updateEvent, deleteEvent } from "./CalendarManager"; import { createMeeting, updateMeeting, deleteMeeting } from "./videoClient"; -const log = logger.getChildLogger({ prefix: ["EventManager"] }); +const log = logger.getSubLogger({ prefix: ["EventManager"] }); export const isDedicatedIntegration = (location: string): boolean => { return location !== MeetLocationType && location.includes("integrations:"); }; diff --git a/packages/core/getCalendarsEvents.ts b/packages/core/getCalendarsEvents.ts index 6cf85100cc..8ee9d44fb0 100644 --- a/packages/core/getCalendarsEvents.ts +++ b/packages/core/getCalendarsEvents.ts @@ -8,7 +8,7 @@ import { performance } from "@calcom/lib/server/perfObserver"; import type { EventBusyDate } from "@calcom/types/Calendar"; import type { CredentialPayload } from "@calcom/types/Credential"; -const log = logger.getChildLogger({ prefix: ["getCalendarsEvents"] }); +const log = logger.getSubLogger({ prefix: ["getCalendarsEvents"] }); const getCalendarsEvents = async ( withCredentials: CredentialPayload[], dateFrom: string, diff --git a/packages/core/getUserAvailability.ts b/packages/core/getUserAvailability.ts index d2078b0fd7..5843005e20 100644 --- a/packages/core/getUserAvailability.ts +++ b/packages/core/getUserAvailability.ts @@ -26,7 +26,7 @@ import type { import { getBusyTimes, getBusyTimesForLimitChecks } from "./getBusyTimes"; -const log = logger.getChildLogger({ prefix: ["getUserAvailability"] }); +const log = logger.getSubLogger({ prefix: ["getUserAvailability"] }); const availabilitySchema = z .object({ dateFrom: stringToDayjs, diff --git a/packages/core/videoClient.ts b/packages/core/videoClient.ts index 9d6281f1b1..a2585ab1dd 100644 --- a/packages/core/videoClient.ts +++ b/packages/core/videoClient.ts @@ -15,7 +15,7 @@ import type { CredentialPayload } from "@calcom/types/Credential"; import type { EventResult, PartialReference } from "@calcom/types/EventManager"; import type { VideoApiAdapter, VideoApiAdapterFactory, VideoCallData } from "@calcom/types/VideoApiAdapter"; -const log = logger.getChildLogger({ prefix: ["[lib] videoClient"] }); +const log = logger.getSubLogger({ prefix: ["[lib] videoClient"] }); const translator = short(); diff --git a/packages/features/auth/lib/verifyEmail.ts b/packages/features/auth/lib/verifyEmail.ts index f73dd9c877..01c186ba49 100644 --- a/packages/features/auth/lib/verifyEmail.ts +++ b/packages/features/auth/lib/verifyEmail.ts @@ -9,7 +9,7 @@ import logger from "@calcom/lib/logger"; import { getTranslation } from "@calcom/lib/server/i18n"; import { prisma } from "@calcom/prisma"; -const log = logger.getChildLogger({ prefix: [`[[Auth] `] }); +const log = logger.getSubLogger({ prefix: [`[[Auth] `] }); interface VerifyEmailType { username?: string; diff --git a/packages/features/bookings/lib/handleBookingRequested.ts b/packages/features/bookings/lib/handleBookingRequested.ts index d7ba0b4a54..1abe2f2042 100644 --- a/packages/features/bookings/lib/handleBookingRequested.ts +++ b/packages/features/bookings/lib/handleBookingRequested.ts @@ -6,7 +6,7 @@ import logger from "@calcom/lib/logger"; import { WebhookTriggerEvents } from "@calcom/prisma/enums"; import type { CalendarEvent } from "@calcom/types/Calendar"; -const log = logger.getChildLogger({ prefix: ["[handleBookingRequested] book:user"] }); +const log = logger.getSubLogger({ prefix: ["[handleBookingRequested] book:user"] }); /** * Supposed to do whatever is needed when a booking is requested. diff --git a/packages/features/bookings/lib/handleConfirmation.ts b/packages/features/bookings/lib/handleConfirmation.ts index 892a7d00c9..90c4e63bca 100644 --- a/packages/features/bookings/lib/handleConfirmation.ts +++ b/packages/features/bookings/lib/handleConfirmation.ts @@ -15,7 +15,7 @@ import { BookingStatus, WebhookTriggerEvents } from "@calcom/prisma/enums"; import { bookingMetadataSchema } from "@calcom/prisma/zod-utils"; import type { AdditionalInformation, CalendarEvent } from "@calcom/types/Calendar"; -const log = logger.getChildLogger({ prefix: ["[handleConfirmation] book:user"] }); +const log = logger.getSubLogger({ prefix: ["[handleConfirmation] book:user"] }); export async function handleConfirmation(args: { user: EventManagerUser & { username: string | null }; diff --git a/packages/features/bookings/lib/handleNewBooking.ts b/packages/features/bookings/lib/handleNewBooking.ts index fc5f0b367f..83886bab35 100644 --- a/packages/features/bookings/lib/handleNewBooking.ts +++ b/packages/features/bookings/lib/handleNewBooking.ts @@ -96,7 +96,7 @@ import type { EventTypeInfo } from "../../webhooks/lib/sendPayload"; import getBookingResponsesSchema from "./getBookingResponsesSchema"; const translator = short(); -const log = logger.getChildLogger({ prefix: ["[api] book:user"] }); +const log = logger.getSubLogger({ prefix: ["[api] book:user"] }); type User = Prisma.UserGetPayload; type BufferedBusyTimes = BufferedBusyTime[]; @@ -685,12 +685,12 @@ async function handler( eventType, }); - const loggerWithEventDetails = logger.getChildLogger({ + const loggerWithEventDetails = logger.getSubLogger({ prefix: ["book:user", `${eventTypeId}:${reqBody.user}/${eventTypeSlug}`], }); if (isEventTypeLoggingEnabled({ eventTypeId, usernameOrTeamName: reqBody.user })) { - logger.setSettings({ minLevel: "silly" }); + logger.settings.minLevel = 0; } const fullName = getFullName(bookerName); diff --git a/packages/features/ee/payments/api/webhook.ts b/packages/features/ee/payments/api/webhook.ts index 627349eac6..2e64d5a480 100644 --- a/packages/features/ee/payments/api/webhook.ts +++ b/packages/features/ee/payments/api/webhook.ts @@ -17,7 +17,7 @@ import { handlePaymentSuccess } from "@calcom/lib/payment/handlePaymentSuccess"; import { prisma } from "@calcom/prisma"; import { BookingStatus } from "@calcom/prisma/enums"; -const log = logger.getChildLogger({ prefix: ["[paymentWebhook]"] }); +const log = logger.getSubLogger({ prefix: ["[paymentWebhook]"] }); export const config = { api: { diff --git a/packages/features/ee/workflows/lib/reminders/emailReminderManager.ts b/packages/features/ee/workflows/lib/reminders/emailReminderManager.ts index b40223cd44..f4c36b5d14 100644 --- a/packages/features/ee/workflows/lib/reminders/emailReminderManager.ts +++ b/packages/features/ee/workflows/lib/reminders/emailReminderManager.ts @@ -27,7 +27,7 @@ import emailReminderTemplate from "./templates/emailReminderTemplate"; let sendgridAPIKey, senderEmail: string; -const log = logger.getChildLogger({ prefix: ["[emailReminderManager]"] }); +const log = logger.getSubLogger({ prefix: ["[emailReminderManager]"] }); if (process.env.SENDGRID_API_KEY) { sendgridAPIKey = process.env.SENDGRID_API_KEY as string; senderEmail = process.env.SENDGRID_EMAIL as string; diff --git a/packages/features/ee/workflows/lib/reminders/smsReminderManager.ts b/packages/features/ee/workflows/lib/reminders/smsReminderManager.ts index 5c8a311a04..10fb2166d1 100644 --- a/packages/features/ee/workflows/lib/reminders/smsReminderManager.ts +++ b/packages/features/ee/workflows/lib/reminders/smsReminderManager.ts @@ -20,7 +20,7 @@ export enum timeUnitLowerCase { MINUTE = "minute", YEAR = "year", } -const log = logger.getChildLogger({ prefix: ["[smsReminderManager]"] }); +const log = logger.getSubLogger({ prefix: ["[smsReminderManager]"] }); export type AttendeeInBookingInfo = { name: string; diff --git a/packages/features/ee/workflows/lib/reminders/whatsappReminderManager.ts b/packages/features/ee/workflows/lib/reminders/whatsappReminderManager.ts index 51f28be26a..2945f0e55e 100644 --- a/packages/features/ee/workflows/lib/reminders/whatsappReminderManager.ts +++ b/packages/features/ee/workflows/lib/reminders/whatsappReminderManager.ts @@ -20,7 +20,7 @@ import { whatsappReminderTemplate, } from "./templates/whatsapp"; -const log = logger.getChildLogger({ prefix: ["[whatsappReminderManager]"] }); +const log = logger.getSubLogger({ prefix: ["[whatsappReminderManager]"] }); export const scheduleWhatsappReminder = async ( evt: BookingInfo, diff --git a/packages/features/embed/lib/EmbedTabs.tsx b/packages/features/embed/lib/EmbedTabs.tsx index 0f81c2c660..e2f41a7315 100644 --- a/packages/features/embed/lib/EmbedTabs.tsx +++ b/packages/features/embed/lib/EmbedTabs.tsx @@ -47,19 +47,17 @@ export const tabs = [ className="text-default bg-default selection:bg-subtle h-[calc(100%-50px)] font-mono" style={{ resize: "none", overflow: "auto" }} readOnly - value={ - `\n` + - (embedType === "inline" + value={`\n${ + embedType === "inline" ? `
\n` - : "") + - ` - ` - } + `} />

{t("need_help_embedding")}

@@ -118,7 +116,7 @@ export const tabs = [ { calLink: string; embedType: EmbedType; previewState: PreviewState } >(function Preview({ calLink, embedType }, ref) { const bookerUrl = useBookerUrl(); - const iframeSrc = `${EMBED_PREVIEW_HTML_URL}?embedType=${embedType}&calLink=${calLink}&embedLibUrl=${embedLibUrl}&bookerUrl=${bookerUrl}` + const iframeSrc = `${EMBED_PREVIEW_HTML_URL}?embedType=${embedType}&calLink=${calLink}&embedLibUrl=${embedLibUrl}&bookerUrl=${bookerUrl}`; if (ref instanceof Function || !ref) { return null; } diff --git a/packages/features/insights/server/events.ts b/packages/features/insights/server/events.ts index 44e9884579..b950dce3b9 100644 --- a/packages/features/insights/server/events.ts +++ b/packages/features/insights/server/events.ts @@ -440,8 +440,8 @@ class EventsInsights { if (!data.length) { return ""; } - const header = Object.keys(data[0]).join(",") + "\n"; - const rows = data.map((obj: any) => Object.values(obj).join(",") + "\n"); + const header = `${Object.keys(data[0]).join(",")}\n`; + const rows = data.map((obj: any) => `${Object.values(obj).join(",")}\n`); return header + rows.join(""); } } diff --git a/packages/features/webhooks/lib/scheduleTrigger.ts b/packages/features/webhooks/lib/scheduleTrigger.ts index 505a761c55..b2210dad6f 100644 --- a/packages/features/webhooks/lib/scheduleTrigger.ts +++ b/packages/features/webhooks/lib/scheduleTrigger.ts @@ -9,7 +9,7 @@ import prisma from "@calcom/prisma"; import type { ApiKey } from "@calcom/prisma/client"; import { BookingStatus, WebhookTriggerEvents } from "@calcom/prisma/enums"; -const log = logger.getChildLogger({ prefix: ["[node-scheduler]"] }); +const log = logger.getSubLogger({ prefix: ["[node-scheduler]"] }); export async function addSubscription({ appApiKey, diff --git a/packages/lib/CalendarService.ts b/packages/lib/CalendarService.ts index 323ad01a64..5aeca7ee1b 100644 --- a/packages/lib/CalendarService.ts +++ b/packages/lib/CalendarService.ts @@ -121,7 +121,7 @@ export default abstract class BaseCalendarService implements Calendar { this.headers = getBasicAuthHeaders({ username, password }); this.credential = credential; - this.log = logger.getChildLogger({ prefix: [`[[lib] ${this.integrationName}`] }); + this.log = logger.getSubLogger({ prefix: [`[[lib] ${this.integrationName}`] }); } private getAttendees(event: CalendarEvent) { diff --git a/packages/lib/CloseCom.ts b/packages/lib/CloseCom.ts index 72c7fb71be..cb2587f953 100644 --- a/packages/lib/CloseCom.ts +++ b/packages/lib/CloseCom.ts @@ -193,7 +193,7 @@ export default class CloseCom { private log: typeof logger; constructor(providedApiKey = "") { - this.log = logger.getChildLogger({ prefix: [`[[lib] close.com`] }); + this.log = logger.getSubLogger({ prefix: [`[[lib] close.com`] }); if (!providedApiKey && !environmentApiKey) throw Error("Close.com Api Key not present"); this.apiKey = providedApiKey || environmentApiKey; } diff --git a/packages/lib/Sendgrid.ts b/packages/lib/Sendgrid.ts index 6677094fee..a67e2b4798 100644 --- a/packages/lib/Sendgrid.ts +++ b/packages/lib/Sendgrid.ts @@ -52,7 +52,7 @@ export default class Sendgrid { private log: typeof logger; constructor(providedApiKey = "") { - this.log = logger.getChildLogger({ prefix: [`[[lib] sendgrid`] }); + this.log = logger.getSubLogger({ prefix: [`[[lib] sendgrid`] }); if (!providedApiKey && !environmentApiKey) throw Error("Sendgrid Api Key not present"); client.setApiKey(providedApiKey || environmentApiKey); } diff --git a/packages/lib/logger.ts b/packages/lib/logger.ts index f3d5d4d296..4d6d4be3c6 100644 --- a/packages/lib/logger.ts +++ b/packages/lib/logger.ts @@ -3,19 +3,17 @@ import { Logger } from "tslog"; import { IS_PRODUCTION } from "./constants"; const logger = new Logger({ - minLevel: !!process.env.NEXT_PUBLIC_DEBUG ? "debug" : "warn", - dateTimePattern: "hour:minute:second.millisecond", - displayFunctionName: false, - displayFilePath: "hidden", - dateTimeTimezone: IS_PRODUCTION ? "utc" : Intl.DateTimeFormat().resolvedOptions().timeZone, - prettyInspectHighlightStyles: { - name: "yellow", - number: "blue", - bigint: "blue", - boolean: "blue", - }, + minLevel: !!process.env.NEXT_PUBLIC_DEBUG ? 2 : 4, maskValuesOfKeys: ["password", "passwordConfirmation", "credentials", "credential"], - exposeErrorCodeFrame: !IS_PRODUCTION, + prettyLogTimeZone: IS_PRODUCTION ? "UTC" : "local", + prettyErrorStackTemplate: " • {{fileName}}\t{{method}}\n\t{{filePathWithLine}}", // default + prettyErrorTemplate: "\n{{errorName}} {{errorMessage}}\nerror stack:\n{{errorStack}}", // default + prettyLogTemplate: "{{hh}}:{{MM}}:{{ss}}:{{ms}}\t{{logLevelName}}", // default with exclusion of `{{filePathWithLine}}` + stylePrettyLogs: true, + prettyLogStyles: { + name: "yellow", + dateIsoStr: "blue", + }, }); export default logger; diff --git a/packages/lib/package.json b/packages/lib/package.json index 1683a06975..b2ada1df57 100644 --- a/packages/lib/package.json +++ b/packages/lib/package.json @@ -27,7 +27,7 @@ "rrule": "^2.7.1", "tailwind-merge": "^1.13.2", "tsdav": "2.0.3", - "tslog": "^3.2.1", + "tslog": "^4.9.2", "uuid": "^8.3.2" }, "devDependencies": { diff --git a/packages/lib/payment/handlePaymentSuccess.ts b/packages/lib/payment/handlePaymentSuccess.ts index 4e0a88867a..fa477d5ebc 100644 --- a/packages/lib/payment/handlePaymentSuccess.ts +++ b/packages/lib/payment/handlePaymentSuccess.ts @@ -12,7 +12,7 @@ import { BookingStatus } from "@calcom/prisma/enums"; import logger from "../logger"; -const log = logger.getChildLogger({ prefix: ["[handlePaymentSuccess]"] }); +const log = logger.getSubLogger({ prefix: ["[handlePaymentSuccess]"] }); export async function handlePaymentSuccess(paymentId: number, bookingId: number) { const { booking, user: userWithCredentials, evt, eventType } = await getBooking(bookingId); diff --git a/packages/lib/rateLimit.ts b/packages/lib/rateLimit.ts index 876efb79aa..be2c74308d 100644 --- a/packages/lib/rateLimit.ts +++ b/packages/lib/rateLimit.ts @@ -4,7 +4,7 @@ import { Redis } from "@upstash/redis"; import { isIpInBanListString } from "./getIP"; import logger from "./logger"; -const log = logger.getChildLogger({ prefix: ["RateLimit"] }); +const log = logger.getSubLogger({ prefix: ["RateLimit"] }); export type RateLimitHelper = { rateLimitingType?: "core" | "forcedSlowMode" | "common" | "api" | "ai"; diff --git a/packages/lib/redactError.ts b/packages/lib/redactError.ts index 820e00e99f..de9fd404b3 100644 --- a/packages/lib/redactError.ts +++ b/packages/lib/redactError.ts @@ -2,7 +2,7 @@ import { Prisma } from "@prisma/client"; import logger from "@calcom/lib/logger"; -const log = logger.getChildLogger({ prefix: [`[[redactError]`] }); +const log = logger.getSubLogger({ prefix: [`[[redactError]`] }); function shouldRedact(error: T) { return ( diff --git a/packages/lib/sync/SyncServiceManager.ts b/packages/lib/sync/SyncServiceManager.ts index 95cbd14b64..621c6e14aa 100644 --- a/packages/lib/sync/SyncServiceManager.ts +++ b/packages/lib/sync/SyncServiceManager.ts @@ -6,7 +6,7 @@ import type { ConsoleUserInfoType, TeamInfoType, WebUserInfoType } from "./ISync import services from "./services"; import CloseComService from "./services/CloseComService"; -const log = logger.getChildLogger({ prefix: [`[[SyncServiceManager] `] }); +const log = logger.getSubLogger({ prefix: [`[[SyncServiceManager] `] }); export const createConsoleUser = async (user: ConsoleUserInfoType | null | undefined) => { if (user) { diff --git a/packages/lib/sync/services/CloseComService.ts b/packages/lib/sync/services/CloseComService.ts index a7243afb84..9be83a643a 100644 --- a/packages/lib/sync/services/CloseComService.ts +++ b/packages/lib/sync/services/CloseComService.ts @@ -25,7 +25,7 @@ export default class CloseComService extends SyncServiceCore implements ISyncSer protected declare service: CloseCom; constructor() { - super(serviceName, CloseCom, logger.getChildLogger({ prefix: [`[[sync] ${serviceName}`] })); + super(serviceName, CloseCom, logger.getSubLogger({ prefix: [`[[sync] ${serviceName}`] })); } upsertAnyUser = async ( diff --git a/packages/lib/sync/services/SendgridService.ts b/packages/lib/sync/services/SendgridService.ts index 8d4762d357..3c081e9fb8 100644 --- a/packages/lib/sync/services/SendgridService.ts +++ b/packages/lib/sync/services/SendgridService.ts @@ -20,7 +20,7 @@ const serviceName = "sendgrid_service"; export default class SendgridService extends SyncServiceCore implements ISyncService { protected declare service: Sendgrid; constructor() { - super(serviceName, Sendgrid, logger.getChildLogger({ prefix: [`[[sync] ${serviceName}`] })); + super(serviceName, Sendgrid, logger.getSubLogger({ prefix: [`[[sync] ${serviceName}`] })); } upsert = async (user: WebUserInfoType | ConsoleUserInfoType) => { diff --git a/packages/prisma/schema.prisma b/packages/prisma/schema.prisma index 75373b7394..78c0ce069c 100644 --- a/packages/prisma/schema.prisma +++ b/packages/prisma/schema.prisma @@ -978,20 +978,21 @@ model CalendarCache { enum RedirectType { UserEventType @map("user-event-type") TeamEventType @map("team-event-type") - User @map("user") - Team @map("team") + User @map("user") + Team @map("team") } model TempOrgRedirect { - id Int @id @default(autoincrement()) + id Int @id @default(autoincrement()) // Better would be to have fromOrgId and toOrgId as well and then we should have just to instead toUrl from String // 0 would mean it is non org - fromOrgId Int + fromOrgId Int type RedirectType toUrl String - enabled Boolean @default(true) - createdAt DateTime @default(now()) - updatedAt DateTime @updatedAt + enabled Boolean @default(true) + createdAt DateTime @default(now()) + updatedAt DateTime @updatedAt + @@unique([from, type, fromOrgId]) -} \ No newline at end of file +} diff --git a/packages/trpc/server/routers/viewer/auth/resendVerifyEmail.handler.ts b/packages/trpc/server/routers/viewer/auth/resendVerifyEmail.handler.ts index b5a4a77c4a..89659b6b1e 100644 --- a/packages/trpc/server/routers/viewer/auth/resendVerifyEmail.handler.ts +++ b/packages/trpc/server/routers/viewer/auth/resendVerifyEmail.handler.ts @@ -9,7 +9,7 @@ type ResendEmailOptions = { }; }; -const log = logger.getChildLogger({ prefix: [`[[Auth] `] }); +const log = logger.getSubLogger({ prefix: [`[[Auth] `] }); export const resendVerifyEmail = async ({ ctx }: ResendEmailOptions) => { if (ctx.user.emailVerified) { diff --git a/packages/trpc/server/routers/viewer/availability/calendarOverlay.handler.ts b/packages/trpc/server/routers/viewer/availability/calendarOverlay.handler.ts index 6ae1ccdaba..876d95eb58 100644 --- a/packages/trpc/server/routers/viewer/availability/calendarOverlay.handler.ts +++ b/packages/trpc/server/routers/viewer/availability/calendarOverlay.handler.ts @@ -1,6 +1,6 @@ -import { prisma } from "@calcom/prisma"; import { getBusyCalendarTimes } from "@calcom/core/CalendarManager"; import dayjs from "@calcom/dayjs"; +import { prisma } from "@calcom/prisma"; import type { EventBusyDate } from "@calcom/types/Calendar"; import { TRPCError } from "@trpc/server"; diff --git a/packages/trpc/server/routers/viewer/slots/util.ts b/packages/trpc/server/routers/viewer/slots/util.ts index 6b9cc9abfe..11f582757d 100644 --- a/packages/trpc/server/routers/viewer/slots/util.ts +++ b/packages/trpc/server/routers/viewer/slots/util.ts @@ -268,7 +268,7 @@ export function getRegularOrDynamicEventType( export async function getAvailableSlots({ input, ctx }: GetScheduleOptions) { const orgDetails = orgDomainConfig(ctx?.req?.headers.host ?? ""); if (process.env.INTEGRATION_TEST_MODE === "true") { - logger.setSettings({ minLevel: "silly" }); + logger.settings.minLevel = 2; } const startPrismaEventTypeGet = performance.now(); const eventType = await getRegularOrDynamicEventType(input, orgDetails); @@ -279,10 +279,10 @@ export async function getAvailableSlots({ input, ctx }: GetScheduleOptions) { } if (isEventTypeLoggingEnabled({ eventTypeId: eventType.id })) { - logger.setSettings({ minLevel: "debug" }); + logger.settings.minLevel = 2; } - const loggerWithEventDetails = logger.getChildLogger({ + const loggerWithEventDetails = logger.getSubLogger({ prefix: ["getAvailableSlots", `${eventType.id}:${input.usernameList}/${input.eventTypeSlug}`], }); diff --git a/yarn.lock b/yarn.lock index acad17e7a2..16eb04a285 100644 --- a/yarn.lock +++ b/yarn.lock @@ -91,6 +91,13 @@ __metadata: languageName: node linkType: hard +"@alloc/quick-lru@npm:^5.2.0": + version: 5.2.0 + resolution: "@alloc/quick-lru@npm:5.2.0" + checksum: bdc35758b552bcf045733ac047fb7f9a07c4678b944c641adfbd41f798b4b91fffd0fdc0df2578d9b0afc7b4d636aa6e110ead5d6281a2adc1ab90efd7f057f8 + languageName: node + linkType: hard + "@ampproject/remapping@npm:^2.2.0": version: 2.2.1 resolution: "@ampproject/remapping@npm:2.2.1" @@ -3381,7 +3388,7 @@ __metadata: "@types/mailparser": ^3.4.0 langchain: ^0.0.131 mailparser: ^3.6.5 - next: ^13.4.6 + next: ^13.5.4 supports-color: 8.1.1 zod: ^3.22.2 languageName: unknown @@ -3538,7 +3545,7 @@ __metadata: "@types/react-dom": ^18.0.9 eslint: ^8.34.0 eslint-config-next: ^13.2.1 - next: ^13.4.6 + next: ^13.5.4 next-auth: ^4.22.1 postcss: ^8.4.18 react: ^18.2.0 @@ -3637,7 +3644,7 @@ __metadata: "@calcom/ui": "*" "@headlessui/react": ^1.5.0 "@heroicons/react": ^1.0.6 - "@prisma/client": ^5.4.2 + "@prisma/client": ^5.3.0 "@tailwindcss/forms": ^0.5.2 "@types/node": 16.9.1 "@types/react": 18.0.26 @@ -4041,7 +4048,7 @@ __metadata: rrule: ^2.7.1 tailwind-merge: ^1.13.2 tsdav: 2.0.3 - tslog: ^3.2.1 + tslog: ^4.9.2 typescript: ^4.9.4 uuid: ^8.3.2 languageName: unknown @@ -4644,6 +4651,7 @@ __metadata: "@calcom/ui": "*" "@datocms/cma-client-node": ^2.0.0 "@floating-ui/react-dom": ^1.0.0 + "@flodlc/nebula": ^1.0.56 "@graphql-codegen/cli": ^5.0.0 "@graphql-codegen/typed-document-node": ^5.0.1 "@graphql-codegen/typescript": ^4.0.1 @@ -4655,6 +4663,7 @@ __metadata: "@juggle/resize-observer": ^3.4.0 "@next/bundle-analyzer": ^13.1.6 "@radix-ui/react-accordion": ^1.0.0 + "@radix-ui/react-avatar": ^1.0.4 "@radix-ui/react-dropdown-menu": ^2.0.5 "@radix-ui/react-navigation-menu": ^1.0.0 "@radix-ui/react-portal": ^1.0.0 @@ -4718,6 +4727,7 @@ __metadata: react-hot-toast: ^2.3.0 react-live-chat-loader: ^2.8.1 react-merge-refs: 1.1.0 + react-resize-detector: ^9.1.0 react-twemoji: ^0.3.0 react-use-measure: ^2.1.1 react-wrap-balancer: ^1.0.0 @@ -4726,7 +4736,7 @@ __metadata: remeda: ^1.24.1 stripe: ^9.16.0 tailwind-merge: ^1.13.2 - tailwindcss: ^3.3.1 + tailwindcss: ^3.3.3 ts-node: ^10.9.1 typescript: ^4.9.4 wait-on: ^7.0.1 @@ -5936,6 +5946,13 @@ __metadata: languageName: node linkType: hard +"@flodlc/nebula@npm:^1.0.56": + version: 1.0.56 + resolution: "@flodlc/nebula@npm:1.0.56" + checksum: 044058423bc8a2c6ea60a0636400593a0912c142fbb6f50cc03288c702ae9c2029f84eb4fbac7e701a7ee1c2a5e33cc1af1b8d94af419c1197f74066b7867d21 + languageName: node + linkType: hard + "@formatjs/ecma402-abstract@npm:1.11.4": version: 1.11.4 resolution: "@formatjs/ecma402-abstract@npm:1.11.4" @@ -7779,6 +7796,13 @@ __metadata: languageName: node linkType: hard +"@next/env@npm:13.5.5": + version: 13.5.5 + resolution: "@next/env@npm:13.5.5" + checksum: 4e3a92f2bd60189d81eb0437bf8141de26dec371edc125553c2d93b1de4c40ce99e8c81f60d8450961fab5c8880a6bcfccd23d9ef9c86aceab2f5380776def9f + languageName: node + linkType: hard + "@next/eslint-plugin-next@npm:13.2.1": version: 13.2.1 resolution: "@next/eslint-plugin-next@npm:13.2.1" @@ -7795,6 +7819,13 @@ __metadata: languageName: node linkType: hard +"@next/swc-darwin-arm64@npm:13.5.5": + version: 13.5.5 + resolution: "@next/swc-darwin-arm64@npm:13.5.5" + conditions: os=darwin & cpu=arm64 + languageName: node + linkType: hard + "@next/swc-darwin-x64@npm:13.4.6": version: 13.4.6 resolution: "@next/swc-darwin-x64@npm:13.4.6" @@ -7802,6 +7833,13 @@ __metadata: languageName: node linkType: hard +"@next/swc-darwin-x64@npm:13.5.5": + version: 13.5.5 + resolution: "@next/swc-darwin-x64@npm:13.5.5" + conditions: os=darwin & cpu=x64 + languageName: node + linkType: hard + "@next/swc-linux-arm64-gnu@npm:13.4.6": version: 13.4.6 resolution: "@next/swc-linux-arm64-gnu@npm:13.4.6" @@ -7809,6 +7847,13 @@ __metadata: languageName: node linkType: hard +"@next/swc-linux-arm64-gnu@npm:13.5.5": + version: 13.5.5 + resolution: "@next/swc-linux-arm64-gnu@npm:13.5.5" + conditions: os=linux & cpu=arm64 & libc=glibc + languageName: node + linkType: hard + "@next/swc-linux-arm64-musl@npm:13.4.6": version: 13.4.6 resolution: "@next/swc-linux-arm64-musl@npm:13.4.6" @@ -7816,6 +7861,13 @@ __metadata: languageName: node linkType: hard +"@next/swc-linux-arm64-musl@npm:13.5.5": + version: 13.5.5 + resolution: "@next/swc-linux-arm64-musl@npm:13.5.5" + conditions: os=linux & cpu=arm64 & libc=musl + languageName: node + linkType: hard + "@next/swc-linux-x64-gnu@npm:13.4.6": version: 13.4.6 resolution: "@next/swc-linux-x64-gnu@npm:13.4.6" @@ -7823,6 +7875,13 @@ __metadata: languageName: node linkType: hard +"@next/swc-linux-x64-gnu@npm:13.5.5": + version: 13.5.5 + resolution: "@next/swc-linux-x64-gnu@npm:13.5.5" + conditions: os=linux & cpu=x64 & libc=glibc + languageName: node + linkType: hard + "@next/swc-linux-x64-musl@npm:13.4.6": version: 13.4.6 resolution: "@next/swc-linux-x64-musl@npm:13.4.6" @@ -7830,6 +7889,13 @@ __metadata: languageName: node linkType: hard +"@next/swc-linux-x64-musl@npm:13.5.5": + version: 13.5.5 + resolution: "@next/swc-linux-x64-musl@npm:13.5.5" + conditions: os=linux & cpu=x64 & libc=musl + languageName: node + linkType: hard + "@next/swc-win32-arm64-msvc@npm:13.4.6": version: 13.4.6 resolution: "@next/swc-win32-arm64-msvc@npm:13.4.6" @@ -7837,6 +7903,13 @@ __metadata: languageName: node linkType: hard +"@next/swc-win32-arm64-msvc@npm:13.5.5": + version: 13.5.5 + resolution: "@next/swc-win32-arm64-msvc@npm:13.5.5" + conditions: os=win32 & cpu=arm64 + languageName: node + linkType: hard + "@next/swc-win32-ia32-msvc@npm:13.4.6": version: 13.4.6 resolution: "@next/swc-win32-ia32-msvc@npm:13.4.6" @@ -7844,6 +7917,13 @@ __metadata: languageName: node linkType: hard +"@next/swc-win32-ia32-msvc@npm:13.5.5": + version: 13.5.5 + resolution: "@next/swc-win32-ia32-msvc@npm:13.5.5" + conditions: os=win32 & cpu=ia32 + languageName: node + linkType: hard + "@next/swc-win32-x64-msvc@npm:13.4.6": version: 13.4.6 resolution: "@next/swc-win32-x64-msvc@npm:13.4.6" @@ -7851,6 +7931,13 @@ __metadata: languageName: node linkType: hard +"@next/swc-win32-x64-msvc@npm:13.5.5": + version: 13.5.5 + resolution: "@next/swc-win32-x64-msvc@npm:13.5.5" + conditions: os=win32 & cpu=x64 + languageName: node + linkType: hard + "@noble/curves@npm:1.1.0, @noble/curves@npm:~1.1.0": version: 1.1.0 resolution: "@noble/curves@npm:1.1.0" @@ -8158,7 +8245,7 @@ __metadata: languageName: node linkType: hard -"@prisma/client@npm:^5.4.2": +"@prisma/client@npm:^5.3.0, @prisma/client@npm:^5.4.2": version: 5.4.2 resolution: "@prisma/client@npm:5.4.2" dependencies: @@ -8510,6 +8597,29 @@ __metadata: languageName: node linkType: hard +"@radix-ui/react-avatar@npm:^1.0.4": + version: 1.0.4 + resolution: "@radix-ui/react-avatar@npm:1.0.4" + dependencies: + "@babel/runtime": ^7.13.10 + "@radix-ui/react-context": 1.0.1 + "@radix-ui/react-primitive": 1.0.3 + "@radix-ui/react-use-callback-ref": 1.0.1 + "@radix-ui/react-use-layout-effect": 1.0.1 + peerDependencies: + "@types/react": "*" + "@types/react-dom": "*" + react: ^16.8 || ^17.0 || ^18.0 + react-dom: ^16.8 || ^17.0 || ^18.0 + peerDependenciesMeta: + "@types/react": + optional: true + "@types/react-dom": + optional: true + checksum: 63b9c3d1637dea4bac74cb8f1b7825cb28921778e5e21365fe2e9569a1e4ee434a43b072789ce4a71af878b067c48bdb549d7eb8c193ed5750b8cf17cfbc418e + languageName: node + linkType: hard + "@radix-ui/react-checkbox@npm:^1.0.4": version: 1.0.4 resolution: "@radix-ui/react-checkbox@npm:1.0.4" @@ -12109,6 +12219,15 @@ __metadata: languageName: node linkType: hard +"@swc/helpers@npm:0.5.2": + version: 0.5.2 + resolution: "@swc/helpers@npm:0.5.2" + dependencies: + tslib: ^2.4.0 + checksum: 51d7e3d8bd56818c49d6bfbd715f0dbeedc13cf723af41166e45c03e37f109336bbcb57a1f2020f4015957721aeb21e1a7fff281233d797ff7d3dd1f447fa258 + languageName: node + linkType: hard + "@szmarczak/http-timer@npm:^4.0.5": version: 4.0.6 resolution: "@szmarczak/http-timer@npm:4.0.6" @@ -24658,7 +24777,7 @@ __metadata: languageName: node linkType: hard -"is-core-module@npm:^2.11.0": +"is-core-module@npm:^2.11.0, is-core-module@npm:^2.13.0": version: 2.13.0 resolution: "is-core-module@npm:2.13.0" dependencies: @@ -26793,6 +26912,13 @@ __metadata: languageName: node linkType: hard +"lilconfig@npm:^2.1.0": + version: 2.1.0 + resolution: "lilconfig@npm:2.1.0" + checksum: 8549bb352b8192375fed4a74694cd61ad293904eee33f9d4866c2192865c44c4eb35d10782966242634e0cbc1e91fe62b1247f148dc5514918e3a966da7ea117 + languageName: node + linkType: hard + "limiter@npm:^1.1.5": version: 1.1.5 resolution: "limiter@npm:1.1.5" @@ -29426,6 +29552,61 @@ __metadata: languageName: node linkType: hard +"next@npm:^13.5.4": + version: 13.5.5 + resolution: "next@npm:13.5.5" + dependencies: + "@next/env": 13.5.5 + "@next/swc-darwin-arm64": 13.5.5 + "@next/swc-darwin-x64": 13.5.5 + "@next/swc-linux-arm64-gnu": 13.5.5 + "@next/swc-linux-arm64-musl": 13.5.5 + "@next/swc-linux-x64-gnu": 13.5.5 + "@next/swc-linux-x64-musl": 13.5.5 + "@next/swc-win32-arm64-msvc": 13.5.5 + "@next/swc-win32-ia32-msvc": 13.5.5 + "@next/swc-win32-x64-msvc": 13.5.5 + "@swc/helpers": 0.5.2 + busboy: 1.6.0 + caniuse-lite: ^1.0.30001406 + postcss: 8.4.31 + styled-jsx: 5.1.1 + watchpack: 2.4.0 + peerDependencies: + "@opentelemetry/api": ^1.1.0 + react: ^18.2.0 + react-dom: ^18.2.0 + sass: ^1.3.0 + dependenciesMeta: + "@next/swc-darwin-arm64": + optional: true + "@next/swc-darwin-x64": + optional: true + "@next/swc-linux-arm64-gnu": + optional: true + "@next/swc-linux-arm64-musl": + optional: true + "@next/swc-linux-x64-gnu": + optional: true + "@next/swc-linux-x64-musl": + optional: true + "@next/swc-win32-arm64-msvc": + optional: true + "@next/swc-win32-ia32-msvc": + optional: true + "@next/swc-win32-x64-msvc": + optional: true + peerDependenciesMeta: + "@opentelemetry/api": + optional: true + sass: + optional: true + bin: + next: dist/bin/next + checksum: 034a52cf9a5df79912ad67467e00ab98e6505a7544514a12d6310d67fea760764f6b04ade344d457aadecb6170dd50eb0709346fd97a9e6659fcabd5e510fb97 + languageName: node + linkType: hard + "nice-try@npm:^1.0.4": version: 1.0.5 resolution: "nice-try@npm:1.0.5" @@ -31395,6 +31576,19 @@ __metadata: languageName: node linkType: hard +"postcss-import@npm:^15.1.0": + version: 15.1.0 + resolution: "postcss-import@npm:15.1.0" + dependencies: + postcss-value-parser: ^4.0.0 + read-cache: ^1.0.0 + resolve: ^1.1.7 + peerDependencies: + postcss: ^8.0.0 + checksum: 7bd04bd8f0235429009d0022cbf00faebc885de1d017f6d12ccb1b021265882efc9302006ba700af6cab24c46bfa2f3bc590be3f9aee89d064944f171b04e2a3 + languageName: node + linkType: hard + "postcss-js@npm:^4.0.0": version: 4.0.0 resolution: "postcss-js@npm:4.0.0" @@ -31406,6 +31600,17 @@ __metadata: languageName: node linkType: hard +"postcss-js@npm:^4.0.1": + version: 4.0.1 + resolution: "postcss-js@npm:4.0.1" + dependencies: + camelcase-css: ^2.0.1 + peerDependencies: + postcss: ^8.4.21 + checksum: 5c1e83efeabeb5a42676193f4357aa9c88f4dc1b3c4a0332c132fe88932b33ea58848186db117cf473049fc233a980356f67db490bd0a7832ccba9d0b3fd3491 + languageName: node + linkType: hard + "postcss-load-config@npm:^3.1.4": version: 3.1.4 resolution: "postcss-load-config@npm:3.1.4" @@ -31424,6 +31629,24 @@ __metadata: languageName: node linkType: hard +"postcss-load-config@npm:^4.0.1": + version: 4.0.1 + resolution: "postcss-load-config@npm:4.0.1" + dependencies: + lilconfig: ^2.0.5 + yaml: ^2.1.1 + peerDependencies: + postcss: ">=8.0.9" + ts-node: ">=9.0.0" + peerDependenciesMeta: + postcss: + optional: true + ts-node: + optional: true + checksum: b61f890499ed7dcda1e36c20a9582b17d745bad5e2b2c7bc96942465e406bc43ae03f270c08e60d1e29dab1ee50cb26970b5eb20c9aae30e066e20bd607ae4e4 + languageName: node + linkType: hard + "postcss-loader@npm:^4.2.0": version: 4.3.0 resolution: "postcss-loader@npm:4.3.0" @@ -31550,6 +31773,17 @@ __metadata: languageName: node linkType: hard +"postcss-nested@npm:^6.0.1": + version: 6.0.1 + resolution: "postcss-nested@npm:6.0.1" + dependencies: + postcss-selector-parser: ^6.0.11 + peerDependencies: + postcss: ^8.2.14 + checksum: 7ddb0364cd797de01e38f644879189e0caeb7ea3f78628c933d91cc24f327c56d31269384454fc02ecaf503b44bfa8e08870a7c4cc56b23bc15640e1894523fa + languageName: node + linkType: hard + "postcss-pseudo-companion-classes@npm:^0.1.1": version: 0.1.1 resolution: "postcss-pseudo-companion-classes@npm:0.1.1" @@ -31604,6 +31838,17 @@ __metadata: languageName: node linkType: hard +"postcss@npm:8.4.31": + version: 8.4.31 + resolution: "postcss@npm:8.4.31" + dependencies: + nanoid: ^3.3.6 + picocolors: ^1.0.0 + source-map-js: ^1.0.2 + checksum: 1d8611341b073143ad90486fcdfeab49edd243377b1f51834dc4f6d028e82ce5190e4f11bb2633276864503654fb7cab28e67abdc0fbf9d1f88cad4a0ff0beea + languageName: node + linkType: hard + "postcss@npm:^7.0.14, postcss@npm:^7.0.26, postcss@npm:^7.0.32, postcss@npm:^7.0.36, postcss@npm:^7.0.5, postcss@npm:^7.0.6": version: 7.0.39 resolution: "postcss@npm:7.0.39" @@ -33177,6 +33422,18 @@ __metadata: languageName: node linkType: hard +"react-resize-detector@npm:^9.1.0": + version: 9.1.0 + resolution: "react-resize-detector@npm:9.1.0" + dependencies: + lodash: ^4.17.21 + peerDependencies: + react: ^16.0.0 || ^17.0.0 || ^18.0.0 + react-dom: ^16.0.0 || ^17.0.0 || ^18.0.0 + checksum: 05b263e141fd428eea433e399f88c3e1a379b4a2293958f59b5a5c75dd86c621ce60583724257cc3dc1f5c120a664666ff3fa53d41e6c283687676dc55afa02b + languageName: node + linkType: hard + "react-schemaorg@npm:^2.0.0": version: 2.0.0 resolution: "react-schemaorg@npm:2.0.0" @@ -34205,6 +34462,19 @@ __metadata: languageName: node linkType: hard +"resolve@npm:^1.22.2": + version: 1.22.8 + resolution: "resolve@npm:1.22.8" + dependencies: + is-core-module: ^2.13.0 + path-parse: ^1.0.7 + supports-preserve-symlinks-flag: ^1.0.0 + bin: + resolve: bin/resolve + checksum: f8a26958aa572c9b064562750b52131a37c29d072478ea32e129063e2da7f83e31f7f11e7087a18225a8561cfe8d2f0df9dbea7c9d331a897571c0a2527dbb4c + languageName: node + linkType: hard + "resolve@npm:^2.0.0-next.3": version: 2.0.0-next.3 resolution: "resolve@npm:2.0.0-next.3" @@ -34254,6 +34524,19 @@ __metadata: languageName: node linkType: hard +"resolve@patch:resolve@^1.22.2#~builtin": + version: 1.22.8 + resolution: "resolve@patch:resolve@npm%3A1.22.8#~builtin::version=1.22.8&hash=c3c19d" + dependencies: + is-core-module: ^2.13.0 + path-parse: ^1.0.7 + supports-preserve-symlinks-flag: ^1.0.0 + bin: + resolve: bin/resolve + checksum: 5479b7d431cacd5185f8db64bfcb7286ae5e31eb299f4c4f404ad8aa6098b77599563ac4257cb2c37a42f59dfc06a1bec2bcf283bb448f319e37f0feb9a09847 + languageName: node + linkType: hard + "resolve@patch:resolve@^2.0.0-next.3#~builtin": version: 2.0.0-next.3 resolution: "resolve@patch:resolve@npm%3A2.0.0-next.3#~builtin::version=2.0.0-next.3&hash=c3c19d" @@ -35439,7 +35722,7 @@ __metadata: languageName: node linkType: hard -"source-map-support@npm:^0.5.16, source-map-support@npm:^0.5.21, source-map-support@npm:~0.5.12, source-map-support@npm:~0.5.20": +"source-map-support@npm:^0.5.16, source-map-support@npm:~0.5.12, source-map-support@npm:~0.5.20": version: 0.5.21 resolution: "source-map-support@npm:0.5.21" dependencies: @@ -36385,6 +36668,24 @@ __metadata: languageName: node linkType: hard +"sucrase@npm:^3.32.0": + version: 3.34.0 + resolution: "sucrase@npm:3.34.0" + dependencies: + "@jridgewell/gen-mapping": ^0.3.2 + commander: ^4.0.0 + glob: 7.1.6 + lines-and-columns: ^1.1.6 + mz: ^2.7.0 + pirates: ^4.0.1 + ts-interface-checker: ^0.1.9 + bin: + sucrase: bin/sucrase + sucrase-node: bin/sucrase-node + checksum: 61860063bdf6103413698e13247a3074d25843e91170825a9752e4af7668ffadd331b6e99e92fc32ee5b3c484ee134936f926fa9039d5711fafff29d017a2110 + languageName: node + linkType: hard + "superagent@npm:^5.1.1": version: 5.3.1 resolution: "superagent@npm:5.3.1" @@ -36783,6 +37084,39 @@ __metadata: languageName: node linkType: hard +"tailwindcss@npm:^3.3.3": + version: 3.3.3 + resolution: "tailwindcss@npm:3.3.3" + dependencies: + "@alloc/quick-lru": ^5.2.0 + arg: ^5.0.2 + chokidar: ^3.5.3 + didyoumean: ^1.2.2 + dlv: ^1.1.3 + fast-glob: ^3.2.12 + glob-parent: ^6.0.2 + is-glob: ^4.0.3 + jiti: ^1.18.2 + lilconfig: ^2.1.0 + micromatch: ^4.0.5 + normalize-path: ^3.0.0 + object-hash: ^3.0.0 + picocolors: ^1.0.0 + postcss: ^8.4.23 + postcss-import: ^15.1.0 + postcss-js: ^4.0.1 + postcss-load-config: ^4.0.1 + postcss-nested: ^6.0.1 + postcss-selector-parser: ^6.0.11 + resolve: ^1.22.2 + sucrase: ^3.32.0 + bin: + tailwind: lib/cli.js + tailwindcss: lib/cli.js + checksum: 0195c7a3ebb0de5e391d2a883d777c78a4749f0c532d204ee8aea9129f2ed8e701d8c0c276aa5f7338d07176a3c2a7682c1d0ab9c8a6c2abe6d9325c2954eb50 + languageName: node + linkType: hard + "tapable@npm:^1.0.0, tapable@npm:^1.1.3": version: 1.1.3 resolution: "tapable@npm:1.1.3" @@ -37708,12 +38042,10 @@ __metadata: languageName: node linkType: hard -"tslog@npm:^3.2.1": - version: 3.3.3 - resolution: "tslog@npm:3.3.3" - dependencies: - source-map-support: ^0.5.21 - checksum: ae84f4056865ad2d5a1f33d491387e4fd6c24642a08ccc29b8fcebce20784e94ef8b5863df5a5f85ec881125abc2b6b8b3aa022d2401a3716643332158346720 +"tslog@npm:^4.9.2": + version: 4.9.2 + resolution: "tslog@npm:4.9.2" + checksum: 702e45647a68b127d63c5eb63a0f322af8d01f17b689127d32238d6ca2ef76889648a00b88c040430e3126acedef070022b20ebd81823879ba3766cf5188c868 languageName: node linkType: hard @@ -40641,6 +40973,13 @@ __metadata: languageName: node linkType: hard +"yaml@npm:^2.1.1": + version: 2.3.3 + resolution: "yaml@npm:2.3.3" + checksum: cdfd132e7e0259f948929efe8835923df05c013c273c02bb7a2de9b46ac3af53c2778a35b32c7c0f877cc355dc9340ed564018c0242bfbb1278c2a3e53a0e99e + languageName: node + linkType: hard + "yaml@npm:^2.2.1": version: 2.3.1 resolution: "yaml@npm:2.3.1"