scandic/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in feat/sw-2998-font-optimization (pull request #2323)

Browse Source 
feat(SW-2998) - Optimize font loading

* feat(SW-2998) - Optimize font loading

* display swap on fonts


Approved-by: Anton Gunnarsson
This commit is contained in:
Linus Flood
2025-06-10 12:21:55 +00:00
parent 8ddcc39192
commit 9eb15e232b
5 changed files with 83 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/scandic-web/app/[lang]/(live)/layout.tsx
View File

@@ -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 (
<html lang={params.lang}>
<head>
<FontPreload />
<AdobeSDKScript />
<GTMScript />
<Script
@@ -56,6 +55,7 @@ export default async function RootLayout(
data-culture={params.lang}
id="Cookiebot"
src="https://consent.cookiebot.com/uc.js"
async={true}
/>
{/* eslint-disable-next-line formatjs/no-literal-string-in-jsx */}
<Script id="ensure-adobeDataLayer">{`

13
apps/scandic-web/app/[lang]/(partner)/layout.tsx
View File

@@ -17,18 +17,19 @@ 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"
import type { LangParams, LayoutArgs } from "@/types/params"
export default async function RootLayout(props: React.PropsWithChildren<LayoutArgs<LangParams>>) {
const params = await props.params;
export default async function RootLayout(
props: React.PropsWithChildren<LayoutArgs<LangParams>>
) {
const params = await props.params
const {
children
} = props;
const { children } = props
if (!env.SAS_ENABLED) {
return null
@@ -40,6 +41,7 @@ export default async function RootLayout(props: React.PropsWithChildren<LayoutAr
return (
<html lang={params.lang}>
<head>
<FontPreload />
<AdobeSDKScript />
<GTMScript />
<Script
@@ -49,6 +51,7 @@ export default async function RootLayout(props: React.PropsWithChildren<LayoutAr
data-culture={params.lang}
id="Cookiebot"
src="https://consent.cookiebot.com/uc.js"
async={true}
/>
{/* eslint-disable-next-line formatjs/no-literal-string-in-jsx */}
<Script id="ensure-adobeDataLayer">{`

12
apps/scandic-web/app/[lang]/webview/layout.tsx
View File

@@ -12,6 +12,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"
@@ -26,12 +27,12 @@ export const metadata: Metadata = {
title: "Webview",
}
export default async function RootLayout(props: React.PropsWithChildren<LayoutArgs<LangParams>>) {
const params = await props.params;
export default async function RootLayout(
props: React.PropsWithChildren<LayoutArgs<LangParams>>
) {
const params = await props.params
const {
children
} = props;
const { children } = props
setLang(params.lang)
const messages = await getMessages(params.lang)
@@ -39,6 +40,7 @@ export default async function RootLayout(props: React.PropsWithChildren<LayoutAr
return (
<html lang={params.lang}>
<head>
<FontPreload />
<AdobeSDKScript />
<GTMScript />
{/* eslint-disable-next-line formatjs/no-literal-string-in-jsx */}

34
apps/scandic-web/fonts/font-preloading.tsx Normal file
View File

@@ -0,0 +1,34 @@
export function FontPreload() {
return (
<>
<link
rel="preload"
href="/_static/fonts/biro-script-plus/regular.woff2"
as="font"
type="font/woff2"
crossOrigin="anonymous"
/>
<link
rel="preload"
href="/_static/fonts/brandon-text/bold.woff2"
as="font"
type="font/woff2"
crossOrigin="anonymous"
/>
<link
rel="preload"
href="/_static/fonts/fira-sans/medium.woff2"
as="font"
type="font/woff2"
crossOrigin="anonymous"
/>
<link
rel="preload"
href="/_static/fonts/fira-sans/regular.woff2"
as="font"
type="font/woff2"
crossOrigin="anonymous"
/>
</>
)
}