From f40a66617051340b14ff70137c515d9477041b2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20J=C3=A4derberg?= Date: Fri, 16 May 2025 11:38:41 +0000 Subject: [PATCH] Merged in feat/add-version-to-responses (pull request #2118) feature: add a version tag to responses SW-2792 * feature: add a version tag to responses Approved-by: Linus Flood --- apps/scandic-web/app/[lang]/(live)/layout.tsx | 2 ++ apps/scandic-web/app/[lang]/(live-current)/layout.tsx | 2 ++ apps/scandic-web/app/[lang]/(partner)/layout.tsx | 1 + apps/scandic-web/app/[lang]/webview/layout.tsx | 2 ++ apps/scandic-web/app/api/web/trpc/[trpc]/route.ts | 8 ++++++++ apps/scandic-web/app/sitemap/[sitemapId]/route.ts | 2 +- apps/scandic-web/app/sitemap/route.ts | 2 +- apps/scandic-web/env/server.ts | 4 ++++ 8 files changed, 21 insertions(+), 2 deletions(-) diff --git a/apps/scandic-web/app/[lang]/(live)/layout.tsx b/apps/scandic-web/app/[lang]/(live)/layout.tsx index 248545bb8..926fb6fa8 100644 --- a/apps/scandic-web/app/[lang]/(live)/layout.tsx +++ b/apps/scandic-web/app/[lang]/(live)/layout.tsx @@ -8,6 +8,7 @@ import Script from "next/script" import { SessionProvider } from "next-auth/react" import { Lang } from "@/constants/languages" +import { env } from "@/env/server" import TrpcProvider from "@/lib/trpc/Provider" import { SessionRefresher } from "@/components/Auth/TokenRefresher" @@ -57,6 +58,7 @@ export default async function RootLayout({ window.adobeDataLayer = window.adobeDataLayer || [] window.dataLayer = window.dataLayer || [] `} +
diff --git a/apps/scandic-web/app/[lang]/(live-current)/layout.tsx b/apps/scandic-web/app/[lang]/(live-current)/layout.tsx index a289f3461..fe02aa6ff 100644 --- a/apps/scandic-web/app/[lang]/(live-current)/layout.tsx +++ b/apps/scandic-web/app/[lang]/(live-current)/layout.tsx @@ -8,6 +8,7 @@ import "@scandic-hotels/design-system/style.css" import Script from "next/script" import { Lang } from "@/constants/languages" +import { env } from "@/env/server" import TokenRefresher from "@/components/Auth/TokenRefresher" import CookieBotConsent from "@/components/CookieBot" @@ -59,6 +60,7 @@ export default async function RootLayout({ window.datalayer = window.datalayer || {} `} + diff --git a/apps/scandic-web/app/[lang]/(partner)/layout.tsx b/apps/scandic-web/app/[lang]/(partner)/layout.tsx index 70ab21123..e9e77c4c0 100644 --- a/apps/scandic-web/app/[lang]/(partner)/layout.tsx +++ b/apps/scandic-web/app/[lang]/(partner)/layout.tsx @@ -51,6 +51,7 @@ export default async function RootLayout({ + + \n${entries.join("")}\n` return new Response(sitemapXML, { - headers: { "Content-Type": "text/xml" }, + headers: { "Content-Type": "text/xml", "X-Version": env.VERSION }, }) } diff --git a/apps/scandic-web/app/sitemap/route.ts b/apps/scandic-web/app/sitemap/route.ts index 802eb6e41..8e00bc5cf 100644 --- a/apps/scandic-web/app/sitemap/route.ts +++ b/apps/scandic-web/app/sitemap/route.ts @@ -33,6 +33,6 @@ export async function GET() { const sitemapIndexXML = `\n${urls.join("")}\n` return new Response(sitemapIndexXML, { - headers: { "Content-Type": "text/xml" }, + headers: { "Content-Type": "text/xml", "X-Version": env.VERSION }, }) } diff --git a/apps/scandic-web/env/server.ts b/apps/scandic-web/env/server.ts index 63f24c264..02dfadf99 100644 --- a/apps/scandic-web/env/server.ts +++ b/apps/scandic-web/env/server.ts @@ -303,6 +303,10 @@ export const env = { ..._env, NEW_SITE_LIVE_STATUS: getLiveStatus(_env), isLangLive: (lang: Lang) => isLangLive(lang, _env.NEW_SITE_LIVE_FOR_LANGS), + VERSION: + process.env.NODE_ENV === "development" + ? "development" + : (_env.GIT_SHA ?? "unknown"), } as const function replaceTopLevelDomain(url: string, domain: string) {