Sync submodule

apps/auth/pages/auth

@@ -1 +0,0 @@
-../../../packages/features/auth/pages

apps/console

@@ -1 +1 @@
-Subproject commit 9aac72159ef357db240ef6d4d897f7322c843b6a
+Subproject commit 8c0921a70213667e1411062ad37dd5c653904159

apps/web/pages/404.tsx

@@ -4,12 +4,11 @@ import { useRouter } from "next/router";
 import { useEffect, useState } from "react";
 
 import { COMPANY_NAME, DEVELOPER_DOCS, DOCS_URL, JOIN_SLACK, WEBSITE_URL } from "@calcom/lib/constants";
+import { ssgInit } from "@calcom/trpc/server/ssg";
 import { Icon, HeadSeo } from "@calcom/ui";
 
 import { useLocale } from "@lib/hooks/useLocale";
 
-import { ssgInit } from "@server/lib/ssg";
-
 export default function Custom404() {
   const { t } = useLocale();
 

apps/web/pages/[user].tsx

@@ -22,11 +22,11 @@ import defaultEvents, {
 } from "@calcom/lib/defaultEvents";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import useTheme from "@calcom/lib/hooks/useTheme";
-import { ssrInit } from "@calcom/lib/server/ssr";
 import { collectPageParameters, telemetryEventTypes, useTelemetry } from "@calcom/lib/telemetry";
 import prisma from "@calcom/prisma";
 import { baseEventTypeSelect } from "@calcom/prisma/selects";
 import { EventTypeMetaDataSchema } from "@calcom/prisma/zod-utils";
+import { ssrInit } from "@calcom/trpc/server/ssr";
 import { Icon, HeadSeo, AvatarGroup } from "@calcom/ui";
 
 import { inferSSRProps } from "@lib/types/inferSSRProps";

apps/web/pages/[user]/[type].tsx

@@ -62,7 +62,7 @@ Type.isThemeSupported = true;
 
 async function getUserPageProps(context: GetStaticPropsContext) {
   const { type: slug, user: username } = paramsSchema.parse(context.params);
-  const { ssgInit } = await import("@server/lib/ssg");
+  const { ssgInit } = await import("@calcom/trpc/server/ssg");
   const ssg = await ssgInit(context);
   const user = await prisma.user.findUnique({
     where: {
@@ -186,7 +186,7 @@ async function getUserPageProps(context: GetStaticPropsContext) {
 }
 
 async function getDynamicGroupPageProps(context: GetStaticPropsContext) {
-  const { ssgInit } = await import("@server/lib/ssg");
+  const { ssgInit } = await import("@calcom/trpc/server/ssg");
   const ssg = await ssgInit(context);
   const { type: typeParam, user: userParam } = paramsSchema.parse(context.params);
   const usernameList = getUsernameList(userParam);

apps/web/pages/[user]/book.tsx

@@ -10,10 +10,10 @@ import {
   getUsernameList,
 } from "@calcom/lib/defaultEvents";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { ssrInit } from "@calcom/lib/server/ssr";
 import { bookEventTypeSelect } from "@calcom/prisma";
 import prisma from "@calcom/prisma";
 import { customInputSchema, EventTypeMetaDataSchema } from "@calcom/prisma/zod-utils";
+import { ssrInit } from "@calcom/trpc/server/ssr";
 
 import { asStringOrNull, asStringOrThrow } from "@lib/asStringOrNull";
 import getBooking, { GetBookingType } from "@lib/getBooking";

apps/web/pages/api/book/event.ts

@@ -1,7 +1,7 @@
 import type { NextApiRequest } from "next";
 
-import handleNewBooking from "@calcom/features/bookings/lib/handleNewBooking";
 import { getSession } from "@calcom/features/auth/lib";
+import handleNewBooking from "@calcom/features/bookings/lib/handleNewBooking";
 import { defaultResponder } from "@calcom/lib/server";
 
 async function handler(req: NextApiRequest & { userId?: number }) {

apps/web/pages/api/cancel.ts

@@ -1,7 +1,7 @@
 import type { NextApiRequest } from "next";
 
-import handleCancelBooking from "@calcom/features/bookings/lib/handleCancelBooking";
 import { getSession } from "@calcom/features/auth/lib";
+import handleCancelBooking from "@calcom/features/bookings/lib/handleCancelBooking";
 import { defaultResponder, defaultHandler } from "@calcom/lib/server";
 
 async function handler(req: NextApiRequest & { userId?: number }) {

apps/web/pages/apps/[slug]/[...pages].tsx

@@ -3,8 +3,8 @@ import { useRouter } from "next/router";
 
 import RoutingFormsRoutingConfig from "@calcom/app-store/ee/routing-forms/pages/app-routing.config";
 import TypeformRoutingConfig from "@calcom/app-store/typeform/pages/app-routing.config";
-import { ssrInit } from "@calcom/lib/server/ssr";
 import prisma from "@calcom/prisma";
+import { ssrInit } from "@calcom/trpc/server/ssr";
 import { AppGetServerSideProps } from "@calcom/types/AppGetServerSideProps";
 
 import { AppProps } from "@lib/app-providers";

apps/web/pages/apps/index.tsx

@@ -2,10 +2,11 @@ import { GetServerSidePropsContext } from "next";
 import { ChangeEventHandler, useState } from "react";
 
 import { getAppRegistry, getAppRegistryWithCredentials } from "@calcom/app-store/_appRegistry";
-import { classNames } from "@calcom/lib";
 import { getSession } from "@calcom/features/auth/lib";
+import { classNames } from "@calcom/lib";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import type { AppCategories } from "@calcom/prisma/client";
+import { ssgInit } from "@calcom/trpc/server/ssg";
 import { inferSSRProps } from "@calcom/types/inferSSRProps";
 import {
   AllApps,
@@ -19,8 +20,6 @@ import {
 
 import AppsLayout from "@components/apps/layouts/AppsLayout";
 
-import { ssgInit } from "@server/lib/ssg";
-
 const tabs: HorizontalTabItemProps[] = [
   {
     name: "app_store",

apps/web/pages/availability/[schedule].tsx

@@ -8,10 +8,10 @@ import Shell from "@calcom/features/shell/Shell";
 import { availabilityAsString } from "@calcom/lib/availability";
 import { yyyymmdd } from "@calcom/lib/date-fns";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { ssrInit } from "@calcom/lib/server/ssr";
 import { stringOrNumber } from "@calcom/prisma/zod-utils";
 import { trpc } from "@calcom/trpc/react";
 import useMeQuery from "@calcom/trpc/react/hooks/useMeQuery";
+import { ssrInit } from "@calcom/trpc/server/ssr";
 import type { Schedule as ScheduleType, TimeRange, WorkingHours } from "@calcom/types/schedule";
 import {
   Button,

apps/web/pages/availability/index.tsx

@@ -4,8 +4,8 @@ import { GetServerSidePropsContext } from "next";
 import { NewScheduleButton, ScheduleListItem } from "@calcom/features/schedules";
 import Shell from "@calcom/features/shell/Shell";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { ssrInit } from "@calcom/lib/server/ssr";
 import { RouterOutputs, trpc } from "@calcom/trpc/react";
+import { ssrInit } from "@calcom/trpc/server/ssr";
 import { EmptyScreen, Icon, showToast } from "@calcom/ui";
 
 import { withQuery } from "@lib/QueryCell";

apps/web/pages/booking/[uid].tsx

@@ -35,6 +35,7 @@ import { localStorage } from "@calcom/lib/webstorage";
 import prisma from "@calcom/prisma";
 import { Prisma } from "@calcom/prisma/client";
 import { customInputSchema, EventTypeMetaDataSchema } from "@calcom/prisma/zod-utils";
+import { ssrInit } from "@calcom/trpc/server/ssr";
 import { Button, EmailInput, Icon, HeadSeo } from "@calcom/ui";
 
 import { timeZone } from "@lib/clock";
@@ -43,8 +44,6 @@ import { inferSSRProps } from "@lib/types/inferSSRProps";
 import CancelBooking from "@components/booking/CancelBooking";
 import EventReservationSchema from "@components/schemas/EventReservationSchema";
 
-import { ssrInit } from "@calcom/lib/server/ssr";
-
 function redirectToExternalUrl(url: string) {
   window.parent.location.href = url;
 }

apps/web/pages/bookings/[status].tsx

@@ -9,6 +9,7 @@ import BookingLayout from "@calcom/features/bookings/layout/BookingLayout";
 import { filterQuerySchema, useFilterQuery } from "@calcom/features/bookings/lib/useFilterQuery";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { RouterOutputs, trpc } from "@calcom/trpc/react";
+import { ssgInit } from "@calcom/trpc/server/ssg";
 import { Alert, Button, EmptyScreen, Icon } from "@calcom/ui";
 
 import { useInViewObserver } from "@lib/hooks/useInViewObserver";
@@ -16,8 +17,6 @@ import { useInViewObserver } from "@lib/hooks/useInViewObserver";
 import BookingListItem from "@components/booking/BookingListItem";
 import SkeletonLoader from "@components/booking/SkeletonLoader";
 
-import { ssgInit } from "@server/lib/ssg";
-
 type BookingListingStatus = z.infer<typeof filterQuerySchema>["status"];
 type BookingOutput = RouterOutputs["viewer"]["bookings"]["get"]["bookings"][0];
 

apps/web/pages/d/[link]/[slug].tsx

@@ -3,10 +3,10 @@ import { z } from "zod";
 
 import { privacyFilteredLocations, LocationObject } from "@calcom/core/location";
 import { parseRecurringEvent } from "@calcom/lib";
-import { ssrInit } from "@calcom/lib/server/ssr";
 import { availiblityPageEventTypeSelect } from "@calcom/prisma";
 import prisma from "@calcom/prisma";
 import { EventTypeMetaDataSchema } from "@calcom/prisma/zod-utils";
+import { ssrInit } from "@calcom/trpc/server/ssr";
 
 import { getWorkingHours } from "@lib/availability";
 import { GetBookingType } from "@lib/getBooking";

apps/web/pages/d/[link]/book.tsx

@@ -2,10 +2,10 @@ import { GetServerSidePropsContext } from "next";
 import { JSONObject } from "superjson/dist/types";
 
 import { parseRecurringEvent } from "@calcom/lib";
-import { ssrInit } from "@calcom/lib/server/ssr";
 import prisma from "@calcom/prisma";
 import { bookEventTypeSelect } from "@calcom/prisma/selects";
 import { customInputSchema, EventTypeMetaDataSchema } from "@calcom/prisma/zod-utils";
+import { ssrInit } from "@calcom/trpc/server/ssr";
 
 import { asStringOrNull, asStringOrThrow } from "@lib/asStringOrNull";
 import { inferSSRProps } from "@lib/types/inferSSRProps";

apps/web/pages/event-types/[type]/index.tsx

@@ -16,10 +16,10 @@ import getEventTypeById from "@calcom/lib/getEventTypeById";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { useTypedQuery } from "@calcom/lib/hooks/useTypedQuery";
 import { HttpError } from "@calcom/lib/http-error";
-import { ssrInit } from "@calcom/lib/server/ssr";
 import prisma from "@calcom/prisma";
 import { customInputSchema, EventTypeMetaDataSchema } from "@calcom/prisma/zod-utils";
 import { trpc, RouterOutputs } from "@calcom/trpc/react";
+import { ssrInit } from "@calcom/trpc/server/ssr";
 import type { BookingLimit, RecurringEvent } from "@calcom/types/Calendar";
 import { Form, showToast } from "@calcom/ui";
 

apps/web/pages/event-types/index.tsx

@@ -11,8 +11,8 @@ import {
 import Shell from "@calcom/features/shell/Shell";
 import { APP_NAME, CAL_URL, WEBAPP_URL } from "@calcom/lib/constants";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { ssrInit } from "@calcom/lib/server/ssr";
 import { RouterOutputs, trpc, TRPCClientError } from "@calcom/trpc/react";
+import { ssrInit } from "@calcom/trpc/server/ssr";
 import {
   Badge,
   Button,

apps/web/pages/settings/admin/apps/[category].tsx

@@ -2,7 +2,7 @@ import { GetServerSidePropsContext } from "next";
 
 import AdminAppsList from "@calcom/features/apps/AdminAppsList";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { ssrInit } from "@calcom/lib/server/ssr";
+import { ssrInit } from "@calcom/trpc/server/ssr";
 import { Meta } from "@calcom/ui";
 
 import { getLayout } from "@components/auth/layouts/AdminLayout";

apps/web/pages/settings/admin/impersonation.tsx

@@ -3,7 +3,7 @@ import { signIn } from "next-auth/react";
 import { useRef } from "react";
 
 import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { ssrInit } from "@calcom/lib/server/ssr";
+import { ssrInit } from "@calcom/trpc/server/ssr";
 import { Button, Meta, TextField } from "@calcom/ui";
 
 import { getLayout } from "@components/auth/layouts/AdminLayout";

apps/web/pages/settings/admin/index.tsx

@@ -1,6 +1,6 @@
 import { GetServerSidePropsContext } from "next";
 
-import { ssrInit } from "@calcom/lib/server/ssr";
+import { ssrInit } from "@calcom/trpc/server/ssr";
 import { Meta } from "@calcom/ui";
 
 import { getLayout } from "@components/auth/layouts/AdminLayout";

apps/web/pages/settings/admin/users.tsx

@@ -1,7 +1,7 @@
 import { GetServerSidePropsContext } from "next";
 
 import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { ssrInit } from "@calcom/lib/server/ssr";
+import { ssrInit } from "@calcom/trpc/server/ssr";
 import { Meta } from "@calcom/ui";
 
 import { getLayout } from "@components/auth/layouts/AdminLayout";

apps/web/pages/settings/billing/index.tsx

@@ -7,8 +7,8 @@ import { getLayout } from "@calcom/features/settings/layouts/SettingsLayout";
 import { classNames } from "@calcom/lib";
 import { WEBAPP_URL } from "@calcom/lib/constants";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { ssrInit } from "@calcom/lib/server/ssr";
 import { trpc } from "@calcom/trpc/react";
+import { ssrInit } from "@calcom/trpc/server/ssr";
 import { Button, Icon, Meta } from "@calcom/ui";
 
 interface CtaRowProps {

apps/web/pages/settings/developer/api-keys.tsx

@@ -8,8 +8,8 @@ import ApiKeyListItem from "@calcom/features/ee/api-keys/components/ApiKeyListIt
 import { getLayout } from "@calcom/features/settings/layouts/SettingsLayout";
 import { APP_NAME } from "@calcom/lib/constants";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { ssrInit } from "@calcom/lib/server/ssr";
 import { trpc } from "@calcom/trpc/react";
+import { ssrInit } from "@calcom/trpc/server/ssr";
 import {
   Button,
   Dialog,

apps/web/pages/settings/my-account/appearance.tsx

@@ -5,8 +5,8 @@ import { Controller, useForm } from "react-hook-form";
 import { getLayout } from "@calcom/features/settings/layouts/SettingsLayout";
 import { APP_NAME } from "@calcom/lib/constants";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { ssrInit } from "@calcom/lib/server/ssr";
 import { trpc } from "@calcom/trpc/react";
+import { ssrInit } from "@calcom/trpc/server/ssr";
 import {
   Button,
   ColorPicker,

apps/web/pages/settings/my-account/calendars.tsx

@@ -8,8 +8,8 @@ import DisconnectIntegration from "@calcom/features/apps/components/DisconnectIn
 import DestinationCalendarSelector from "@calcom/features/calendars/DestinationCalendarSelector";
 import { getLayout } from "@calcom/features/settings/layouts/SettingsLayout";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { ssrInit } from "@calcom/lib/server/ssr";
 import { trpc } from "@calcom/trpc/react";
+import { ssrInit } from "@calcom/trpc/server/ssr";
 import {
   Alert,
   Badge,

apps/web/pages/settings/my-account/conferencing.tsx

@@ -3,8 +3,8 @@ import { useState } from "react";
 
 import { getLayout } from "@calcom/features/settings/layouts/SettingsLayout";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { ssrInit } from "@calcom/lib/server/ssr";
 import { trpc } from "@calcom/trpc/react";
+import { ssrInit } from "@calcom/trpc/server/ssr";
 import {
   Button,
   Dialog,

apps/web/pages/settings/my-account/general.tsx

@@ -5,8 +5,8 @@ import { Controller, useForm } from "react-hook-form";
 
 import { getLayout } from "@calcom/features/settings/layouts/SettingsLayout";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { ssrInit } from "@calcom/lib/server/ssr";
 import { RouterOutputs, trpc } from "@calcom/trpc/react";
+import { ssrInit } from "@calcom/trpc/server/ssr";
 import {
   Button,
   Form,

apps/web/pages/settings/my-account/profile.tsx

@@ -9,10 +9,10 @@ import { ErrorCode } from "@calcom/features/auth/lib";
 import { getLayout } from "@calcom/features/settings/layouts/SettingsLayout";
 import { APP_NAME } from "@calcom/lib/constants";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { ssrInit } from "@calcom/lib/server/ssr";
 import { TRPCClientErrorLike } from "@calcom/trpc/client";
 import { trpc } from "@calcom/trpc/react";
 import { AppRouter } from "@calcom/trpc/server/routers/_app";
+import { ssrInit } from "@calcom/trpc/server/ssr";
 import {
   Alert,
   Avatar,

apps/web/pages/settings/security/impersonation.tsx

@@ -3,8 +3,8 @@ import { useForm } from "react-hook-form";
 
 import { getLayout } from "@calcom/features/settings/layouts/SettingsLayout";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { ssrInit } from "@calcom/lib/server/ssr";
 import { trpc } from "@calcom/trpc/react";
+import { ssrInit } from "@calcom/trpc/server/ssr";
 import { Button, Form, Label, Meta, showToast, Skeleton, Switch } from "@calcom/ui";
 
 const ProfileImpersonationView = () => {

apps/web/pages/settings/security/password.tsx

@@ -6,8 +6,8 @@ import { useForm } from "react-hook-form";
 import { identityProviderNameMap } from "@calcom/features/auth/lib";
 import { getLayout } from "@calcom/features/settings/layouts/SettingsLayout";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { ssrInit } from "@calcom/lib/server/ssr";
 import { trpc } from "@calcom/trpc/react";
+import { ssrInit } from "@calcom/trpc/server/ssr";
 import { Button, Form, Meta, PasswordField, showToast } from "@calcom/ui";
 
 type ChangePasswordFormValues = {

apps/web/pages/settings/security/sso.tsx

@@ -1,6 +1,6 @@
 import { GetServerSidePropsContext } from "next";
 
-import { ssrInit } from "@calcom/lib/server/ssr";
+import { ssrInit } from "@calcom/trpc/server/ssr";
 
 export { default } from "@calcom/features/ee/sso/page/user-sso-view";
 

apps/web/pages/settings/security/two-factor-auth.tsx

@@ -3,8 +3,8 @@ import { useState } from "react";
 
 import { getLayout } from "@calcom/features/settings/layouts/SettingsLayout";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { ssrInit } from "@calcom/lib/server/ssr";
 import { trpc } from "@calcom/trpc/react";
+import { ssrInit } from "@calcom/trpc/server/ssr";
 import { Badge, Meta, Switch, SkeletonButton, SkeletonContainer, SkeletonText } from "@calcom/ui";
 
 import DisableTwoFactorModal from "@components/settings/DisableTwoFactorModal";

apps/web/pages/settings/teams/[id]/appearance.tsx

@@ -1,6 +1,6 @@
 import { GetServerSidePropsContext } from "next";
 
-import { ssrInit } from "@calcom/lib/server/ssr";
+import { ssrInit } from "@calcom/trpc/server/ssr";
 
 export { default } from "@calcom/features/ee/teams/pages/team-appearance-view";
 

apps/web/pages/settings/teams/[id]/billing.tsx

@@ -1,6 +1,6 @@
 import { GetServerSidePropsContext } from "next";
 
-import { ssrInit } from "@calcom/lib/server/ssr";
+import { ssrInit } from "@calcom/trpc/server/ssr";
 
 export { default } from "@calcom/features/ee/teams/pages/team-billing-view";
 

apps/web/pages/settings/teams/[id]/members.tsx

@@ -1,6 +1,6 @@
 import { GetServerSidePropsContext } from "next";
 
-import { ssrInit } from "@calcom/lib/server/ssr";
+import { ssrInit } from "@calcom/trpc/server/ssr";
 
 export { default } from "@calcom/features/ee/teams/pages/team-members-view";
 

apps/web/pages/settings/teams/[id]/profile.tsx

@@ -1,6 +1,6 @@
 import { GetServerSidePropsContext } from "next";
 
-import { ssrInit } from "@calcom/lib/server/ssr";
+import { ssrInit } from "@calcom/trpc/server/ssr";
 
 export { default } from "@calcom/features/ee/teams/pages/team-profile-view";
 

apps/web/pages/settings/teams/[id]/sso.tsx

@@ -1,6 +1,6 @@
 import { GetServerSidePropsContext } from "next";
 
-import { ssrInit } from "@calcom/lib/server/ssr";
+import { ssrInit } from "@calcom/trpc/server/ssr";
 
 export { default } from "@calcom/features/ee/sso/page/teams-sso-view";
 

apps/web/pages/settings/teams/new/index.tsx

@@ -3,7 +3,7 @@ import Head from "next/head";
 
 import { CreateANewTeamForm } from "@calcom/features/ee/teams/components";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { ssrInit } from "@calcom/lib/server/ssr";
+import { ssrInit } from "@calcom/trpc/server/ssr";
 
 import { getLayout } from "@components/layouts/WizardLayout";
 

apps/web/pages/signup.tsx

@@ -7,13 +7,13 @@ import LicenseRequired from "@calcom/features/ee/common/components/v2/LicenseReq
 import { isSAMLLoginEnabled } from "@calcom/features/ee/sso/lib/saml";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { collectPageParameters, telemetryEventTypes, useTelemetry } from "@calcom/lib/telemetry";
+import { ssrInit } from "@calcom/trpc/server/ssr";
 import { inferSSRProps } from "@calcom/types/inferSSRProps";
 import { Alert, Button, EmailField, PasswordField, TextField, HeadSeo } from "@calcom/ui";
 import { asStringOrNull } from "@calcom/web/lib/asStringOrNull";
 import { WEBAPP_URL } from "@calcom/web/lib/config/constants";
 import prisma from "@calcom/web/lib/prisma";
 import { IS_GOOGLE_LOGIN_ENABLED } from "@calcom/web/server/lib/constants";
-import { ssrInit } from "@calcom/lib/server/ssr";
 
 type FormValues = {
   username: string;

apps/web/pages/team/[slug]/[type].tsx

@@ -4,6 +4,7 @@ import { privacyFilteredLocations, LocationObject } from "@calcom/core/location"
 import { parseRecurringEvent } from "@calcom/lib";
 import prisma from "@calcom/prisma";
 import { EventTypeMetaDataSchema } from "@calcom/prisma/zod-utils";
+import { ssgInit } from "@calcom/trpc/server/ssg";
 
 import { asStringOrNull } from "@lib/asStringOrNull";
 import { getWorkingHours } from "@lib/availability";
@@ -13,8 +14,6 @@ import { EmbedProps } from "@lib/withEmbedSsr";
 
 import AvailabilityPage from "@components/booking/pages/AvailabilityPage";
 
-import { ssgInit } from "@server/lib/ssg";
-
 export type AvailabilityTeamPageProps = inferSSRProps<typeof getServerSideProps> & EmbedProps;
 
 export default function TeamType(props: AvailabilityTeamPageProps) {

apps/web/pages/teams/index.tsx

@@ -4,7 +4,7 @@ import { TeamsListing } from "@calcom/features/ee/teams/components";
 import Shell from "@calcom/features/shell/Shell";
 import { WEBAPP_URL } from "@calcom/lib/constants";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { ssrInit } from "@calcom/lib/server/ssr";
+import { ssrInit } from "@calcom/trpc/server/ssr";
 import { Button, Icon } from "@calcom/ui";
 
 function Teams() {

apps/web/pages/workflows/index.tsx

@@ -1,6 +1,6 @@
 import { GetServerSidePropsContext } from "next";
 
-import { ssrInit } from "@calcom/lib/server/ssr";
+import { ssrInit } from "@calcom/trpc/server/ssr";
 
 export { default } from "@calcom/features/ee/workflows/pages/index";
 

apps/website

@@ -1 +1 @@
-Subproject commit 8ee1ce1292ffac42d2abfd1ea34c0f3bc3b5e0f8
+Subproject commit bb8a37c4ce912b825c31d5a8caf5d1f19fe04656

packages/features/auth/api/auth/next-auth.ts

@@ -10,11 +10,11 @@ import nodemailer, { TransportOptions } from "nodemailer";
 import { authenticator } from "otplib";
 import path from "path";
 
+import { ErrorCode, isPasswordValid, verifyPassword } from "@calcom/features/auth/lib";
+import CalComAdapter from "@calcom/features/auth/lib/next-auth-custom-adapter";
 import checkLicense from "@calcom/features/ee/common/server/checkLicense";
 import ImpersonationProvider from "@calcom/features/ee/impersonation/lib/ImpersonationProvider";
 import { hostedCal, isSAMLLoginEnabled } from "@calcom/features/ee/sso/lib/saml";
-import { ErrorCode, isPasswordValid, verifyPassword } from "@calcom/features/auth/lib";
-import CalComAdapter from "@calcom/features/auth/lib/next-auth-custom-adapter";
 import { APP_NAME, IS_TEAM_BILLING_ENABLED, WEBAPP_URL } from "@calcom/lib/constants";
 import { symmetricDecrypt } from "@calcom/lib/crypto";
 import { defaultCookies } from "@calcom/lib/default-cookies";

packages/features/auth/pages/error.tsx

@@ -4,10 +4,9 @@ import { useRouter } from "next/router";
 import z from "zod";
 
 import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { ssgInit } from "@calcom/trpc/server/ssg";
 import { Button, Icon, SkeletonText } from "@calcom/ui";
 
-import { ssgInit } from "@server/lib/ssg";
-
 import AuthContainer from "../components/AuthContainer";
 
 const querySchema = z.object({

packages/features/auth/pages/login.tsx

@@ -13,16 +13,14 @@ import { isSAMLLoginEnabled, samlProductID, samlTenantID } from "@calcom/feature
 import { WEBAPP_URL, WEBSITE_URL } from "@calcom/lib/constants";
 import { getSafeRedirectUrl } from "@calcom/lib/getSafeRedirectUrl";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { ssrInit } from "@calcom/lib/server/ssr";
 import { collectPageParameters, telemetryEventTypes, useTelemetry } from "@calcom/lib/telemetry";
 import prisma from "@calcom/prisma";
+import { ssrInit } from "@calcom/trpc/server/ssr";
 import { inferSSRProps } from "@calcom/types/inferSSRProps";
-import { Alert, Button, EmailField, Icon, PasswordField } from "@calcom/ui";
+import { AddToHomescreen, Alert, Button, EmailField, Icon, PasswordField } from "@calcom/ui";
 // TODO: Fix this import
 import { IS_GOOGLE_LOGIN_ENABLED } from "@calcom/web/server/lib/constants";
 
-import AddToHomescreen from "@components/AddToHomescreen";
-
 import AuthContainer from "../components/AuthContainer";
 import TwoFactor from "../components/TwoFactor";
 

packages/features/auth/pages/logout.tsx

@@ -5,12 +5,11 @@ import { useEffect } from "react";
 
 import { WEBSITE_URL } from "@calcom/lib/constants";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { ssrInit } from "@calcom/trpc/server/ssr";
 import { Button, Icon } from "@calcom/ui";
 
 import { inferSSRProps } from "@lib/types/inferSSRProps";
 
-import { ssrInit } from "@calcom/lib/server/ssr";
-
 import AuthContainer from "../components/AuthContainer";
 
 type Props = inferSSRProps<typeof getServerSideProps>;

packages/features/auth/pages/sso/[provider].tsx

@@ -15,9 +15,9 @@ import {
 } from "@calcom/features/ee/sso/lib/saml";
 import { checkUsername } from "@calcom/lib/server/checkUsername";
 import prisma from "@calcom/prisma";
-import { inferSSRProps } from "@calcom/types/inferSSRProps";
 // TODO: Fix this import
-import { ssrInit } from "@calcom/lib/server/ssr";
+import { ssrInit } from "@calcom/trpc/server/ssr";
+import { inferSSRProps } from "@calcom/types/inferSSRProps";
 
 import { getSession } from "../../lib";
 

packages/features/ee/payments/pages/payment.tsx

@@ -4,10 +4,9 @@ import { z } from "zod";
 import { PaymentData } from "@calcom/app-store/stripepayment/lib/server";
 import prisma from "@calcom/prisma";
 import { EventTypeMetaDataSchema } from "@calcom/prisma/zod-utils";
+import { ssrInit } from "@calcom/trpc/server/ssr";
 import type { inferSSRProps } from "@calcom/types/inferSSRProps";
 
-import { ssrInit } from "@calcom/lib/server/ssr";
-
 export type PaymentPageProps = inferSSRProps<typeof getServerSideProps>;
 
 const querySchema = z.object({

packages/features/ee/teams/api/upgrade.ts

@@ -3,8 +3,8 @@ import Stripe from "stripe";
 import { z } from "zod";
 
 import { getRequestedSlugError } from "@calcom/app-store/stripepayment/lib/team-billing";
-import stripe from "@calcom/features/ee/payments/server/stripe";
 import { getSession } from "@calcom/features/auth/lib";
+import stripe from "@calcom/features/ee/payments/server/stripe";
 import { WEBAPP_URL } from "@calcom/lib/constants";
 import { HttpError } from "@calcom/lib/http-error";
 import { defaultHandler, defaultResponder } from "@calcom/lib/server";

packages/trpc/server/routers/viewer.tsx

@@ -19,7 +19,6 @@ import { ErrorCode, verifyPassword } from "@calcom/features/auth/lib";
 import { samlTenantProduct } from "@calcom/features/ee/sso/lib/saml";
 import { isPrismaObjOrUndefined, parseRecurringEvent } from "@calcom/lib";
 import getEnabledApps from "@calcom/lib/apps/getEnabledApps";
-import { IS_SELF_HOSTED, IS_TEAM_BILLING_ENABLED } from "@calcom/lib/constants";
 import { symmetricDecrypt } from "@calcom/lib/crypto";
 import getStripeAppData from "@calcom/lib/getStripeAppData";
 import hasKeyInMetadata from "@calcom/lib/hasKeyInMetadata";
@@ -43,7 +42,7 @@ import { authRouter } from "./viewer/auth";
 import { availabilityRouter } from "./viewer/availability";
 import { bookingsRouter } from "./viewer/bookings";
 import { eventTypesRouter } from "./viewer/eventTypes";
-import { samlRouter } from "./viewer/saml";
+// import { samlRouter } from "./viewer/saml";
 import { slotsRouter } from "./viewer/slots";
 import { viewerTeamsRouter } from "./viewer/teams";
 import { webhookRouter } from "./viewer/webhook";
@@ -1157,7 +1156,7 @@ export const viewerRouter = mergeRouters(
     apiKeys: apiKeysRouter,
     slots: slotsRouter,
     workflows: workflowsRouter,
-    saml: samlRouter,
+    // saml: samlRouter,
     // NOTE: Add all app related routes in the bottom till the problem described in @calcom/app-store/trpc-routers.ts is solved.
     // After that there would just one merge call here for all the apps.
     appRoutingForms: app_RoutingForms,

packages/trpc/server/ssg.ts

@@ -1,11 +1,12 @@
 import { GetStaticPropsContext } from "next";
-import { i18n } from "next-i18next.config";
 import { serverSideTranslations } from "next-i18next/serverSideTranslations";
 import superjson from "superjson";
 
+import { i18n } from "@calcom/config/next-i18next.config";
 import prisma from "@calcom/prisma";
-import { createProxySSGHelpers } from "@calcom/trpc/react/ssg";
-import { appRouter } from "@calcom/trpc/server/routers/_app";
+
+import { createProxySSGHelpers } from "../react/ssg";
+import { appRouter } from "./routers/_app";
 
 /**
  * Initialize static site rendering tRPC helpers.

packages/trpc/server/ssr.ts

@@ -1,9 +1,9 @@
 import { GetServerSidePropsContext } from "next";
 import superjson from "superjson";
 
-import { createProxySSGHelpers } from "@calcom/trpc/react/ssg";
-import { createContext } from "@calcom/trpc/server/createContext";
-import { appRouter } from "@calcom/trpc/server/routers/_app";
+import { createProxySSGHelpers } from "../react/ssg";
+import { createContext } from "./createContext";
+import { appRouter } from "./routers/_app";
 
 /**
  * Initialize server-side rendering tRPC helpers.