Merged in feat/sw-2863-move-contentstack-router-to-trpc-package (pull request #2389)

feat(SW-2863): Move contentstack router to trpc package

* Add exports to packages and lint rule to prevent relative imports

* Add env to trpc package

* Add eslint to trpc package

* Apply lint rules

* Use direct imports from trpc package

* Add lint-staged config to trpc

* Move lang enum to common

* Restructure trpc package folder structure

* WIP first step

* update internal imports in trpc

* Fix most errors in scandic-web

Just 100 left...

* Move Props type out of trpc

* Fix CategorizedFilters types

* Move more schemas in hotel router

* Fix deps

* fix getNonContentstackUrls

* Fix import error

* Fix entry error handling

* Fix generateMetadata metrics

* Fix alertType enum

* Fix duplicated types

* lint:fix

* Merge branch 'master' into feat/sw-2863-move-contentstack-router-to-trpc-package

* Fix broken imports

* Merge branch 'master' into feat/sw-2863-move-contentstack-router-to-trpc-package


Approved-by: Linus Flood

apps/scandic-web/middlewares/authRequired.ts

@@ -1,11 +1,12 @@
 import { type NextMiddleware, NextResponse } from "next/server"
 
+import { findLang } from "@scandic-hotels/common/utils/languages"
+
 import { authRequired, mfaRequired } from "@/constants/routes/authRequired"
 import { login } from "@/constants/routes/handleAuth"
 import { getInternalNextURL, getPublicNextURL } from "@/server/utils"
 
 import { auth } from "@/auth"
-import { findLang } from "@/utils/languages"
 
 import type { MiddlewareMatcher } from "@/types/middleware"
 

apps/scandic-web/middlewares/bookingFlow.ts

@@ -5,7 +5,7 @@ import { login } from "@/constants/routes/handleAuth"
 import { getPublicNextURL } from "@/server/utils"
 
 import { auth } from "@/auth"
-import { findLang } from "@/utils/languages"
+import { findLang } from "@scandic-hotels/common/utils/languages"
 import { isValidSession } from "@/utils/session"
 
 import { getDefaultRequestHeaders } from "./utils"

apps/scandic-web/middlewares/cmsContent.ts

@@ -1,13 +1,15 @@
 import { type NextMiddleware, NextResponse } from "next/server"
 
-import { getUidAndContentTypeByPath } from "@/services/cms/getUidAndContentTypeByPath"
-import { findLang } from "@/utils/languages"
-import { removeTrailingSlash } from "@/utils/url"
+import { findLang } from "@scandic-hotels/common/utils/languages"
+import { removeTrailingSlash } from "@scandic-hotels/common/utils/url"
+import { getUidAndContentTypeByPath } from "@scandic-hotels/trpc/cms/getUidAndContentTypeByPath"
+import { PageContentTypeEnum } from "@scandic-hotels/trpc/enums/contentType"
+
+import { internalServerError } from "@/server/errors/next"
 
 import { getDefaultRequestHeaders } from "./utils"
 
 import type { MiddlewareMatcher } from "@/types/middleware"
-import { PageContentTypeEnum } from "@/types/requests/contentType"
 
 export const middleware: NextMiddleware = async (request) => {
   const { nextUrl } = request
@@ -21,7 +23,11 @@ export const middleware: NextMiddleware = async (request) => {
     ? pathWithoutTrailingSlash.replace("/preview", "")
     : pathWithoutTrailingSlash
 
-  let { contentType, uid } = await getUidAndContentTypeByPath(incomingPathName)
+  let { contentType, uid, error } =
+    await getUidAndContentTypeByPath(incomingPathName)
+  if (error) {
+    throw internalServerError(error)
+  }
 
   const searchParams = new URLSearchParams(request.nextUrl.searchParams)
 

apps/scandic-web/middlewares/currentWebLogin.ts

@@ -2,7 +2,7 @@ import { type NextMiddleware, NextResponse } from "next/server"
 
 import { badRequest } from "@/server/errors/next"
 
-import { findLang } from "@/utils/languages"
+import { findLang } from "@scandic-hotels/common/utils/languages"
 
 import type { MiddlewareMatcher } from "@/types/middleware"
 

apps/scandic-web/middlewares/currentWebLoginEmail.ts

@@ -2,7 +2,7 @@ import { type NextMiddleware, NextResponse } from "next/server"
 
 import { badRequest } from "@/server/errors/next"
 
-import { findLang } from "@/utils/languages"
+import { findLang } from "@scandic-hotels/common/utils/languages"
 
 import type { MiddlewareMatcher } from "@/types/middleware"
 

apps/scandic-web/middlewares/currentWebLogout.ts

@@ -3,7 +3,7 @@ import { type NextMiddleware, NextResponse } from "next/server"
 import { badRequest } from "@/server/errors/next"
 import { getPublicURL } from "@/server/utils"
 
-import { findLang } from "@/utils/languages"
+import { findLang } from "@scandic-hotels/common/utils/languages"
 
 import type { MiddlewareMatcher } from "@/types/middleware"
 

apps/scandic-web/middlewares/familyAndFriends.ts

@@ -2,7 +2,7 @@ import { type NextMiddleware, NextResponse } from "next/server"
 
 import { getPublicNextURL } from "@/server/utils"
 
-import { findLang } from "@/utils/languages"
+import { findLang } from "@scandic-hotels/common/utils/languages"
 
 import { getDefaultRequestHeaders } from "./utils"
 

apps/scandic-web/middlewares/myPages.ts

@@ -1,17 +1,17 @@
 import { type NextMiddleware, NextResponse } from "next/server"
 
+import { findLang } from "@scandic-hotels/common/utils/languages"
+import { resolve as resolveEntry } from "@scandic-hotels/trpc/utils/entry"
+
 import {
   myPages,
   overview,
   profile,
   profileEdit,
 } from "@/constants/routes/myPages"
-import { notFound } from "@/server/errors/next"
+import { internalServerError, notFound } from "@/server/errors/next"
 import { getPublicNextURL } from "@/server/utils"
 
-import { resolve as resolveEntry } from "@/utils/entry"
-import { findLang } from "@/utils/languages"
-
 import { getDefaultRequestHeaders } from "./utils"
 
 import type { MiddlewareMatcher } from "@/types/middleware"
@@ -32,7 +32,13 @@ export const middleware: NextMiddleware = async (request) => {
   }
 
   const pathNameWithoutLang = nextUrl.pathname.replace(`/${lang}`, "")
-  const { uid, contentType } = await resolveEntry(pathNameWithoutLang, lang)
+  const { uid, contentType, error } = await resolveEntry(
+    pathNameWithoutLang,
+    lang
+  )
+  if (error) {
+    throw internalServerError(error)
+  }
   if (!uid || !contentType) {
     throw notFound(
       `Unable to resolve CMS entry for locale "${lang}": ${pathNameWithoutLang}`

apps/scandic-web/middlewares/redirect.ts

@@ -1,12 +1,11 @@
 import { type NextMiddleware, NextResponse } from "next/server"
 
 import { getCacheClient } from "@scandic-hotels/common/dataCache"
+import { findLang } from "@scandic-hotels/common/utils/languages"
 
 import { notFound } from "@/server/errors/next"
 import { getPublicNextURL } from "@/server/utils"
 
-import { findLang } from "@/utils/languages"
-
 import { getDefaultRequestHeaders } from "./utils"
 
 import type { Lang } from "@scandic-hotels/common/constants/language"

apps/scandic-web/middlewares/utils.ts

@@ -1,7 +1,7 @@
-import { getPublicNextURL } from "@/server/utils"
+import { findLang } from "@scandic-hotels/common/utils/languages"
+import { removeTrailingSlash } from "@scandic-hotels/common/utils/url"
 
-import { findLang } from "@/utils/languages"
-import { removeTrailingSlash } from "@/utils/url"
+import { getPublicNextURL } from "@/server/utils"
 
 import type { NextRequest } from "next/server"
 

apps/scandic-web/middlewares/webView.ts

@@ -1,5 +1,8 @@
 import { type NextMiddleware, NextResponse } from "next/server"
 
+import { findLang } from "@scandic-hotels/common/utils/languages"
+import { resolve as resolveEntry } from "@scandic-hotels/trpc/utils/entry"
+
 import {
   loyaltyPagesWebviews,
   myPagesWebviews,
@@ -8,11 +11,9 @@ import {
   webviews,
 } from "@/constants/routes/webviews"
 import { env } from "@/env/server"
-import { badRequest, notFound } from "@/server/errors/next"
+import { badRequest, internalServerError, notFound } from "@/server/errors/next"
 
 import { decryptData } from "@/utils/aes"
-import { resolve as resolveEntry } from "@/utils/entry"
-import { findLang } from "@/utils/languages"
 
 import { getDefaultRequestHeaders } from "./utils"
 
@@ -148,7 +149,11 @@ async function handleWebviewRewrite({
 
   const pathNameWithoutLang = path.replace(`/${lang}/webview`, "")
 
-  const { uid } = await resolveEntry(pathNameWithoutLang, lang)
+  const { uid, error } = await resolveEntry(pathNameWithoutLang, lang)
+  if (error) {
+    throw internalServerError(error)
+  }
+
   if (uid) {
     headers.set("x-uid", uid)
   }