From 9eb15e232b606a54cc0c81cae52b4c220ef51394 Mon Sep 17 00:00:00 2001 From: Linus Flood Date: Tue, 10 Jun 2025 12:21:55 +0000 Subject: [PATCH] Merged in feat/sw-2998-font-optimization (pull request #2323) feat(SW-2998) - Optimize font loading * feat(SW-2998) - Optimize font loading * display swap on fonts Approved-by: Anton Gunnarsson --- apps/scandic-web/app/[lang]/(live)/layout.tsx | 10 ++-- .../app/[lang]/(partner)/layout.tsx | 13 +++-- .../scandic-web/app/[lang]/webview/layout.tsx | 12 ++-- apps/scandic-web/fonts/font-preloading.tsx | 34 +++++++++++ packages/design-system/lib/fonts.css | 58 +++++++++---------- 5 files changed, 83 insertions(+), 44 deletions(-) create mode 100644 apps/scandic-web/fonts/font-preloading.tsx diff --git a/apps/scandic-web/app/[lang]/(live)/layout.tsx b/apps/scandic-web/app/[lang]/(live)/layout.tsx index f32f02fd9..3110fc9f6 100644 --- a/apps/scandic-web/app/[lang]/(live)/layout.tsx +++ b/apps/scandic-web/app/[lang]/(live)/layout.tsx @@ -21,6 +21,7 @@ import { ToastHandler } from "@/components/TempDesignSystem/Toasts" import AdobeSDKScript from "@/components/TrackingSDK/AdobeSDKScript" import GTMScript from "@/components/TrackingSDK/GTMScript" import RouterTracking from "@/components/TrackingSDK/RouterTracking" +import { FontPreload } from "@/fonts/font-preloading" import { getMessages } from "@/i18n" import ClientIntlProvider from "@/i18n/Provider" import { setLang } from "@/i18n/serverContext" @@ -34,12 +35,9 @@ export default async function RootLayout( } > ) { - const params = await props.params; + const params = await props.params - const { - bookingwidget, - children - } = props; + const { bookingwidget, children } = props setLang(params.lang) const messages = await getMessages(params.lang) @@ -47,6 +45,7 @@ export default async function RootLayout( return ( +