Skip to content

Scheduling infrastructure for absolutely everyone.

perf: remove atoms monorepo imports (#19688)

Keith Williams381f2781a3c8
diff --git a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/my-account/conferencing/page.tsx b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/my-account/conferencing/page.tsx
index 0548c3cc752..5d6a0451af0 100644
--- a/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/my-account/conferencing/page.tsx
+++ b/apps/web/app/(use-page-wrapper)/settings/(settings-layout)/my-account/conferencing/page.tsx
@@ -1,7 +1,7 @@
import { _generateMetadata } from "app/_utils";
import { getTranslate } from "app/_utils";
-import { ConferencingAppsViewWebWrapper } from "@calcom/atoms/monorepo";
+import { ConferencingAppsViewWebWrapper } from "@calcom/atoms/connect/conferencing-apps/ConferencingAppsViewWebWrapper";
export const generateMetadata = async () =>
await _generateMetadata(
diff --git a/apps/web/components/apps/CalendarListContainer.tsx b/apps/web/components/apps/CalendarListContainer.tsx
index 25b4d38ffd0..20177f7a244 100644
--- a/apps/web/components/apps/CalendarListContainer.tsx
+++ b/apps/web/components/apps/CalendarListContainer.tsx
@@ -3,10 +3,8 @@
import { useEffect, Suspense } from "react";
import { InstallAppButton } from "@calcom/app-store/components";
-import {
- SelectedCalendarsSettingsWebWrapper,
- DestinationCalendarSettingsWebWrapper,
-} from "@calcom/atoms/monorepo";
+import { DestinationCalendarSettingsWebWrapper } from "@calcom/atoms/destination-calendar/wrappers/DestinationCalendarSettingsWebWrapper";
+import { SelectedCalendarsSettingsWebWrapper } from "@calcom/atoms/selected-calendars/wrappers/SelectedCalendarsSettingsWebWrapper";
import AppListCard from "@calcom/features/apps/components/AppListCard";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { trpc } from "@calcom/trpc/react";
diff --git a/apps/web/modules/availability/[schedule]/schedule-view.tsx b/apps/web/modules/availability/[schedule]/schedule-view.tsx
index bbc69bc9acd..dbf6cf42402 100644
--- a/apps/web/modules/availability/[schedule]/schedule-view.tsx
+++ b/apps/web/modules/availability/[schedule]/schedule-view.tsx
@@ -3,7 +3,7 @@
import { useRouter } from "next/navigation";
import { useState } from "react";
-import { AvailabilitySettings } from "@calcom/atoms/monorepo";
+import { AvailabilitySettings } from "@calcom/atoms/availability/AvailabilitySettings";
import type { BulkUpdatParams } from "@calcom/features/eventtypes/components/BulkEditDefaultForEventsModal";
import { withErrorFromUnknown } from "@calcom/lib/getClientErrorFromUnknown";
import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";
diff --git a/apps/web/modules/d/[link]/d-type-view.tsx b/apps/web/modules/d/[link]/d-type-view.tsx
index d4bc2246ee9..7f2595ead8d 100644
--- a/apps/web/modules/d/[link]/d-type-view.tsx
+++ b/apps/web/modules/d/[link]/d-type-view.tsx
@@ -1,6 +1,6 @@
"use client";
-import { Booker } from "@calcom/atoms/monorepo";
+import { BookerWebWrapper as Booker } from "@calcom/atoms/booker";
import { getBookerWrapperClasses } from "@calcom/features/bookings/Booker/utils/getBookerWrapperClasses";
import { type PageProps } from "@lib/d/[link]/[slug]/getServerSideProps";
diff --git a/apps/web/modules/event-types/views/event-types-single-view.tsx b/apps/web/modules/event-types/views/event-types-single-view.tsx
index a03659ad0f5..e64db7ee88e 100644
--- a/apps/web/modules/event-types/views/event-types-single-view.tsx
+++ b/apps/web/modules/event-types/views/event-types-single-view.tsx
@@ -1,6 +1,6 @@
"use client";
-import { EventType } from "@calcom/atoms/monorepo";
+import { EventTypeWebWrapper as EventType } from "@calcom/atoms/event-types/wrappers/EventTypeWebWrapper";
import type { PageProps } from "@lib/event-types/[type]/getServerSideProps";
diff --git a/apps/web/modules/org/[orgSlug]/instant-meeting/team/[slug]/[type]/instant-meeting-view.tsx b/apps/web/modules/org/[orgSlug]/instant-meeting/team/[slug]/[type]/instant-meeting-view.tsx
index be6efb41f82..8b30d62d652 100644
--- a/apps/web/modules/org/[orgSlug]/instant-meeting/team/[slug]/[type]/instant-meeting-view.tsx
+++ b/apps/web/modules/org/[orgSlug]/instant-meeting/team/[slug]/[type]/instant-meeting-view.tsx
@@ -2,7 +2,7 @@
import type { EmbedProps } from "app/WithEmbedSSR";
-import { Booker } from "@calcom/atoms/monorepo";
+import { BookerWebWrapper as Booker } from "@calcom/atoms/booker";
import { getBookerWrapperClasses } from "@calcom/features/bookings/Booker/utils/getBookerWrapperClasses";
import type { getServerSideProps } from "@lib/org/[orgSlug]/instant-meeting/team/[slug]/[type]/getServerSideProps";
diff --git a/apps/web/modules/team/type-view.tsx b/apps/web/modules/team/type-view.tsx
index 8bbfba6057e..4fce3061dc4 100644
--- a/apps/web/modules/team/type-view.tsx
+++ b/apps/web/modules/team/type-view.tsx
@@ -3,7 +3,7 @@
import type { EmbedProps } from "app/WithEmbedSSR";
import { useSearchParams } from "next/navigation";
-import { Booker } from "@calcom/atoms/monorepo";
+import { BookerWebWrapper as Booker } from "@calcom/atoms/booker";
import { getBookerWrapperClasses } from "@calcom/features/bookings/Booker/utils/getBookerWrapperClasses";
import type { getServerSideProps } from "@lib/team/[slug]/[type]/getServerSideProps";
diff --git a/apps/web/modules/users/views/users-type-public-view.tsx b/apps/web/modules/users/views/users-type-public-view.tsx
index 8a709c7c5ba..a5f6a3ce135 100644
--- a/apps/web/modules/users/views/users-type-public-view.tsx
+++ b/apps/web/modules/users/views/users-type-public-view.tsx
@@ -3,7 +3,7 @@
import type { EmbedProps } from "app/WithEmbedSSR";
import { useSearchParams } from "next/navigation";
-import { Booker } from "@calcom/atoms/monorepo";
+import { BookerWebWrapper as Booker } from "@calcom/atoms/booker";
import { getBookerWrapperClasses } from "@calcom/features/bookings/Booker/utils/getBookerWrapperClasses";
import type { inferSSRProps } from "@lib/types/inferSSRProps";
diff --git a/packages/app-store/test-setup.ts b/packages/app-store/test-setup.ts
index 4ab01f05077..ff205a97f23 100644
--- a/packages/app-store/test-setup.ts
+++ b/packages/app-store/test-setup.ts
@@ -21,7 +21,7 @@ vi.mock("@calcom/lib/hooks/useLocale", () => ({
},
}));
-vi.mock("@calcom/atoms/monorepo", () => ({
+vi.mock("@calcom/atoms/hooks/useIsPlatform", () => ({
useIsPlatform: () => {
return false;
},
diff --git a/packages/features/bookings/Booker/Booker.tsx b/packages/features/bookings/Booker/Booker.tsx
index 8495b11a3c8..75e61ae782e 100644
--- a/packages/features/bookings/Booker/Booker.tsx
+++ b/packages/features/bookings/Booker/Booker.tsx
@@ -6,7 +6,7 @@ import { Toaster } from "sonner";
import { shallow } from "zustand/shallow";
import BookingPageTagManager from "@calcom/app-store/BookingPageTagManager";
-import { useIsPlatformBookerEmbed } from "@calcom/atoms/monorepo";
+import { useIsPlatformBookerEmbed } from "@calcom/atoms/hooks/useIsPlatformBookerEmbed";
import dayjs from "@calcom/dayjs";
import useSkipConfirmStep from "@calcom/features/bookings/Booker/components/hooks/useSkipConfirmStep";
import { getQueryParam } from "@calcom/features/bookings/Booker/utils/query-param";
diff --git a/packages/features/bookings/Booker/components/BookEventForm/BookEventForm.tsx b/packages/features/bookings/Booker/components/BookEventForm/BookEventForm.tsx
index 0275f1bea7e..8416866820c 100644
--- a/packages/features/bookings/Booker/components/BookEventForm/BookEventForm.tsx
+++ b/packages/features/bookings/Booker/components/BookEventForm/BookEventForm.tsx
@@ -4,7 +4,7 @@ import Link from "next/link";
import { useMemo, useState } from "react";
import type { FieldError } from "react-hook-form";
-import { useIsPlatformBookerEmbed } from "@calcom/atoms/monorepo";
+import { useIsPlatformBookerEmbed } from "@calcom/atoms/hooks/useIsPlatformBookerEmbed";
import type { BookerEvent } from "@calcom/features/bookings/types";
import { WEBSITE_PRIVACY_POLICY_URL, WEBSITE_TERMS_URL } from "@calcom/lib/constants";
import { getPaymentAppData } from "@calcom/lib/getPaymentAppData";
diff --git a/packages/features/bookings/Booker/components/BookEventForm/BookFormAsModal.tsx b/packages/features/bookings/Booker/components/BookEventForm/BookFormAsModal.tsx
index 763824da355..a36071c641a 100644
--- a/packages/features/bookings/Booker/components/BookEventForm/BookFormAsModal.tsx
+++ b/packages/features/bookings/Booker/components/BookEventForm/BookFormAsModal.tsx
@@ -1,8 +1,8 @@
import type { ReactNode } from "react";
import React from "react";
+import { useEventTypeById } from "@calcom/atoms/hooks/event-types/private/useEventTypeById";
import { useIsPlatform } from "@calcom/atoms/hooks/useIsPlatform";
-import { useEventTypeById } from "@calcom/atoms/monorepo";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import { Badge, Dialog, DialogContent } from "@calcom/ui";
diff --git a/packages/features/bookings/Booker/components/EventMeta.tsx b/packages/features/bookings/Booker/components/EventMeta.tsx
index 6c5a1de9bad..777c9a768a2 100644
--- a/packages/features/bookings/Booker/components/EventMeta.tsx
+++ b/packages/features/bookings/Booker/components/EventMeta.tsx
@@ -3,7 +3,7 @@ import dynamic from "next/dynamic";
import { useEffect, useMemo } from "react";
import { shallow } from "zustand/shallow";
-import { Timezone as PlatformTimezoneSelect } from "@calcom/atoms/monorepo";
+import { Timezone as PlatformTimezoneSelect } from "@calcom/atoms/timezone";
import { useEmbedUiConfig, useIsEmbed } from "@calcom/embed-core/embed-iframe";
import { EventDetails, EventMembers, EventMetaSkeleton, EventTitle } from "@calcom/features/bookings";
import { SeatsAvailabilityText } from "@calcom/features/bookings/components/SeatsAvailabilityText";
diff --git a/packages/features/bookings/Booker/components/hooks/useBookings.ts b/packages/features/bookings/Booker/components/hooks/useBookings.ts
index bb4f6258c49..23e1ed98ab8 100644
--- a/packages/features/bookings/Booker/components/hooks/useBookings.ts
+++ b/packages/features/bookings/Booker/components/hooks/useBookings.ts
@@ -3,7 +3,7 @@ import { useRouter } from "next/navigation";
import { useRef, useState, useEffect } from "react";
import { createPaymentLink } from "@calcom/app-store/stripepayment/lib/client";
-import { useHandleBookEvent } from "@calcom/atoms/monorepo";
+import { useHandleBookEvent } from "@calcom/atoms/hooks/bookings/useHandleBookEvent";
import dayjs from "@calcom/dayjs";
import { sdkActionManager } from "@calcom/embed-core/embed-iframe";
import { useBookerStore } from "@calcom/features/bookings/Booker/store";
diff --git a/packages/features/eventtypes/components/AddMembersWithSwitch.tsx b/packages/features/eventtypes/components/AddMembersWithSwitch.tsx
index b92a99d41b6..4b7cf823c0a 100644
--- a/packages/features/eventtypes/components/AddMembersWithSwitch.tsx
+++ b/packages/features/eventtypes/components/AddMembersWithSwitch.tsx
@@ -3,8 +3,9 @@ import { useFormContext } from "react-hook-form";
import { Controller } from "react-hook-form";
import type { Options } from "react-select";
+import { AddMembersWithSwitchPlatformWrapper } from "@calcom/atoms/add-members-switch/AddMembersWithSwitchPlatformWrapper";
+import { AddMembersWithSwitchWebWrapper } from "@calcom/atoms/add-members-switch/AddMembersWithSwitchWebWrapper";
import { useIsPlatform } from "@calcom/atoms/hooks/useIsPlatform";
-import { AddMembersWithSwitchWebWrapper, AddMembersWithSwitchPlatformWrapper } from "@calcom/atoms/monorepo";
import { Segment } from "@calcom/features/Segment";
import type {
FormValues,
diff --git a/packages/features/eventtypes/components/EventTypeLayout.tsx b/packages/features/eventtypes/components/EventTypeLayout.tsx
index 5af3ceb208a..387a98d2ee5 100644
--- a/packages/features/eventtypes/components/EventTypeLayout.tsx
+++ b/packages/features/eventtypes/components/EventTypeLayout.tsx
@@ -1,7 +1,6 @@
import { useMemo, useState, Suspense } from "react";
import type { UseFormReturn } from "react-hook-form";
-import { Shell as PlatformShell } from "@calcom/atoms/monorepo";
import useLockedFieldsManager from "@calcom/features/ee/managed-event-types/hooks/useLockedFieldsManager";
import { EventTypeEmbedButton, EventTypeEmbedDialog } from "@calcom/features/embed/EventTypeEmbed";
import type { FormValues } from "@calcom/features/eventtypes/lib/types";
@@ -31,6 +30,7 @@ import {
} from "@calcom/ui";
import classNames from "@calcom/ui/classNames";
+import { Shell as PlatformShell } from "../../../platform/atoms/src/components/ui/shell";
import { DeleteDialog } from "./dialogs/DeleteDialog";
type Props = {
diff --git a/packages/features/eventtypes/components/tabs/advanced/EventAdvancedTab.tsx b/packages/features/eventtypes/components/tabs/advanced/EventAdvancedTab.tsx
index edd97b10385..c35bbc57aed 100644
--- a/packages/features/eventtypes/components/tabs/advanced/EventAdvancedTab.tsx
+++ b/packages/features/eventtypes/components/tabs/advanced/EventAdvancedTab.tsx
@@ -3,13 +3,13 @@ import type { Dispatch, SetStateAction } from "react";
import { Controller, useFormContext } from "react-hook-form";
import type { z } from "zod";
+import { useAtomsContext } from "@calcom/atoms/hooks/useAtomsContext";
import { useIsPlatform } from "@calcom/atoms/hooks/useIsPlatform";
import {
SelectedCalendarsSettingsWebWrapper,
SelectedCalendarSettingsScope,
SelectedCalendarsSettingsWebWrapperSkeleton,
-} from "@calcom/atoms/monorepo";
-import { useAtomsContext } from "@calcom/atoms/monorepo";
+} from "@calcom/atoms/selected-calendars/wrappers/SelectedCalendarsSettingsWebWrapper";
import getLocationsOptionsForSelect from "@calcom/features/bookings/lib/getLocationOptionsForSelect";
import DestinationCalendarSelector from "@calcom/features/calendars/DestinationCalendarSelector";
import useLockedFieldsManager from "@calcom/features/ee/managed-event-types/hooks/useLockedFieldsManager";
diff --git a/packages/features/package.json b/packages/features/package.json
index 4f00a62d001..b47d3df0827 100644
--- a/packages/features/package.json
+++ b/packages/features/package.json
@@ -7,6 +7,7 @@
"version": "1.0.0",
"main": "index.ts",
"dependencies": {
+ "@calcom/atoms": "*",
"@calcom/dayjs": "*",
"@calcom/lib": "*",
"@calcom/trpc": "*",
diff --git a/packages/lib/hooks/useLocale.ts b/packages/lib/hooks/useLocale.ts
index 622aa964934..6721972301c 100644
--- a/packages/lib/hooks/useLocale.ts
+++ b/packages/lib/hooks/useLocale.ts
@@ -1,6 +1,6 @@
import { useTranslation } from "next-i18next";
-import { useAtomsContext } from "@calcom/atoms/monorepo";
+import { useAtomsContext } from "@calcom/atoms/hooks/useAtomsContext";
export const useLocale = (namespace: Parameters<typeof useTranslation>[0] = "common") => {
const context = useAtomsContext();
diff --git a/packages/platform/atoms/monorepo.ts b/packages/platform/atoms/monorepo.ts
deleted file mode 100644
index c54643c86b4..00000000000
--- a/packages/platform/atoms/monorepo.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-export { BookerWebWrapper as Booker } from "./booker";
-export { CalProvider } from "./cal-provider/CalProvider";
-export { useAtomsContext } from "./hooks/useAtomsContext";
-export { useEventTypeById } from "./hooks/event-types/private/useEventTypeById";
-export { useHandleBookEvent } from "./hooks/bookings/useHandleBookEvent";
-export * as Dialog from "./src/components/ui/dialog";
-export { Timezone } from "./timezone";
-export {
- SelectedCalendarsSettingsWebWrapper,
- SelectedCalendarsSettingsWebWrapperSkeleton,
- SelectedCalendarSettingsScope,
-} from "./selected-calendars/wrappers/SelectedCalendarsSettingsWebWrapper";
-export { DestinationCalendarSettingsWebWrapper } from "./destination-calendar/wrappers/DestinationCalendarSettingsWebWrapper";
-export * from "./availability";
-export { EventTypeWebWrapper as EventType } from "./event-types/wrappers/EventTypeWebWrapper";
-export { ConferencingAppsViewWebWrapper } from "./connect/conferencing-apps/ConferencingAppsViewWebWrapper";
-export type { UpdateScheduleInput_2024_06_11 as UpdateScheduleBody } from "@calcom/platform-types";
-export { Shell } from "./src/components/ui/shell";
-export { AddMembersWithSwitchWebWrapper } from "./add-members-switch/AddMembersWithSwitchWebWrapper";
-export { AddMembersWithSwitchPlatformWrapper } from "./add-members-switch/AddMembersWithSwitchPlatformWrapper";
-export { markdownToSafeHTML } from "./lib/markdownToSafeHTML";
-export { useIsPlatformBookerEmbed } from "./hooks/useIsPlatformBookerEmbed";
diff --git a/packages/platform/atoms/package.json b/packages/platform/atoms/package.json
index edcb3b9ec14..63cf63dbcd9 100644
--- a/packages/platform/atoms/package.json
+++ b/packages/platform/atoms/package.json
@@ -46,14 +46,24 @@
"import": "./dist/cal-atoms.js",
"types": "./dist/index.d.ts"
},
- "./monorepo": {
- "import": "./monorepo.ts",
- "require": "./monorepo.ts"
- },
- "./hooks/useIsPlatform": "./hooks/useIsPlatform.ts",
- "./globals.min.css": "./globals.min.css",
+ "./add-members-switch/AddMembersWithSwitchPlatformWrapper": "./add-members-switch/AddMembersWithSwitchPlatformWrapper.tsx",
+ "./add-members-switch/AddMembersWithSwitchWebWrapper": "./add-members-switch/AddMembersWithSwitchWebWrapper.tsx",
+ "./availability/AvailabilitySettings": "./availability/AvailabilitySettings.tsx",
+ "./booker": "./booker/index.ts",
+ "./components/ui/shell": "./src/components/ui/shell.tsx",
+ "./connect/conferencing-apps/ConferencingAppsViewWebWrapper": "./connect/conferencing-apps/ConferencingAppsViewWebWrapper.tsx",
+ "./destination-calendar/wrappers/DestinationCalendarSettingsWebWrapper": "./destination-calendar/wrappers/DestinationCalendarSettingsWebWrapper.tsx",
"./dist/index.ts": "./index.ts",
- "./dist/index.d.ts": "./dist/index.d.ts"
+ "./dist/index.d.ts": "./dist/index.d.ts",
+ "./event-types/wrappers/EventTypeWebWrapper": "./event-types/wrappers/EventTypeWebWrapper.tsx",
+ "./globals.min.css": "./globals.min.css",
+ "./hooks/bookings/useHandleBookEvent": "./hooks/bookings/useHandleBookEvent.ts",
+ "./hooks/useAtomsContext": "./hooks/useAtomsContext.ts",
+ "./hooks/useIsPlatform": "./hooks/useIsPlatform.ts",
+ "./hooks/useIsPlatformBookerEmbed": "./hooks/useIsPlatformBookerEmbed.ts",
+ "./hooks/event-types/private/useEventTypeById": "./hooks/event-types/private/useEventTypeById.ts",
+ "./selected-calendars/wrappers/SelectedCalendarsSettingsWebWrapper": "./selected-calendars/wrappers/SelectedCalendarsSettingsWebWrapper.tsx",
+ "./timezone": "./timezone/index.tsx"
},
"types": "./dist/index.d.ts",
"dependencies": {
diff --git a/packages/platform/atoms/vite.config.ts b/packages/platform/atoms/vite.config.ts
index 29ea09002a1..dba4597125c 100644
--- a/packages/platform/atoms/vite.config.ts
+++ b/packages/platform/atoms/vite.config.ts
@@ -52,7 +52,7 @@ export default defineConfig(({ mode }) => {
path: resolve("../../../node_modules/rollup-plugin-node-builtins"),
os: resolve("../../../node_modules/rollup-plugin-node-builtins"),
"@": path.resolve(__dirname, "./src"),
- "@calcom/lib/markdownToSafeHTML": "@calcom/atoms/monorepo",
+ "@calcom/lib/markdownToSafeHTML": path.resolve(__dirname, "./lib/markdownToSafeHTML"),
".prisma/client": path.resolve(__dirname, "../../prisma-client"),
"@prisma/client": path.resolve(__dirname, "../../prisma-client"),
"@calcom/prisma": path.resolve(__dirname, "../../prisma"),
diff --git a/packages/ui/components/dialog/Dialog.tsx b/packages/ui/components/dialog/Dialog.tsx
index a6fcf0b08e3..baa2b5b2ad1 100644
--- a/packages/ui/components/dialog/Dialog.tsx
+++ b/packages/ui/components/dialog/Dialog.tsx
@@ -7,11 +7,11 @@ import type { ForwardRefExoticComponent, ReactElement, ReactNode } from "react";
import React, { useMemo, useState } from "react";
import { useIsPlatform } from "@calcom/atoms/hooks/useIsPlatform";
-import { Dialog as PlatformDialogPrimitives } from "@calcom/atoms/monorepo";
import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";
import { useLocale } from "@calcom/lib/hooks/useLocale";
import classNames from "@calcom/ui/classNames";
+import * as PlatformDialogPrimitives from "../../../platform/atoms/src/components/ui/dialog";
import type { ButtonProps } from "../button";
import { Button } from "../button";
import type { IconName } from "../icon";
diff --git a/packages/ui/components/test-setup.ts b/packages/ui/components/test-setup.ts
index 1b09e2d3e57..e57146da5c8 100644
--- a/packages/ui/components/test-setup.ts
+++ b/packages/ui/components/test-setup.ts
@@ -57,7 +57,7 @@ vi.mock("@calcom/lib/hooks/useLocale", () => ({
},
}));
-vi.mock("@calcom/atoms/monorepo", () => ({
+vi.mock("@calcom/atoms/hooks/useIsPlatform", () => ({
useIsPlatform: () => {
return false;
},
diff --git a/yarn.lock b/yarn.lock
index 7d7074840f5..5d7d965c19e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2945,6 +2945,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@calcom/features@workspace:packages/features"
dependencies:
+ "@calcom/atoms": "*"
"@calcom/dayjs": "*"
"@calcom/lib": "*"
"@calcom/trpc": "*"