refactor: eliminate all @calcom/trpc/react imports and tRPC hooks from @calcom/features by hbjORbj · Pull Request #27728 · calcom/cal.com

hbjORbj · 2026-02-07T09:00:01Z

What does this PR do?

Removes every @calcom/trpc/react import and every tRPC hook call from packages/features/, fully decoupling the shared features package from tRPC client-side code. @calcom/trpc/server imports are the only remaining trpc imports in /features package now.

Impact

`@calcom/trpc` imports removed from `packages/features/` — 7 total, 0 remaining

Removed import	File	Action
`import { trpc } from "@calcom/trpc/react"`	`apps/hooks/useApp.ts`	deleted
`import { trpc } from "@calcom/trpc/react"`	`bookings/Booker/utils/event.ts`	moved to `apps/web/`
`import { trpc } from "@calcom/trpc/react"`	`components/phone-input/PhoneInput.tsx`	moved to `apps/web/`
`import type { RouterOutputs } from "@calcom/trpc/react"`	`bookings/types.ts`	replaced with direct type
`import type { RouterOutputs, RouterInputs } from "@calcom/trpc/react"`	`eventtypes/lib/types.ts`	types moved from trpc pkg
`import useMeQuery from "@calcom/trpc/react/hooks/useMeQuery"`	`pbac/client/context/PermissionProvider.tsx`	deleted (dead code)
`import type { TIsAvailableOutputSchema } from "@calcom/trpc/server/..."`	`bookings/Booker/types.ts`	removed

tRPC hook calls eliminated from `@calcom/features` — 4 removed, 0 remaining

Hook call	What happened
`trpc.viewer.apps.appById.useQuery`	`useApp` hook deleted; `OmniInstallAppButton` refactored to accept app data as prop
`trpc.viewer.public.event.useQuery`	`useEvent` hook moved to `apps/web/modules/bookings/hooks/`
`trpc.viewer.public.countryCode.useQuery`	`PhoneInput` moved to `apps/web/components/phone-input/`
`useMeQuery`	dead `PermissionProvider` deleted

Files moved from `packages/features/` → `apps/web/`

From	To
`features/bookings/Booker/utils/event.ts`	`apps/web/modules/bookings/hooks/useEvent.ts`
`features/components/phone-input/PhoneInput.tsx`	`apps/web/components/phone-input/PhoneInput.tsx`
`features/components/phone-input/index.ts`	`apps/web/components/phone-input/index.ts`
`features/eventtypes/components/locations/LocationInput.tsx`	`apps/web/modules/event-types/components/LocationInput.tsx`

Dead code removed

packages/features/apps/hooks/useApp.ts — deleted; consumers refactored to pass app data as props
packages/features/pbac/client/context/PermissionProvider.tsx — deleted (unused)
4 stale type imports removed from bookings/Booker/types.ts

Types relocated (~242 lines)

packages/trpc/server/routers/viewer/eventTypes/types.ts → packages/features/eventtypes/lib/types.ts

Event-type form types now live next to the feature they belong to, not inside the tRPC router.

Result

packages/features/ has zero @calcom/trpc/react imports — no tRPC client or hook usage remains in the shared features package.

Mandatory Tasks (DO NOT REMOVE)

I have self-reviewed the code (A decent size PR without self-review might be rejected).
I have updated the developer docs in /docs if this PR makes changes that would require a documentation change. N/A — no docs changes needed.
I confirm automated tests are in place that prove my fix is effective or that my feature works.

How should this be tested?

Build verification only — no functional changes. Confirm the booker, embed, and booking form views render correctly.

Link to Devin run: https://app.devin.ai/sessions/d2e8db2ab39840bfadb633ed8be49800
Requested by: @hbjORbj

paragon-review · 2026-02-07T09:00:04Z

Paragon Review Unavailable

Hi @hbjORbj! You are not toggled active by your team. Reach out to your admin.

github-actions · 2026-02-07T09:00:11Z

Hey there and thank you for opening this pull request! 👋🏼

We require pull request titles to follow the Conventional Commits specification and it looks like your proposed title needs to be adjusted.

Details:

No release type found in pull request title "Refactor/migrate trpc stuff from features to web 2". Add a prefix to indicate what kind of release this pull request corresponds to. For reference, see https://www.conventionalcommits.org/

Available types:
 - feat: A new feature
 - fix: A bug fix
 - docs: Documentation only changes
 - style: Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc)
 - refactor: A code change that neither fixes a bug nor adds a feature
 - perf: A code change that improves performance
 - test: Adding missing tests or correcting existing tests
 - build: Changes that affect the build system or external dependencies (example scopes: gulp, broccoli, npm)
 - ci: Changes to our CI configuration files and scripts (example scopes: Travis, Circle, BrowserStack, SauceLabs)
 - chore: Other changes that don't modify src or test files
 - revert: Reverts a previous commit

cubic-dev-ai

No issues found across 8 files

github-actions · 2026-02-07T14:28:42Z

E2E results are ready!

Workflow #103683.1 latest results

hbjORbj · 2026-02-07T17:08:09Z

packages/trpc/server/routers/viewer/eventTypes/types.ts

-// ============================================================================
-// EXPLICIT TYPE DEFINITIONS
-// ============================================================================
-// These explicit types prevent TypeScript from having to infer complex types
-// through chains of .extend(), .partial(), .merge() etc. This significantly
-// reduces type-checking time by giving TypeScript the answer directly.
-// ============================================================================
-
-type HashedLinkInput = {
-  link: string;
-  expiresAt?: Date | null;
-  maxUsageCount?: number | null;
-  usageCount?: number | null;
-};
-
-type AiPhoneCallConfig = {
-  generalPrompt: string;
-  enabled: boolean;
-  beginMessage: string | null;
-  yourPhoneNumber: string;
-  numberToCall: string;
-  guestName?: string | null;
-  guestEmail?: string | null;
-  guestCompany?: string | null;
-  templateType: TemplateType;
-};
-
-type CalVideoSettings = {
-  disableRecordingForGuests?: boolean | null;


all these types are moved to packages/features/eventtypes/lib/types.ts

hbjORbj · 2026-02-07T17:10:56Z

packages/app-store/_components/AppCard.tsx

            ) : (
              <OmniInstallAppButton
                className="ml-auto flex items-center"
-                appId={app.slug}


no longer needed as we are using app prop as it is

hbjORbj · 2026-02-07T17:11:08Z

packages/app-store/_components/OmniInstallAppButton.tsx

+ * This avoids redundant API calls and prevents the app-store package from depending on the features package.
 */
 export default function OmniInstallAppButton({
-  appId,


no longer needed as we are using app prop as it is

hbjORbj · 2026-02-07T17:11:49Z

packages/features/bookings/Booker/types.ts

-import type { useScheduleForEventReturnType } from "@calcom/features/bookings/Booker/utils/event";
-import type { BookerEventQuery } from "@calcom/features/bookings/types";
 import type { IntlSupportedTimeZones } from "@calcom/lib/timeZones";
-import type { EventBusyDate } from "@calcom/types/Calendar";
-import type { TIsAvailableOutputSchema } from "@calcom/trpc/server/routers/viewer/slots/isAvailable.schema";


unused imports

hbjORbj · 2026-02-07T17:12:26Z

packages/features/pbac/client/context/PermissionProvider.tsx

@@ -1,20 +0,0 @@
-export function PermissionProvider({ children }: { children: React.ReactNode }) {


hbjORbj · 2026-02-07T17:12:44Z

packages/features/form-builder/index.ts

-// TODO: FormBuilder makes more sense in @calcom/ui but it has an additional thing that other components don't have
-// It has zod schema associated with it and I currently can't import zod in there.
-// Move it later there maybe? @sean
-export { FormBuilderField } from "./FormBuilderField";


Removing barrel file. FormBuilderField is moved to /apps/web

hbjORbj · 2026-02-07T17:13:28Z

packages/features/schedules/components/ScheduleComponent.tsx

 import { defaultDayRange as DEFAULT_DAY_RANGE } from "@calcom/lib/availability";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { weekdayNames } from "@calcom/lib/weekday";
-import useMeQuery from "@calcom/trpc/react/hooks/useMeQuery";


unused import

cubic-dev-ai

No issues found across 33 files

…-stuff-from-features-to-web-2

hbjORbj added 16 commits February 7, 2026 17:31

migrate booker layout selector

9a68b30

move schedule hooks and types

e328211

migrate feature opt in components

9403caa

migrate feedback dialog

93415c8

update

8ca8a36

migrate schedule hooks

981a1b8

migrate useSegments

4bbc1a4

update

04d6293

update import paths

d8af64a

fix import paths

041d105

mv useTimesForSchedule back to features

02a5a71

fix

a589e9a

add useEvent to web

265e289

remove the old file

b7d7f68

update imports

08e8b24

clean up

c22100b

pull-request-size bot added the size/S label Feb 7, 2026

graphite-app bot added foundation core area: core, team members only labels Feb 7, 2026

graphite-app bot requested a review from a team February 7, 2026 09:00

hbjORbj added ready-for-e2e and removed foundation labels Feb 7, 2026

hbjORbj marked this pull request as draft February 7, 2026 09:00

devin-ai-integration bot changed the title ~~Refactor/migrate trpc stuff from features to web 2~~ refactor: remove 2 @calcom/trpc imports from packages/features (useEvent) Feb 7, 2026

hbjORbj added 3 commits February 7, 2026 18:02

migrate Segment

b37391b

update imports

d42a6a9

update imports

0b1107f

cubic-dev-ai bot reviewed Feb 7, 2026

View reviewed changes

simplify

45bcf16

calcom-bot changed the title ~~refactor: remove 2 @calcom/trpc imports from packages/features (useEvent)~~ refactor: eliminate all @calcom/trpc/react imports and tRPC hooks from @calcom/features Feb 7, 2026

hbjORbj added 5 commits February 7, 2026 22:20

fix

5cf8e95

fix

a00943c

fix

c691291

fix

12565f0

fix

e2d9f55

hbjORbj added 3 commits February 8, 2026 02:06

fix

2bac360

format

4a331db

format

2832a98

hbjORbj commented Feb 7, 2026

View reviewed changes

hbjORbj added 2 commits February 8, 2026 02:10

restore

a4cb3b8

remove prop

5b73bd6

hbjORbj commented Feb 7, 2026

View reviewed changes

hbjORbj marked this pull request as ready for review February 7, 2026 17:13

hbjORbj requested a review from keithwillcode February 7, 2026 17:15

hbjORbj enabled auto-merge (squash) February 7, 2026 17:15

cubic-dev-ai bot reviewed Feb 7, 2026

View reviewed changes

hbjORbj added 2 commits February 9, 2026 19:57

Merge remote-tracking branch 'origin/main' into refactor/migrate-trpc…

a0875a2

…-stuff-from-features-to-web-2

revert

320cb1d

keithwillcode added this to the v6.2 milestone Feb 9, 2026

keithwillcode approved these changes Feb 9, 2026

View reviewed changes

hbjORbj merged commit eba0635 into main Feb 9, 2026
87 of 90 checks passed

hbjORbj deleted the refactor/migrate-trpc-stuff-from-features-to-web-2 branch February 9, 2026 11:39

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor: eliminate all @calcom/trpc/react imports and tRPC hooks from @calcom/features#27728

refactor: eliminate all @calcom/trpc/react imports and tRPC hooks from @calcom/features#27728
hbjORbj merged 58 commits intomainfrom
refactor/migrate-trpc-stuff-from-features-to-web-2

hbjORbj commented Feb 7, 2026 •

edited

Loading

Uh oh!

paragon-review bot commented Feb 7, 2026

Uh oh!

github-actions bot commented Feb 7, 2026 •

edited

Loading

Uh oh!

cubic-dev-ai bot left a comment

Uh oh!

github-actions bot commented Feb 7, 2026 •

edited

Loading

Uh oh!

hbjORbj Feb 7, 2026

Uh oh!

hbjORbj Feb 7, 2026

Uh oh!

hbjORbj Feb 7, 2026

Uh oh!

hbjORbj Feb 7, 2026

Uh oh!

hbjORbj Feb 7, 2026

Uh oh!

hbjORbj Feb 7, 2026

Uh oh!

hbjORbj Feb 7, 2026 •

edited

Loading

Uh oh!

cubic-dev-ai bot left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

		@@ -1,20 +0,0 @@
		export function PermissionProvider({ children }: { children: React.ReactNode }) {

Conversation

hbjORbj commented Feb 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does this PR do?

Impact

@calcom/trpc imports removed from packages/features/ — 7 total, 0 remaining

tRPC hook calls eliminated from @calcom/features — 4 removed, 0 remaining

Files moved from packages/features/ → apps/web/

Dead code removed

Types relocated (~242 lines)

Result

Mandatory Tasks (DO NOT REMOVE)

How should this be tested?

Uh oh!

paragon-review bot commented Feb 7, 2026

Uh oh!

github-actions bot commented Feb 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

cubic-dev-ai bot left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Feb 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

E2E results are ready!

Uh oh!

hbjORbj Feb 7, 2026

Choose a reason for hiding this comment

Uh oh!

hbjORbj Feb 7, 2026

Choose a reason for hiding this comment

Uh oh!

hbjORbj Feb 7, 2026

Choose a reason for hiding this comment

Uh oh!

hbjORbj Feb 7, 2026

Choose a reason for hiding this comment

Uh oh!

hbjORbj Feb 7, 2026

Choose a reason for hiding this comment

Uh oh!

hbjORbj Feb 7, 2026

Choose a reason for hiding this comment

Uh oh!

hbjORbj Feb 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

cubic-dev-ai bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

hbjORbj commented Feb 7, 2026 •

edited

Loading

`@calcom/trpc` imports removed from `packages/features/` — 7 total, 0 remaining

tRPC hook calls eliminated from `@calcom/features` — 4 removed, 0 remaining

Files moved from `packages/features/` → `apps/web/`

github-actions bot commented Feb 7, 2026 •

edited

Loading

github-actions bot commented Feb 7, 2026 •

edited

Loading

hbjORbj Feb 7, 2026 •

edited

Loading