fix(runtime): detect 404 api responses in SSG (#1608)

nuxt · Oct 19, 2022 · 4a79197 · 4a79197
1 parent 4e66f1e
commit 4a79197
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 4 deletions.
diff --git a/playground/basic/content/0.index.md b/playground/basic/content/0.index.md
@@ -6,4 +6,5 @@ title: Index
 
 - [Playground](/playground)
 - [Query Builder](/query-playground)
-- [Not found](/404)
+- [Custom 404 page](/404)
+- [Not Found Content](/not-found-content)
diff --git a/playground/basic/pages/[...slug].vue b/playground/basic/pages/[...slug].vue
@@ -1,6 +1,13 @@
 <template>
   <div class="content-page">
-    <ContentDoc />
+    <ContentDoc>
+      <template #not-found>
+        Back
+        <NuxtLink to="/">
+          Home page
+        </NuxtLink>
+      </template>
+    </ContentDoc>
   </div>
 </template>
 

diff --git a/src/runtime/composables/navigation.ts b/src/runtime/composables/navigation.ts
@@ -22,12 +22,20 @@ export const fetchContentNavigation = async (queryBuilder?: QueryBuilder | Query
     return generateNavigation(params || {})
   }
 
-  return $fetch(apiPath, {
+  const data = await $fetch(apiPath, {
     method: 'GET',
     responseType: 'json',
     params: {
       _params: jsonStringify(params || {}),
       previewToken: useCookie('previewToken').value
     }
   })
+
+  // On SSG, all url are redirected to `404.html` when not found, so we need to check the content type
+  // to know if the response is a valid JSON or not
+  if (typeof data === 'string' && data.startsWith('<!DOCTYPE html>')) {
+    throw new Error('Not found')
+  }
+
+  return data
 }
diff --git a/src/runtime/composables/query.ts b/src/runtime/composables/query.ts
@@ -36,14 +36,22 @@ export const createQueryFetch = <T = ParsedContent>(path?: string) => async (que
     return db.fetch(query)
   }
 
-  return $fetch(apiPath as any, {
+  const data = await $fetch(apiPath as any, {
     method: 'GET',
     responseType: 'json',
     params: {
       _params: jsonStringify(params),
       previewToken: useCookie('previewToken').value
     }
   })
+
+  // On SSG, all url are redirected to `404.html` when not found, so we need to check the content type
+  // to know if the response is a valid JSON or not
+  if (typeof data === 'string' && data.startsWith('<!DOCTYPE html>')) {
+    throw new Error('Not found')
+  }
+
+  return data
 }
 
 /**