Merged in chore/upgrade-next (pull request #3124)

Upgrade next@15.5.6

* chore: upgrade next@15.5.6

* chore: upgrade turborepo@2.6.1

* fix typings for scandic-web

* fix: set correct type for pages

* cleanup

* fix more route.ts typing issues

* Merge branch 'master' of bitbucket.org:scandic-swap/web into chore/upgrade-next

* explicitly import the types


Approved-by: Linus Flood

apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(payment-callback)/gla-payment-callback/page.tsx

@@ -5,28 +5,25 @@ import { logger } from "@scandic-hotels/common/logger"
 
 import GuaranteeCallbackPage from "@/components/GuaranteeCallback"
 
+import type { Lang } from "@scandic-hotels/common/constants/language"
 import type { PaymentCallbackStatusEnum } from "@scandic-hotels/common/constants/paymentCallbackStatusEnum"
 
-import type { LangParams, PageArgs } from "@/types/params"
-
 export default async function GuaranteePaymentCallbackPage(
-  props: PageArgs<
-    LangParams,
-    {
-      status?: PaymentCallbackStatusEnum
-      RefId?: string
-      confirmationNumber?: string
-      ancillary?: string
-    }
-  >
+  props: PageProps<"/[lang]/hotelreservation/gla-payment-callback">
 ) {
   const searchParams = await props.searchParams
   const params = await props.params
   logger.debug(`[gla-payment-callback] callback started`)
-  const lang = params.lang
-  const status = searchParams.status
-  const confirmationNumber = searchParams.confirmationNumber
-  const refId = searchParams.RefId
+  const lang = params.lang as Lang
+  const status = searchParams.status as PaymentCallbackStatusEnum
+  const confirmationNumber =
+    typeof searchParams.confirmationNumber === "string"
+      ? searchParams.confirmationNumber
+      : null
+
+  const refId =
+    typeof searchParams.RefId === "string" ? searchParams.RefId : null
+
   if (!status || !confirmationNumber || !refId) {
     notFound()
   }

apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(payment-callback)/payment-callback/layout.tsx

@@ -1,9 +1,7 @@
 import styles from "./layout.module.css"
 
-import type { LangParams, LayoutArgs } from "@/types/params"
-
 export default function PaymentCallbackLayout({
   children,
-}: React.PropsWithChildren<LayoutArgs<LangParams>>) {
+}: LayoutProps<"/[lang]/hotelreservation/payment-callback">) {
   return <div className={styles.layout}>{children}</div>
 }

apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(payment-callback)/payment-callback/page.tsx

@@ -6,23 +6,16 @@ import { bookingFlowConfig } from "@/constants/bookingFlowConfig"
 
 import { auth } from "@/auth"
 
+import type { Lang } from "@scandic-hotels/common/constants/language"
 import type { PaymentCallbackStatusEnum } from "@scandic-hotels/common/constants/paymentCallbackStatusEnum"
 
-import type { LangParams, PageArgs } from "@/types/params"
-
 export default async function PaymentCallbackPage(
-  props: PageArgs<
-    LangParams,
-    {
-      status?: PaymentCallbackStatusEnum
-      confirmationNumber?: string
-    }
-  >
+  props: PageProps<"/[lang]/hotelreservation/payment-callback">
 ) {
   const searchParams = await props.searchParams
   const params = await props.params
   logger.debug(`[payment-callback] callback started`)
-  const lang = params.lang
+  const lang = params.lang as Lang
 
   let userAccessToken = null
   const session = await auth()