Skip to content

[pull] main from vuejs:main #192

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

Merged
pull merged 1 commit into from
Apr 14, 2026
Merged

[pull] main from vuejs:main #192

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions src/client/theme-default/components/VPContent.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang="ts">
import { resolveComponent } from 'vue'
import { resolveDynamicComponent } from 'vue'
import NotFound from '../NotFound.vue'
import { useData } from '../composables/data'
import { useLayout } from '../composables/layout'
Expand All @@ -10,9 +10,8 @@ import VPPage from './VPPage.vue'
const { page, frontmatter } = useData()
const { isHome, hasSidebar } = useLayout()

function resolveLayout(name: string) {
const component = resolveComponent(name)
return typeof component === 'string' ? null : component
function isRegistered(component: string): boolean {
return typeof resolveDynamicComponent(component) !== 'string'
}
</script>

Expand All @@ -24,12 +23,12 @@ function resolveLayout(name: string) {
>
<slot name="not-found" v-if="page.isNotFound"><NotFound /></slot>

<VPPage v-else-if="frontmatter.layout === 'page' && !resolveLayout('page')">
<VPPage v-else-if="frontmatter.layout === 'page' && !isRegistered('page')">
<template #page-top><slot name="page-top" /></template>
<template #page-bottom><slot name="page-bottom" /></template>
</VPPage>

<VPHome v-else-if="frontmatter.layout === 'home' && !resolveLayout('home')">
<VPHome v-else-if="frontmatter.layout === 'home' && !isRegistered('home')">
<template #home-hero-before><slot name="home-hero-before" /></template>
<template #home-hero-info-before><slot name="home-hero-info-before" /></template>
<template #home-hero-info><slot name="home-hero-info" /></template>
Expand All @@ -42,7 +41,7 @@ function resolveLayout(name: string) {
<template #home-features-after><slot name="home-features-after" /></template>
</VPHome>

<VPDoc v-else-if="(!frontmatter.layout || frontmatter.layout === 'doc') && !resolveLayout('doc')">
<VPDoc v-else-if="(!frontmatter.layout || frontmatter.layout === 'doc') && !isRegistered('doc')">
<template #doc-top><slot name="doc-top" /></template>
<template #doc-bottom><slot name="doc-bottom" /></template>

Expand Down
Loading