Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(document-driven): update documentDriven feature #1294

Merged
merged 3 commits into from
Jun 27, 2022
Merged

fix(document-driven): update documentDriven feature #1294

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c0abd76
fix(document-driven): update documentDriven feature
Tahul Jun 27, 2022
872b235
fix(surround): add surround queries to the fix
Tahul Jun 27, 2022
d851ac9
Merge branch 'main' into fix/document-driven
Tahul Jun 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 9 additions & 14 deletions src/runtime/plugins/documentDriven.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import type { RouteLocationNormalized, RouteLocationNormalizedLoaded } from 'vue-router'
// @ts-ignore
import { useRuntimeConfig, addRouteMiddleware } from '#app'
import { withoutTrailingSlash } from 'ufo'
import { NavItem, ParsedContent } from '../types'
// @ts-ignore
import { defineNuxtPlugin, queryContent, useContentHelpers, useContentState, fetchContentNavigation, useRoute } from '#imports'
Expand Down Expand Up @@ -60,7 +61,7 @@ export default defineNuxtPlugin((nuxt) => {
})
.catch((_) => {
// eslint-disable-next-line no-console
console.log('Could not fetch navigation!')
// console.log('Could not fetch navigation!')
})
}

Expand Down Expand Up @@ -94,7 +95,7 @@ export default defineNuxtPlugin((nuxt) => {

return queryContent(query)[type]().catch(() => {
// eslint-disable-next-line no-console
console.log(`Could not find globals key: ${key}`)
// console.log(`Could not find globals key: ${key}`)
})
}
)
Expand Down Expand Up @@ -128,11 +129,11 @@ export default defineNuxtPlugin((nuxt) => {
}

return queryContent()
.where({ _path: to.path })
.where({ _path: withoutTrailingSlash(to.path) })
.findOne()
.catch(() => {
// eslint-disable-next-line no-console
console.log(`Could not find page: ${to.path}`)
// console.log(`Could not find page: ${to.path}`)
})
}

Expand All @@ -156,10 +157,12 @@ export default defineNuxtPlugin((nuxt) => {
})
// Exclude `body` for `surround`
.without(['body'])
.findSurround(to.path)
.findSurround(
withoutTrailingSlash(to.path)
)
.catch(() => {
// eslint-disable-next-line no-console
console.log(`Could not find surrounding pages for: ${to.path}`)
// console.log(`Could not find surrounding pages for: ${to.path}`)
})
}

Expand All @@ -174,20 +177,14 @@ export default defineNuxtPlugin((nuxt) => {
]) => {
if (_navigation) {
navigation.value = _navigation
} else {
navigation.value = []
}

if (_globals) {
globals.value = _globals
} else {
globals.value = {}
}

if (_surround) {
surround.value = _surround
} else {
surround.value = []
}

if (_page) {
Expand All @@ -196,8 +193,6 @@ export default defineNuxtPlugin((nuxt) => {

// Update values
page.value = _page
} else {
page.value = undefined
}

// Find used layout
Expand Down