Scheduling infrastructure for absolutely everyone.
perf: move all booking pages into (booking-page-wrapper) route group (#19321)
Benny Jooaba7c6df7f9a
diff --git a/apps/web/app/(use-page-wrapper)/[user]/[type]/page.tsx b/apps/web/app/(booking-page-wrapper)/[user]/[type]/page.tsxsimilarity index 100%rename from apps/web/app/(use-page-wrapper)/[user]/[type]/page.tsxrename to apps/web/app/(booking-page-wrapper)/[user]/[type]/page.tsxdiff --git a/apps/web/app/(use-page-wrapper)/[user]/page.tsx b/apps/web/app/(booking-page-wrapper)/[user]/page.tsxsimilarity index 100%rename from apps/web/app/(use-page-wrapper)/[user]/page.tsxrename to apps/web/app/(booking-page-wrapper)/[user]/page.tsxdiff --git a/apps/web/app/(booking-page-wrapper)/layout.tsx b/apps/web/app/(booking-page-wrapper)/layout.tsxnew file mode 100644index 00000000000..1dd819f322f--- /dev/null+++ b/apps/web/app/(booking-page-wrapper)/layout.tsx@@ -0,0 +1,25 @@+import { cookies, headers } from "next/headers";++import { buildLegacyCtx } from "@lib/buildLegacyCtx";++import PageWrapper from "@components/PageWrapperAppDir";++import { ssrInit } from "@server/lib/ssr";++export default async function BookingPageWrapperLayout({ children }: { children: React.ReactNode }) {+ const h = headers();+ const nonce = h.get("x-nonce") ?? undefined;+ const context = buildLegacyCtx(h, cookies(), {}, {});+ const ssr = await ssrInit(context);++ return (+ <PageWrapper+ isBookingPage={true}+ requiresLicense={false}+ nonce={nonce}+ themeBasis={null}+ dehydratedState={ssr.dehydrate()}>+ {children}+ </PageWrapper>+ );+}diff --git a/apps/web/app/org/[orgSlug]/[user]/[type]/page.tsx b/apps/web/app/(booking-page-wrapper)/org/[orgSlug]/[user]/[type]/page.tsxsimilarity index 92%rename from apps/web/app/org/[orgSlug]/[user]/[type]/page.tsxrename to apps/web/app/(booking-page-wrapper)/org/[orgSlug]/[user]/[type]/page.tsxindex c33365e31e7..65b7bdf34a1 100644--- a/apps/web/app/org/[orgSlug]/[user]/[type]/page.tsx+++ b/apps/web/app/(booking-page-wrapper)/org/[orgSlug]/[user]/[type]/page.tsx@@ -1,7 +1,6 @@import { withAppDirSsr } from "app/WithAppDirSsr";import type { PageProps } from "app/_types";import { generateMeetingMetadata } from "app/_utils";-import { WithLayout } from "app/layoutHOC";import { cookies, headers } from "next/headers";import { getOrgFullOrigin } from "@calcom/features/ee/organizations/lib/orgDomains";@@ -56,11 +55,12 @@ export const generateMetadata = async ({ params, searchParams }: PageProps) => {};};-const Page = async (props: OrgTypePageProps) => {+const ServerPage = async ({ params, searchParams }: PageProps) => {+ const props = await getData(buildLegacyCtx(headers(), cookies(), params, searchParams));if ((props as TeamTypePageProps)?.teamId) {return <TeamTypePage {...(props as TeamTypePageProps)} />;}return <UserTypePage {...(props as UserTypePageProps)} />;};-export default WithLayout({ getLayout: null, getData, ServerPage: Page, isBookingPage: true });+export default ServerPage;diff --git a/apps/web/app/org/[orgSlug]/[user]/page.tsx b/apps/web/app/(booking-page-wrapper)/org/[orgSlug]/[user]/page.tsxsimilarity index 93%rename from apps/web/app/org/[orgSlug]/[user]/page.tsxrename to apps/web/app/(booking-page-wrapper)/org/[orgSlug]/[user]/page.tsxindex ec1baeceb86..a338de8f77e 100644--- a/apps/web/app/org/[orgSlug]/[user]/page.tsx+++ b/apps/web/app/(booking-page-wrapper)/org/[orgSlug]/[user]/page.tsx@@ -1,7 +1,6 @@import { withAppDirSsr } from "app/WithAppDirSsr";import type { PageProps } from "app/_types";import { generateMeetingMetadata } from "app/_utils";-import { WithLayout } from "app/layoutHOC";import { cookies, headers } from "next/headers";import { getOrgFullOrigin } from "@calcom/features/ee/organizations/lib/orgDomains";@@ -78,11 +77,12 @@ export const generateMetadata = async ({ params, searchParams }: PageProps) => {}};-const Page = async (props: OrgPageProps) => {+const ServerPage = async ({ params, searchParams }: PageProps) => {+ const props = await getData(buildLegacyCtx(headers(), cookies(), params, searchParams));if ((props as TeamPageProps)?.team) {return <TeamPage {...(props as TeamPageProps)} />;}return <UserPage {...(props as UserPageProps)} />;};-export default WithLayout({ getLayout: null, getData, ServerPage: Page, isBookingPage: true });+export default ServerPage;diff --git a/apps/web/app/org/[orgSlug]/instant-meeting/team/[slug]/[type]/page.tsx b/apps/web/app/(booking-page-wrapper)/org/[orgSlug]/instant-meeting/team/[slug]/[type]/page.tsxsimilarity index 89%rename from apps/web/app/org/[orgSlug]/instant-meeting/team/[slug]/[type]/page.tsxrename to apps/web/app/(booking-page-wrapper)/org/[orgSlug]/instant-meeting/team/[slug]/[type]/page.tsxindex 3b9354b9002..42aadb35fa2 100644--- a/apps/web/app/org/[orgSlug]/instant-meeting/team/[slug]/[type]/page.tsx+++ b/apps/web/app/(booking-page-wrapper)/org/[orgSlug]/instant-meeting/team/[slug]/[type]/page.tsx@@ -1,7 +1,6 @@import { withAppDirSsr } from "app/WithAppDirSsr";import type { PageProps as _PageProps } from "app/_types";import { generateMeetingMetadata } from "app/_utils";-import { WithLayout } from "app/layoutHOC";import { headers, cookies } from "next/headers";import { getOrgFullOrigin } from "@calcom/features/ee/organizations/lib/orgDomains";@@ -50,4 +49,10 @@ export const generateMetadata = async ({ params, searchParams }: _PageProps) =>};const getData = withAppDirSsr<Props>(getServerSideProps);-export default WithLayout({ getData, Page, isBookingPage: true })<"P">;++const ServerPage = async ({ params, searchParams }: _PageProps) => {+ const props = await getData(buildLegacyCtx(headers(), cookies(), params, searchParams));+ return <Page {...props} />;+};++export default ServerPage;diff --git a/apps/web/app/(booking-page-wrapper)/org/[orgSlug]/page.tsx b/apps/web/app/(booking-page-wrapper)/org/[orgSlug]/page.tsxnew file mode 100644index 00000000000..2359fb25a1f--- /dev/null+++ b/apps/web/app/(booking-page-wrapper)/org/[orgSlug]/page.tsx@@ -0,0 +1,4 @@+import Page from "app/(booking-page-wrapper)/team/[slug]/page";++export { generateMetadata } from "app/(booking-page-wrapper)/team/[slug]/page";+export default Page;diff --git a/apps/web/app/(booking-page-wrapper)/org/[orgSlug]/team/[slug]/[type]/page.tsx b/apps/web/app/(booking-page-wrapper)/org/[orgSlug]/team/[slug]/[type]/page.tsxnew file mode 100644index 00000000000..26c2c6eb89f--- /dev/null+++ b/apps/web/app/(booking-page-wrapper)/org/[orgSlug]/team/[slug]/[type]/page.tsx@@ -0,0 +1,4 @@+import Page from "app/(booking-page-wrapper)/team/[slug]/[type]/page";++export { generateMetadata } from "app/(booking-page-wrapper)/team/[slug]/[type]/page";+export default Page;diff --git a/apps/web/app/(booking-page-wrapper)/org/[orgSlug]/team/[slug]/page.tsx b/apps/web/app/(booking-page-wrapper)/org/[orgSlug]/team/[slug]/page.tsxnew file mode 100644index 00000000000..2359fb25a1f--- /dev/null+++ b/apps/web/app/(booking-page-wrapper)/org/[orgSlug]/team/[slug]/page.tsx@@ -0,0 +1,4 @@+import Page from "app/(booking-page-wrapper)/team/[slug]/page";++export { generateMetadata } from "app/(booking-page-wrapper)/team/[slug]/page";+export default Page;diff --git a/apps/web/app/team/[slug]/[type]/page.tsx b/apps/web/app/(booking-page-wrapper)/team/[slug]/[type]/page.tsxsimilarity index 89%rename from apps/web/app/team/[slug]/[type]/page.tsxrename to apps/web/app/(booking-page-wrapper)/team/[slug]/[type]/page.tsxindex 56bc0ef9fcc..72016bebc9e 100644--- a/apps/web/app/team/[slug]/[type]/page.tsx+++ b/apps/web/app/(booking-page-wrapper)/team/[slug]/[type]/page.tsx@@ -1,7 +1,6 @@import { withAppDirSsr } from "app/WithAppDirSsr";import type { PageProps } from "app/_types";import { generateMeetingMetadata } from "app/_utils";-import { WithLayout } from "app/layoutHOC";import { cookies, headers } from "next/headers";import { getOrgFullOrigin } from "@calcom/features/ee/organizations/lib/orgDomains";@@ -51,9 +50,8 @@ export const generateMetadata = async ({ params, searchParams }: PageProps) => {const getData = withAppDirSsr<LegacyPageProps>(getServerSideProps);-export default WithLayout({- Page: LegacyPage,- getData,- getLayout: null,- isBookingPage: true,-})<"P">;+const ServerPage = async ({ params, searchParams }: PageProps) => {+ const props = await getData(buildLegacyCtx(headers(), cookies(), params, searchParams));+ return <LegacyPage {...props} />;+};+export default ServerPage;diff --git a/apps/web/app/team/[slug]/page.tsx b/apps/web/app/(booking-page-wrapper)/team/[slug]/page.tsxsimilarity index 86%rename from apps/web/app/team/[slug]/page.tsxrename to apps/web/app/(booking-page-wrapper)/team/[slug]/page.tsxindex a4e3eaffc6b..70993de138b 100644--- a/apps/web/app/team/[slug]/page.tsx+++ b/apps/web/app/(booking-page-wrapper)/team/[slug]/page.tsx@@ -1,7 +1,6 @@import { withAppDirSsr } from "app/WithAppDirSsr";import type { PageProps as _PageProps } from "app/_types";import { generateMeetingMetadata } from "app/_utils";-import { WithLayout } from "app/layoutHOC";import { cookies, headers } from "next/headers";import { getOrgFullOrigin } from "@calcom/features/ee/organizations/lib/orgDomains";@@ -45,9 +44,8 @@ export const generateMetadata = async ({ params, searchParams }: _PageProps) =>const getData = withAppDirSsr<PageProps>(getServerSideProps);-export default WithLayout({- Page: LegacyPage,- getData,- getLayout: null,- isBookingPage: true,-})<"P">;+const ServerPage = async ({ params, searchParams }: _PageProps) => {+ const props = await getData(buildLegacyCtx(headers(), cookies(), params, searchParams));+ return <LegacyPage {...props} />;+};+export default ServerPage;diff --git a/apps/web/app/(use-page-wrapper)/layout.tsx b/apps/web/app/(use-page-wrapper)/layout.tsxindex 2e75568305a..40aeb0db276 100644--- a/apps/web/app/(use-page-wrapper)/layout.tsx+++ b/apps/web/app/(use-page-wrapper)/layout.tsx@@ -9,6 +9,7 @@ import { ssrInit } from "@server/lib/ssr";export default async function PageWrapperLayout({ children }: { children: React.ReactNode }) {const h = headers();const nonce = h.get("x-nonce") ?? undefined;+const context = buildLegacyCtx(headers(), cookies(), {}, {});const ssr = await ssrInit(context);diff --git a/apps/web/app/future/org/[orgSlug]/[user]/[type]/embed/page.tsx b/apps/web/app/future/org/[orgSlug]/[user]/[type]/embed/page.tsxindex b246540b8e8..081d18a07f9 100644--- a/apps/web/app/future/org/[orgSlug]/[user]/[type]/embed/page.tsx+++ b/apps/web/app/future/org/[orgSlug]/[user]/[type]/embed/page.tsx@@ -1,7 +1,7 @@import Page from "@pages/org/[orgSlug]/[user]/[type]/embed";import withEmbedSsrAppDir from "app/WithEmbedSSR";import { WithLayout } from "app/layoutHOC";-import type { OrgTypePageProps } from "app/org/[orgSlug]/[user]/[type]/page";+import type { OrgTypePageProps } from "app/(booking-page-wrapper)/org/[orgSlug]/[user]/[type]/page";import { getServerSideProps } from "@lib/org/[orgSlug]/[user]/[type]/getServerSideProps";diff --git a/apps/web/app/future/org/[orgSlug]/[user]/embed/page.tsx b/apps/web/app/future/org/[orgSlug]/[user]/embed/page.tsxindex 605dafa3331..4f214d72b38 100644--- a/apps/web/app/future/org/[orgSlug]/[user]/embed/page.tsx+++ b/apps/web/app/future/org/[orgSlug]/[user]/embed/page.tsx@@ -1,6 +1,6 @@import withEmbedSsrAppDir from "app/WithEmbedSSR";import { WithLayout } from "app/layoutHOC";-import type { OrgPageProps } from "app/org/[orgSlug]/[user]/page";+import type { OrgPageProps } from "app/(booking-page-wrapper)/org/[orgSlug]/[user]/page";import { getServerSideProps } from "@lib/org/[orgSlug]/[user]/getServerSideProps";diff --git a/apps/web/app/org/[orgSlug]/page.tsx b/apps/web/app/org/[orgSlug]/page.tsxdeleted file mode 100644index 215b04ad5fe..00000000000--- a/apps/web/app/org/[orgSlug]/page.tsx+++ /dev/null@@ -1,4 +0,0 @@-import Page from "app/team/[slug]/page";--export { generateMetadata } from "app/team/[slug]/page";-export default Page;diff --git a/apps/web/app/org/[orgSlug]/team/[slug]/[type]/page.tsx b/apps/web/app/org/[orgSlug]/team/[slug]/[type]/page.tsxdeleted file mode 100644index ebc0046999e..00000000000--- a/apps/web/app/org/[orgSlug]/team/[slug]/[type]/page.tsx+++ /dev/null@@ -1,4 +0,0 @@-import Page from "app/team/[slug]/[type]/page";--export { generateMetadata } from "app/team/[slug]/[type]/page";-export default Page;diff --git a/apps/web/app/org/[orgSlug]/team/[slug]/page.tsx b/apps/web/app/org/[orgSlug]/team/[slug]/page.tsxdeleted file mode 100644index 215b04ad5fe..00000000000--- a/apps/web/app/org/[orgSlug]/team/[slug]/page.tsx+++ /dev/null@@ -1,4 +0,0 @@-import Page from "app/team/[slug]/page";--export { generateMetadata } from "app/team/[slug]/page";-export default Page;diff --git a/apps/web/lib/app-providers-app-dir.tsx b/apps/web/lib/app-providers-app-dir.tsxindex 99885bbfbf6..bec6cc812d2 100644--- a/apps/web/lib/app-providers-app-dir.tsx+++ b/apps/web/lib/app-providers-app-dir.tsx@@ -287,7 +287,7 @@ const AppProviders = (props: PageWrapperProps) => {RemainingProviders);- if (isBookingPage) {+ if (props.isBookingPage || isBookingPage) {return Hydrated;}diff --git a/apps/web/modules/team/team-view.tsx b/apps/web/modules/team/team-view.tsxindex ae602d6840c..5f6ff3501f0 100644--- a/apps/web/modules/team/team-view.tsx+++ b/apps/web/modules/team/team-view.tsx@@ -240,6 +240,4 @@ function TeamPage({ team, considerUnpublished, isValidOrgDomain }: PageProps) {);}-TeamPage.isBookingPage = true;-export default TeamPage;diff --git a/apps/web/modules/users/views/users-public-view.tsx b/apps/web/modules/users/views/users-public-view.tsxindex 97143b8efb9..31d32c4b10c 100644--- a/apps/web/modules/users/views/users-public-view.tsx+++ b/apps/web/modules/users/views/users-public-view.tsx@@ -146,5 +146,5 @@ export function UserPage(props: PageProps) {</>);}-UserPage.isBookingPage = true;+export default UserPage;diff --git a/apps/web/modules/users/views/users-type-public-view.tsx b/apps/web/modules/users/views/users-type-public-view.tsxindex db10cfd684a..8a709c7c5ba 100644--- a/apps/web/modules/users/views/users-type-public-view.tsx+++ b/apps/web/modules/users/views/users-type-public-view.tsx@@ -48,6 +48,4 @@ function Type({ slug, user, isEmbed, booking, isBrandingHidden, eventData, orgBa);}-Type.isBookingPage = true;-export default Type;diff --git a/apps/web/pagesAndRewritePaths.js b/apps/web/pagesAndRewritePaths.jsindex 7c2f1f083be..f64a0d33df5 100644--- a/apps/web/pagesAndRewritePaths.js+++ b/apps/web/pagesAndRewritePaths.js@@ -3,12 +3,18 @@ const { nextJsOrgRewriteConfig } = require("./getNextjsOrgRewriteConfig");/** Needed to rewrite public booking page, gets all static pages but [user] */// Pages found here are excluded from redirects in beforeFiles in next.config.jslet pages = (exports.pages = glob- .sync("{pages,app,app/(use-page-wrapper),app/(use-page-wrapper)/(main-nav)}/**/[^_]*.{tsx,js,ts}", {- cwd: __dirname,- })+ .sync(+ "{pages,app,app/(booking-page-wrapper),app/(use-page-wrapper),app/(use-page-wrapper)/(main-nav)}/**/[^_]*.{tsx,js,ts}",+ {+ cwd: __dirname,+ }+ ).map((filename) =>filename- .replace(/^(app\/\(use-page-wrapper\)\/\(main-nav\)|app\/\(use-page-wrapper\)|pages|app)\//, "")+ .replace(+ /^(app\/\(use-page-wrapper\)\/\(main-nav\)|app\/\(use-page-wrapper\)|app\/\(booking-page-wrapper\)|pages|app)\//,+ ""+ ).replace(/(\.tsx|\.js|\.ts)/, "").replace(/\/.*/, ""))