Merged in chore/update-eslint-configs (pull request #2812)

chore: Extend eslint configs from @typescript-eslint/recommended

* Change to typescript recommended in scandic-web

* Remove comment

* Change to recommended ts config in partner-sas

* Change to recommended ts lint config in booking-flow


Approved-by: Linus Flood

apps/partner-sas/app/[lang]/debug/page.tsx

@@ -9,7 +9,7 @@ import { getLang } from "@/i18n/serverContext"
 
 import { ClientComponent } from "../../../components/ClientComponent"
 
-type SearchParams<S = {}> = {
+type SearchParams<S = object> = {
   searchParams: Promise<S & { [key: string]: string }>
 }
 

apps/partner-sas/app/[lang]/hotelreservation/(payment-callback)/payment-callback/[status]/page.tsx

@@ -13,7 +13,7 @@ export default async function PaymentCallbackPage(
   logger.debug(`[payment-callback] callback started`)
   const lang = params.lang
 
-  let userAccessToken = null
+  const userAccessToken = null
   // TODO fix when auth is implemented
   // const session = await auth()
   // if (isValidSession(session)) {

apps/partner-sas/app/utils/tracking.ts

@@ -29,6 +29,7 @@ export function trackOpenSidePeek(input: {
   console.warn("TODO: Implement trackOpenSidePeek", { input })
 }
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function trackGenericEvent(data: any) {
   console.warn("TODO: Implement trackGenericEvent", { data })
 }

apps/partner-sas/eslint.config.mjs

@@ -13,7 +13,10 @@ const compat = new FlatCompat({
 
 export default defineConfig([
   {
-    extends: compat.extends("next/core-web-vitals", "plugin:import/typescript"),
+    extends: compat.extends(
+      "next/core-web-vitals",
+      "plugin:@typescript-eslint/recommended"
+    ),
     plugins: {
       "simple-import-sort": simpleImportSort,
       "@typescript-eslint": typescriptEslint,

apps/scandic-web/app/[lang]/(live)/(public)/(contentTypes)/destination_city_page/[uid]/page.tsx

@@ -10,7 +10,7 @@ import type { PageArgs } from "@/types/params"
 export { generateMetadata } from "@/utils/metadata/generateMetadata"
 
 export default async function DestinationCityPagePage(
-  props: PageArgs<{}, { view?: "map"; filterFromUrl?: string }>
+  props: PageArgs<object, { view?: "map"; filterFromUrl?: string }>
 ) {
   const searchParams = await props.searchParams
   return (

apps/scandic-web/app/[lang]/(live)/(public)/(contentTypes)/destination_country_page/[uid]/page.tsx

@@ -10,7 +10,7 @@ import type { PageArgs } from "@/types/params"
 export { generateMetadata } from "@/utils/metadata/generateMetadata"
 
 export default async function DestinationCountryPagePage(
-  props: PageArgs<{}, { view?: "map"; filterFromUrl?: string }>
+  props: PageArgs<object, { view?: "map"; filterFromUrl?: string }>
 ) {
   const searchParams = await props.searchParams
   return (

apps/scandic-web/app/[lang]/(live)/(public)/(contentTypes)/hotel_page/[uid]/page.tsx

@@ -13,7 +13,7 @@ import type { PageArgs } from "@/types/params"
 export { generateMetadata } from "@/utils/metadata/generateMetadata"
 
 export default async function HotelPagePage(
-  props: PageArgs<{}, { subpage?: string; view?: "map" }>
+  props: PageArgs<object, { subpage?: string; view?: "map" }>
 ) {
   const searchParams = await props.searchParams
   const hotelPageData = await getHotelPage()

apps/scandic-web/app/[lang]/(live)/(public)/(contentTypes)/start_page/[uid]/page.tsx

@@ -9,7 +9,7 @@ import type { NextSearchParams, PageArgs } from "@/types/params"
 export { generateMetadata } from "@/utils/metadata/generateMetadata"
 
 export default async function StartPagePage(
-  props: PageArgs<{}, NextSearchParams>
+  props: PageArgs<object, NextSearchParams>
 ) {
   const searchParams = await props.searchParams
   const booking = parseBookingWidgetSearchParams(searchParams)

apps/scandic-web/app/[lang]/(live)/(public)/login/route.ts

@@ -119,6 +119,7 @@ export async function GET(
     logger.debug(`[login] final redirectUrl: ${redirectTo}`)
 
     /** Record<string, any> is next-auth typings */
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const params: Record<string, any> = {
       ui_locales: contextParams.lang,
       scope: [

apps/scandic-web/app/[lang]/(live)/@bookingwidget/(contentTypes)/destination_city_page/[uid]/page.tsx

@@ -8,7 +8,7 @@ import { getLang } from "@/i18n/serverContext"
 import type { NextSearchParams, PageArgs } from "@/types/params"
 
 export default async function BookingWidgetDestinationCityPage(
-  props: PageArgs<{}, NextSearchParams>
+  props: PageArgs<object, NextSearchParams>
 ) {
   const searchParams = await props.searchParams
 

apps/scandic-web/app/[lang]/(live)/@bookingwidget/(contentTypes)/hotel_page/[uid]/page.tsx

@@ -8,7 +8,7 @@ import { getLang } from "@/i18n/serverContext"
 import type { NextSearchParams, PageArgs } from "@/types/params"
 
 export default async function BookingWidgetHotelPage(
-  props: PageArgs<{}, NextSearchParams & { subpage?: string }>
+  props: PageArgs<object, NextSearchParams & { subpage?: string }>
 ) {
   const searchParams = await props.searchParams
 

apps/scandic-web/app/[lang]/(partner)/(sas)/(protected)/sas-x-scandic/link/LinkAccountForm.tsx

@@ -29,7 +29,7 @@ export function LinkAccountForm({
 }) {
   const router = useRouter()
   const params = useParams<LangParams>()
-  let [isPending, startTransition] = useTransition()
+  const [isPending, startTransition] = useTransition()
   const intl = useIntl()
   const form = useForm<LinkAccountForm>({
     defaultValues: {

apps/scandic-web/app/[lang]/webview/(views)/[contentType]/[uid]/page.tsx

@@ -13,7 +13,7 @@ import type {
 } from "@/types/params"
 
 export default async function ContentTypePage(
-  props: PageArgs<LangParams & ContentTypeWebviewParams & UIDParams, {}>
+  props: PageArgs<LangParams & ContentTypeWebviewParams & UIDParams>
 ) {
   const params = await props.params
 

apps/scandic-web/components/Blocks/DynamicContent/OverviewTable/reducer.ts

@@ -63,7 +63,11 @@ export function getInitialState({
   }
 }
 
-export function reducer(state: any, action: OverviewTableReducerAction) {
+export function reducer(
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  state: any,
+  action: OverviewTableReducerAction
+) {
   switch (action.type) {
     case OverviewTableActionsEnum.SET_SELECTED_LEVEL_A_MOBILE:
       return {

apps/scandic-web/components/Blocks/Table/index.tsx

@@ -28,6 +28,7 @@ export default function TableBlock({ data }: TableBlockProps) {
     accessorKey: col.id,
     header: col.header,
     size: col.width,
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     cell: (info: any) => (
       <div dangerouslySetInnerHTML={{ __html: info.getValue() }} />
     ),

apps/scandic-web/components/ContentType/HotelPage/DialogshiftWidget/Client.tsx

@@ -17,6 +17,7 @@ export default function DialogshiftWidgetClient({
   widgetId,
   language,
 }: DialogshiftWidgetClientProps) {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const dialogshiftRef = useRef<any>(null)
 
   useEffect(() => {

apps/scandic-web/components/DeprecatedJsonToHtml/renderOptions.tsx

@@ -42,6 +42,7 @@ import type { RenderOptions } from "@/types/rte/option"
 
 function extractPossibleAttributes(attrs: Attributes | undefined) {
   if (!attrs) return {}
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const props: Record<string, any> = {}
   if (attrs.id) {
     props.id = attrs.id
@@ -601,7 +602,7 @@ export const renderOptions: RenderOptions = {
     className?: string,
     id?: string
   ) => {
-    let props = {
+    const props = {
       className,
       id,
     }
@@ -614,9 +615,6 @@ export const renderOptions: RenderOptions = {
 
     if (className) {
       if (hasAvailableULFormat(className)) {
-        // @ts-ignore:  We want to set css modules classNames even if it does not correspond
-        // to an existing class in the module style sheet. Due to our css modules plugin for
-        // typescript, we cannot do this without the ts-ignore
         props.className = styles[className]
       }
     }

apps/scandic-web/components/DeprecatedJsonToHtml/utils.tsx

@@ -36,6 +36,7 @@ export function nodeChildrenToHtml(
   nodes: RTENode[],
   embeds: EmbedByUid,
   fullRenderOptions: RenderOptions
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
 ): any {
   return nodes
     .map((node, i) => {

apps/scandic-web/components/Forms/Edit/Profile/index.tsx

@@ -176,10 +176,7 @@ export default function Form({ user }: EditFormProps) {
           </Button>
         </div>
         <form
-          /**
+          /* @ts-expect-error Ignoring since ts doesn't recognize that tRPC parses FormData before reaching the route */
-           * Ignoring since ts doesn't recognize that tRPC
-           * parses FormData before reaching the route
-           * @ts-ignore */
           action={editProfile}
           className={styles.form}
           id={formId}

apps/scandic-web/components/HotelReservation/MyStay/Ancillaries/AddAncillaryFlow/AddAncillaryFlowModal/index.tsx

@@ -204,6 +204,7 @@ export default function AddAncillaryFlowModal({
     )
   }
 
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   function handleGuaranteePayment(data: AncillaryFormData, packages: any) {
     const savedCreditCard = savedCreditCards?.find(
       (card) => card.id === data.paymentMethod

apps/scandic-web/components/HotelReservation/MyStay/ReferenceCard/Actions/NotCancelled/ManageStay/Actions/GuaranteeLateArrival/Form/schema.ts

@@ -7,4 +7,4 @@ export const paymentSchema = z.object({
   }),
 })
 
-export interface GuaranteeFormData extends z.output<typeof paymentSchema> {}
+export type GuaranteeFormData = z.output<typeof paymentSchema>

apps/scandic-web/components/HotelReservation/MyStay/TrackGuarantee.tsx

@@ -95,6 +95,7 @@ export default function TrackGuarantee({
         break
 
       case PaymentCallbackStatusEnum.Cancel:
+        // eslint-disable-next-line @typescript-eslint/no-unused-expressions
         isAncillaryFlow
           ? trackAncillaryPaymentEvent(
               "GuaranteeCancelAncillary",
@@ -107,6 +108,7 @@ export default function TrackGuarantee({
         break
 
       case PaymentCallbackStatusEnum.Error:
+        // eslint-disable-next-line @typescript-eslint/no-unused-expressions
         isAncillaryFlow
           ? trackAncillaryPaymentEvent(
               "GuaranteeFailAncillary",

apps/scandic-web/components/TempDesignSystem/Form/Input/index.tsx

@@ -36,7 +36,7 @@ const Input = forwardRef<HTMLInputElement, InputProps>(function Input(
 ) {
   const intl = useIntl()
   const { control } = useFormContext()
-  let numberAttributes: HTMLAttributes<HTMLInputElement> = {}
+  const numberAttributes: HTMLAttributes<HTMLInputElement> = {}
   if (type === "number") {
     numberAttributes.onWheel = function (evt: WheelEvent<HTMLInputElement>) {
       evt.currentTarget.blur()

apps/scandic-web/components/TempDesignSystem/Form/Select/select.ts

@@ -15,6 +15,7 @@ interface ReactAriaSelectProps
   showRadioButton?: boolean
   discreet?: boolean
   isNestedInModal?: boolean
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   optionsIcon?: ReactElement<any>
 }
 

apps/scandic-web/eslint.config.mjs

@@ -13,7 +13,10 @@ const compat = new FlatCompat({
 
 export default defineConfig([
   {
-    extends: compat.extends("next/core-web-vitals", "plugin:import/typescript"),
+    extends: compat.extends(
+      "next/core-web-vitals",
+      "plugin:@typescript-eslint/recommended"
+    ),
     plugins: {
       "simple-import-sort": simpleImportSort,
       "@typescript-eslint": typescriptEslint,
@@ -63,7 +66,6 @@ export default defineConfig([
           ],
         },
       ],
-
       "simple-import-sort/exports": "warn",
       "import/first": "warn",
       "import/newline-after-import": "warn",

apps/scandic-web/types/params.ts

@@ -3,11 +3,11 @@ import type { PageContentTypeEnum } from "@scandic-hotels/trpc/enums/contentType
 
 export type NextSearchParams = { [key: string]: string | string[] | undefined }
 
-export type SearchParams<S = {}> = {
+export type SearchParams<S = object> = {
   searchParams: Promise<S & { [key: string]: string }>
 }
 
-export type Params<P = {}> = {
+export type Params<P = object> = {
   params: Promise<P>
 }
 
@@ -50,7 +50,9 @@ export type PreviewParams = {
   live_preview?: string
 }
 
-export type LayoutArgs<P = undefined> = P extends undefined ? {} : Params<P>
+export type LayoutArgs<P = undefined> = P extends undefined
+  ? unknown
+  : Params<P>
 
 export type PageArgs<P = undefined, S = undefined> = LayoutArgs<P> &
-  (S extends undefined ? {} : SearchParams<S>)
+  (S extends undefined ? unknown : SearchParams<S>)

packages/booking-flow/eslint.config.mjs

@@ -18,7 +18,10 @@ const packageDir = path.dirname(fileURLToPath(import.meta.url))
 
 export default defineConfig([
   {
-    extends: compat.extends("next/core-web-vitals", "plugin:import/typescript"),
+    extends: compat.extends(
+      "next/core-web-vitals",
+      "plugin:@typescript-eslint/recommended"
+    ),
     plugins: {
       "simple-import-sort": simpleImportSort,
       "@typescript-eslint": typescriptEslint,

packages/booking-flow/lib/components/BookingConfirmation/Header/Actions/ManageBooking.tsx

@@ -13,7 +13,7 @@ import type { BookingConfirmation } from "@scandic-hotels/trpc/types/bookingConf
 
 import type { AdditionalInfoCookieValue } from "../../../../types/components/findMyBooking/additionalInfoCookieValue"
 
-interface ManageBookingProps extends Pick<BookingConfirmation, "booking"> {}
+type ManageBookingProps = Pick<BookingConfirmation, "booking">
 
 export default function ManageBooking({ booking }: ManageBookingProps) {
   const intl = useIntl()

packages/booking-flow/lib/components/BookingConfirmation/Promos/index.tsx

@@ -13,7 +13,7 @@ import type { BookingConfirmation } from "@scandic-hotels/trpc/types/bookingConf
 
 import type { AdditionalInfoCookieValue } from "../../../types/components/findMyBooking/additionalInfoCookieValue"
 
-export interface PromosProps extends Pick<BookingConfirmation, "booking"> {}
+export type PromosProps = Pick<BookingConfirmation, "booking">
 
 export function Promos({ booking }: PromosProps) {
   const intl = useIntl()

packages/booking-flow/lib/components/BookingWidget/Client.tsx

@@ -90,7 +90,7 @@ export default function BookingWidgetClient({
     toDate = now.add(1, "day")
   }
 
-  let selectedLocation =
+  const selectedLocation =
     destinationsData?.currentSelection.hotel ??
     destinationsData?.currentSelection.city
 
@@ -199,8 +199,9 @@ export default function BookingWidgetClient({
           ? JSON.parse(storedBookingCode)
           : undefined
 
-      initialBookingCode?.remember &&
+      if (initialBookingCode?.remember) {
         methods.setValue("bookingCode", initialBookingCode)
+      }
     }
   }, [methods, selectedBookingCode])
 

packages/booking-flow/lib/components/BookingWidget/GuestsRoomsPicker/ChildSelector/ChildInfoSelector.tsx

@@ -84,7 +84,7 @@ export default function ChildInfoSelector({
   ]
 
   function getAvailableBeds(age: number) {
-    let availableBedTypes: ChildBed[] = []
+    const availableBedTypes: ChildBed[] = []
     if (age <= 5 && (adults > childrenInAdultsBed || child.bed === 0)) {
       availableBedTypes.push(allBedTypes[0])
     }

packages/booking-flow/lib/components/BookingWidget/GuestsRoomsPicker/index.tsx

@@ -63,7 +63,7 @@ export default function GuestsRoomsPickerForm({
   const updateHeight = useCallback(() => {
     // Get available space for picker to show without going beyond screen
     const bookingWidget = document.getElementById("booking-widget")
-    let maxHeight =
+    const maxHeight =
       window.innerHeight -
       (bookingWidget?.getBoundingClientRect().bottom ?? 0) -
       50

packages/booking-flow/lib/components/EnterDetails/Payment/schema.ts

@@ -13,4 +13,4 @@ export const paymentSchema = z.object({
   guarantee: z.boolean(),
 })
 
-export interface PaymentFormData extends z.output<typeof paymentSchema> {}
+export type PaymentFormData = z.output<typeof paymentSchema>

packages/booking-flow/lib/components/EnterDetails/Summary/Mobile/BottomSheet/index.tsx

@@ -17,10 +17,9 @@ import { formId } from "../../../Payment/PaymentClient"
 
 import styles from "./bottomSheet.module.css"
 
-interface SummaryBottomSheetProps
+type SummaryBottomSheetProps = PropsWithChildren<{
-  extends PropsWithChildren<{
+  isUserLoggedIn: boolean
-    isUserLoggedIn: boolean
+}>
-  }> {}
 
 export default function SummaryBottomSheet({
   children,

packages/booking-flow/lib/components/SelectHotel/index.tsx

@@ -46,6 +46,7 @@ export async function SelectHotel({
   const isAllUnavailable = hotels.every(
     (hotel) => hotel.availability.status !== "Available"
   )
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const isCityWithCountry = (city: any): city is { country: string } =>
     "country" in city
 

packages/booking-flow/lib/components/SelectRate/RoomsContainer/RateSummary/DesktopSummary.tsx

@@ -84,7 +84,7 @@ export function DesktopSummary({
     isUserLoggedIn || selectedRates.rates.some(isBookingCodeRate)
 
   const mainRoomRate = selectedRates.rates.at(0)
-  let mainRoomCurrency = getRoomCurrency(mainRoomRate)
+  const mainRoomCurrency = getRoomCurrency(mainRoomRate)
 
   return (
     <>

packages/booking-flow/lib/components/SelectRate/RoomsContainer/Rooms/RoomsList/RoomListItem/Rates/Code.tsx

@@ -159,6 +159,7 @@ function CorporateChequeCode({
   handleSelectRate,
   isSelected,
 }: {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   codeProduct: Extract<CodeProduct, { corporateCheque: any }>
   roomIndex: number
   roomTypeCode: string
@@ -329,6 +330,7 @@ function VoucherCode({
   handleSelectRate,
   isSelected,
 }: {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   codeProduct: Extract<CodeProduct, { voucher: any }>
   roomIndex: number
   roomTypeCode: string

packages/booking-flow/lib/contexts/SelectRate/isRateSelected.test.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import { describe, expect, it } from "vitest"
 
 import { RateEnum } from "@scandic-hotels/common/constants/rate"

packages/booking-flow/lib/stores/enter-details/helpers.ts

@@ -345,11 +345,10 @@ function getRequestedAdditionalPrice(
   }
 }
 
-interface TRoom
+type TRoom = Pick<
-  extends Pick<
+  RoomState["room"],
-    RoomState["room"],
+  "adults" | "breakfast" | "guest" | "roomFeatures" | "roomRate"
-    "adults" | "breakfast" | "guest" | "roomFeatures" | "roomRate"
+>
-  > {}
 
 interface TRoomCorporateCheque extends TRoom {
   roomRate: CorporateChequeProduct

packages/booking-flow/lib/trackingContext.tsx

@@ -20,6 +20,7 @@ export type TrackingFunctions = {
     includePathname?: boolean
     roomTypeCode?: string | null
   }) => void
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   trackGenericEvent(data: any): void
   trackLoginClick(position: TrackingPosition & (string & {})): void
   trackPaymentEvent(payment: PaymentEvent): void

packages/booking-flow/lib/utils/searchParams.test.ts

@@ -548,6 +548,7 @@ const getSearchParams = (input: string) => {
   return searchParamsToObject(searchParams)
 }
 const searchParamsToObject = (searchParams: URLSearchParams) => {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const obj: Record<string, any> = {}
   for (const [key, value] of searchParams.entries()) {
     obj[key] = value

packages/booking-flow/lib/utils/searchParams.ts

@@ -20,6 +20,7 @@ export function parseSearchParams<T extends z.ZodRawShape>(
 export function parseSearchParams<T extends z.ZodRawShape>(
   searchParams: NextSearchParams,
   options?: ParseOptions<T>
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
 ): Record<string, any>
 
 /**
@@ -49,6 +50,7 @@ export function parseSearchParams<T extends z.ZodRawShape>(
 
   const buildObject = getBuilder(options || {})
 
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const resultObject: Record<string, any> = {}
   for (const [key, value] of entries) {
     const paths = key.split(".")
@@ -80,6 +82,7 @@ function getBuilder<T extends z.ZodRawShape>(options: ParseOptions<T>) {
   const typeHints = options.typeHints || {}
 
   return function buildNestedObject(
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     obj: Record<string, any>,
     paths: string[],
     value: string
@@ -134,6 +137,7 @@ function getBuilder<T extends z.ZodRawShape>(options: ParseOptions<T>) {
   }
 }
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 function isNotArray(value: any) {
   return !value || typeof value !== "object" || !Array.isArray(value)
 }
@@ -157,6 +161,7 @@ type SerializeOptions = {
  * Arrays are not merged, they will always replace existing values.
  */
 export function serializeSearchParams(
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   obj: Record<string, any>,
   options?: SerializeOptions
 ): URLSearchParams {