refactor: move shared components from apps/web to packages/features by hbjORbj · Pull Request #27490 · calcom/cal.diy

hbjORbj · 2026-02-02T06:08:51Z

What does this PR do?

This PR moves shared components from apps/web/modules to packages/features to reduce circular dependencies where packages/platform/atoms was importing from @calcom/web. This is Part 1 of 2 - containing only pure file moves without any dependency injection pattern changes.

Context: This is a split from PR #26995 to reduce risk. Part 1 (this PR) contains safe, straightforward file moves. Part 2 will contain the dependency injection pattern changes for components that have tRPC dependencies.

Components moved to packages/features:

DisconnectIntegrationModal → @calcom/features/apps/components
Booking components (Header, Section, TimeFormatToggle, PayIcon, Price) → @calcom/features/bookings/components
useInitializeWeekStart hook → @calcom/features/bookings/hooks
TeamEventTypeForm → @calcom/features/ee/teams/components
Event type components (AssignAllTeamMembers, BulkEditDefaultForEventsModal, CheckedTeamSelect, ChildrenEventTypeSelect, CreateEventTypeForm, LearnMoreLink, WeightDescription) → @calcom/features/eventtypes/components
Event type dialogs (HostEditDialogs, ManagedEventDialog) → @calcom/features/eventtypes/components/dialogs
Location components (LocationInput, types) → @calcom/features/eventtypes/components/locations
Tab components (EventLimitsTab, EventRecurringTab, etc.) → @calcom/features/eventtypes/components/tabs

Updates since last revision:

Fixed circular dependency in Header component (addresses Cubic AI review feedback with 9/10 confidence):

The Header component (now in @calcom/features/bookings/components) was importing useIsPlatform from @calcom/atoms, creating a circular dependency:

@calcom/atoms → @calcom/features (imports Header) → @calcom/atoms (imports useIsPlatform)

Fix: Refactored Header to accept an isPlatform prop instead of calling useIsPlatform internally:

Added isPlatform?: boolean prop to Header, LayoutToggle, and LayoutToggleWithData (defaults to false)
Updated callers to pass the prop:
- CalendarViewComponent.tsx: isPlatform={true}
- EventTypeCalendarViewComponent.tsx: isPlatform={true}
- Booker.tsx: isPlatform={isPlatform}

Verification:

All 23 moved files have been verified to contain NO @calcom/trpc imports
All 23 moved files have been verified to contain NO @calcom/web imports
Type check passes locally
Lint passes locally

Move components that don't require dependency injection: - DisconnectIntegrationModal - Booking components (Header, Section, TimeFormatToggle, PayIcon, Price) - useInitializeWeekStart hook - TeamEventTypeForm - Event type components (AssignAllTeamMembers, BulkEditDefaultForEventsModal, etc.) - Event type dialogs (HostEditDialogs, ManagedEventDialog) - Location components (LocationInput, types) - Tab components (EventLimitsTab, EventRecurringTab, etc.) Co-Authored-By: benny@cal.com <sldisek783@gmail.com>

Update imports in apps/web and packages/platform/atoms to reference the moved components from @calcom/features instead of @calcom/web. Co-Authored-By: benny@cal.com <sldisek783@gmail.com>

devin-ai-integration · 2026-02-02T06:08:56Z

🤖 Devin AI Engineer

I'll be helping with this pull request! Here's what you should know:

✅ I will automatically:

Address comments on this PR that start with 'DevinAI' or '@devin'.
Look at CI failures and help fix them

Note: I can only respond to comments from users who have write access to this repository.

⚙️ Control Options:

Disable automatic comment and CI monitoring

Complete the file move by deleting the original files that were copied to packages/features. This makes it a proper move instead of a copy, reducing the PR size significantly. Co-Authored-By: benny@cal.com <sldisek783@gmail.com>

Update import paths in apps/web files that reference components that were moved from apps/web/modules to packages/features: - LearnMoreLink - ChildrenEventTypeSelect - AssignAllTeamMembers - WeightDescription - LocationCustomClassNames (types) Co-Authored-By: benny@cal.com <sldisek783@gmail.com>

Update import paths in apps/web files that reference components moved from apps/web/modules to packages/features: - AppList.tsx: BulkEditDefaultForEventsModal - schedule-view.tsx: BulkUpdatParams type - AddMembersWithSwitch.tsx: AssignAllTeamMembers, CheckedTeamSelect - EventTypeWebWrapper.tsx: ChildrenEventType, ManagedEventDialog - DefaultLocationSettings.tsx: LocationCustomClassNames, LocationInput - Locations.tsx: LocationCustomClassNames, LocationInput Co-Authored-By: benny@cal.com <sldisek783@gmail.com>

cubic-dev-ai

1 issue found across 55 files

Prompt for AI agents (all issues)


Check if these issues are valid — if so, understand the root cause of each and fix them.


<file name="packages/platform/atoms/calendar-view/CalendarViewComponent.tsx">

<violation number="1" location="packages/platform/atoms/calendar-view/CalendarViewComponent.tsx:1">
P1: These imports introduce a circular dependency: @calcom/atoms (CalendarViewComponent) now depends on @calcom/features/Header, but Header depends on @calcom/atoms (useIsPlatform). Atoms should not depend on Features if Features already depend on Atoms—this can break bundling/runtime.

Consider moving useIsPlatform to a lower-level shared package (e.g., @calcom/lib), or refactoring Header to accept an `isPlatform` prop so it no longer imports from @calcom/atoms.</violation>
</file>

_{Reply with feedback, questions, or to request a fix. Tag @cubic-dev-ai to re-run a review.}

github-actions · 2026-02-02T07:50:06Z

Devin AI is addressing Cubic AI's review feedback

A Devin session has been created to address the issues identified by Cubic AI.

View Devin Session

This fixes the circular dependency where @calcom/atoms (CalendarViewComponent) was importing Header from @calcom/features, but Header was importing useIsPlatform from @calcom/atoms. The fix adds an isPlatform prop to the Header component so it no longer needs to import useIsPlatform from @calcom/atoms. Callers now pass the isPlatform value directly: - atoms components pass isPlatform={true} - web components pass the isPlatform prop they receive Fix confidence: 9/10 (Cubic AI) Co-Authored-By: unknown <>

github-actions · 2026-02-02T07:59:02Z

E2E results are ready!

Workflow #102097.2 latest results

deepeshbind · 2026-02-02T09:04:19Z

Hi @hbjORbj, great work on this!
Quick question: Would it be helpful to add index.ts files to the new feature folders for cleaner imports in Part 2?

hbjORbj · 2026-02-02T09:33:45Z

We don't really prefer barrel files @deepeshbind

cubic-dev-ai

1 issue found across 1 file (changes from recent commits).

Prompt for AI agents (all issues)


Check if these issues are valid — if so, understand the root cause of each and fix them.


<file name="packages/features/bookings/components/Header.tsx">

<violation number="1" location="packages/features/bookings/components/Header.tsx:189">
P1: `LayoutToggle` now calls `useIsPlatform`, reintroducing a dependency from features to atoms and causing a circular dependency because atoms import `Header`. Consider keeping the `isPlatform` prop thread instead of using the hook here to avoid cycles.</violation>
</file>

_{Reply with feedback, questions, or to request a fix. Tag @cubic-dev-ai to re-run a review.}

github-actions · 2026-02-02T09:49:53Z

Devin AI is addressing Cubic AI's review feedback

A Devin session has been created to address the issues identified by Cubic AI.

View Devin Session

hbjORbj · 2026-02-02T10:00:37Z

@@ -187,7 +187,6 @@ const LayoutToggle = ({
 }) => {
  const isEmbed = useIsEmbed();
  const isPlatform = useIsPlatform();


so, now features is importing atoms for this hook. I am aware that this isn't ideal, but there are already many other cases where features import atoms. It's another decoupling we should do. I will handle it in separate PRs.

devin-ai-integration Bot and others added 2 commits February 2, 2026 06:06

refactor: update import paths to use @calcom/features

b4a991a

Update imports in apps/web and packages/platform/atoms to reference the moved components from @calcom/features instead of @calcom/web. Co-Authored-By: benny@cal.com <sldisek783@gmail.com>

pull-request-size Bot added the size/XXL label Feb 2, 2026

refactor: delete original files from apps/web/modules

9c955b6

Complete the file move by deleting the original files that were copied to packages/features. This makes it a proper move instead of a copy, reducing the PR size significantly. Co-Authored-By: benny@cal.com <sldisek783@gmail.com>

pull-request-size Bot added size/L and removed size/XXL labels Feb 2, 2026

hbjORbj added the ready-for-e2e label Feb 2, 2026

hbjORbj marked this pull request as ready for review February 2, 2026 07:42

hbjORbj requested review from a team as code owners February 2, 2026 07:42

graphite-app Bot added foundation core area: core, team members only labels Feb 2, 2026

cubic-dev-ai Bot reviewed Feb 2, 2026

View reviewed changes

Comment thread packages/platform/atoms/calendar-view/CalendarViewComponent.tsx

keithwillcode previously approved these changes Feb 2, 2026

View reviewed changes

fix

8eb7a15

hbjORbj dismissed keithwillcode’s stale review via 8eb7a15 February 2, 2026 09:36

hbjORbj added 5 commits February 2, 2026 18:37

fix

0abb2fa

fix

7a0f7d1

fix

981f335

fix

ca88bed

fix

d4601aa

hbjORbj changed the title ~~refactor: move shared components from apps/web to packages/features (pure moves)~~ refactor: move shared components from apps/web to packages/features Feb 2, 2026

hbjORbj enabled auto-merge (squash) February 2, 2026 09:42

cubic-dev-ai Bot reviewed Feb 2, 2026

View reviewed changes

Comment thread packages/features/bookings/components/Header.tsx

hbjORbj commented Feb 2, 2026

View reviewed changes

hbjORbj added 2 commits February 2, 2026 19:03

Merge branch 'main' into devin/1770011679-pure-file-moves

b07e38d

Merge branch 'main' into devin/1770011679-pure-file-moves

da29036

hbjORbj mentioned this pull request Feb 2, 2026

feat: add dependency injection pattern for web-specific components #27505

Closed

11 tasks

hbjORbj requested a review from keithwillcode February 2, 2026 12:33

keithwillcode approved these changes Feb 2, 2026

View reviewed changes

hbjORbj merged commit 8c123ec into main Feb 2, 2026
47 checks passed

hbjORbj deleted the devin/1770011679-pure-file-moves branch February 2, 2026 13:25

hbjORbj mentioned this pull request Feb 10, 2026

refactor: remove ~/ path alias from @calcom/web to fix cross-package build resolution #27776

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor: move shared components from apps/web to packages/features#27490

refactor: move shared components from apps/web to packages/features#27490
hbjORbj merged 14 commits intomainfrom
devin/1770011679-pure-file-moves

hbjORbj commented Feb 2, 2026 •

edited

Loading

Uh oh!

devin-ai-integration Bot commented Feb 2, 2026

Uh oh!

cubic-dev-ai Bot left a comment

Uh oh!

Uh oh!

github-actions Bot commented Feb 2, 2026

Uh oh!

github-actions Bot commented Feb 2, 2026 •

edited

Loading

Uh oh!

deepeshbind commented Feb 2, 2026

Uh oh!

hbjORbj commented Feb 2, 2026

Uh oh!

cubic-dev-ai Bot left a comment

Uh oh!

Uh oh!

github-actions Bot commented Feb 2, 2026

Uh oh!

hbjORbj Feb 2, 2026 •

edited

Loading

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

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

Uh oh!

What does this PR do?

Components moved to packages/features:

Updates since last revision:

Verification:

Uh oh!

devin-ai-integration Bot commented Feb 2, 2026

🤖 Devin AI Engineer

Uh oh!

cubic-dev-ai Bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions Bot commented Feb 2, 2026

Devin AI is addressing Cubic AI's review feedback

Uh oh!

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

Uh oh!

E2E results are ready!

Uh oh!

deepeshbind commented Feb 2, 2026

Uh oh!

hbjORbj commented Feb 2, 2026

Uh oh!

cubic-dev-ai Bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions Bot commented Feb 2, 2026

Devin AI is addressing Cubic AI's review feedback

Uh oh!

hbjORbj Feb 2, 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!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

hbjORbj commented Feb 2, 2026 •

edited

Loading

github-actions Bot commented Feb 2, 2026 •

edited

Loading

hbjORbj Feb 2, 2026 •

edited

Loading