Merged in feat/use-hash-for-graphql-cache (pull request #2251)

Feature: Use hash of query+variables for graphql cache instead of gitsha

* feature: use a hash of query+variables as part of the cache key instead of gitsha

* .

* Merge branch 'master' of bitbucket.org:scandic-swap/web into feat/use-hash-for-graphql-cache

* use correct json stringify

* merge

* remove edgeRequest in favor of request

* add more indicative logging


Approved-by: Linus Flood

apps/scandic-web/middlewares/myPages.ts

@@ -9,7 +9,7 @@ import {
 import { notFound } from "@/server/errors/next"
 import { getPublicNextURL } from "@/server/utils"
 
-import { fetchAndCacheEntry } from "@/services/cms/fetchAndCacheEntry"
+import { resolve as resolveEntry } from "@/utils/entry"
 import { findLang } from "@/utils/languages"
 
 import { getDefaultRequestHeaders } from "./utils"
@@ -32,10 +32,7 @@ export const middleware: NextMiddleware = async (request) => {
   }
 
   const pathNameWithoutLang = nextUrl.pathname.replace(`/${lang}`, "")
-  const { uid, contentType } = await fetchAndCacheEntry(
-    pathNameWithoutLang,
-    lang
-  )
+  const { uid, contentType } = await resolveEntry(pathNameWithoutLang, lang)
   if (!uid || !contentType) {
     throw notFound(
       `Unable to resolve CMS entry for locale "${lang}": ${pathNameWithoutLang}`

apps/scandic-web/middlewares/webView.ts

@@ -10,8 +10,8 @@ import {
 import { env } from "@/env/server"
 import { badRequest, notFound } from "@/server/errors/next"
 
-import { fetchAndCacheEntry } from "@/services/cms/fetchAndCacheEntry"
 import { decryptData } from "@/utils/aes"
+import { resolve as resolveEntry } from "@/utils/entry"
 import { findLang } from "@/utils/languages"
 
 import { getDefaultRequestHeaders } from "./utils"
@@ -147,7 +147,7 @@ async function handleWebviewRewrite({
 
   const pathNameWithoutLang = path.replace(`/${lang}/webview`, "")
 
-  const { uid } = await fetchAndCacheEntry(pathNameWithoutLang, lang)
+  const { uid } = await resolveEntry(pathNameWithoutLang, lang)
   if (uid) {
     headers.set("x-uid", uid)
   }