feat(generate): use nitro header instead of header link (#1502)

Co-authored-by: Sébastien Chopin <seb@nuxtjs.com>
nuxt · Sep 6, 2022 · 96e3fcb · 96e3fcb
1 parent 3eba501
commit 96e3fcb
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 15 deletions.
diff --git a/src/runtime/composables/navigation.ts b/src/runtime/composables/navigation.ts
@@ -1,8 +1,8 @@
 import { hash } from 'ohash'
-import { useHead, useCookie } from '#app'
+import { useCookie } from '#app'
 import type { NavItem, QueryBuilder, QueryBuilderParams } from '../types'
 import { jsonStringify } from '../utils/json'
-import { withContentBase } from './utils'
+import { addPrerenderPath, withContentBase } from './utils'
 
 export const fetchContentNavigation = (queryBuilder?: QueryBuilder | QueryBuilderParams): Promise<Array<NavItem>> => {
   let params = queryBuilder
@@ -14,11 +14,7 @@ export const fetchContentNavigation = (queryBuilder?: QueryBuilder | QueryBuilde
 
   // Add `prefetch` to `<head>` in production
   if (!process.dev && process.server) {
-    useHead({
-      link: [
-        { rel: 'prefetch', href: apiPath }
-      ]
-    })
+    addPrerenderPath(apiPath)
   }
 
   return $fetch(apiPath, {

diff --git a/src/runtime/composables/query.ts b/src/runtime/composables/query.ts
@@ -1,10 +1,10 @@
 import { joinURL, withLeadingSlash, withoutTrailingSlash } from 'ufo'
 import { hash } from 'ohash'
-import { useHead, useCookie } from '#app'
+import { useCookie } from '#app'
 import { createQuery } from '../query/query'
 import type { ParsedContent, QueryBuilder, QueryBuilderParams } from '../types'
 import { jsonStringify } from '../utils/json'
-import { withContentBase } from './utils'
+import { addPrerenderPath, withContentBase } from './utils'
 
 /**
  * Query fetcher
@@ -28,11 +28,7 @@ export const createQueryFetch = <T = ParsedContent>(path?: string) => (query: Qu
 
   // Prefetch the query
   if (!process.dev && process.server) {
-    useHead({
-      link: [
-        { rel: 'prefetch', href: apiPath }
-      ]
-    })
+    addPrerenderPath(apiPath)
   }
 
   return $fetch(apiPath as any, {

diff --git a/src/runtime/composables/utils.ts b/src/runtime/composables/utils.ts
@@ -1,5 +1,5 @@
 import { withBase } from 'ufo'
-import { useRuntimeConfig } from '#app'
+import { useRuntimeConfig, useRequestEvent } from '#app'
 import { unwrap, flatUnwrap } from '../markdown-parser/utils/node'
 
 export const withContentBase = (url: string) => withBase(url, '/api/' + useRuntimeConfig().public.content.base)
@@ -19,3 +19,14 @@ export const useContentDisabled = () => {
   // Break app
   throw new Error('useContent is only accessible when you are using `documentDriven` mode.')
 }
+
+export const addPrerenderPath = (path: string) => {
+  const event = useRequestEvent()
+  event.res.setHeader(
+    'x-nitro-prerender',
+    [
+      event.res.getHeader('x-nitro-prerender'),
+      path
+    ].filter(Boolean).join(',')
+  )
+}