diff --git a/renderer/app.ts b/renderer/app.ts index 0680983..8175dc4 100644 --- a/renderer/app.ts +++ b/renderer/app.ts @@ -48,7 +48,7 @@ function createApp(pageContext: VikePageContext & PageContext, isClient = true) objectAssign(app, { changePage: (pageContext: VikePageContext & PageContext) => { - Object.assign(pageContextReactive, reactive(pageContext)) + Object.assign(pageContextReactive, pageContext) rootComponent.Page = markRaw(pageContext.Page) rootComponent.pageProps = markRaw(pageContext.pageProps || {}) }, diff --git a/src/pages/app/index.page.route.ts b/src/pages/app/index.page.route.ts index 77cea0f..a73deee 100644 --- a/src/pages/app/index.page.route.ts +++ b/src/pages/app/index.page.route.ts @@ -10,8 +10,8 @@ export default (pageContext: PageContext) => { } } - const result = resolveRoute('/app/@id', pageContext.urlPathname) - if (!['inc', 'reset'].includes(result.routeParams.id)) { + const result = resolveRoute('/app/@page', pageContext.urlPathname) + if (!['inc', 'reset'].includes(result.routeParams.page)) { return false } return result diff --git a/src/pages/app/index.page.server.ts b/src/pages/app/index.page.server.ts new file mode 100644 index 0000000..e1729b7 --- /dev/null +++ b/src/pages/app/index.page.server.ts @@ -0,0 +1,13 @@ +import type { PageContextBuiltInServer } from 'vike/types' + +export { onBeforeRender } + +async function onBeforeRender(pageContext: PageContextBuiltInServer) { + const { page } = pageContext.routeParams + const pageProps = { page } + return { + pageContext: { + pageProps, + }, + } +} diff --git a/src/pages/app/index.page.vue b/src/pages/app/index.page.vue index 9de6e38..de2ec8b 100644 --- a/src/pages/app/index.page.vue +++ b/src/pages/app/index.page.vue @@ -6,7 +6,6 @@ - @@ -31,18 +30,9 @@