refactor: move WebWrapper files from packages/platform to apps/web/modules by hbjORbj · Pull Request #26629 · calcom/cal.com

hbjORbj · 2026-01-09T17:27:32Z

What does this PR do?

Moves WebWrapper files from packages/platform/atoms to apps/web/modules.

Why?

As part of moving components/hooks from packages/features to apps/web, the WebWrapper components in packages/platform/atoms were importing those moved files via @calcom/web. Moving the WebWrapper files to apps/web allows them to import from sibling locations instead of cross-package, unblocking the larger refactoring effort.

Files moved:

EventTypeWebWrapper and tab wrappers → apps/web/modules/event-types/components/
BookerWebWrapper → apps/web/modules/bookings/components/
ConferencingAppsViewWebWrapper → apps/web/modules/apps/components/
SelectedCalendarsSettingsWebWrapper → apps/web/modules/calendars/components/
AddMembersWithSwitchWebWrapper → apps/web/modules/event-types/components/
DestinationCalendarSettingsWebWrapper → apps/web/components/apps/

Additional changes:

Moved sortHosts utility to @calcom/lib/bookings/hostGroupUtils.ts for shared access
Added hook exports to @calcom/atoms package.json (useEventTypeForm, useHandleRouteChange, useTabsNavigations)
Removed WebWrapper exports from @calcom/atoms package.json

Updates since last revision:

Fixed deep relative imports in EventTypeWebWrapper.tsx to use @calcom/atoms package alias instead of traversing outside apps/web (addresses Cubic AI review feedback)

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
I confirm automated tests are in place that prove my fix is effective or that my feature works.

How should this be tested?

Run yarn type-check:ci --force and verify event types, booking pages, and settings pages load correctly.

Human Review Checklist

Verify sortHosts function move to @calcom/lib/bookings/hostGroupUtils.ts doesn't break existing functionality
Confirm no external consumers depend on the deleted @calcom/atoms/booker export
Check that @calcom/atoms hook exports resolve correctly

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

…dules Move the following WebWrapper files to their appropriate locations in apps/web/modules: - EventTypeWebWrapper and related tab wrappers to apps/web/modules/event-types/components/wrappers/ - BookerWebWrapper to apps/web/modules/bookings/components/ - ConferencingAppsViewWebWrapper to apps/web/modules/apps/components/ - SelectedCalendarsSettingsWebWrapper to apps/web/modules/calendars/components/ - AddMembersWithSwitchWebWrapper to apps/web/modules/event-types/components/ This reduces the number of files in packages/platform that import from @calcom/web, improving the separation between platform and web-specific code. Co-Authored-By: benny@cal.com <sldisek783@gmail.com>

devin-ai-integration · 2026-01-09T17:27:36Z

🤖 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

Co-Authored-By: benny@cal.com <sldisek783@gmail.com>

vercel · 2026-01-09T17:52:37Z

The latest updates on your projects. Learn more about Vercel for GitHub.

4 Skipped Deployments

Project	Deployment	Review	Updated (UTC)
api-v2	Ignored	Preview	Jan 12, 2026 7:40pm
cal	Ignored		Jan 12, 2026 7:40pm
cal-companion	Ignored	Preview	Jan 12, 2026 7:40pm
cal-eu	Ignored		Jan 12, 2026 7:40pm

…-webwrappers-to-apps-web

github-actions · 2026-01-10T04:26:07Z

E2E results are ready!

Workflow #98193.1 latest results

Co-Authored-By: benny@cal.com <sldisek783@gmail.com>

…-webwrappers-to-apps-web

cubic-dev-ai

1 issue found across 24 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="apps/web/modules/event-types/components/EventTypeWebWrapper.tsx">

<violation number="1" location="apps/web/modules/event-types/components/EventTypeWebWrapper.tsx:29">
P2: These deeply nested relative paths (`../../../../../packages/...`) are fragile and bypass proper package resolution. Since this file is in `apps/web/modules` but imports from `packages/platform/atoms`, consider either:
1. Using the package alias (e.g., `@calcom/atoms/event-types/hooks/useEventTypeForm`) and adding an export if needed
2. Moving these hooks to the web app as part of this refactor

The current approach contradicts the PR goal of reducing cross-package coupling and will break if directory structure changes.</violation>
</file>

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

apps/web/modules/event-types/components/EventTypeWebWrapper.tsx

github-actions · 2026-01-10T11:32:35Z

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

…relative paths - Move sortHosts function to @calcom/lib/bookings/hostGroupUtils.ts for shared access - Add exports for useEventTypeForm, useHandleRouteChange, useTabsNavigations to @calcom/atoms package.json - Update EventTypeWebWrapper.tsx to use @calcom/atoms package alias instead of ../../../../../packages/... paths - Update useEventTypeForm.ts to import sortHosts from @calcom/lib instead of @calcom/web - Re-export sortHosts from HostEditDialogs.tsx for backward compatibility This addresses the Cubic AI review feedback about fragile deeply nested relative paths that bypass proper package resolution. Co-Authored-By: unknown <>

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="apps/web/modules/event-types/components/EventTypeWebWrapper.tsx">

<violation number="1" location="apps/web/modules/event-types/components/EventTypeWebWrapper.tsx:29">
P1: Deep relative imports traversing outside `apps/web` into `packages/` violate monorepo conventions. Use the package alias `@calcom/atoms/event-types/hooks/useEventTypeForm` instead of relative paths. This pattern is fragile and not used elsewhere in the codebase.</violation>
</file>

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

apps/web/modules/event-types/components/EventTypeWebWrapper.tsx

github-actions · 2026-01-10T12:18:29Z

Devin AI is addressing Cubic AI's review feedback

New feedback has been sent to the existing Devin session.

View Devin Session

Addresses Cubic AI review feedback about deep relative imports traversing outside apps/web into packages/ violating monorepo conventions. - Update EventTypeWebWrapper.tsx to use @calcom/atoms alias - Add hook exports to @calcom/atoms package.json Co-Authored-By: benny@cal.com <sldisek783@gmail.com>

apps/web/modules/calendars/components/SelectedCalendarsSettingsWebWrapper.tsx

…dules (calcom#26629) * refactor: move WebWrapper files from packages/platform to apps/web/modules Move the following WebWrapper files to their appropriate locations in apps/web/modules: - EventTypeWebWrapper and related tab wrappers to apps/web/modules/event-types/components/wrappers/ - BookerWebWrapper to apps/web/modules/bookings/components/ - ConferencingAppsViewWebWrapper to apps/web/modules/apps/components/ - SelectedCalendarsSettingsWebWrapper to apps/web/modules/calendars/components/ - AddMembersWithSwitchWebWrapper to apps/web/modules/event-types/components/ This reduces the number of files in packages/platform that import from @calcom/web, improving the separation between platform and web-specific code. Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * fix: move web-specific hooks to apps/web and update imports Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * fix * fix * fix * fix * fix * fix * fix * fix * add back comments * fix * fix * fix * fix * fix: correct relative import paths in moved WebWrapper files Co-Authored-By: benny@cal.com <sldisek783@gmail.com> * final * fix: use package alias for event-type hooks instead of deeply nested relative paths - Move sortHosts function to @calcom/lib/bookings/hostGroupUtils.ts for shared access - Add exports for useEventTypeForm, useHandleRouteChange, useTabsNavigations to @calcom/atoms package.json - Update EventTypeWebWrapper.tsx to use @calcom/atoms package alias instead of ../../../../../packages/... paths - Update useEventTypeForm.ts to import sortHosts from @calcom/lib instead of @calcom/web - Re-export sortHosts from HostEditDialogs.tsx for backward compatibility This addresses the Cubic AI review feedback about fragile deeply nested relative paths that bypass proper package resolution. Co-Authored-By: unknown <> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>

pull-request-size bot added the size/L label Jan 9, 2026

hbjORbj added the ready-for-e2e label Jan 9, 2026

fix: move web-specific hooks to apps/web and update imports

f046c25

Co-Authored-By: benny@cal.com <sldisek783@gmail.com>

pull-request-size bot added size/XL and removed size/L labels Jan 9, 2026

hbjORbj added 2 commits January 10, 2026 03:30

fix

2e1250f

fix

2c601bf

pull-request-size bot added size/L and removed size/XL labels Jan 9, 2026

hbjORbj added 4 commits January 10, 2026 13:03

fix

de0c157

fix

9fd96d5

fix

8088177

Merge remote-tracking branch 'origin/main' into devin/1767978717-move…

d97a545

…-webwrappers-to-apps-web

hbjORbj and others added 11 commits January 10, 2026 13:26

fix

38037da

fix

65d48da

fix

6e4a08a

add back comments

eeefe7a

fix

576aec2

fix

338dbbe

fix

3aaef0b

fix

99a383e

fix: correct relative import paths in moved WebWrapper files

086c934

Co-Authored-By: benny@cal.com <sldisek783@gmail.com>

final

69b0e53

Merge remote-tracking branch 'origin/main' into devin/1767978717-move…

ec8ccb4

…-webwrappers-to-apps-web

hbjORbj marked this pull request as ready for review January 10, 2026 11:28

hbjORbj requested a review from a team as a code owner January 10, 2026 11:28

graphite-app bot added foundation core area: core, team members only labels Jan 10, 2026

cubic-dev-ai bot reviewed Jan 10, 2026

View reviewed changes

apps/web/modules/event-types/components/EventTypeWebWrapper.tsx Outdated Show resolved Hide resolved

hbjORbj requested a review from keithwillcode January 10, 2026 11:42

hbjORbj enabled auto-merge (squash) January 10, 2026 11:42

hbjORbj added 3 commits January 10, 2026 21:11

remove

c1d10a5

remove

5565172

remove

11a5bf0

cubic-dev-ai bot reviewed Jan 10, 2026

View reviewed changes

apps/web/modules/event-types/components/EventTypeWebWrapper.tsx Show resolved Hide resolved

hbjORbj and others added 2 commits January 10, 2026 21:18

fix ts error

5d60abe

keithwillcode reviewed Jan 10, 2026

View reviewed changes

apps/web/modules/calendars/components/SelectedCalendarsSettingsWebWrapper.tsx Outdated Show resolved Hide resolved

fix

5086de4

keithwillcode added this to the v6.1 milestone Jan 10, 2026

keithwillcode approved these changes Jan 10, 2026

View reviewed changes

Merge branch 'main' into devin/1767978717-move-webwrappers-to-apps-web

d399367

hbjORbj merged commit d3e7554 into main Jan 10, 2026
73 of 76 checks passed

hbjORbj deleted the devin/1767978717-move-webwrappers-to-apps-web branch January 10, 2026 12:55

vercel bot had a problem deploying to Preview – dev January 12, 2026 20:25 Failure

tomerqodo mentioned this pull request Jan 25, 2026

Code Review Bench PR #26629 - refactor: move WebWrapper files from packages/platform to apps/web/modules agentic-review-benchmarks/cal.com#9

Open

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor: move WebWrapper files from packages/platform to apps/web/modules#26629

refactor: move WebWrapper files from packages/platform to apps/web/modules#26629
hbjORbj merged 27 commits intomainfrom
devin/1767978717-move-webwrappers-to-apps-web

hbjORbj commented Jan 9, 2026 •

edited by devin-ai-integration bot

Loading

Uh oh!

devin-ai-integration bot commented Jan 9, 2026

Uh oh!

vercel bot commented Jan 9, 2026 •

edited

Loading

Uh oh!

github-actions bot commented Jan 10, 2026 •

edited

Loading

Uh oh!

cubic-dev-ai bot left a comment

Uh oh!

Uh oh!

github-actions bot commented Jan 10, 2026

Uh oh!

cubic-dev-ai bot left a comment

Uh oh!

Uh oh!

github-actions bot commented Jan 10, 2026

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

hbjORbj commented Jan 9, 2026 • edited by devin-ai-integration bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does this PR do?

Why?

Files moved:

Additional changes:

Updates since last revision:

Mandatory Tasks (DO NOT REMOVE)

How should this be tested?

Human Review Checklist

Uh oh!

devin-ai-integration bot commented Jan 9, 2026

🤖 Devin AI Engineer

Uh oh!

vercel bot commented Jan 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

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

Uh oh!

E2E results are ready!

Uh oh!

cubic-dev-ai bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions bot commented Jan 10, 2026

Devin AI is addressing Cubic AI's review feedback

Uh oh!

cubic-dev-ai bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions bot commented Jan 10, 2026

Devin AI is addressing Cubic AI's review feedback

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

hbjORbj commented Jan 9, 2026 •

edited by devin-ai-integration bot

Loading

vercel bot commented Jan 9, 2026 •

edited

Loading

github-actions bot commented Jan 10, 2026 •

edited

Loading