fix(prerender): add extension to pre-rendered queries (#1456)

nuxt · Sep 7, 2022 · 6c5350a · 6c5350a
1 parent ee3da84
commit 6c5350a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/runtime/composables/navigation.ts b/src/runtime/composables/navigation.ts
@@ -4,13 +4,13 @@ import type { NavItem, QueryBuilder, QueryBuilderParams } from '../types'
 import { jsonStringify } from '../utils/json'
 import { withContentBase } from './utils'
 
-export const fetchContentNavigation = (queryBuilder?: QueryBuilder | QueryBuilderParams) => {
+export const fetchContentNavigation = (queryBuilder?: QueryBuilder | QueryBuilderParams): Promise<Array<NavItem>> => {
   let params = queryBuilder
 
   // When params is an instance of QueryBuilder then we need to pick the params explicitly
   if (typeof params?.params === 'function') { params = params.params() }
 
-  const apiPath = withContentBase(params ? `/navigation/${hash(params)}` : '/navigation')
+  const apiPath = withContentBase(params ? `/navigation/${hash(params)}.json` : '/navigation')
 
   // Add `prefetch` to `<head>` in production
   if (!process.dev && process.server) {
@@ -21,7 +21,7 @@ export const fetchContentNavigation = (queryBuilder?: QueryBuilder | QueryBuilde
     })
   }
 
-  return $fetch<Array<NavItem>>(apiPath, {
+  return $fetch(apiPath, {
     method: 'GET',
     responseType: 'json',
     params: {

diff --git a/src/runtime/composables/query.ts b/src/runtime/composables/query.ts
@@ -24,7 +24,7 @@ export const createQueryFetch = <T = ParsedContent>(path?: string) => (query: Qu
 
   const params = query.params()
 
-  const apiPath = withContentBase(process.dev ? '/query' : `/query/${hash(params)}`)
+  const apiPath = withContentBase(process.dev ? '/query' : `/query/${hash(params)}.json`)
 
   // Prefetch the query
   if (!process.dev && process.server) {

diff --git a/src/runtime/utils/query.ts b/src/runtime/utils/query.ts
@@ -12,7 +12,7 @@ const parseQueryParams = (body: string) => {
 
 const memory = {}
 export const getContentQuery = (event: CompatibilityEvent): QueryBuilderParams => {
-  const { qid } = event.context.params
+  const qid = event.context.params.qid?.replace(/.json$/, '')
   const query: any = useQuery(event) || {}
 
   // Using /api/_content/query/:qid?_params=....