Merge branch 'main' into chore/revert-appDir-2

This reverts commit 83a187bf11.

apps/web/_app/_trpc/HydrateClient.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import { createHydrateClient } from "app/_trpc/createHydrateClient";
+import { createHydrateClient } from "_app/_trpc/createHydrateClient";
 import superjson from "superjson";
 
 export const HydrateClient = createHydrateClient({

apps/web/_app/_trpc/trpc-provider.tsx

@@ -1,6 +1,6 @@
 import { type DehydratedState, QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import { HydrateClient } from "app/_trpc/HydrateClient";
-import { trpc } from "app/_trpc/client";
+import { HydrateClient } from "_app/_trpc/HydrateClient";
+import { trpc } from "_app/_trpc/client";
 import { useState } from "react";
 import superjson from "superjson";
 

apps/web/_app/future/(individual-page-wrapper)/apps/[slug]/page.tsx

@@ -1,6 +1,6 @@
 import AppPage from "@pages/apps/[slug]/index";
 import { Prisma } from "@prisma/client";
-import { _generateMetadata } from "app/_utils";
+import { _generateMetadata } from "_app/_utils";
 import fs from "fs";
 import matter from "gray-matter";
 import { notFound } from "next/navigation";

apps/web/_app/future/(individual-page-wrapper)/apps/[slug]/setup/page.tsx

@@ -1,5 +1,5 @@
 import SetupPage from "@pages/apps/[slug]/setup";
-import { _generateMetadata } from "app/_utils";
+import { _generateMetadata } from "_app/_utils";
 import type { GetServerSidePropsContext } from "next";
 import { cookies, headers } from "next/headers";
 import { notFound, redirect } from "next/navigation";

apps/web/_app/future/(individual-page-wrapper)/apps/categories/[category]/page.tsx

@@ -1,6 +1,6 @@
 import CategoryPage from "@pages/apps/categories/[category]";
 import { Prisma } from "@prisma/client";
-import { _generateMetadata } from "app/_utils";
+import { _generateMetadata } from "_app/_utils";
 import { notFound } from "next/navigation";
 import z from "zod";
 

apps/web/_app/future/(individual-page-wrapper)/apps/categories/page.tsx

@@ -1,6 +1,6 @@
 import LegacyPage from "@pages/apps/categories/index";
-import { ssrInit } from "app/_trpc/ssrInit";
-import { _generateMetadata } from "app/_utils";
+import { ssrInit } from "_app/_trpc/ssrInit";
+import { _generateMetadata } from "_app/_utils";
 import { cookies, headers } from "next/headers";
 
 import { getAppRegistry, getAppRegistryWithCredentials } from "@calcom/app-store/_appRegistry";

apps/web/_app/future/(individual-page-wrapper)/apps/installed/[category]/page.tsx

@@ -1,5 +1,5 @@
 import LegacyPage from "@pages/apps/installed/[category]";
-import { _generateMetadata } from "app/_utils";
+import { _generateMetadata } from "_app/_utils";
 import { notFound } from "next/navigation";
 import { z } from "zod";
 

apps/web/_app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/apps/[category]/page.tsx

@@ -1,5 +1,5 @@
 import Page from "@pages/settings/admin/apps/[category]";
-import { _generateMetadata } from "app/_utils";
+import { _generateMetadata } from "_app/_utils";
 
 export const generateMetadata = async () =>
   await _generateMetadata(

apps/web/_app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/apps/page.tsx

@@ -1,5 +1,5 @@
 import Page from "@pages/settings/admin/apps/index";
-import { _generateMetadata } from "app/_utils";
+import { _generateMetadata } from "_app/_utils";
 
 export const generateMetadata = async () =>
   await _generateMetadata(

apps/web/_app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/flags/page.tsx

@@ -1,5 +1,5 @@
 import Page from "@pages/settings/admin/flags";
-import { _generateMetadata } from "app/_utils";
+import { _generateMetadata } from "_app/_utils";
 
 export const generateMetadata = async () =>
   await _generateMetadata(

apps/web/_app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/impersonation/page.tsx

@@ -1,5 +1,5 @@
 import Page from "@pages/settings/admin/impersonation";
-import { _generateMetadata } from "app/_utils";
+import { _generateMetadata } from "_app/_utils";
 
 export const generateMetadata = async () =>
   await _generateMetadata(

apps/web/_app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/oAuth/page.tsx

@@ -1,5 +1,5 @@
 import Page from "@pages/settings/admin/oAuth/index";
-import { _generateMetadata } from "app/_utils";
+import { _generateMetadata } from "_app/_utils";
 
 export const generateMetadata = async () =>
   await _generateMetadata(

apps/web/_app/future/(shared-page-wrapper)/(admin-layout)/settings/admin/page.tsx

@@ -1,5 +1,5 @@
 import Page from "@pages/settings/admin/index";
-import { _generateMetadata } from "app/_utils";
+import { _generateMetadata } from "_app/_utils";
 
 export const generateMetadata = async () =>
   await _generateMetadata(

apps/web/_app/future/(shared-page-wrapper)/(layout)/event-types/page.tsx

@@ -1,5 +1,5 @@
 import EventTypes from "@pages/event-types";
-import { _generateMetadata } from "app/_utils";
+import { _generateMetadata } from "_app/_utils";
 
 export const generateMetadata = async () =>
   await _generateMetadata(

apps/web/_app/future/(shared-page-wrapper)/(no-layout)/settings/admin/oAuth/oAuthView/page.tsx

@@ -1,5 +1,5 @@
 import Page from "@pages/settings/admin/oAuth/oAuthView";
-import { _generateMetadata } from "app/_utils";
+import { _generateMetadata } from "_app/_utils";
 
 export const generateMetadata = async () =>
   await _generateMetadata(

apps/web/_app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/organizations/page.tsx

@@ -1,4 +1,4 @@
-import { _generateMetadata } from "app/_utils";
+import { _generateMetadata } from "_app/_utils";
 
 import Page from "@calcom/features/ee/organizations/pages/settings/admin/AdminOrgPage";
 

apps/web/_app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/users/[id]/edit/page.tsx

@@ -1,6 +1,6 @@
-import { getServerCaller } from "app/_trpc/serverClient";
-import { type Params } from "app/_types";
-import { _generateMetadata } from "app/_utils";
+import { getServerCaller } from "_app/_trpc/serverClient";
+import { type Params } from "_app/_types";
+import { _generateMetadata } from "_app/_utils";
 import { cookies, headers } from "next/headers";
 import { z } from "zod";
 

apps/web/_app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/users/add/page.tsx

@@ -1,4 +1,4 @@
-import { _generateMetadata } from "app/_utils";
+import { _generateMetadata } from "_app/_utils";
 
 import Page from "@calcom/features/ee/users/pages/users-add-view";
 

apps/web/_app/future/(shared-page-wrapper)/(settings-layout)/settings/admin/users/page.tsx

@@ -1,4 +1,4 @@
-import { _generateMetadata } from "app/_utils";
+import { _generateMetadata } from "_app/_utils";
 
 import Page from "@calcom/features/ee/users/pages/users-listing-view";
 

apps/web/app/future/(individual-page-wrapper)/bookings/[status]/layout.tsx

@@ -1,56 +0,0 @@
-import { ssgInit } from "app/_trpc/ssgInit";
-import type { Params } from "app/_types";
-import { _generateMetadata } from "app/_utils";
-import { notFound } from "next/navigation";
-import type { ReactElement } from "react";
-import { z } from "zod";
-
-import { getLayout } from "@calcom/features/MainLayoutAppDir";
-import { APP_NAME } from "@calcom/lib/constants";
-
-import PageWrapper from "@components/PageWrapperAppDir";
-
-const validStatuses = ["upcoming", "recurring", "past", "cancelled", "unconfirmed"] as const;
-
-const querySchema = z.object({
-  status: z.enum(validStatuses),
-});
-
-type Props = { params: Params; children: ReactElement };
-
-export const generateMetadata = async () =>
-  await _generateMetadata(
-    (t) => `${APP_NAME} | ${t("bookings")}`,
-    () => ""
-  );
-
-export const generateStaticParams = async () => {
-  return validStatuses.map((status) => ({ status }));
-};
-
-const getData = async ({ params }: { params: Params }) => {
-  const parsedParams = querySchema.safeParse(params);
-
-  if (!parsedParams.success) {
-    notFound();
-  }
-
-  const ssg = await ssgInit();
-
-  return {
-    status: parsedParams.data.status,
-    dehydratedState: await ssg.dehydrate(),
-  };
-};
-
-export default async function BookingPageLayout({ params, children }: Props) {
-  const props = await getData({ params });
-
-  return (
-    <PageWrapper requiresLicense={false} getLayout={getLayout} nonce={undefined} themeBasis={null} {...props}>
-      {children}
-    </PageWrapper>
-  );
-}
-
-export const dynamic = "force-static";

apps/web/app/future/(individual-page-wrapper)/bookings/[status]/page.tsx

@@ -1 +0,0 @@
-export { default } from "@pages/bookings/[status]";

apps/web/app/future/(individual-page-wrapper)/teams/page.tsx

@@ -1,64 +0,0 @@
-import OldPage from "@pages/teams/index";
-import { ssrInit } from "app/_trpc/ssrInit";
-import { type Params } from "app/_types";
-import { _generateMetadata } from "app/_utils";
-import { type GetServerSidePropsContext } from "next";
-import { headers, cookies } from "next/headers";
-import { redirect } from "next/navigation";
-
-import { getLayout } from "@calcom/features/MainLayoutAppDir";
-import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
-
-import { buildLegacyCtx } from "@lib/buildLegacyCtx";
-
-import PageWrapper from "@components/PageWrapperAppDir";
-
-export const generateMetadata = async () =>
-  await _generateMetadata(
-    (t) => t("teams"),
-    (t) => t("create_manage_teams_collaborative")
-  );
-
-type PageProps = {
-  params: Params;
-};
-
-async function getData(context: Omit<GetServerSidePropsContext, "res" | "resolvedUrl">) {
-  const ssr = await ssrInit();
-  await ssr.viewer.me.prefetch();
-
-  const session = await getServerSession({
-    req: context.req,
-  });
-
-  if (!session) {
-    const token = Array.isArray(context.query.token) ? context.query.token[0] : context.query.token;
-
-    const callbackUrl = token ? `/teams?token=${encodeURIComponent(token)}` : null;
-    return redirect(callbackUrl ? `/auth/login?callbackUrl=${callbackUrl}` : "/auth/login");
-  }
-
-  return { dehydratedState: await ssr.dehydrate() };
-}
-
-const Page = async ({ params }: PageProps) => {
-  const h = headers();
-  const nonce = h.get("x-nonce") ?? undefined;
-
-  const legacyCtx = buildLegacyCtx(h, cookies(), params);
-  // @ts-expect-error `req` of type '{ headers: ReadonlyHeaders; cookies: ReadonlyRequestCookies; }' is not assignable to `req` in `GetServerSidePropsContext`
-  const props = await getData(legacyCtx);
-
-  return (
-    <PageWrapper
-      getLayout={getLayout}
-      requiresLicense={false}
-      nonce={nonce}
-      themeBasis={null}
-      dehydratedState={props.dehydratedState}>
-      <OldPage />
-    </PageWrapper>
-  );
-};
-
-export default Page;

apps/web/app/future/(individual-page-wrapper)/video/[uid]/page.tsx

@@ -1,130 +0,0 @@
-import OldPage from "@pages/video/[uid]";
-import { ssrInit } from "app/_trpc/ssrInit";
-import { type Params } from "app/_types";
-import { _generateMetadata } from "app/_utils";
-import MarkdownIt from "markdown-it";
-import { type GetServerSidePropsContext } from "next";
-import { headers, cookies } from "next/headers";
-import { redirect } from "next/navigation";
-
-import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
-import { APP_NAME } from "@calcom/lib/constants";
-import prisma, { bookingMinimalSelect } from "@calcom/prisma";
-
-import { buildLegacyCtx } from "@lib/buildLegacyCtx";
-
-import PageWrapper from "@components/PageWrapperAppDir";
-
-export const generateMetadata = async () =>
-  await _generateMetadata(
-    () => `${APP_NAME} Video`,
-    (t) => t("quick_video_meeting")
-  );
-
-type PageProps = Readonly<{
-  params: Params;
-}>;
-
-const md = new MarkdownIt("default", { html: true, breaks: true, linkify: true });
-
-async function getData(context: Omit<GetServerSidePropsContext, "res" | "resolvedUrl">) {
-  const ssr = await ssrInit();
-
-  const booking = await prisma.booking.findUnique({
-    where: {
-      uid: context.query.uid as string,
-    },
-    select: {
-      ...bookingMinimalSelect,
-      uid: true,
-      description: true,
-      isRecorded: true,
-      user: {
-        select: {
-          id: true,
-          timeZone: true,
-          name: true,
-          email: true,
-          organization: {
-            select: {
-              calVideoLogo: true,
-            },
-          },
-        },
-      },
-      references: {
-        select: {
-          uid: true,
-          type: true,
-          meetingUrl: true,
-          meetingPassword: true,
-        },
-        where: {
-          type: "daily_video",
-        },
-      },
-    },
-  });
-
-  if (!booking || booking.references.length === 0 || !booking.references[0].meetingUrl) {
-    return redirect("/video/no-meeting-found");
-  }
-
-  //daily.co calls have a 60 minute exit buffer when a user enters a call when it's not available it will trigger the modals
-  const now = new Date();
-  const exitDate = new Date(now.getTime() - 60 * 60 * 1000);
-
-  //find out if the meeting is in the past
-  const isPast = booking?.endTime <= exitDate;
-  if (isPast) {
-    return redirect(`/video/meeting-ended/${booking?.uid}`);
-  }
-
-  const bookingObj = Object.assign({}, booking, {
-    startTime: booking.startTime.toString(),
-    endTime: booking.endTime.toString(),
-  });
-
-  const session = await getServerSession({ req: context.req });
-
-  // set meetingPassword to null for guests
-  if (session?.user.id !== bookingObj.user?.id) {
-    bookingObj.references.forEach((bookRef: any) => {
-      bookRef.meetingPassword = null;
-    });
-  }
-
-  return {
-    meetingUrl: bookingObj.references[0].meetingUrl ?? "",
-    ...(typeof bookingObj.references[0].meetingPassword === "string" && {
-      meetingPassword: bookingObj.references[0].meetingPassword,
-    }),
-    booking: {
-      ...bookingObj,
-      ...(bookingObj.description && { description: md.render(bookingObj.description) }),
-    },
-    dehydratedState: await ssr.dehydrate(),
-  };
-}
-
-const Page = async ({ params }: PageProps) => {
-  const h = headers();
-  const nonce = h.get("x-nonce") ?? undefined;
-
-  const legacyCtx = buildLegacyCtx(headers(), cookies(), params);
-  // @ts-expect-error `req` of type '{ headers: ReadonlyHeaders; cookies: ReadonlyRequestCookies; }' is not assignable to `req` in `GetServerSidePropsContext`
-  const { dehydratedState, ...restProps } = await getData(legacyCtx);
-
-  return (
-    <PageWrapper
-      getLayout={null}
-      requiresLicense={false}
-      nonce={nonce}
-      themeBasis={null}
-      dehydratedState={dehydratedState}>
-      <OldPage {...restProps} />
-    </PageWrapper>
-  );
-};
-
-export default Page;

apps/web/app/future/(individual-page-wrapper)/video/meeting-ended/[uid]/page.tsx

@@ -1,76 +0,0 @@
-import OldPage from "@pages/video/meeting-ended/[uid]";
-import { type Params } from "app/_types";
-import { _generateMetadata } from "app/_utils";
-import { type GetServerSidePropsContext } from "next";
-import { headers, cookies } from "next/headers";
-import { redirect } from "next/navigation";
-
-import prisma, { bookingMinimalSelect } from "@calcom/prisma";
-
-import { buildLegacyCtx } from "@lib/buildLegacyCtx";
-
-import PageWrapper from "@components/PageWrapperAppDir";
-
-export const generateMetadata = async () =>
-  await _generateMetadata(
-    () => "Meeting Unavailable",
-    () => "Meeting Unavailable"
-  );
-
-type PageProps = Readonly<{
-  params: Params;
-}>;
-
-async function getData(context: Omit<GetServerSidePropsContext, "res" | "resolvedUrl">) {
-  const booking = await prisma.booking.findUnique({
-    where: {
-      uid: typeof context?.params?.uid === "string" ? context.params.uid : "",
-    },
-    select: {
-      ...bookingMinimalSelect,
-      uid: true,
-      user: {
-        select: {
-          credentials: true,
-        },
-      },
-      references: {
-        select: {
-          uid: true,
-          type: true,
-          meetingUrl: true,
-        },
-      },
-    },
-  });
-
-  if (!booking) {
-    return redirect("/video/no-meeting-found");
-  }
-
-  const bookingObj = Object.assign({}, booking, {
-    startTime: booking.startTime.toString(),
-    endTime: booking.endTime.toString(),
-  });
-
-  return {
-    booking: bookingObj,
-  };
-}
-
-const Page = async ({ params }: PageProps) => {
-  const h = headers();
-  const nonce = h.get("x-nonce") ?? undefined;
-
-  const legacyCtx = buildLegacyCtx(headers(), cookies(), params);
-  // @ts-expect-error `req` of type '{ headers: ReadonlyHeaders; cookies: ReadonlyRequestCookies; }' is not assignable to `req` in `GetServerSidePropsContext`
-  const props = await getData(legacyCtx);
-
-  return (
-    <PageWrapper getLayout={null} requiresLicense={false} nonce={nonce} themeBasis={null}>
-      <OldPage {...props} />
-    </PageWrapper>
-  );
-};
-
-export default Page;

apps/web/app/future/(individual-page-wrapper)/video/meeting-not-started/[uid]/page.tsx

@@ -1,69 +0,0 @@
-import OldPage from "@pages/video/meeting-not-started/[uid]";
-import { type Params } from "app/_types";
-import { _generateMetadata } from "app/_utils";
-import { type GetServerSidePropsContext } from "next";
-import { headers, cookies } from "next/headers";
-import { redirect } from "next/navigation";
-
-import prisma, { bookingMinimalSelect } from "@calcom/prisma";
-
-import { buildLegacyCtx } from "@lib/buildLegacyCtx";
-
-import PageWrapper from "@components/PageWrapperAppDir";
-
-type PageProps = Readonly<{
-  params: Params;
-}>;
-
-export const generateMetadata = async ({ params }: PageProps) => {
-  const booking = await prisma.booking.findUnique({
-    where: {
-      uid: typeof params?.uid === "string" ? params.uid : "",
-    },
-    select: bookingMinimalSelect,
-  });
-
-  return await _generateMetadata(
-    (t) => t("this_meeting_has_not_started_yet"),
-    () => booking?.title ?? ""
-  );
-};
-
-async function getData(context: Omit<GetServerSidePropsContext, "res" | "resolvedUrl">) {
-  const booking = await prisma.booking.findUnique({
-    where: {
-      uid: typeof context?.params?.uid === "string" ? context.params.uid : "",
-    },
-    select: bookingMinimalSelect,
-  });
-
-  if (!booking) {
-    return redirect("/video/no-meeting-found");
-  }
-
-  const bookingObj = Object.assign({}, booking, {
-    startTime: booking.startTime.toString(),
-    endTime: booking.endTime.toString(),
-  });
-
-  return {
-    booking: bookingObj,
-  };
-}
-
-const Page = async ({ params }: PageProps) => {
-  const h = headers();
-  const nonce = h.get("x-nonce") ?? undefined;
-
-  const legacyCtx = buildLegacyCtx(headers(), cookies(), params);
-  // @ts-expect-error `req` of type '{ headers: ReadonlyHeaders; cookies: ReadonlyRequestCookies; }' is not assignable to `req` in `GetServerSidePropsContext`
-  const props = await getData(legacyCtx);
-
-  return (
-    <PageWrapper getLayout={null} requiresLicense={false} nonce={nonce} themeBasis={null}>
-      <OldPage {...props} />
-    </PageWrapper>
-  );
-};
-
-export default Page;

apps/web/app/future/(shared-page-wrapper)/(no-layout)/video/no-meeting-found/page.tsx

@@ -1,10 +0,0 @@
-import Page from "@pages/video/no-meeting-found";
-import { _generateMetadata } from "app/_utils";
-
-export const generateMetadata = async () =>
-  await _generateMetadata(
-    () => "",
-    () => ""
-  );
-
-export default Page;

apps/web/lib/app-providers-app-dir.tsx

@@ -1,5 +1,5 @@
 import { TooltipProvider } from "@radix-ui/react-tooltip";
-import { TrpcProvider } from "app/_trpc/trpc-provider";
+import { TrpcProvider } from "_app/_trpc/trpc-provider";
 import { dir } from "i18next";
 import type { Session } from "next-auth";
 import { SessionProvider, useSession } from "next-auth/react";

apps/web/lib/buildLegacyCtx.tsx

@@ -1,4 +1,4 @@
-import { type Params } from "app/_types";
+import { type Params } from "_app/_types";
 import { type ReadonlyHeaders } from "next/dist/server/web/spec-extension/adapters/headers";
 import { type ReadonlyRequestCookies } from "next/dist/server/web/spec-extension/adapters/request-cookies";
 

apps/web/playwright/ab-tests-redirect.e2e.ts

@@ -4,7 +4,7 @@ import { test } from "./lib/fixtures";
 
 test.describe.configure({ mode: "parallel" });
 
-test.describe("apps/ A/B tests", () => {
+test.describe.skip("apps/ A/B tests", () => {
   test("should point to the /future/apps/installed/[category]", async ({ page, users, context }) => {
     await context.addCookies([
       {

apps/web/playwright/event-types.e2e.ts

@@ -11,7 +11,7 @@ import { bookTimeSlot, createNewEventType, selectFirstAvailableTimeSlotNextMonth
 test.describe.configure({ mode: "parallel" });
 
 test.describe("Event Types A/B tests", () => {
-  test("should point to the /future/event-types page", async ({ page, users, context }) => {
+  test.skip("should point to the /future/event-types page", async ({ page, users, context }) => {
     await context.addCookies([
       {
         name: "x-calcom-future-routes-override",

apps/web/playwright/lib/future-legacy-routes.ts

@@ -2,7 +2,7 @@ import { test } from "./fixtures";
 
 export type RouteVariant = "future" | "legacy";
 
-const routeVariants = ["future", "legacy"];
+const routeVariants = [/*"future",*/ "legacy"];
 
 /**
  * Small wrapper around test.describe().

apps/web/playwright/settings-admin.e2e.ts

@@ -5,7 +5,7 @@ import { test } from "./lib/fixtures";
 test.describe.configure({ mode: "parallel" });
 
 test.describe("Settings/admin A/B tests", () => {
-  test("should point to the /future/settings/admin page", async ({ page, users, context }) => {
+  test.skip("should point to the /future/settings/admin page", async ({ page, users, context }) => {
     await context.addCookies([
       {
         name: "x-calcom-future-routes-override",