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

packages/trpc/lib/routers/contentstack/accountPage/query.ts

@@ -1,13 +1,13 @@
 import { createCounter } from "@scandic-hotels/common/telemetry"
-import { notFound } from "@scandic-hotels/trpc/errors"
-import { contentstackExtendedProcedureUID } from "@scandic-hotels/trpc/procedures"
 
 import { router } from "../../.."
+import { notFound } from "../../../errors"
 import {
   GetAccountPage,
   GetAccountPageRefs,
 } from "../../../graphql/Query/AccountPage/AccountPage.graphql"
 import { request } from "../../../graphql/request"
+import { contentstackExtendedProcedureUID } from "../../../procedures"
 import {
   generateRefsResponseTag,
   generateTag,

packages/trpc/lib/routers/contentstack/base/query.ts

@@ -1,10 +1,9 @@
 import { cache } from "react"
 
 import { createCounter } from "@scandic-hotels/common/telemetry"
-import { notFound } from "@scandic-hotels/trpc/errors"
-import { contentstackBaseProcedure } from "@scandic-hotels/trpc/procedures"
 
 import { router } from "../../.."
+import { notFound } from "../../../errors"
 import { GetContactConfig } from "../../../graphql/Query/ContactConfig.graphql"
 import {
   GetCurrentFooter,
@@ -22,6 +21,7 @@ import {
 } from "../../../graphql/Query/SiteConfig.graphql"
 // import { router } from "../../.."
 import { request } from "../../../graphql/request"
+import { contentstackBaseProcedure } from "../../../procedures"
 import { langInput } from "../../../utils"
 import {
   generateRefsResponseTag,

packages/trpc/lib/routers/contentstack/breadcrumbs/query.ts

@@ -1,11 +1,10 @@
 import { cache } from "react"
 
 import { createCounter } from "@scandic-hotels/common/telemetry"
-import { notFound } from "@scandic-hotels/trpc/errors"
-import { contentstackExtendedProcedureUID } from "@scandic-hotels/trpc/procedures"
 
 import { router } from "../../.."
 import { PageContentTypeEnum } from "../../../enums/contentType"
+import { notFound } from "../../../errors"
 import {
   GetMyPagesBreadcrumbs,
   GetMyPagesBreadcrumbsRefs,
@@ -47,6 +46,7 @@ import {
   GetLoyaltyPageBreadcrumbsRefs,
 } from "../../../graphql/Query/Breadcrumbs/LoyaltyPage.graphql"
 import { request } from "../../../graphql/request"
+import { contentstackExtendedProcedureUID } from "../../../procedures"
 import { generateRefsResponseTag } from "../../../utils/generateTag"
 import { breadcrumbsRefsSchema, breadcrumbsSchema } from "./output"
 import { getTags } from "./utils"

packages/trpc/lib/routers/contentstack/campaignOverviewPage/query.ts

@@ -1,14 +1,14 @@
 import { createCounter } from "@scandic-hotels/common/telemetry"
-import { router } from "@scandic-hotels/trpc"
-import { notFound } from "@scandic-hotels/trpc/errors"
-import { request } from "@scandic-hotels/trpc/graphql/request"
-import { contentStackUidWithServiceProcedure } from "@scandic-hotels/trpc/procedures"
-import { generateRefsResponseTag } from "@scandic-hotels/trpc/utils/generateTag"
 
+import { router } from "../../.."
+import { notFound } from "../../../errors"
 import {
   GetCampaignOverviewPage,
   GetCampaignOverviewPageRefs,
 } from "../../../graphql/Query/CampaignOverviewPage/CampaignOverviewPage.graphql"
+import { request } from "../../../graphql/request"
+import { contentStackUidWithServiceProcedure } from "../../../procedures"
+import { generateRefsResponseTag } from "../../../utils/generateTag"
 import {
   campaignOverviewPageRefsSchema,
   campaignOverviewPageSchema,

packages/trpc/lib/routers/contentstack/campaignOverviewPage/utils.ts

@@ -1,13 +1,10 @@
-import {
-  generateTag,
-  generateTagsFromSystem,
-} from "@scandic-hotels/trpc/utils/generateTag"
+import { generateTag, generateTagsFromSystem } from "../../../utils/generateTag"
 
 import { CampaignOverviewPageEnum } from "../../../types/campaignOverviewPageEnum"
 
 import type { Lang } from "@scandic-hotels/common/constants/language"
-import type { System } from "@scandic-hotels/trpc/routers/contentstack/schemas/system"
 
+import type { System } from "../../../routers/contentstack/schemas/system"
 import type { CampaignOverviewPageRefs } from "../../../types/campaignOverviewPage"
 
 export function generatePageTags(

packages/trpc/lib/routers/contentstack/campaignPage/query.ts

@@ -1,13 +1,13 @@
 import { createCounter } from "@scandic-hotels/common/telemetry"
-import { notFound } from "@scandic-hotels/trpc/errors"
-import { contentStackUidWithServiceProcedure } from "@scandic-hotels/trpc/procedures"
 
 import { router } from "../../.."
+import { notFound } from "../../../errors"
 import {
   GetCampaignPage,
   GetCampaignPageRefs,
 } from "../../../graphql/Query/CampaignPage/CampaignPage.graphql"
 import { request } from "../../../graphql/request"
+import { contentStackUidWithServiceProcedure } from "../../../procedures"
 import { generateRefsResponseTag } from "../../../utils/generateTag"
 import { campaignPageRefsSchema, campaignPageSchema } from "./output"
 import { generatePageTags } from "./utils"

packages/trpc/lib/routers/contentstack/collectionPage/query.ts

@@ -1,9 +1,9 @@
 import { createCounter } from "@scandic-hotels/common/telemetry"
-import { contentstackExtendedProcedureUID } from "@scandic-hotels/trpc/procedures"
 
 import { router } from "../../.."
 import { GetCollectionPage } from "../../../graphql/Query/CollectionPage/CollectionPage.graphql"
 import { request } from "../../../graphql/request"
+import { contentstackExtendedProcedureUID } from "../../../procedures"
 import { collectionPageSchema } from "./output"
 import {
   fetchCollectionPageRefs,

packages/trpc/lib/routers/contentstack/collectionPage/utils.ts

@@ -1,6 +1,6 @@
 import { createCounter } from "@scandic-hotels/common/telemetry"
-import { notFound } from "@scandic-hotels/trpc/errors"
 
+import { notFound } from "../../../errors"
 import { GetCollectionPageRefs } from "../../../graphql/Query/CollectionPage/CollectionPage.graphql"
 import { request } from "../../../graphql/request"
 import {

packages/trpc/lib/routers/contentstack/contentPage/query.ts

@@ -1,5 +1,4 @@
 import { createCounter } from "@scandic-hotels/common/telemetry"
-import { contentstackExtendedProcedureUID } from "@scandic-hotels/trpc/procedures"
 
 import { router } from "../../.."
 import { batchRequest } from "../../../graphql/batchRequest"
@@ -8,6 +7,7 @@ import {
   GetContentPageBlocksBatch1,
   GetContentPageBlocksBatch2,
 } from "../../../graphql/Query/ContentPage/ContentPage.graphql"
+import { contentstackExtendedProcedureUID } from "../../../procedures"
 import { contentPageSchema } from "./output"
 import { fetchContentPageRefs, generatePageTags } from "./utils"
 

packages/trpc/lib/routers/contentstack/contentPage/utils.ts

@@ -1,6 +1,6 @@
 import { createCounter } from "@scandic-hotels/common/telemetry"
-import { notFound } from "@scandic-hotels/trpc/errors"
 
+import { notFound } from "../../../errors"
 import { batchRequest } from "../../../graphql/batchRequest"
 import {
   GetContentPageBlocksRefs,

packages/trpc/lib/routers/contentstack/destinationCityPage/query.ts

@@ -1,13 +1,13 @@
 import { createCounter } from "@scandic-hotels/common/telemetry"
-import { notFound } from "@scandic-hotels/trpc/errors"
-import { contentStackUidWithServiceProcedure } from "@scandic-hotels/trpc/procedures"
 
 import { router } from "../../.."
+import { notFound } from "../../../errors"
 import {
   GetDestinationCityPage,
   GetDestinationCityPageRefs,
 } from "../../../graphql/Query/DestinationCityPage/DestinationCityPage.graphql"
 import { request } from "../../../graphql/request"
+import { contentStackUidWithServiceProcedure } from "../../../procedures"
 import { generateRefsResponseTag } from "../../../utils/generateTag"
 import { getCityByCityIdentifier } from "../../hotels/utils"
 import {

packages/trpc/lib/routers/contentstack/destinationCountryPage/query.ts

@@ -1,16 +1,16 @@
 import { createCounter } from "@scandic-hotels/common/telemetry"
-import { notFound } from "@scandic-hotels/trpc/errors"
-import {
-  contentStackBaseWithServiceProcedure,
-  contentstackExtendedProcedureUID,
-} from "@scandic-hotels/trpc/procedures"
 
 import { router } from "../../.."
+import { notFound } from "../../../errors"
 import {
   GetDestinationCountryPage,
   GetDestinationCountryPageRefs,
 } from "../../../graphql/Query/DestinationCountryPage/DestinationCountryPage.graphql"
 import { request } from "../../../graphql/request"
+import {
+  contentStackBaseWithServiceProcedure,
+  contentstackExtendedProcedureUID,
+} from "../../../procedures"
 import { ApiCountry } from "../../../types/country"
 import { generateRefsResponseTag } from "../../../utils/generateTag"
 import { getCityPagesInput } from "./input"

packages/trpc/lib/routers/contentstack/destinationOverviewPage/query.ts

@@ -1,18 +1,18 @@
 import { Lang } from "@scandic-hotels/common/constants/language"
 import { createCounter } from "@scandic-hotels/common/telemetry"
 import { safeTry } from "@scandic-hotels/common/utils/safeTry"
-import { notFound } from "@scandic-hotels/trpc/errors"
-import {
-  contentstackExtendedProcedureUID,
-  serviceProcedure,
-} from "@scandic-hotels/trpc/procedures"
 
 import { router } from "../../.."
+import { notFound } from "../../../errors"
 import {
   GetDestinationOverviewPage,
   GetDestinationOverviewPageRefs,
 } from "../../../graphql/Query/DestinationOverviewPage/DestinationOverviewPage.graphql"
 import { request } from "../../../graphql/request"
+import {
+  contentstackExtendedProcedureUID,
+  serviceProcedure,
+} from "../../../procedures"
 import { ApiCountry, type Country } from "../../../types/country"
 import {
   generateRefsResponseTag,

packages/trpc/lib/routers/contentstack/hotelPage/query.ts

@@ -1,10 +1,10 @@
 import { createCounter } from "@scandic-hotels/common/telemetry"
-import { notFound } from "@scandic-hotels/trpc/errors"
-import { contentstackExtendedProcedureUID } from "@scandic-hotels/trpc/procedures"
 
 import { router } from "../../.."
+import { notFound } from "../../../errors"
 import { GetHotelPage } from "../../../graphql/Query/HotelPage/HotelPage.graphql"
 import { request } from "../../../graphql/request"
+import { contentstackExtendedProcedureUID } from "../../../procedures"
 import { generateTag } from "../../../utils/generateTag"
 import { hotelPageSchema } from "./output"
 

packages/trpc/lib/routers/contentstack/languageSwitcher/query.ts

@@ -1,6 +1,5 @@
-import { publicProcedure } from "@scandic-hotels/trpc/procedures"
-
 import { router } from "../../.."
+import { publicProcedure } from "../../../procedures"
 import { getUidAndContentTypeByPath } from "../../../services/cms/getUidAndContentTypeByPath"
 import { getNonContentstackUrls } from "../metadata/output"
 import { getLanguageSwitcherInput } from "./input"

packages/trpc/lib/routers/contentstack/languageSwitcher/utils.ts

@@ -1,9 +1,9 @@
 import { Lang } from "@scandic-hotels/common/constants/language"
 import { createCounter } from "@scandic-hotels/common/telemetry"
 import { removeTrailingSlash } from "@scandic-hotels/common/utils/url"
-import { internalServerError } from "@scandic-hotels/trpc/errors"
 
 import { PageContentTypeEnum } from "../../../enums/contentType"
+import { internalServerError } from "../../../errors"
 import { batchRequest } from "../../../graphql/batchRequest"
 import {
   GetDaDeEnUrlsAccountPage,

packages/trpc/lib/routers/contentstack/loyaltyPage/query.ts

@@ -1,13 +1,13 @@
 import { createCounter } from "@scandic-hotels/common/telemetry"
-import { notFound } from "@scandic-hotels/trpc/errors"
-import { contentstackExtendedProcedureUID } from "@scandic-hotels/trpc/procedures"
 
 import { router } from "../../.."
+import { notFound } from "../../../errors"
 import {
   GetLoyaltyPage,
   GetLoyaltyPageRefs,
 } from "../../../graphql/Query/LoyaltyPage/LoyaltyPage.graphql"
 import { request } from "../../../graphql/request"
+import { contentstackExtendedProcedureUID } from "../../../procedures"
 import {
   generateRefsResponseTag,
   generateTag,

packages/trpc/lib/routers/contentstack/metadata/query.ts

@@ -1,11 +1,10 @@
 import { cache } from "react"
 
 import { createCounter } from "@scandic-hotels/common/telemetry"
-import { notFound } from "@scandic-hotels/trpc/errors"
-import { contentStackUidWithServiceProcedure } from "@scandic-hotels/trpc/procedures"
 
 import { router } from "../../.."
 import { PageContentTypeEnum } from "../../../enums/contentType"
+import { notFound } from "../../../errors"
 import { GetAccountPageMetadata } from "../../../graphql/Query/AccountPage/Metadata.graphql"
 import { GetCampaignOverviewPageMetadata } from "../../../graphql/Query/CampaignOverviewPage/Metadata.graphql"
 import { GetCampaignPageMetadata } from "../../../graphql/Query/CampaignPage/Metadata.graphql"
@@ -18,6 +17,7 @@ import { GetHotelPageMetadata } from "../../../graphql/Query/HotelPage/Metadata.
 import { GetLoyaltyPageMetadata } from "../../../graphql/Query/LoyaltyPage/Metadata.graphql"
 import { GetStartPageMetadata } from "../../../graphql/Query/StartPage/Metadata.graphql"
 import { request } from "../../../graphql/request"
+import { contentStackUidWithServiceProcedure } from "../../../procedures"
 import { generateTag } from "../../../utils/generateTag"
 import { getHotel } from "../../hotels/utils"
 import { getUrlsOfAllLanguages } from "../languageSwitcher/utils"

packages/trpc/lib/routers/contentstack/pageSettings/query.ts

@@ -1,7 +1,5 @@
 import * as Sentry from "@sentry/nextjs"
 
-import { contentstackBaseProcedure } from "@scandic-hotels/trpc/procedures"
-
 import { router } from "../../.."
 import { PageContentTypeEnum } from "../../../enums/contentType"
 import {
@@ -19,6 +17,7 @@ import {
   GetStartPageSettings,
 } from "../../../graphql/Query/PageSettings.graphql"
 import { request } from "../../../graphql/request"
+import { contentstackBaseProcedure } from "../../../procedures"
 import { langInput } from "../../../utils"
 import { generateTag } from "../../../utils/generateTag"
 import {

packages/trpc/lib/routers/contentstack/partner/query.ts

@@ -1,12 +1,12 @@
 import { cache } from "react"
 
 import { createCounter } from "@scandic-hotels/common/telemetry"
-import { notFound } from "@scandic-hotels/trpc/errors"
-import { contentstackBaseProcedure } from "@scandic-hotels/trpc/procedures"
 
 import { router } from "../../.."
+import { notFound } from "../../../errors"
 import { GetAllSasTierComparison } from "../../../graphql/Query/SASTierComparison.graphql"
 import { request } from "../../../graphql/request"
+import { contentstackBaseProcedure } from "../../../procedures"
 import { validateSasTierComparisonSchema } from "./output"
 
 import type { Lang } from "@scandic-hotels/common/constants/language"