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
This commit is contained in:
@@ -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)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user