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

Merged in revert-version (pull request #2128)

Browse Source 
revert including version in layouts and api responses

* revert including version in layouts and api responses


Approved-by: Linus Flood
This commit is contained in:
Joakim Jäderberg
2025-05-16 12:57:17 +00:00
parent ec29664a60
commit 4f0c61f68f
8 changed files with 2 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,7 +8,6 @@ import Script from "next/script"
import { SessionProvider } from "next-auth/react" import { SessionProvider } from "next-auth/react"
import { Lang } from "@/constants/languages" import { Lang } from "@/constants/languages"
import { env } from "@/env/server"
import TrpcProvider from "@/lib/trpc/Provider" import TrpcProvider from "@/lib/trpc/Provider"
import { SessionRefresher } from "@/components/Auth/TokenRefresher" import { SessionRefresher } from "@/components/Auth/TokenRefresher"
@@ -58,7 +57,6 @@ export default async function RootLayout({
window.adobeDataLayer = window.adobeDataLayer || [] window.adobeDataLayer = window.adobeDataLayer || []
window.dataLayer = window.dataLayer || [] window.dataLayer = window.dataLayer || []
`}</Script> `}</Script>
<meta name="version" content={env.VERSION} />
</head> </head>
<body className="scandic"> <body className="scandic">
<div className="root"> <div className="root">

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

@@ -8,7 +8,6 @@ import "@scandic-hotels/design-system/style.css"
import Script from "next/script" import Script from "next/script"
import { Lang } from "@/constants/languages" import { Lang } from "@/constants/languages"
import { env } from "@/env/server"
import TokenRefresher from "@/components/Auth/TokenRefresher" import TokenRefresher from "@/components/Auth/TokenRefresher"
import CookieBotConsent from "@/components/CookieBot" import CookieBotConsent from "@/components/CookieBot"
@@ -60,7 +59,6 @@ export default async function RootLayout({
window.datalayer = window.datalayer || {} window.datalayer = window.datalayer || {}
`}</Script> `}</Script>
<AdobeScript /> <AdobeScript />
<meta name="version" content={env.VERSION} />
</head> </head>
<body className="theme-00Corecolours theme-X0Oldcorecolours"> <body className="theme-00Corecolours theme-X0Oldcorecolours">
<LangPopup /> <LangPopup />

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

@@ -51,7 +51,6 @@ export default async function RootLayout({
<Script id="ensure-adobeDataLayer">{` <Script id="ensure-adobeDataLayer">{`
window.adobeDataLayer = window.adobeDataLayer || [] window.adobeDataLayer = window.adobeDataLayer || []
`}</Script> `}</Script>
<meta name="version" content={env.VERSION} />
</head> </head>
<body className="scandic"> <body className="scandic">
<ClientIntlProvider <ClientIntlProvider

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

@@ -6,7 +6,6 @@ import "@scandic-hotels/design-system/style.css"
import Script from "next/script" import Script from "next/script"
import { Lang } from "@/constants/languages" import { Lang } from "@/constants/languages"
import { env } from "@/env/server"
import TrpcProvider from "@/lib/trpc/Provider" import TrpcProvider from "@/lib/trpc/Provider"
import { ToastHandler } from "@/components/TempDesignSystem/Toasts" import { ToastHandler } from "@/components/TempDesignSystem/Toasts"
@@ -44,7 +43,6 @@ export default async function RootLayout({
window.adobeDataLayer = window.adobeDataLayer || [] window.adobeDataLayer = window.adobeDataLayer || []
window.dataLayer = window.dataLayer || [] window.dataLayer = window.dataLayer || []
`}</Script> `}</Script>
<meta name="version" content={env.VERSION} />
</head> </head>
<body className={`scandic ${styles.layout}`}> <body className={`scandic ${styles.layout}`}>
<ClientIntlProvider <ClientIntlProvider

8
apps/scandic-web/app/api/web/trpc/[trpc]/route.ts
View File

@@ -1,6 +1,5 @@
import { fetchRequestHandler } from "@trpc/server/adapters/fetch" import { fetchRequestHandler } from "@trpc/server/adapters/fetch"
import { env } from "@/env/server"
import { appRouter } from "@/server" import { appRouter } from "@/server"
import { createContext } from "@/server/context" import { createContext } from "@/server/context"
@@ -10,13 +9,6 @@ async function handler(req: Request) {
endpoint: "/api/web/trpc", endpoint: "/api/web/trpc",
req, req,
router: appRouter, router: appRouter,
responseMeta({}) {
return {
headers: {
"x-version": env.VERSION,
},
}
},
}) })
} }

2
apps/scandic-web/app/sitemap/[sitemapId]/route.ts
View File

@@ -48,6 +48,6 @@ export async function GET(
const sitemapXML = `<?xml version="1.0" encoding="UTF-8"?>\n<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:xhtml="http://www.w3.org/1999/xhtml">${entries.join("")}\n</urlset>` const sitemapXML = `<?xml version="1.0" encoding="UTF-8"?>\n<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:xhtml="http://www.w3.org/1999/xhtml">${entries.join("")}\n</urlset>`
return new Response(sitemapXML, { return new Response(sitemapXML, {
headers: { "Content-Type": "text/xml", "X-Version": env.VERSION }, headers: { "Content-Type": "text/xml" },
}) })
} }

2
apps/scandic-web/app/sitemap/route.ts
View File

@@ -33,6 +33,6 @@ export async function GET() {
const sitemapIndexXML = `<?xml version="1.0" encoding="UTF-8"?>\n<sitemapindex xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">${urls.join("")}\n</sitemapindex>` const sitemapIndexXML = `<?xml version="1.0" encoding="UTF-8"?>\n<sitemapindex xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">${urls.join("")}\n</sitemapindex>`
return new Response(sitemapIndexXML, { return new Response(sitemapIndexXML, {
headers: { "Content-Type": "text/xml", "X-Version": env.VERSION }, headers: { "Content-Type": "text/xml" },
}) })
} }

4
apps/scandic-web/env/server.ts vendored
View File

@@ -303,10 +303,6 @@ export const env = {
..._env, ..._env,
NEW_SITE_LIVE_STATUS: getLiveStatus(_env), NEW_SITE_LIVE_STATUS: getLiveStatus(_env),
isLangLive: (lang: Lang) => isLangLive(lang, _env.NEW_SITE_LIVE_FOR_LANGS), isLangLive: (lang: Lang) => isLangLive(lang, _env.NEW_SITE_LIVE_FOR_LANGS),
VERSION:
process.env.NODE_ENV === "development"
? "development"
: (_env.GIT_SHA ?? "unknown"),
} as const } as const
function replaceTopLevelDomain(url: string, domain: string) { function replaceTopLevelDomain(url: string, domain: string) {