Merged in chore/next15 (pull request #1999)

chore (SW-834): Upgrade to Next 15

* wip: apply codemod and upgrade swc plugin

* wip: design-system to react 19, fix issues from async (search)params

* wip: fix remaining issues from codemod

serverClient is now async because context use headers()
getLang is now async because it uses headers()

* Minor cleanup

* Inline react-material-symbols package

Package is seemingly not maintained any more and doesn't support
React 19. This copies the package source into `design-system`,
makes the necessary changes for 19 and export it for others to use.

* Fix missing awaits

* Disable modal exit animations

Enabling modal exit animations via isExiting prop is causing
modals to be rendered in "hidden" state and never unmount.
Seems to be an issue with react-aria-components,
see https://github.com/adobe/react-spectrum/issues/7563.
Can probably be fixed by rewriting to a solution similar to
https://react-spectrum.adobe.com/react-aria/examples/framer-modal-sheet.html

* Remove unstable cache implementation and use in memory cache locally

* Fix ref type in SelectFilter

* Use cloneElement to add key prop to element


Approved-by: Linus Flood
This commit is contained in:
Anton Gunnarsson
2025-06-02 11:11:50 +00:00
parent 47abd7d5ef
commit cbf9e7b7c2
188 changed files with 4883 additions and 1023 deletions

View File

@@ -16,7 +16,7 @@ export default async function NoAvailabilityAlert({
operaId,
}: NoAvailabilityAlertProp) {
const intl = await getIntl()
const lang = getLang()
const lang = await getLang()
if (bookingCode && isBookingCodeRateNotAvailable) {
const bookingCodeText = intl.formatMessage(

View File

@@ -14,24 +14,16 @@ import { getTracking } from "./tracking"
import SelectHotelMap from "."
import type { SelectHotelMapContainerProps } from "@/types/components/hotelReservation/selectHotel/map"
import type { SelectHotelSearchParams } from "@/types/components/hotelReservation/selectHotel/selectHotelSearchParams"
export async function SelectHotelMapContainer({
searchParams,
booking,
isAlternativeHotels,
}: SelectHotelMapContainerProps) {
const lang = getLang()
const lang = await getLang()
const googleMapId = env.GOOGLE_DYNAMIC_MAP_ID
const googleMapsApiKey = env.GOOGLE_STATIC_MAP_KEY
const getHotelSearchDetailsPromise = safeTry(
getHotelSearchDetails(
{
searchParams: searchParams as SelectHotelSearchParams & {
[key: string]: string
},
},
isAlternativeHotels
)
getHotelSearchDetails(booking, isAlternativeHotels)
)
const [searchDetails] = await getHotelSearchDetailsPromise

View File

@@ -24,6 +24,7 @@ import type {
HotelLocation,
Location,
} from "@/types/trpc/routers/hotel/locations"
import type { SelectHotelParams } from "@/utils/url"
interface AvailabilityResponse {
availability: HotelsAvailabilityItem[]
@@ -39,7 +40,7 @@ type Result = AvailabilityResponse | null
type SettledResult = PromiseSettledResult<Result>[]
async function enhanceHotels(hotels: HotelsAvailabilityItem[]) {
const language = getLang()
const language = await getLang()
return await Promise.allSettled(
hotels.map(async (availability) => {
const hotelData = await getHotel({
@@ -65,7 +66,8 @@ async function fetchAlternativeHotels(
hotelId: string,
input: AlternativeHotelsAvailabilityInput
) {
const alternativeHotelIds = await serverClient().hotel.nearbyHotelIds({
const caller = await serverClient()
const alternativeHotelIds = await caller.hotel.nearbyHotelIds({
hotelId,
})
@@ -73,20 +75,20 @@ async function fetchAlternativeHotels(
return null
}
return await serverClient().hotel.availability.hotelsByHotelIds({
return await caller.hotel.availability.hotelsByHotelIds({
...input,
hotelIds: alternativeHotelIds,
})
}
async function fetchAvailableHotels(input: AvailabilityInput) {
return await serverClient().hotel.availability.hotelsByCity(input)
const caller = await serverClient()
return await caller.hotel.availability.hotelsByCity(input)
}
async function fetchBookingCodeAvailableHotels(input: AvailabilityInput) {
return await serverClient().hotel.availability.hotelsByCityWithBookingCode(
input
)
const caller = await serverClient()
return await caller.hotel.availability.hotelsByCityWithBookingCode(input)
}
function getFulfilledResponses<T>(result: PromiseSettledResult<T | null>[]) {
@@ -161,7 +163,9 @@ function sortAndFilterHotelsByAvailability(
}
export async function getHotels(
booking: SelectHotelSearchParams | AlternativeHotelsSearchParams,
booking: SelectHotelParams<
SelectHotelSearchParams | AlternativeHotelsSearchParams
>,
isAlternativeFor: HotelLocation | null,
bookingCode: string | undefined,
city: Location,

View File

@@ -43,18 +43,18 @@ export default async function SelectHotel({
const isBookingCodeRateAvailable = bookingCode
? hotels.some(
(hotel) =>
hotel.availability.bookingCode &&
hotel.availability.status === "Available"
)
(hotel) =>
hotel.availability.bookingCode &&
hotel.availability.status === "Available"
)
: false
const isFullPriceHotelAvailable = bookingCode
? hotels?.some(
(hotel) =>
!hotel.availability.bookingCode &&
hotel.availability.status === "Available"
)
(hotel) =>
!hotel.availability.bookingCode &&
hotel.availability.status === "Available"
)
: false
// Special rates (corporate cheque, voucher and reward nights) will not have regular rate hotels availability