From 6a56986c2a19323bfb9d95dc9278a1a7b5318a17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@nuxt.com>
Date: Wed, 20 Dec 2023 16:39:24 +0100
Subject: [PATCH] Revert "chore(perf): leverage ISR instead for query caching"

This reverts commit dee73c6795c685ec146a5692a6565439094196fd.
---
 src/runtime/server/api/navigation.ts | 7 +++++--
 src/runtime/server/api/query.ts      | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/runtime/server/api/navigation.ts b/src/runtime/server/api/navigation.ts
index b5c763435..30a5265ad 100644
--- a/src/runtime/server/api/navigation.ts
+++ b/src/runtime/server/api/navigation.ts
@@ -3,9 +3,9 @@ import { createNav } from '../navigation'
 import type { ParsedContent, ParsedContentMeta } from '../../types'
 import { getContentQuery } from '../../utils/query'
 import { isPreview } from '../preview'
-import { eventHandler } from '#imports'
+import { cachedEventHandler } from '#imports'
 
-export default eventHandler(async (event) => {
+export default cachedEventHandler(async (event) => {
   const query = getContentQuery(event)
 
   // Read from cache if not preview and there is no query
@@ -50,4 +50,7 @@ export default eventHandler(async (event) => {
   }, {} as Record<string, ParsedContentMeta>)
 
   return createNav((contents?.result || contents) as ParsedContentMeta[], configs)
+}, {
+  maxAge: 31536000,
+  shouldBypassCache: () => !!import.meta.dev
 })
diff --git a/src/runtime/server/api/query.ts b/src/runtime/server/api/query.ts
index 5842cc9f4..7de782a2f 100644
--- a/src/runtime/server/api/query.ts
+++ b/src/runtime/server/api/query.ts
@@ -1,9 +1,9 @@
 import { createError } from 'h3'
 import { serverQueryContent } from '../storage'
 import { getContentQuery } from '../../utils/query'
-import { useRuntimeConfig, eventHandler } from '#imports'
+import { useRuntimeConfig, cachedEventHandler } from '#imports'
 
-export default eventHandler(async (event) => {
+export default cachedEventHandler(async (event) => {
   const query = getContentQuery(event)
   const { advanceQuery } = useRuntimeConfig().public.content.experimental
 
@@ -39,4 +39,7 @@ export default eventHandler(async (event) => {
   }
 
   return serverQueryContent(event, query).find()
+}, {
+  maxAge: 31536000,
+  shouldBypassCache: () => !!import.meta.dev
 })