Merged in chore/cleanup-after-trpc-migration (pull request #2457)

Chore/cleanup after trpc migration

* Clean up TODOs

* Rename REDEMPTION constant to SEARCH_TYPE_REDEMPTION

* Update dependencies

Remove unused deps from scandic-web
Add missing deps to trpc package

* Update self-referencing imports

* Remove unused variables from scandic-web env

* Fix missing graphql-tag package

* Actually fix

* Remove unused env var


Approved-by: Christian Andolf
Approved-by: Linus Flood

apps/scandic-web/env/server.ts

@@ -1,8 +1,6 @@
 import { createEnv } from "@t3-oss/env-nextjs"
 import { z } from "zod"
 
-const TWENTYFOUR_HOURS = 24 * 60 * 60
-
 export const env = createEnv({
   /**
    * Due to t3-env only checking typeof window === "undefined"
@@ -21,14 +19,10 @@ export const env = createEnv({
       // transform to boolean
       .transform((s) => s === "true")
       .default("false"),
-    API_BASEURL: z.string(),
     BUILD_ID: z.string().default("64rYXBu8o2eHp0Jf"),
     CMS_ACCESS_TOKEN: z.string(),
     CMS_API_KEY: z.string(),
     CMS_ENVIRONMENT: z.enum(["development", "production", "stage", "test"]),
-    CMS_PREVIEW_TOKEN: z.string(),
-    CMS_PREVIEW_URL: z.string(),
-    CMS_URL: z.string(),
     CMS_BRANCH: z.enum(["development", "production"]),
     CURITY_CLIENT_ID_USER: z.string().default("scandichotels-web"),
     CURITY_CLIENT_ID_SERVICE: z.string().default("scandichotels-web-backend"),
@@ -49,15 +43,9 @@ export const env = createEnv({
     NEXTAUTH_URL: z.string().default(""),
     AUTH_URL: z.string().default(""),
     NODE_ENV: z.enum(["development", "test", "production"]),
-    PRINT_QUERY: z
-      .string()
-      .refine((s) => s === "true" || s === "false")
-      .transform((s) => s === "true")
-      .default("false"),
     PUBLIC_URL: z.string().default(""),
     REVALIDATE_SECRET: z.string(),
     SITEMAP_SYNC_SECRET: z.string(),
-    SALESFORCE_PREFERENCE_BASE_URL: z.string(),
     SEAMLESS_LOGIN_DA: z
       .string()
       .transform((s) => replaceTopLevelDomain(s, "dk")),
@@ -102,7 +90,6 @@ export const env = createEnv({
       .transform((s) => s === "true")
       .default("false"),
     WEBVIEW_ENCRYPTION_KEY: z.string(),
-    BOOKING_ENCRYPTION_KEY: z.string(),
     GOOGLE_STATIC_MAP_KEY: z.string(),
     GOOGLE_STATIC_MAP_SIGNATURE_SECRET: z.string(),
     GOOGLE_DYNAMIC_MAP_ID: z.string(),
@@ -139,9 +126,7 @@ export const env = createEnv({
     SENTRY_SERVER_SAMPLERATE: z.coerce.number().default(0.001),
 
     // TODO: remove defaults for SAS value when we know that netlify has 'room' for it
-    SAS_API_ENDPOINT: z.string().default(""),
     SAS_AUTH_ENDPOINT: z.string().default(""),
-    SAS_OCP_APIM: z.string().default(""),
     SAS_AUTH_CLIENTID: z.string().default(""),
     SAS_POINT_TRANSFER_ENABLED: z
       .string()
@@ -150,16 +135,6 @@ export const env = createEnv({
       // transform to boolean
       .transform((s) => s === "true")
       .default("false"),
-    CACHE_TIME_HOTELS: z.coerce
-      .number()
-      .default(TWENTYFOUR_HOURS)
-      .transform((val) =>
-        process.env.CMS_ENVIRONMENT === "test" ? 5 * 60 : val
-      ),
-    CACHE_TIME_CITY_SEARCH: z.coerce
-      .number()
-      .default(10 * 60)
-      .transform((val) => (process.env.CMS_ENVIRONMENT === "test" ? 60 : val)),
     REDIS_API_HOST: z.string().optional(),
     REDIS_API_KEY: z.string().optional(),
     BRANCH:
@@ -195,14 +170,10 @@ export const env = createEnv({
     ADOBE_SCRIPT_SRC: process.env.ADOBE_SCRIPT_SRC,
     ADOBE_SDK_SCRIPT_SRC: process.env.ADOBE_SDK_SCRIPT_SRC,
     ENABLE_GTMSCRIPT: process.env.ENABLE_GTMSCRIPT,
-    API_BASEURL: process.env.API_BASEURL,
     BUILD_ID: process.env.BUILD_ID,
     CMS_ACCESS_TOKEN: process.env.CMS_ACCESS_TOKEN,
     CMS_API_KEY: process.env.CMS_API_KEY,
     CMS_ENVIRONMENT: process.env.CMS_ENVIRONMENT,
-    CMS_PREVIEW_TOKEN: process.env.CMS_PREVIEW_TOKEN,
-    CMS_PREVIEW_URL: process.env.CMS_PREVIEW_URL,
-    CMS_URL: process.env.CMS_URL,
     CMS_BRANCH: process.env.CMS_BRANCH,
     CURITY_CLIENT_ID_USER: process.env.CURITY_CLIENT_ID_USER,
     CURITY_CLIENT_ID_SERVICE: process.env.CURITY_CLIENT_ID_SERVICE,
@@ -218,11 +189,9 @@ export const env = createEnv({
     NEXTAUTH_URL: process.env.NEXTAUTH_URL,
     AUTH_URL: process.env.AUTH_URL,
     NODE_ENV: process.env.NODE_ENV,
-    PRINT_QUERY: process.env.PRINT_QUERY,
     PUBLIC_URL: process.env.NEXT_PUBLIC_PUBLIC_URL,
     REVALIDATE_SECRET: process.env.REVALIDATE_SECRET,
     SITEMAP_SYNC_SECRET: process.env.SITEMAP_SYNC_SECRET,
-    SALESFORCE_PREFERENCE_BASE_URL: process.env.SALESFORCE_PREFERENCE_BASE_URL,
     SEAMLESS_LOGIN_DA:
       process.env.SEAMLESS_LOGIN || process.env.SEAMLESS_LOGIN_DA,
     SEAMLESS_LOGIN_DE:
@@ -249,7 +218,6 @@ export const env = createEnv({
       process.env.SEAMLESS_LOGOUT || process.env.SEAMLESS_LOGOUT_SV,
     SHOW_SIGNUP_FLOW: process.env.SHOW_SIGNUP_FLOW,
     WEBVIEW_ENCRYPTION_KEY: process.env.WEBVIEW_ENCRYPTION_KEY,
-    BOOKING_ENCRYPTION_KEY: process.env.BOOKING_ENCRYPTION_KEY,
     GOOGLE_STATIC_MAP_KEY: process.env.GOOGLE_STATIC_MAP_KEY,
     GOOGLE_STATIC_MAP_SIGNATURE_SECRET:
       process.env.GOOGLE_STATIC_MAP_SIGNATURE_SECRET,
@@ -262,15 +230,10 @@ export const env = createEnv({
     SENTRY_ENVIRONMENT: process.env.NEXT_PUBLIC_SENTRY_ENVIRONMENT,
     SENTRY_SERVER_SAMPLERATE: process.env.SENTRY_SERVER_SAMPLERATE,
 
-    SAS_API_ENDPOINT: process.env.SAS_API_ENDPOINT,
     SAS_AUTH_ENDPOINT: process.env.SAS_AUTH_ENDPOINT,
-    SAS_OCP_APIM: process.env.SAS_OCP_APIM,
     SAS_AUTH_CLIENTID: process.env.SAS_AUTH_CLIENTID,
     SAS_POINT_TRANSFER_ENABLED: process.env.SAS_POINT_TRANSFER_ENABLED,
 
-    CACHE_TIME_HOTELS: process.env.CACHE_TIME_HOTELS,
-    CACHE_TIME_CITY_SEARCH: process.env.CACHE_TIME_CITY_SEARCH,
-
     REDIS_API_HOST: process.env.REDIS_API_HOST,
     REDIS_API_KEY: process.env.REDIS_API_KEY,
     BRANCH: process.env.BRANCH,