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
This commit is contained in:
Joakim Jäderberg
2025-11-13 07:33:56 +00:00
parent ce469bc4b4
commit dc53ab9245
64 changed files with 746 additions and 404 deletions

View File

@@ -3,26 +3,22 @@ import { SelectRatePage as SelectRatePagePrimitive } from "@scandic-hotels/booki
import { bookingFlowConfig } from "@/constants/bookingFlowConfig"
import { getHotel } from "@/lib/trpc/memoizedRequests"
import { getLang } from "@/i18n/serverContext"
import type { Lang } from "@scandic-hotels/common/constants/language"
import type { Metadata } from "next"
import {
type LangParams,
type NextSearchParams,
type PageArgs,
} from "@/types/params"
export async function generateMetadata(
props: PageProps<"/[lang]/hotelreservation/select-rate">
): Promise<Metadata> {
const searchParams = await props.searchParams
const params = await props.params
export async function generateMetadata({
searchParams,
params,
}: PageArgs<LangParams, { hotel: string }>): Promise<Metadata> {
const { hotel } = await searchParams
const { lang } = await params
if (typeof searchParams.hotel !== "string" || !searchParams.hotel) {
return {}
}
const hotelData = await getHotel({
hotelId: hotel,
language: lang,
hotelId: searchParams.hotel,
language: params.lang as Lang,
isCardOnlyPayment: false,
})
@@ -36,10 +32,12 @@ export async function generateMetadata({
}
export default async function SelectRatePage(
props: PageArgs<LangParams, NextSearchParams>
props: PageProps<"/[lang]/hotelreservation/select-rate">
) {
const searchParams = await props.searchParams
const lang = await getLang()
const params = await props.params
const lang = params.lang as Lang
return (
<SelectRatePagePrimitive