Skip to content

Commit

Permalink
Revert "fix ? wrap transition into client only"
Browse files Browse the repository at this point in the history
This reverts commit 44e0750.
  • Loading branch information
logotip4ik committed Jan 4, 2024
1 parent 6f69fbc commit 16e2761
Showing 1 changed file with 21 additions and 23 deletions.
44 changes: 21 additions & 23 deletions packages/nuxt/src/pages/runtime/page.ts
Original file line number Diff line number Diff line change
Expand Up @@ -100,30 +100,28 @@ export default defineComponent({
{ onAfterLeave: () => { nuxtApp.callHook('page:transition:finish', routeProps.Component) } }
].filter(Boolean))

vnode = _wrapIf(ClientOnly, clientOnlyConfig,
_wrapIf(Transition, hasTransition && transitionProps,
wrapInKeepAlive(keepaliveConfig, h(Suspense, {
suspensible: true,
onPending: () => nuxtApp.callHook('page:start', routeProps.Component),
onResolve: () => { nextTick(() => nuxtApp.callHook('page:finish', routeProps.Component).then(() => nuxtApp.callHook('page:loading:end')).finally(done)) }
}, {
default: () => {
const providerVNode = h(RouteProvider, {
key: key || undefined,
vnode: routeProps.Component,
route: routeProps.route,
renderKey: key || undefined,
trackRootNodes: hasTransition,
vnodeRef: pageRef
})
if (import.meta.client && keepaliveConfig) {
(providerVNode.type as any).name = (routeProps.Component.type as any).name || (routeProps.Component.type as any).__name || 'RouteProvider'
}
return providerVNode
vnode = _wrapIf(Transition, hasTransition && transitionProps,
wrapInKeepAlive(keepaliveConfig, h(Suspense, {
suspensible: true,
onPending: () => nuxtApp.callHook('page:start', routeProps.Component),
onResolve: () => { nextTick(() => nuxtApp.callHook('page:finish', routeProps.Component).then(() => nuxtApp.callHook('page:loading:end')).finally(done)) }
}, {
default: () => {
const providerVNode = h(RouteProvider, {
key: key || undefined,
vnode: _wrapIf(ClientOnly, clientOnlyConfig, { default: () => routeProps.Component }).default(),
route: routeProps.route,
renderKey: key || undefined,
trackRootNodes: hasTransition,
vnodeRef: pageRef
})
if (import.meta.client && keepaliveConfig) {
(providerVNode.type as any).name = (routeProps.Component.type as any).name || (routeProps.Component.type as any).__name || 'RouteProvider'
}
})
))
).default()
return providerVNode
}
})
)).default()

return vnode
}
Expand Down

0 comments on commit 16e2761

Please sign in to comment.