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
This commit is contained in:
@@ -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 || []
|
||||
`}</Script>
|
||||
<meta name="version" content={env.VERSION} />
|
||||
</head>
|
||||
<body className="scandic">
|
||||
<div className="root">
|
||||
|
||||
@@ -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 || {}
|
||||
`}</Script>
|
||||
<AdobeScript />
|
||||
<meta name="version" content={env.VERSION} />
|
||||
</head>
|
||||
<body className="theme-00Corecolours theme-X0Oldcorecolours">
|
||||
<LangPopup />
|
||||
|
||||
@@ -51,6 +51,7 @@ export default async function RootLayout({
|
||||
<Script id="ensure-adobeDataLayer">{`
|
||||
window.adobeDataLayer = window.adobeDataLayer || []
|
||||
`}</Script>
|
||||
<meta name="version" content={env.VERSION} />
|
||||
</head>
|
||||
<body className="scandic">
|
||||
<ClientIntlProvider
|
||||
|
||||
@@ -6,6 +6,7 @@ import "@scandic-hotels/design-system/style.css"
|
||||
import Script from "next/script"
|
||||
|
||||
import { Lang } from "@/constants/languages"
|
||||
import { env } from "@/env/server"
|
||||
import TrpcProvider from "@/lib/trpc/Provider"
|
||||
|
||||
import { ToastHandler } from "@/components/TempDesignSystem/Toasts"
|
||||
@@ -43,6 +44,7 @@ export default async function RootLayout({
|
||||
window.adobeDataLayer = window.adobeDataLayer || []
|
||||
window.dataLayer = window.dataLayer || []
|
||||
`}</Script>
|
||||
<meta name="version" content={env.VERSION} />
|
||||
</head>
|
||||
<body className={`scandic ${styles.layout}`}>
|
||||
<ClientIntlProvider
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import { fetchRequestHandler } from "@trpc/server/adapters/fetch"
|
||||
|
||||
import { env } from "@/env/server"
|
||||
import { appRouter } from "@/server"
|
||||
import { createContext } from "@/server/context"
|
||||
|
||||
@@ -9,6 +10,13 @@ async function handler(req: Request) {
|
||||
endpoint: "/api/web/trpc",
|
||||
req,
|
||||
router: appRouter,
|
||||
responseMeta({}) {
|
||||
return {
|
||||
headers: {
|
||||
"x-version": env.VERSION,
|
||||
},
|
||||
}
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
@@ -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>`
|
||||
|
||||
return new Response(sitemapXML, {
|
||||
headers: { "Content-Type": "text/xml" },
|
||||
headers: { "Content-Type": "text/xml", "X-Version": env.VERSION },
|
||||
})
|
||||
}
|
||||
|
||||
@@ -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>`
|
||||
|
||||
return new Response(sitemapIndexXML, {
|
||||
headers: { "Content-Type": "text/xml" },
|
||||
headers: { "Content-Type": "text/xml", "X-Version": env.VERSION },
|
||||
})
|
||||
}
|
||||
|
||||
4
apps/scandic-web/env/server.ts
vendored
4
apps/scandic-web/env/server.ts
vendored
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user