simplify content api

nuxt · pi0 · Apr 20, 2021 · Apr 19, 2021 · Apr 19, 2021 · Apr 19, 2021
commit 13269ecc3b173d80a8b6e8afe45e907665a82e10
diff --git a/docs/app.vue b/docs/app.vue
@@ -38,9 +38,9 @@ import { useContent } from '~/modules/content/runtime'
 
 export default defineNuxtComponent({
   setup () {
-    useHead({ title: 'Nuxt Documentation' })
+    const { data: menu } = useContent('/menu.json')
 
-    const { data: menu } = useContent('/menu', 'json')
+    useHead({ title: 'Nuxt Documentation' })
 
     return {
       menu

diff --git a/docs/modules/content/runtime/api.ts b/docs/modules/content/runtime/api.ts
@@ -1,4 +1,3 @@
-import { useQuery } from 'h3'
 import unified from 'unified'
 import remarkParse from 'remark-parse'
 import remark2rehype from 'remark-rehype'
@@ -15,11 +14,11 @@ export default async (req) => {
     .use(rehypeDoc)
     .use(rehypeStringify)
 
-  const { slug, ext = 'md' } = useQuery(req)
+  const id = req.url
 
-  const data = await readAsset(`content${slug}.${ext}`) || `content not found: ${slug}.${ext}`
+  const data = await readAsset(`content${id}`) || `content not found: ${id}`
 
-  if (ext === 'md') {
+  if ((id as string).endsWith('.md')) {
     return {
       html: await markdown.process({ contents: data }).then(v => v.toString())
     }

diff --git a/docs/modules/content/runtime/index.ts b/docs/modules/content/runtime/index.ts
@@ -2,6 +2,6 @@ import { asyncData } from '@nuxt/app'
 
 export { default as NuxtContent } from './content.vue'
 
-export function useContent (slug, ext = 'md') {
-  return asyncData(`content:${slug}`, () => globalThis.$fetch(`/api/content?slug=${slug}&ext=${ext}`))
+export function useContent (slug) {
+  return asyncData(`content:${slug}`, () => globalThis.$fetch(`/api/content${slug}`))
 }
diff --git a/docs/pages/docs/[cat]/[slug].vue b/docs/pages/docs/[cat]/[slug].vue
@@ -10,7 +10,7 @@
 </template>
 
 <script>
-import { ref } from 'vue'
+import { computed } from 'vue'
 import { useRoute } from 'vue-router'
 import { defineNuxtComponent } from '@nuxt/app'
 import { useContent, NuxtContent } from '~/modules/content/runtime'
@@ -23,8 +23,7 @@ export default defineNuxtComponent({
     const route = useRoute()
 
     // Slug and page data
-    const slug = ref(route.fullPath)
-
+    const slug = computed(() => route.fullPath + '.md')
     const { data: content } = useContent(slug.value)
 
     return {