chore: Upgrade jackson (#20107)

Co-authored-by: Alex van Andel <me@alexvanandel.com>

apps/web/modules/auth/login-view.tsx

@@ -20,9 +20,9 @@ import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { useTelemetry } from "@calcom/lib/hooks/useTelemetry";
 import { collectPageParameters, telemetryEventTypes } from "@calcom/lib/telemetry";
 import { trpc } from "@calcom/trpc/react";
-import { EmailField } from "@calcom/ui/components/form";
 import { Alert } from "@calcom/ui/components/alert";
 import { Button } from "@calcom/ui/components/button";
+import { EmailField } from "@calcom/ui/components/form";
 import { PasswordField } from "@calcom/ui/components/form";
 
 import type { inferSSRProps } from "@lib/types/inferSSRProps";
@@ -184,7 +184,7 @@ PageProps & WithNonceProps<{}>) {
     : isSAMLLoginEnabled && !isPending && data?.connectionExists;
 
   return (
-    <div className="dark:bg-brand dark:text-brand-contrast text-emphasis min-h-screen [--cal-brand:#111827] [--cal-brand-subtle:#9CA3AF] [--cal-brand-emphasis:#101010] [--cal-brand-text:white] dark:[--cal-brand-emphasis:#e1e1e1] dark:[--cal-brand-text:black] dark:[--cal-brand:white]">
+    <div className="dark:bg-brand dark:text-brand-contrast text-emphasis min-h-screen [--cal-brand-emphasis:#101010] [--cal-brand-subtle:#9CA3AF] [--cal-brand-text:white] [--cal-brand:#111827] dark:[--cal-brand-emphasis:#e1e1e1] dark:[--cal-brand-text:black] dark:[--cal-brand:white]">
       <AuthContainer
         showLogo
         heading={twoFactorRequired ? t("2fa_code") : t("welcome_back")}

apps/web/modules/event-types/views/event-types-listing-view.tsx

@@ -58,7 +58,6 @@ import { HorizontalTabs } from "@calcom/ui/components/navigation";
 import { Skeleton } from "@calcom/ui/components/skeleton";
 import { showToast } from "@calcom/ui/components/toast";
 import { Tooltip } from "@calcom/ui/components/tooltip";
-import ServerTrans from "@calcom/web/components/ServerTrans";
 
 import useMeQuery from "@lib/hooks/useMeQuery";
 

apps/web/modules/getting-started/[[...step]]/onboarding-view.tsx

@@ -1,7 +1,7 @@
 "use client";
 
-import { signOut } from "next-auth/react";
 import type { TFunction } from "i18next";
+import { signOut } from "next-auth/react";
 import { usePathname, useRouter } from "next/navigation";
 import { Suspense } from "react";
 import { Toaster } from "sonner";

apps/web/modules/settings/my-account/general-view.tsx

@@ -12,12 +12,12 @@ import { localeOptions } from "@calcom/lib/i18n";
 import { nameOfDay } from "@calcom/lib/weekday";
 import type { RouterOutputs } from "@calcom/trpc/react";
 import { trpc } from "@calcom/trpc/react";
+import classNames from "@calcom/ui/classNames";
+import { Button } from "@calcom/ui/components/button";
 import { Form } from "@calcom/ui/components/form";
 import { Label } from "@calcom/ui/components/form";
 import { Select } from "@calcom/ui/components/form";
 import { SettingsToggle } from "@calcom/ui/components/form";
-import { Button } from "@calcom/ui/components/button";
-import classNames from "@calcom/ui/classNames";
 import { SkeletonButton, SkeletonContainer, SkeletonText } from "@calcom/ui/components/skeleton";
 import { showToast } from "@calcom/ui/components/toast";
 

apps/web/modules/upgrade/upgrade-view.tsx

@@ -6,9 +6,9 @@ import Shell from "@calcom/features/shell/Shell";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import type { RouterOutputs } from "@calcom/trpc/react";
 import { trpc } from "@calcom/trpc/react";
+import { Button } from "@calcom/ui/components/button";
 import { EmptyScreen } from "@calcom/ui/components/empty-screen";
 import { showToast } from "@calcom/ui/components/toast";
-import { Button } from "@calcom/ui/components/button";
 
 export type OrgUpgradeBannerProps = {
   data: RouterOutputs["viewer"]["me"]["getUserTopBanners"]["orgUpgradeBanner"];
@@ -30,7 +30,7 @@ export default function UpgradePage() {
   const doesUserHaveOrgToUpgrade = trpc.viewer.organizations.checkIfOrgNeedsUpgrade.useQuery();
 
   return (
-    <Shell >
+    <Shell>
       <div className="max-w-screen-lg">
         {doesUserHaveOrgToUpgrade.data ? (
           <EmptyScreen

apps/web/package.json

@@ -27,7 +27,7 @@
     "yarn": "3.4.1"
   },
   "dependencies": {
-    "@boxyhq/saml-jackson": "1.18.6",
+    "@boxyhq/saml-jackson": "1.42.0",
     "@calcom/app-store": "*",
     "@calcom/app-store-cli": "*",
     "@calcom/dayjs": "*",

apps/web/test/lib/plainTiers.test.ts

@@ -77,7 +77,7 @@ describe("Plain Integration API", () => {
     const userData = { id: 1, email: `${tier}@example.com`, name: `${tier} User` };
     (getServerSession as any).mockResolvedValue({ user: userData });
     prismaMock.user.findUnique.mockResolvedValue({ ...userData, teams });
-    const params = Promise.resolve<Params>({})
+    const params = Promise.resolve<Params>({});
 
     const data = await (await POST({} as NextRequest, { params })).json();
     expect(data).toMatchObject({ userTier: tier, email: userData.email, fullName: userData.name });
@@ -85,7 +85,7 @@ describe("Plain Integration API", () => {
 
   it("should return 401 when no session exists", async () => {
     (getServerSession as any).mockResolvedValue(null);
-    const params = Promise.resolve<Params>({})
+    const params = Promise.resolve<Params>({});
 
     expect((await POST({} as NextRequest, { params })).status).toBe(401);
   });

packages/app-store/routing-forms/pages/app-routing.client-config.tsx

@@ -1,8 +1,8 @@
 export const routingFormsComponents = {
   "form-edit": () => import("./form-edit/[...appPages]").then((mod) => mod.default),
   "route-builder": () => import("./route-builder/[...appPages]").then((mod) => mod.default),
-  "forms": () => import("./forms/[...appPages]").then((mod) => mod.default),
+  forms: () => import("./forms/[...appPages]").then((mod) => mod.default),
   "routing-link": () => import("./routing-link/[...appPages]").then((mod) => mod.default),
-  "reporting": () => import("./reporting/[...appPages]").then((mod) => mod.default),
+  reporting: () => import("./reporting/[...appPages]").then((mod) => mod.default),
   "incomplete-booking": () => import("./incomplete-booking/[...appPages]").then((mod) => mod.default),
-};
+};

packages/config/eslint-preset.js

@@ -49,7 +49,7 @@ module.exports = {
     "no-restricted-imports": [
       "error",
       {
-        patterns: ["lodash"],
+        patterns: [],
       },
     ],
     "prefer-template": "error",

packages/emails/email-manager.ts

@@ -1,6 +1,5 @@
-// eslint-disable-next-line no-restricted-imports
-import { cloneDeep } from "lodash";
 import type { TFunction } from "i18next";
+import { default as cloneDeep } from "lodash/cloneDeep";
 import type { z } from "zod";
 
 import type BaseEmail from "@calcom/emails/templates/_base-email";

packages/emails/lib/generateIcsFile.ts

@@ -1,5 +1,5 @@
-import type { EventStatus } from "ics";
 import type { TFunction } from "i18next";
+import type { EventStatus } from "ics";
 
 import type { CalendarEvent } from "@calcom/types/Calendar";
 

packages/emails/lib/generateIcsString.ts

@@ -1,6 +1,6 @@
+import type { TFunction } from "i18next";
 import type { DateArray, ParticipationRole, EventStatus, ParticipationStatus } from "ics";
 import { createEvent } from "ics";
-import type { TFunction } from "i18next";
 import { RRule } from "rrule";
 
 import { getRichDescription } from "@calcom/lib/CalEventParser";

packages/emails/templates/attendee-scheduled-email.ts

@@ -1,6 +1,5 @@
-// eslint-disable-next-line no-restricted-imports
-import { cloneDeep } from "lodash";
 import type { TFunction } from "i18next";
+import { default as cloneDeep } from "lodash/cloneDeep";
 
 import { getRichDescription } from "@calcom/lib/CalEventParser";
 import { TimeFormat } from "@calcom/lib/timeFormat";

packages/emails/templates/organizer-scheduled-email.ts

@@ -1,6 +1,5 @@
-// eslint-disable-next-line no-restricted-imports
-import { cloneDeep } from "lodash";
 import type { TFunction } from "i18next";
+import { default as cloneDeep } from "lodash/cloneDeep";
 
 import { getRichDescription } from "@calcom/lib/CalEventParser";
 import { EMAIL_FROM_NAME } from "@calcom/lib/constants";

packages/features/ee/managed-event-types/hooks/useLockedFieldsManager.tsx

@@ -1,6 +1,5 @@
-// eslint-disable-next-line no-restricted-imports
-import { get } from "lodash";
 import type { TFunction } from "i18next";
+import { default as get } from "lodash/get";
 import type { Dispatch, SetStateAction } from "react";
 import { useState } from "react";
 import type { UseFormReturn } from "react-hook-form";
@@ -10,11 +9,11 @@ import type { FormValues } from "@calcom/features/eventtypes/lib/types";
 import type { Prisma } from "@calcom/prisma/client";
 import { SchedulingType } from "@calcom/prisma/enums";
 import type { _EventTypeModel } from "@calcom/prisma/zod/eventtype";
+import classNames from "@calcom/ui/classNames";
 import { Badge } from "@calcom/ui/components/badge";
+import { Switch } from "@calcom/ui/components/form";
 import { Icon } from "@calcom/ui/components/icon";
 import { Tooltip } from "@calcom/ui/components/tooltip";
-import classNames from "@calcom/ui/classNames";
-import { Switch } from "@calcom/ui/components/form";
 
 export const LockedSwitch = (
   isManagedEventType: boolean,

packages/features/ee/organizations/pages/settings/admin/AdminOrgPage.tsx

@@ -8,7 +8,6 @@ import { Badge } from "@calcom/ui/components/badge";
 import { Dialog, ConfirmationDialogContent } from "@calcom/ui/components/dialog";
 import { DropdownActions, Table } from "@calcom/ui/components/table";
 import { showToast } from "@calcom/ui/components/toast";
-import ServerTrans from "@calcom/web/components/ServerTrans";
 
 import { subdomainSuffix } from "../../../../organizations/lib/orgDomains";
 

packages/features/ee/platform/components/CreateANewPlatformForm.tsx

@@ -17,9 +17,9 @@ import { UserPermissionRole } from "@calcom/prisma/enums";
 import { CreationSource } from "@calcom/prisma/enums";
 import { trpc } from "@calcom/trpc/react";
 import type { Ensure } from "@calcom/types/utils";
-import { TextField } from "@calcom/ui/components/form";
 import { Alert } from "@calcom/ui/components/alert";
 import { Button } from "@calcom/ui/components/button";
+import { TextField } from "@calcom/ui/components/form";
 import { Form } from "@calcom/ui/components/form";
 
 export const CreateANewPlatformForm = () => {

packages/features/ee/teams/components/AddNewTeamMembers.tsx

@@ -16,10 +16,10 @@ import { telemetryEventTypes } from "@calcom/lib/telemetry";
 import { MembershipRole } from "@calcom/prisma/enums";
 import type { RouterOutputs } from "@calcom/trpc/react";
 import { trpc } from "@calcom/trpc/react";
-import { Badge } from "@calcom/ui/components/badge";
-import { UserAvatar } from "@calcom/ui/components/avatar";
-import { Button } from "@calcom/ui/components/button";
 import classNames from "@calcom/ui/classNames";
+import { UserAvatar } from "@calcom/ui/components/avatar";
+import { Badge } from "@calcom/ui/components/badge";
+import { Button } from "@calcom/ui/components/button";
 import { SkeletonButton, SkeletonContainer, SkeletonText } from "@calcom/ui/components/skeleton";
 import { showToast } from "@calcom/ui/components/toast";
 

packages/features/eventtypes/components/HostEditDialogs.tsx

@@ -9,12 +9,12 @@ import type {
   SelectClassNames,
 } from "@calcom/features/eventtypes/lib/types";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
+import classNames from "@calcom/ui/classNames";
+import { Button } from "@calcom/ui/components/button";
+import { Dialog, DialogContent, DialogFooter, DialogClose } from "@calcom/ui/components/dialog";
 import { Label } from "@calcom/ui/components/form";
 import { Select } from "@calcom/ui/components/form";
 import { TextField } from "@calcom/ui/components/form";
-import { Button } from "@calcom/ui/components/button";
-import classNames from "@calcom/ui/classNames";
-import { Dialog, DialogContent, DialogFooter, DialogClose } from "@calcom/ui/components/dialog";
 
 import type { CheckedSelectOption } from "./CheckedTeamSelect";
 import WeightDescription from "./WeightDescription";

packages/features/eventtypes/components/dialogs/DeleteDialog.tsx

@@ -1,8 +1,6 @@
 import { useLocale } from "@calcom/lib/hooks/useLocale";
-import classNames from "@calcom/ui/classNames";
 import type { DialogProps } from "@calcom/ui/components/dialog";
 import { ConfirmationDialogContent, Dialog } from "@calcom/ui/components/dialog";
-import ServerTrans from "@calcom/web/components/ServerTrans";
 
 export function DeleteDialog({
   isManagedEvent,

packages/features/form-builder/FormBuilderField.tsx

@@ -4,8 +4,8 @@ import { Controller, useFormContext } from "react-hook-form";
 import type { z } from "zod";
 
 import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { InfoBadge } from "@calcom/ui/components/badge";
 import classNames from "@calcom/ui/classNames";
+import { InfoBadge } from "@calcom/ui/components/badge";
 import { Label } from "@calcom/ui/components/form";
 import { Icon } from "@calcom/ui/components/icon";
 

packages/lib/event-types/utils/locationsResolver.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-empty-function */
-import { isValidPhoneNumber } from "libphonenumber-js";
 import type { TFunction } from "i18next";
+import { isValidPhoneNumber } from "libphonenumber-js";
 // eslint-disable-next-line @calcom/eslint/deprecated-imports-next-router
 import { z } from "zod";
 

packages/types/Calendar.d.ts

@@ -6,8 +6,8 @@ import type {
   SelectedCalendar as _SelectedCalendar,
 } from "@prisma/client";
 import type { Dayjs } from "dayjs";
-import type { Time } from "ical.js";
 import type { TFunction } from "i18next";
+import type { Time } from "ical.js";
 import type { Frequency } from "rrule";
 import type z from "zod";