From bec83b2342c470fa3557c064aa540ab46ad6f1c2 Mon Sep 17 00:00:00 2001 From: sean-brydon <55134778+sean-brydon@users.noreply.github.com> Date: Mon, 3 Mar 2025 18:33:32 +0000 Subject: [PATCH] chore: remove TRPC barrel exports (#19598) * remove barrel export for client * fix more imports * remove server barrel * remove more barrel exporst and fix tssconfig * fix types * fix imports for removed barrels * fig ssg createserverside helpers * restore lock * new yarn lock * remove barel exports * remove barrel * replace client with react in tsconfig * fix yarn lock * Update exports for trpc to not be types * add ENDPOINTS export to the correct location * other exports fixes lost due to barrel * fix client error export * more imports --------- Co-authored-by: hbjORbj Co-authored-by: Keith Williams --- apps/web/app/_trpc/trpc-provider.tsx | 3 ++- .../steps-views/SetupAvailability.tsx | 3 ++- .../ui/UsernameAvailability/PremiumTextfield.tsx | 3 ++- .../ui/UsernameAvailability/UsernameTextfield.tsx | 3 ++- .../components/ui/UsernameAvailability/index.tsx | 3 ++- .../connect-and-join/connect-and-join-view.tsx | 3 ++- .../event-types/views/event-types-listing-view.tsx | 4 +++- .../modules/settings/my-account/profile-view.tsx | 3 ++- apps/web/pages/api/link.ts | 3 ++- apps/web/pages/api/verify-booking-token.ts | 3 ++- apps/web/server/lib/ssg.ts | 3 ++- apps/web/server/lib/ssr.ts | 3 ++- .../basecamp3/trpc/projectMutation.handler.ts | 3 ++- .../app-store/basecamp3/trpc/projects.handler.ts | 3 ++- .../routing-forms/components/SingleForm.tsx | 4 +++- .../app-store/routing-forms/lib/handleResponse.ts | 3 ++- .../routing-forms/trpc/deleteForm.handler.ts | 3 ++- .../routing-forms/trpc/formMutation.handler.ts | 3 ++- .../trpc/getIncompleteBookingSettings.handler.ts | 3 ++- .../app-store/routing-forms/trpc/report.handler.ts | 3 ++- .../trpc/saveIncompleteBookingSettings.handler.ts | 3 ++- packages/app-store/tsconfig.json | 2 +- packages/features/auth/lib/next-auth-options.ts | 5 ++--- .../refreshCredentials.ts | 8 ++------ packages/features/ee/sso/lib/sso.ts | 3 ++- packages/features/ee/users/server/trpc-router.ts | 5 +++-- packages/lib/CalendarAppError.ts | 2 +- packages/lib/checkRateLimitAndThrowError.ts | 3 ++- packages/lib/server/getRoutedUrl.ts | 3 ++- .../event-types/wrappers/EventTypeWebWrapper.tsx | 4 +++- packages/trpc/client/index.ts | 1 - packages/trpc/index.ts | 3 --- packages/trpc/next/index.ts | 1 - packages/trpc/react/index.ts | 7 +++++-- packages/trpc/react/server.ts | 1 - packages/trpc/react/trpc.ts | 14 ++++++-------- packages/trpc/server/index.ts | 1 - .../viewer/auth/resendVerifyEmail.handler.ts | 3 ++- .../viewer/domainWideDelegation/update.handler.ts | 3 ++- ...MembersMatchingAttributeLogicOfRoute.handler.ts | 3 ++- .../viewer/routing-forms/response.handler.ts | 3 ++- .../routers/viewer/teams/createInvite.handler.ts | 3 ++- .../routers/viewer/teams/deleteInvite.handler.ts | 3 ++- .../viewer/teams/setInviteExpiration.handler.ts | 3 ++- packages/trpc/tsconfig.json | 5 +---- packages/ui/components/mocks/trpc.tsx | 2 +- 46 files changed, 89 insertions(+), 67 deletions(-) delete mode 100644 packages/trpc/client/index.ts delete mode 100644 packages/trpc/next/index.ts delete mode 100644 packages/trpc/react/server.ts delete mode 100644 packages/trpc/server/index.ts diff --git a/apps/web/app/_trpc/trpc-provider.tsx b/apps/web/app/_trpc/trpc-provider.tsx index eacb9be901..2b8f3b8c3b 100644 --- a/apps/web/app/_trpc/trpc-provider.tsx +++ b/apps/web/app/_trpc/trpc-provider.tsx @@ -6,10 +6,11 @@ import { trpc } from "app/_trpc/client"; import { useState } from "react"; import superjson from "superjson"; -import { httpBatchLink, httpLink, loggerLink, splitLink, TRPCClientError } from "@calcom/trpc/client"; import { ENDPOINTS } from "@calcom/trpc/react/shared"; import type { AppRouter } from "@calcom/trpc/server/routers/_app"; +import { httpBatchLink, httpLink, loggerLink, splitLink, TRPCClientError } from "@trpc/client"; + export type Endpoint = (typeof ENDPOINTS)[number]; const MAX_QUERY_RETRIES = 3; diff --git a/apps/web/components/getting-started/steps-views/SetupAvailability.tsx b/apps/web/components/getting-started/steps-views/SetupAvailability.tsx index a1fd3be7bf..8108537125 100644 --- a/apps/web/components/getting-started/steps-views/SetupAvailability.tsx +++ b/apps/web/components/getting-started/steps-views/SetupAvailability.tsx @@ -3,11 +3,12 @@ import { useForm } from "react-hook-form"; import { Schedule } from "@calcom/features/schedules"; import { DEFAULT_SCHEDULE } from "@calcom/lib/availability"; import { useLocale } from "@calcom/lib/hooks/useLocale"; -import type { TRPCClientErrorLike } from "@calcom/trpc/react"; import { trpc } from "@calcom/trpc/react"; import type { AppRouter } from "@calcom/trpc/server/routers/_app"; import { Button, Form } from "@calcom/ui"; +import type { TRPCClientErrorLike } from "@trpc/client"; + interface ISetupAvailabilityProps { nextStep: () => void; defaultScheduleId?: number | null; diff --git a/apps/web/components/ui/UsernameAvailability/PremiumTextfield.tsx b/apps/web/components/ui/UsernameAvailability/PremiumTextfield.tsx index d0b4fd88b0..ac9e0282db 100644 --- a/apps/web/components/ui/UsernameAvailability/PremiumTextfield.tsx +++ b/apps/web/components/ui/UsernameAvailability/PremiumTextfield.tsx @@ -12,13 +12,14 @@ import { fetchUsername } from "@calcom/lib/fetchUsername"; import hasKeyInMetadata from "@calcom/lib/hasKeyInMetadata"; import { useDebounce } from "@calcom/lib/hooks/useDebounce"; import { useLocale } from "@calcom/lib/hooks/useLocale"; -import type { TRPCClientErrorLike } from "@calcom/trpc/client"; import type { RouterOutputs } from "@calcom/trpc/react"; import { trpc } from "@calcom/trpc/react"; import type { AppRouter } from "@calcom/trpc/server/routers/_app"; import { Button, Dialog, DialogClose, DialogContent, DialogFooter, Input, Label } from "@calcom/ui"; import { Icon } from "@calcom/ui"; +import type { TRPCClientErrorLike } from "@trpc/client"; + export enum UsernameChangeStatusEnum { UPGRADE = "UPGRADE", } diff --git a/apps/web/components/ui/UsernameAvailability/UsernameTextfield.tsx b/apps/web/components/ui/UsernameAvailability/UsernameTextfield.tsx index 2eab59a02a..0b472302fa 100644 --- a/apps/web/components/ui/UsernameAvailability/UsernameTextfield.tsx +++ b/apps/web/components/ui/UsernameAvailability/UsernameTextfield.tsx @@ -8,12 +8,13 @@ import { useEffect, useState } from "react"; import { fetchUsername } from "@calcom/lib/fetchUsername"; import { useDebounce } from "@calcom/lib/hooks/useDebounce"; import { useLocale } from "@calcom/lib/hooks/useLocale"; -import type { TRPCClientErrorLike } from "@calcom/trpc/client"; import { trpc } from "@calcom/trpc/react"; import type { AppRouter } from "@calcom/trpc/server/routers/_app"; import { Button, Dialog, DialogClose, DialogContent, TextField, DialogFooter, Tooltip } from "@calcom/ui"; import { Icon } from "@calcom/ui"; +import type { TRPCClientErrorLike } from "@trpc/client"; + interface ICustomUsernameProps { currentUsername: string | undefined; setCurrentUsername?: (newUsername: string) => void; diff --git a/apps/web/components/ui/UsernameAvailability/index.tsx b/apps/web/components/ui/UsernameAvailability/index.tsx index 9d2636d76a..530ca656f8 100644 --- a/apps/web/components/ui/UsernameAvailability/index.tsx +++ b/apps/web/components/ui/UsernameAvailability/index.tsx @@ -6,12 +6,13 @@ import { Controller, useForm } from "react-hook-form"; import { useOrgBranding } from "@calcom/features/ee/organizations/context/provider"; import { WEBSITE_URL, IS_SELF_HOSTED } from "@calcom/lib/constants"; -import type { TRPCClientErrorLike } from "@calcom/trpc/client"; import { trpc } from "@calcom/trpc/react"; import type { AppRouter } from "@calcom/trpc/server/routers/_app"; import useRouterQuery from "@lib/hooks/useRouterQuery"; +import type { TRPCClientErrorLike } from "@trpc/client"; + interface UsernameAvailabilityFieldProps { onSuccessMutation?: () => void; onErrorMutation?: (error: TRPCClientErrorLike) => void; diff --git a/apps/web/modules/connect-and-join/connect-and-join-view.tsx b/apps/web/modules/connect-and-join/connect-and-join-view.tsx index 66645a6ae3..16a55dde92 100644 --- a/apps/web/modules/connect-and-join/connect-and-join-view.tsx +++ b/apps/web/modules/connect-and-join/connect-and-join-view.tsx @@ -10,9 +10,10 @@ import { getQueryParam } from "@calcom/features/bookings/Booker/utils/query-para import { WEBAPP_URL } from "@calcom/lib/constants"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { trpc } from "@calcom/trpc"; -import { TRPCClientError } from "@calcom/trpc/react"; import { Button, EmptyScreen, Alert } from "@calcom/ui"; +import { TRPCClientError } from "@trpc/client"; + function ConnectAndJoin() { const { t } = useLocale(); const router = useRouter(); 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 32a7f67770..840d3f8701 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 @@ -28,7 +28,7 @@ import { HttpError } from "@calcom/lib/http-error"; import type { MembershipRole } from "@calcom/prisma/enums"; import { SchedulingType } from "@calcom/prisma/enums"; import type { RouterOutputs } from "@calcom/trpc/react"; -import { trpc, TRPCClientError } from "@calcom/trpc/react"; +import { trpc } from "@calcom/trpc/react"; import { Alert, Badge, @@ -60,6 +60,8 @@ import classNames from "@calcom/ui/classNames"; import useMeQuery from "@lib/hooks/useMeQuery"; +import { TRPCClientError } from "@trpc/client"; + type GetUserEventGroupsResponse = RouterOutputs["viewer"]["eventTypes"]["getUserEventGroups"]; type GetEventTypesFromGroupsResponse = RouterOutputs["viewer"]["eventTypes"]["getEventTypesFromGroup"]; diff --git a/apps/web/modules/settings/my-account/profile-view.tsx b/apps/web/modules/settings/my-account/profile-view.tsx index fcdd444471..6d8e058207 100644 --- a/apps/web/modules/settings/my-account/profile-view.tsx +++ b/apps/web/modules/settings/my-account/profile-view.tsx @@ -19,7 +19,6 @@ import { useLocale } from "@calcom/lib/hooks/useLocale"; import { md } from "@calcom/lib/markdownIt"; import turndown from "@calcom/lib/turndownService"; import { IdentityProvider } from "@calcom/prisma/enums"; -import type { TRPCClientErrorLike } from "@calcom/trpc/client"; import type { RouterOutputs } from "@calcom/trpc/react"; import { trpc } from "@calcom/trpc/react"; import type { AppRouter } from "@calcom/trpc/server/routers/_app"; @@ -51,6 +50,8 @@ import SecondaryEmailConfirmModal from "@components/settings/SecondaryEmailConfi import SecondaryEmailModal from "@components/settings/SecondaryEmailModal"; import { UsernameAvailabilityField } from "@components/ui/UsernameAvailability"; +import type { TRPCClientErrorLike } from "@trpc/client"; + const SkeletonLoader = () => { return ( diff --git a/apps/web/pages/api/link.ts b/apps/web/pages/api/link.ts index f2085c90ca..4fd1ed1773 100644 --- a/apps/web/pages/api/link.ts +++ b/apps/web/pages/api/link.ts @@ -5,11 +5,12 @@ import { symmetricDecrypt } from "@calcom/lib/crypto"; import { defaultResponder } from "@calcom/lib/server/defaultResponder"; import prisma from "@calcom/prisma"; import { UserPermissionRole } from "@calcom/prisma/enums"; -import { TRPCError } from "@calcom/trpc/server"; import { createContext } from "@calcom/trpc/server/createContext"; import { bookingsRouter } from "@calcom/trpc/server/routers/viewer/bookings/_router"; import type { UserProfile } from "@calcom/types/UserProfile"; +import { TRPCError } from "@trpc/server"; + enum DirectAction { ACCEPT = "accept", REJECT = "reject", diff --git a/apps/web/pages/api/verify-booking-token.ts b/apps/web/pages/api/verify-booking-token.ts index 0a2614ee58..1a661a0f7b 100644 --- a/apps/web/pages/api/verify-booking-token.ts +++ b/apps/web/pages/api/verify-booking-token.ts @@ -4,12 +4,13 @@ import { z } from "zod"; import { defaultResponder } from "@calcom/lib/server/defaultResponder"; import prisma from "@calcom/prisma"; import { UserPermissionRole } from "@calcom/prisma/enums"; -import { TRPCError } from "@calcom/trpc/server"; import { createContext } from "@calcom/trpc/server/createContext"; import { bookingsRouter } from "@calcom/trpc/server/routers/viewer/bookings/_router"; import { createCallerFactory } from "@calcom/trpc/server/trpc"; import type { UserProfile } from "@calcom/types/UserProfile"; +import { TRPCError } from "@trpc/server"; + enum DirectAction { ACCEPT = "accept", REJECT = "reject", diff --git a/apps/web/server/lib/ssg.ts b/apps/web/server/lib/ssg.ts index 00e8c64f39..1d1fa30467 100644 --- a/apps/web/server/lib/ssg.ts +++ b/apps/web/server/lib/ssg.ts @@ -4,9 +4,10 @@ import superjson from "superjson"; import { CALCOM_VERSION } from "@calcom/lib/constants"; import prisma, { readonlyPrisma } from "@calcom/prisma"; -import { createServerSideHelpers } from "@calcom/trpc/react/server"; import { appRouter } from "@calcom/trpc/server/routers/_app"; +import { createServerSideHelpers } from "@trpc/react-query/server"; + // eslint-disable-next-line @typescript-eslint/no-var-requires const { i18n } = require("@calcom/config/next-i18next.config"); diff --git a/apps/web/server/lib/ssr.ts b/apps/web/server/lib/ssr.ts index 11cf707e9c..68afe31abf 100644 --- a/apps/web/server/lib/ssr.ts +++ b/apps/web/server/lib/ssr.ts @@ -6,7 +6,6 @@ import { forms } from "@calcom/app-store/routing-forms/trpc/procedures/forms"; import { getLocale } from "@calcom/features/auth/lib/getLocale"; import { map } from "@calcom/features/flags/server/procedures/map"; import { CALCOM_VERSION } from "@calcom/lib/constants"; -import { createServerSideHelpers } from "@calcom/trpc/react/server"; import { createContext } from "@calcom/trpc/server/createContext"; import { me } from "@calcom/trpc/server/routers/loggedInViewer/procedures/me"; import { teamsAndUserProfilesQuery } from "@calcom/trpc/server/routers/loggedInViewer/procedures/teamsAndUserProfilesQuery"; @@ -16,6 +15,8 @@ import { get } from "@calcom/trpc/server/routers/viewer/eventTypes/procedures/ge import { hasTeamPlan } from "@calcom/trpc/server/routers/viewer/teams/procedures/hasTeamPlan"; import { router, mergeRouters } from "@calcom/trpc/server/trpc"; +import { createServerSideHelpers } from "@trpc/react-query/server"; + const loggedInRouter = router({ me, }); diff --git a/packages/app-store/basecamp3/trpc/projectMutation.handler.ts b/packages/app-store/basecamp3/trpc/projectMutation.handler.ts index fec2e0c422..98b71a2d44 100644 --- a/packages/app-store/basecamp3/trpc/projectMutation.handler.ts +++ b/packages/app-store/basecamp3/trpc/projectMutation.handler.ts @@ -1,8 +1,9 @@ import type { PrismaClient } from "@calcom/prisma/client"; import { credentialForCalendarServiceSelect } from "@calcom/prisma/selects/credential"; -import { TRPCError } from "@calcom/trpc/server"; import type { TrpcSessionUser } from "@calcom/trpc/server/trpc"; +import { TRPCError } from "@trpc/server"; + import getAppKeysFromSlug from "../../_utils/getAppKeysFromSlug"; import type { BasecampToken } from "../lib/CalendarService"; import { refreshAccessToken } from "../lib/helpers"; diff --git a/packages/app-store/basecamp3/trpc/projects.handler.ts b/packages/app-store/basecamp3/trpc/projects.handler.ts index e477a06d59..5b3b4b7dd8 100644 --- a/packages/app-store/basecamp3/trpc/projects.handler.ts +++ b/packages/app-store/basecamp3/trpc/projects.handler.ts @@ -1,8 +1,9 @@ import type { PrismaClient } from "@calcom/prisma/client"; import { credentialForCalendarServiceSelect } from "@calcom/prisma/selects/credential"; -import { TRPCError } from "@calcom/trpc/server"; import type { TrpcSessionUser } from "@calcom/trpc/server/trpc"; +import { TRPCError } from "@trpc/server"; + import getAppKeysFromSlug from "../../_utils/getAppKeysFromSlug"; import type { BasecampToken } from "../lib/CalendarService"; import { refreshAccessToken } from "../lib/helpers"; diff --git a/packages/app-store/routing-forms/components/SingleForm.tsx b/packages/app-store/routing-forms/components/SingleForm.tsx index 310f33f8b9..a8fcc42757 100644 --- a/packages/app-store/routing-forms/components/SingleForm.tsx +++ b/packages/app-store/routing-forms/components/SingleForm.tsx @@ -11,7 +11,7 @@ import { IS_CALCOM } from "@calcom/lib/constants"; import useApp from "@calcom/lib/hooks/useApp"; import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams"; import { useLocale } from "@calcom/lib/hooks/useLocale"; -import { trpc, TRPCClientError } from "@calcom/trpc/react"; +import { trpc } from "@calcom/trpc/react"; import useMeQuery from "@calcom/trpc/react/hooks/useMeQuery"; import type { inferSSRProps } from "@calcom/types/inferSSRProps"; import type { Brand } from "@calcom/types/utils"; @@ -36,6 +36,8 @@ import { } from "@calcom/ui"; import classNames from "@calcom/ui/classNames"; +import { TRPCClientError } from "@trpc/react-query"; + import { getAbsoluteEventTypeRedirectUrl } from "../getEventTypeRedirectUrl"; import { RoutingPages } from "../lib/RoutingPages"; import { isFallbackRoute } from "../lib/isFallbackRoute"; diff --git a/packages/app-store/routing-forms/lib/handleResponse.ts b/packages/app-store/routing-forms/lib/handleResponse.ts index d582e0e533..91f7bd9d61 100644 --- a/packages/app-store/routing-forms/lib/handleResponse.ts +++ b/packages/app-store/routing-forms/lib/handleResponse.ts @@ -8,9 +8,10 @@ import { safeStringify } from "@calcom/lib/safeStringify"; import { prisma } from "@calcom/prisma"; import type { App_RoutingForms_Form } from "@calcom/prisma/client"; import { RoutingFormSettings } from "@calcom/prisma/zod-utils"; -import { TRPCError } from "@calcom/trpc/server"; import type { ZResponseInputSchema } from "@calcom/trpc/server/routers/viewer/routing-forms/response.schema"; +import { TRPCError } from "@trpc/server"; + import isRouter from "../lib/isRouter"; import { onFormSubmission } from "../trpc/utils"; import type { FormResponse, SerializableForm } from "../types/types"; diff --git a/packages/app-store/routing-forms/trpc/deleteForm.handler.ts b/packages/app-store/routing-forms/trpc/deleteForm.handler.ts index 831f223d93..ee9d3214c1 100644 --- a/packages/app-store/routing-forms/trpc/deleteForm.handler.ts +++ b/packages/app-store/routing-forms/trpc/deleteForm.handler.ts @@ -1,8 +1,9 @@ import { entityPrismaWhereClause } from "@calcom/lib/entityPermissionUtils"; import type { PrismaClient } from "@calcom/prisma"; -import { TRPCError } from "@calcom/trpc/server"; import type { TrpcSessionUser } from "@calcom/trpc/server/trpc"; +import { TRPCError } from "@trpc/server"; + import getConnectedForms from "../lib/getConnectedForms"; import { isFormCreateEditAllowed } from "../lib/isFormCreateEditAllowed"; import type { TDeleteFormInputSchema } from "./deleteForm.schema"; diff --git a/packages/app-store/routing-forms/trpc/formMutation.handler.ts b/packages/app-store/routing-forms/trpc/formMutation.handler.ts index d36feef631..964f143007 100644 --- a/packages/app-store/routing-forms/trpc/formMutation.handler.ts +++ b/packages/app-store/routing-forms/trpc/formMutation.handler.ts @@ -3,9 +3,10 @@ import { Prisma } from "@prisma/client"; import { entityPrismaWhereClause, canEditEntity } from "@calcom/lib/entityPermissionUtils"; import type { PrismaClient } from "@calcom/prisma"; -import { TRPCError } from "@calcom/trpc/server"; import type { TrpcSessionUser } from "@calcom/trpc/server/trpc"; +import { TRPCError } from "@trpc/server"; + import { createFallbackRoute } from "../lib/createFallbackRoute"; import { getSerializableForm } from "../lib/getSerializableForm"; import { isFallbackRoute } from "../lib/isFallbackRoute"; diff --git a/packages/app-store/routing-forms/trpc/getIncompleteBookingSettings.handler.ts b/packages/app-store/routing-forms/trpc/getIncompleteBookingSettings.handler.ts index cadc831d3a..a0b3a34373 100644 --- a/packages/app-store/routing-forms/trpc/getIncompleteBookingSettings.handler.ts +++ b/packages/app-store/routing-forms/trpc/getIncompleteBookingSettings.handler.ts @@ -1,7 +1,8 @@ import type { PrismaClient } from "@calcom/prisma"; -import { TRPCError } from "@calcom/trpc/server"; import type { TrpcSessionUser } from "@calcom/trpc/server/trpc"; +import { TRPCError } from "@trpc/server"; + import { enabledIncompleteBookingApps } from "../lib/enabledIncompleteBookingApps"; import type { TGetIncompleteBookingSettingsInputSchema } from "./getIncompleteBookingSettings.schema"; diff --git a/packages/app-store/routing-forms/trpc/report.handler.ts b/packages/app-store/routing-forms/trpc/report.handler.ts index 63adfb37d8..1f89267881 100644 --- a/packages/app-store/routing-forms/trpc/report.handler.ts +++ b/packages/app-store/routing-forms/trpc/report.handler.ts @@ -3,9 +3,10 @@ import type { z } from "zod"; import logger from "@calcom/lib/logger"; import type { PrismaClient } from "@calcom/prisma"; import type { App_RoutingForms_FormResponse } from "@calcom/prisma/client"; -import { TRPCError } from "@calcom/trpc/server"; import type { TrpcSessionUser } from "@calcom/trpc/server/trpc"; +import { TRPCError } from "@trpc/server"; + import { jsonLogicToPrisma } from "../jsonLogicToPrisma"; import { getSerializableForm } from "../lib/getSerializableForm"; import { ensureStringOrStringArray, getLabelsFromOptionIds } from "../lib/reportingUtils"; diff --git a/packages/app-store/routing-forms/trpc/saveIncompleteBookingSettings.handler.ts b/packages/app-store/routing-forms/trpc/saveIncompleteBookingSettings.handler.ts index 2cdb084f79..5445fcbb72 100644 --- a/packages/app-store/routing-forms/trpc/saveIncompleteBookingSettings.handler.ts +++ b/packages/app-store/routing-forms/trpc/saveIncompleteBookingSettings.handler.ts @@ -1,8 +1,9 @@ import logger from "@calcom/lib/logger"; import type { PrismaClient } from "@calcom/prisma"; -import { TRPCError } from "@calcom/trpc/server"; import type { TrpcSessionUser } from "@calcom/trpc/server/trpc"; +import { TRPCError } from "@trpc/server"; + import incompleteBookingActionDataSchemas from "../lib/incompleteBooking/actionDataSchemas"; import type { TSaveIncompleteBookingSettingsInputSchema } from "./saveIncompleteBookingSettings.schema"; diff --git a/packages/app-store/tsconfig.json b/packages/app-store/tsconfig.json index 8c2e0fb50a..8e9faeb56e 100644 --- a/packages/app-store/tsconfig.json +++ b/packages/app-store/tsconfig.json @@ -8,7 +8,7 @@ "@components/*": ["../../apps/web/components/*"], /* A `package` should never import from `apps` ↓ */ "@lib/*": ["../../apps/web/lib/*"], - "@prisma/client/*": ["@calcom/prisma/client/*"], + "@prisma/client/*": ["@calcom/prisma/client/*"] }, "resolveJsonModule": true, "experimentalDecorators": true diff --git a/packages/features/auth/lib/next-auth-options.ts b/packages/features/auth/lib/next-auth-options.ts index 893593e906..be14526ce8 100644 --- a/packages/features/auth/lib/next-auth-options.ts +++ b/packages/features/auth/lib/next-auth-options.ts @@ -10,7 +10,6 @@ import CredentialsProvider from "next-auth/providers/credentials"; import EmailProvider from "next-auth/providers/email"; import GoogleProvider from "next-auth/providers/google"; - import { updateProfilePhotoGoogle } from "@calcom/app-store/_utils/oauth/updateProfilePhotoGoogle"; import GoogleCalendarService from "@calcom/app-store/googlecalendar/lib/CalendarService"; import { LicenseKeySingleton } from "@calcom/ee/common/server/LicenseKeyService"; @@ -42,12 +41,12 @@ import { CreationSource } from "@calcom/prisma/enums"; import { IdentityProvider, MembershipRole } from "@calcom/prisma/enums"; import { teamMetadataSchema, userMetadata } from "@calcom/prisma/zod-utils"; +import { getOrgUsernameFromEmail } from "../signup/utils/getOrgUsernameFromEmail"; import { ErrorCode } from "./ErrorCode"; import { dub } from "./dub"; import { isPasswordValid } from "./isPasswordValid"; import CalComAdapter from "./next-auth-custom-adapter"; import { verifyPassword } from "./verifyPassword"; -import { getOrgUsernameFromEmail } from "../signup/utils/getOrgUsernameFromEmail" const log = logger.getSubLogger({ prefix: ["next-auth-options"] }); const GOOGLE_API_CREDENTIALS = process.env.GOOGLE_API_CREDENTIALS || "{}"; @@ -897,7 +896,7 @@ export const getOptions = ({ email: user.email, // Slugify the incoming name and append a few random characters to // prevent conflicts for users with the same name. - username: getOrgUsernameFromEmail(user.name,getDomainFromEmail(user.email)), + username: getOrgUsernameFromEmail(user.name, getDomainFromEmail(user.email)), emailVerified: new Date(Date.now()), name: user.name, identityProvider: idP, diff --git a/packages/features/bookings/lib/getAllCredentialsForUsersOnEvent/refreshCredentials.ts b/packages/features/bookings/lib/getAllCredentialsForUsersOnEvent/refreshCredentials.ts index 65cf216ae0..e778ee81d2 100644 --- a/packages/features/bookings/lib/getAllCredentialsForUsersOnEvent/refreshCredentials.ts +++ b/packages/features/bookings/lib/getAllCredentialsForUsersOnEvent/refreshCredentials.ts @@ -14,12 +14,8 @@ import { refreshCredential } from "./refreshCredential"; export async function refreshCredentials( credentials: Array ): Promise> { - const nonDwdCredentials = credentials.filter( - (cred) => !isDwdCredential({ credentialId: cred.id }) - ); - const dwdCredentials = credentials.filter((cred) => - isDwdCredential({ credentialId: cred.id }) - ); + const nonDwdCredentials = credentials.filter((cred) => !isDwdCredential({ credentialId: cred.id })); + const dwdCredentials = credentials.filter((cred) => isDwdCredential({ credentialId: cred.id })); const refreshedDbCredentials = await async.mapLimit(nonDwdCredentials, 5, refreshCredential); return buildAllCredentials({ dwdCredentials, existingCredentials: refreshedDbCredentials }); } diff --git a/packages/features/ee/sso/lib/sso.ts b/packages/features/ee/sso/lib/sso.ts index 5ad5d3d561..1201f3c602 100644 --- a/packages/features/ee/sso/lib/sso.ts +++ b/packages/features/ee/sso/lib/sso.ts @@ -3,7 +3,8 @@ import { HOSTED_CAL_FEATURES } from "@calcom/lib/constants"; import { OrganizationRepository } from "@calcom/lib/server/repository/organization"; import type { PrismaClient } from "@calcom/prisma"; import { IdentityProvider } from "@calcom/prisma/enums"; -import { TRPCError } from "@calcom/trpc/server"; + +import { TRPCError } from "@trpc/server"; import jackson from "./jackson"; import { tenantPrefix, samlProductID } from "./saml"; diff --git a/packages/features/ee/users/server/trpc-router.ts b/packages/features/ee/users/server/trpc-router.ts index 20399911ce..796c0738a0 100644 --- a/packages/features/ee/users/server/trpc-router.ts +++ b/packages/features/ee/users/server/trpc-router.ts @@ -4,11 +4,12 @@ import { getOrgFullOrigin } from "@calcom/ee/organizations/lib/orgDomains"; import { CreationSource } from "@calcom/prisma/enums"; import { RedirectType } from "@calcom/prisma/enums"; import { _UserModel as User } from "@calcom/prisma/zod"; -import type { inferRouterOutputs } from "@calcom/trpc"; -import { TRPCError } from "@calcom/trpc"; import { authedAdminProcedure } from "@calcom/trpc/server/procedures/authedProcedure"; import { router } from "@calcom/trpc/server/trpc"; +import { TRPCError } from "@trpc/server"; +import type { inferRouterOutputs } from "@trpc/server"; + export type UserAdminRouter = typeof userAdminRouter; export type UserAdminRouterOutputs = inferRouterOutputs; diff --git a/packages/lib/CalendarAppError.ts b/packages/lib/CalendarAppError.ts index 5dfbf7e3dc..9dc0f3e885 100644 --- a/packages/lib/CalendarAppError.ts +++ b/packages/lib/CalendarAppError.ts @@ -38,4 +38,4 @@ export class CalendarAppDomainWideDelegationNotSetupError extends CalendarAppDom super(message); this.name = "CalendarAppDomainWideDelegationNotSetupError"; } -} \ No newline at end of file +} diff --git a/packages/lib/checkRateLimitAndThrowError.ts b/packages/lib/checkRateLimitAndThrowError.ts index f2c293df5f..f2da8c28f0 100644 --- a/packages/lib/checkRateLimitAndThrowError.ts +++ b/packages/lib/checkRateLimitAndThrowError.ts @@ -1,6 +1,7 @@ import prisma from "@calcom/prisma"; import { SMSLockState } from "@calcom/prisma/enums"; -import { TRPCError } from "@calcom/trpc/server"; + +import { TRPCError } from "@trpc/server"; import type { RateLimitHelper } from "./rateLimit"; import { rateLimiter } from "./rateLimit"; diff --git a/packages/lib/server/getRoutedUrl.ts b/packages/lib/server/getRoutedUrl.ts index d5703b319f..9fcd8071a6 100644 --- a/packages/lib/server/getRoutedUrl.ts +++ b/packages/lib/server/getRoutedUrl.ts @@ -18,7 +18,8 @@ import { orgDomainConfig } from "@calcom/features/ee/organizations/lib/orgDomain import { isAuthorizedToViewFormOnOrgDomain } from "@calcom/features/routing-forms/lib/isAuthorizedToViewForm"; import logger from "@calcom/lib/logger"; import { RoutingFormRepository } from "@calcom/lib/server/repository/routingForm"; -import { TRPCError } from "@calcom/trpc/server"; + +import { TRPCError } from "@trpc/server"; const log = logger.getSubLogger({ prefix: ["[routing-forms]", "[router]"] }); const querySchema = z diff --git a/packages/platform/atoms/event-types/wrappers/EventTypeWebWrapper.tsx b/packages/platform/atoms/event-types/wrappers/EventTypeWebWrapper.tsx index c3f4601cc5..b77f628a0e 100644 --- a/packages/platform/atoms/event-types/wrappers/EventTypeWebWrapper.tsx +++ b/packages/platform/atoms/event-types/wrappers/EventTypeWebWrapper.tsx @@ -15,10 +15,12 @@ import { useTypedQuery } from "@calcom/lib/hooks/useTypedQuery"; import { HttpError } from "@calcom/lib/http-error"; import { telemetryEventTypes, useTelemetry } from "@calcom/lib/telemetry"; import { SchedulingType } from "@calcom/prisma/enums"; -import { trpc, TRPCClientError } from "@calcom/trpc/react"; +import { trpc } from "@calcom/trpc/react"; import useMeQuery from "@calcom/trpc/react/hooks/useMeQuery"; import { showToast } from "@calcom/ui"; +import { TRPCClientError } from "@trpc/react-query"; + import { useEventTypeForm } from "../hooks/useEventTypeForm"; import { useHandleRouteChange } from "../hooks/useHandleRouteChange"; import { useTabsNavigations } from "../hooks/useTabsNavigations"; diff --git a/packages/trpc/client/index.ts b/packages/trpc/client/index.ts deleted file mode 100644 index 475e75c7fb..0000000000 --- a/packages/trpc/client/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from "@trpc/client"; diff --git a/packages/trpc/index.ts b/packages/trpc/index.ts index d03e008f51..2b5ed7162b 100644 --- a/packages/trpc/index.ts +++ b/packages/trpc/index.ts @@ -1,4 +1 @@ -export * from "./client"; -export * from "./next"; export * from "./react"; -export * from "./server"; diff --git a/packages/trpc/next/index.ts b/packages/trpc/next/index.ts deleted file mode 100644 index 89cfa7ca25..0000000000 --- a/packages/trpc/next/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from "@trpc/next"; diff --git a/packages/trpc/react/index.ts b/packages/trpc/react/index.ts index dbcd304c99..2e6de1951b 100644 --- a/packages/trpc/react/index.ts +++ b/packages/trpc/react/index.ts @@ -1,2 +1,5 @@ -export * from "@trpc/react-query"; -export * from "./trpc"; +export type { RouterInputs, RouterOutputs } from "./trpc"; + +export { trpc, transformer } from "./trpc"; + +export { ENDPOINTS } from "./shared"; diff --git a/packages/trpc/react/server.ts b/packages/trpc/react/server.ts deleted file mode 100644 index 5ddde6fedd..0000000000 --- a/packages/trpc/react/server.ts +++ /dev/null @@ -1 +0,0 @@ -export * from "@trpc/react-query/server"; diff --git a/packages/trpc/react/trpc.ts b/packages/trpc/react/trpc.ts index 78724a86a1..28a43dc1bf 100644 --- a/packages/trpc/react/trpc.ts +++ b/packages/trpc/react/trpc.ts @@ -1,16 +1,14 @@ import type { NextPageContext } from "next/types"; import superjson from "superjson"; -import { httpBatchLink } from "../client"; -import { httpLink } from "../client"; -import { loggerLink } from "../client"; -import { splitLink } from "../client"; -import type { CreateTRPCNext } from "../next"; -import { createTRPCNext } from "../next"; +import { httpBatchLink, httpLink, loggerLink, splitLink } from "@trpc/client"; +import type { CreateTRPCNext } from "@trpc/next"; +import { createTRPCNext } from "@trpc/next"; // ℹ️ Type-only import: // https://www.typescriptlang.org/docs/handbook/release-notes/typescript-3-8.html#type-only-imports-and-export -import type { TRPCClientErrorLike } from "../react"; -import type { inferRouterInputs, inferRouterOutputs } from "../server"; +import type { TRPCClientErrorLike } from "@trpc/react-query"; +import type { inferRouterInputs, inferRouterOutputs } from "@trpc/server"; + import type { AppRouter } from "../server/routers/_app"; import { ENDPOINTS } from "./shared"; diff --git a/packages/trpc/server/index.ts b/packages/trpc/server/index.ts deleted file mode 100644 index 627b3705bf..0000000000 --- a/packages/trpc/server/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from "@trpc/server"; diff --git a/packages/trpc/server/routers/viewer/auth/resendVerifyEmail.handler.ts b/packages/trpc/server/routers/viewer/auth/resendVerifyEmail.handler.ts index 3c93c68792..018d231dd9 100644 --- a/packages/trpc/server/routers/viewer/auth/resendVerifyEmail.handler.ts +++ b/packages/trpc/server/routers/viewer/auth/resendVerifyEmail.handler.ts @@ -2,7 +2,8 @@ import { sendEmailVerification } from "@calcom/features/auth/lib/verifyEmail"; import { checkRateLimitAndThrowError } from "@calcom/lib/checkRateLimitAndThrowError"; import logger from "@calcom/lib/logger"; import { prisma } from "@calcom/prisma"; -import { TRPCError } from "@calcom/trpc/server"; + +import { TRPCError } from "@trpc/server"; import type { TRPCContext } from "../../../createContext"; import type { TrpcSessionUser } from "../../../trpc"; diff --git a/packages/trpc/server/routers/viewer/domainWideDelegation/update.handler.ts b/packages/trpc/server/routers/viewer/domainWideDelegation/update.handler.ts index bc54daffc3..b07fe1abf4 100644 --- a/packages/trpc/server/routers/viewer/domainWideDelegation/update.handler.ts +++ b/packages/trpc/server/routers/viewer/domainWideDelegation/update.handler.ts @@ -2,7 +2,8 @@ import type { z } from "zod"; import { DomainWideDelegationRepository } from "@calcom/lib/server/repository/domainWideDelegation"; import { WorkspacePlatformRepository } from "@calcom/lib/server/repository/workspacePlatform"; -import { TRPCError } from "@calcom/trpc/server"; + +import { TRPCError } from "@trpc/server"; import type { DomainWideDelegationUpdateSchema } from "./schema"; import { diff --git a/packages/trpc/server/routers/viewer/routing-forms/findTeamMembersMatchingAttributeLogicOfRoute.handler.ts b/packages/trpc/server/routers/viewer/routing-forms/findTeamMembersMatchingAttributeLogicOfRoute.handler.ts index 5bbcffac88..2b9a9612ea 100644 --- a/packages/trpc/server/routers/viewer/routing-forms/findTeamMembersMatchingAttributeLogicOfRoute.handler.ts +++ b/packages/trpc/server/routers/viewer/routing-forms/findTeamMembersMatchingAttributeLogicOfRoute.handler.ts @@ -22,9 +22,10 @@ import { getSerializableForm } from "@calcom/routing-forms/lib/getSerializableFo import { getServerTimingHeader } from "@calcom/routing-forms/lib/getServerTimingHeader"; import isRouter from "@calcom/routing-forms/lib/isRouter"; import { RouteActionType } from "@calcom/routing-forms/zod"; -import { TRPCError } from "@calcom/trpc/server"; import type { TrpcSessionUser } from "@calcom/trpc/server/trpc"; +import { TRPCError } from "@trpc/server"; + import type { TFindTeamMembersMatchingAttributeLogicOfRouteInputSchema } from "./findTeamMembersMatchingAttributeLogicOfRoute.schema"; interface FindTeamMembersMatchingAttributeLogicOfRouteHandlerOptions { diff --git a/packages/trpc/server/routers/viewer/routing-forms/response.handler.ts b/packages/trpc/server/routers/viewer/routing-forms/response.handler.ts index d58c347b89..05520076a5 100644 --- a/packages/trpc/server/routers/viewer/routing-forms/response.handler.ts +++ b/packages/trpc/server/routers/viewer/routing-forms/response.handler.ts @@ -1,7 +1,8 @@ import { getSerializableForm } from "@calcom/app-store/routing-forms/lib/getSerializableForm"; import { handleResponse } from "@calcom/app-store/routing-forms/lib/handleResponse"; import type { PrismaClient } from "@calcom/prisma"; -import { TRPCError } from "@calcom/trpc/server"; + +import { TRPCError } from "@trpc/server"; import type { TResponseInputSchema } from "./response.schema"; diff --git a/packages/trpc/server/routers/viewer/teams/createInvite.handler.ts b/packages/trpc/server/routers/viewer/teams/createInvite.handler.ts index 3c18ad94b8..abff4b179e 100644 --- a/packages/trpc/server/routers/viewer/teams/createInvite.handler.ts +++ b/packages/trpc/server/routers/viewer/teams/createInvite.handler.ts @@ -3,9 +3,10 @@ import { randomBytes } from "crypto"; import { WEBAPP_URL } from "@calcom/lib/constants"; import { isTeamAdmin } from "@calcom/lib/server/queries/teams"; import { prisma } from "@calcom/prisma"; -import { TRPCError } from "@calcom/trpc/server"; import type { TrpcSessionUser } from "@calcom/trpc/server/trpc"; +import { TRPCError } from "@trpc/server"; + import type { TCreateInviteInputSchema } from "./createInvite.schema"; type CreateInviteOptions = { diff --git a/packages/trpc/server/routers/viewer/teams/deleteInvite.handler.ts b/packages/trpc/server/routers/viewer/teams/deleteInvite.handler.ts index 78d2c9ca20..3c9f0dac4f 100644 --- a/packages/trpc/server/routers/viewer/teams/deleteInvite.handler.ts +++ b/packages/trpc/server/routers/viewer/teams/deleteInvite.handler.ts @@ -1,8 +1,9 @@ import { isTeamAdmin } from "@calcom/lib/server/queries/teams"; import { prisma } from "@calcom/prisma"; -import { TRPCError } from "@calcom/trpc/server"; import type { TrpcSessionUser } from "@calcom/trpc/server/trpc"; +import { TRPCError } from "@trpc/server"; + import type { TDeleteInviteInputSchema } from "./deleteInvite.schema"; type DeleteInviteOptions = { diff --git a/packages/trpc/server/routers/viewer/teams/setInviteExpiration.handler.ts b/packages/trpc/server/routers/viewer/teams/setInviteExpiration.handler.ts index 1af519b064..49529352a2 100644 --- a/packages/trpc/server/routers/viewer/teams/setInviteExpiration.handler.ts +++ b/packages/trpc/server/routers/viewer/teams/setInviteExpiration.handler.ts @@ -1,8 +1,9 @@ import { isTeamAdmin } from "@calcom/lib/server/queries/teams"; import { prisma } from "@calcom/prisma"; -import { TRPCError } from "@calcom/trpc/server"; import type { TrpcSessionUser } from "@calcom/trpc/server/trpc"; +import { TRPCError } from "@trpc/server"; + import type { TSetInviteExpirationInputSchema } from "./setInviteExpiration.schema"; type SetInviteExpirationOptions = { diff --git a/packages/trpc/tsconfig.json b/packages/trpc/tsconfig.json index b77dab8522..678f634bc0 100644 --- a/packages/trpc/tsconfig.json +++ b/packages/trpc/tsconfig.json @@ -25,10 +25,7 @@ "../types/tanstack-table.d.ts", "../types/next.d.ts", "../types/window.d.ts", - "client", - "next", - "react", - "server" + "react" ], "exclude": ["**/node_modules/**", "types/router.d.ts"], "compilerOptions": { diff --git a/packages/ui/components/mocks/trpc.tsx b/packages/ui/components/mocks/trpc.tsx index b81db79f09..8c06488f46 100644 --- a/packages/ui/components/mocks/trpc.tsx +++ b/packages/ui/components/mocks/trpc.tsx @@ -3,9 +3,9 @@ import { QueryClient, QueryClientProvider } from "@tanstack/react-query"; import { useState, type PropsWithChildren } from "react"; -import { httpBatchLink } from "@calcom/trpc"; import type { AppRouter } from "@calcom/trpc/server/routers/_app"; +import { httpBatchLink } from "@trpc/client"; import { createTRPCReact } from "@trpc/react-query"; // eslint-disable-next-line @typescript-eslint/no-explicit-any