From 4f0c61f68faa0075a04d540ce766472087659bf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20J=C3=A4derberg?= Date: Fri, 16 May 2025 12:57:17 +0000 Subject: [PATCH] Merged in revert-version (pull request #2128) revert including version in layouts and api responses * revert including version in layouts and api 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, 2 insertions(+), 21 deletions(-) diff --git a/apps/scandic-web/app/[lang]/(live)/layout.tsx b/apps/scandic-web/app/[lang]/(live)/layout.tsx index 926fb6fa8..248545bb8 100644 --- a/apps/scandic-web/app/[lang]/(live)/layout.tsx +++ b/apps/scandic-web/app/[lang]/(live)/layout.tsx @@ -8,7 +8,6 @@ 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" @@ -58,7 +57,6 @@ 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 fe02aa6ff..a289f3461 100644 --- a/apps/scandic-web/app/[lang]/(live-current)/layout.tsx +++ b/apps/scandic-web/app/[lang]/(live-current)/layout.tsx @@ -8,7 +8,6 @@ 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" @@ -60,7 +59,6 @@ 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 e9e77c4c0..70ab21123 100644 --- a/apps/scandic-web/app/[lang]/(partner)/layout.tsx +++ b/apps/scandic-web/app/[lang]/(partner)/layout.tsx @@ -51,7 +51,6 @@ export default async function RootLayout({ - - \n${entries.join("")}\n` return new Response(sitemapXML, { - headers: { "Content-Type": "text/xml", "X-Version": env.VERSION }, + headers: { "Content-Type": "text/xml" }, }) } diff --git a/apps/scandic-web/app/sitemap/route.ts b/apps/scandic-web/app/sitemap/route.ts index 8e00bc5cf..802eb6e41 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", "X-Version": env.VERSION }, + headers: { "Content-Type": "text/xml" }, }) } diff --git a/apps/scandic-web/env/server.ts b/apps/scandic-web/env/server.ts index 02dfadf99..63f24c264 100644 --- a/apps/scandic-web/env/server.ts +++ b/apps/scandic-web/env/server.ts @@ -303,10 +303,6 @@ 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) {