diff --git a/examples/vue-pinia/layouts/LayoutDefault.vue b/examples/vue-pinia/layouts/LayoutDefault.vue
index 0e88a0c4..17e26bbc 100644
--- a/examples/vue-pinia/layouts/LayoutDefault.vue
+++ b/examples/vue-pinia/layouts/LayoutDefault.vue
@@ -45,10 +45,6 @@ a {
   line-height: 1.8em;
   border-right: 2px solid #eee;
 }
-.logo {
-  margin-top: 20px;
-  margin-bottom: 10px;
-}
 .content {
   transition: opacity 0.1s ease-in;
 }
diff --git a/examples/vue-query/.test.ts b/examples/vue-query/.test.ts
index f4094c1b..ff9b5594 100644
--- a/examples/vue-query/.test.ts
+++ b/examples/vue-query/.test.ts
@@ -1,33 +1,44 @@
-import { test, expect, run, fetchHtml, page, getServerUrl } from '@brillout/test-e2e'
+import { test, expect, run, fetchHtml, page, getServerUrl, autoRetry } from '@brillout/test-e2e'
 
 runTest()
 
+const fetchedText = 'A New Hope'
+const url = '/'
+
 function runTest() {
   run('pnpm run dev')
 
-  const textLandingPage = 'A New Hope'
-  const title = 'Star Wars Movies'
-  testUrl({
-    url: '/',
-    title,
-    text: textLandingPage,
-  })
-}
-
-function testUrl({ url, title, text }: { url: string; title: string; text: string }) {
-  test(url + ' (HTML)', async () => {
+  test('HTML', async () => {
     const html = await fetchHtml(url)
-    expect(html).toContain(text)
-    expect(getTitle(html)).toBe(title)
+    expect(html).toContain(fetchedText)
   })
-  test(url + ' (Hydration)', async () => {
+
+  test('Hydration', async () => {
     await page.goto(getServerUrl() + url)
-    const body = await page.textContent('body')
-    expect(body).toContain(text)
+    await testDOM()
   })
+
+  test('Navigation', async () => {
+    await page.click('a[href="/about"]')
+    await page.click('a[href="/"]')
+    await testDOM()
+  })
+}
+
+async function testDOM() {
+  await testCounter()
+  const body = await page.textContent('body')
+  expect(body).toContain(fetchedText)
 }
 
-function getTitle(html: string) {
-  const title = html.match(/<title>(.*?)<\/title>/i)?.[1]
-  return title
+async function testCounter() {
+  // autoRetry() for awaiting client-side code loading & executing
+  await autoRetry(
+    async () => {
+      expect(await page.textContent('button')).toBe('Counter 0')
+      await page.click('button')
+      expect(await page.textContent('button')).toContain('Counter 1')
+    },
+    { timeout: 5 * 1000 },
+  )
 }
diff --git a/examples/vue-query/assets/logo.svg b/examples/vue-query/assets/logo.svg
deleted file mode 100644
index 94d3caa0..00000000
--- a/examples/vue-query/assets/logo.svg
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="175" height="175" fill="none" version="1.1" viewBox="0 0 175 175" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
- <metadata>
-  <rdf:RDF>
-   <cc:Work rdf:about="">
-    <dc:format>image/svg+xml</dc:format>
-    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-    <dc:title/>
-   </cc:Work>
-  </rdf:RDF>
- </metadata>
- <defs>
-  <linearGradient id="linearGradient880" x1="108.64" x2="115.51" y1="88.726" y2="136.2" gradientTransform="matrix(1.0498 0 0 1.0498 -2.9171 -2.9658)" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#ffea83" offset="0"/>
-   <stop stop-color="#FFDD35" offset=".083333"/>
-   <stop stop-color="#FFA800" offset="1"/>
-  </linearGradient>
-  <linearGradient id="paint2_linear" x1="48.975" x2="61.299" y1="3.9232" y2="158.04" gradientTransform="translate(-2.832e-5)" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#FFEA83" offset="0"/>
-   <stop stop-color="#FFDD35" offset=".083333"/>
-   <stop stop-color="#FFA800" offset="1"/>
-  </linearGradient>
-  <linearGradient id="paint0_linear-6" x1="-1.4492" x2="116.62" y1="-5.8123" y2="137.08" gradientTransform="translate(-2.832e-5)" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#41D1FF" offset="0"/>
-   <stop stop-color="#BD34FE" offset="1"/>
-  </linearGradient>
- </defs>
- <circle cx="87.5" cy="87.5" r="87.5" fill="#c4c4c4"/>
- <circle cx="87.5" cy="87.5" r="87.5" fill="url(#paint0_linear-6)"/>
- <g transform="translate(632.92 54.355)" fill="#d38787" stroke-width="1.0614">
-  <path d="m-549.75 68.457c-5.7533-3.1217-6.1166-5.2295-6.1166-35.489 0-30.458 0.35464-32.448 6.3339-35.54 3.9943-2.0655 24.279-2.2805 26.735-0.28333 0.89718 0.72974 6.7203 6.6637 12.94 13.187l11.309 11.86v19.575c0 18.473-0.12956 19.74-2.3011 22.5-4.0223 5.1136-7.558 5.8565-27.65 5.8099-14.15-0.03287-19.008-0.40294-21.25-1.6191zm42.473-6.3594c2.27-1.59 2.359-2.2909 2.359-18.575v-16.923h-6.9521c-12.443 0-16.4-4.0845-16.4-16.93v-7.4828h-8.9464c-6.7178 0-9.3619 0.41549-10.614 1.668-2.5031 2.5031-2.5031 55.724 0 58.228 2.4502 2.4502 37.058 2.4636 40.553 0.01609zm-1.8867-42.165c0-0.16422-2.8659-3.1346-6.3686-6.6008l-6.3686-6.3022v4.9328c0 6.3185 1.8955 8.2687 8.0366 8.2687 2.5854 0 4.7007-0.13434 4.7007-0.29859zm-57.57 44.279c-5.6185-3.0486-6.1166-5.593-6.1166-31.243 0-18.891 0.31331-24.063 1.6101-26.571 1.809-3.4981 6.5048-6.3339 10.489-6.3339 2.4847 0 2.5814 0.19984 1.541 3.1843-0.61054 1.7514-1.7457 3.1843-2.5226 3.1843-0.77686 0-2.1631 0.75059-3.0805 1.668-2.4923 2.4923-2.4923 47.244 0 49.736 0.91739 0.9174 2.3036 1.668 3.0805 1.668 0.77688 0 1.912 1.4329 2.5226 3.1843 1.0562 3.0298 0.97108 3.1822-1.7537 3.1418-1.575-0.02331-4.1713-0.75194-5.7694-1.6191zm-16.983-4.2458c-5.4392-2.9512-6.1166-5.9415-6.1166-26.997 0-15.096 0.345-19.878 1.6101-22.325 1.7476-3.3796 6.4758-6.3339 10.137-6.3339 1.8666 0 2.1789 0.44955 1.6594 2.3882-0.35184 1.3135-0.64655 2.7465-0.65453 3.1843-8e-3 0.43784-0.69682 0.79608-1.5308 0.79608-0.83399 0-2.2669 0.75059-3.1843 1.668-2.4767 2.4767-2.4767 38.768 0 41.244 0.91741 0.91739 2.2946 1.668 3.0605 1.668 1.196 0 2.6402 2.995 2.6871 5.5726 0.0241 1.3294-4.5804 0.80962-7.6676-0.8655z" style="mix-blend-mode:lighten"/>
-  <path d="m-552.2 68.911c-5.7533-3.1217-6.1166-5.2295-6.1166-35.489 0-30.458 0.35463-32.448 6.3339-35.54 3.9943-2.0655 24.279-2.2805 26.735-0.28333 0.89718 0.72974 6.7203 6.6637 12.94 13.187l11.309 11.86v19.575c0 18.473-0.12957 19.74-2.3011 22.5-4.0223 5.1136-7.558 5.8565-27.65 5.8099-14.15-0.03287-19.008-0.40294-21.25-1.6191zm42.473-6.3594c2.27-1.59 2.359-2.2909 2.359-18.575v-16.923h-6.952c-12.443 0-16.4-4.0845-16.4-16.93v-7.4828h-8.9464c-6.7179 0-9.3619 0.41549-10.614 1.668-2.5031 2.5031-2.5031 55.724 0 58.228 2.4502 2.4502 37.058 2.4636 40.553 0.01609zm-1.8867-42.165c0-0.16422-2.8659-3.1346-6.3686-6.6008l-6.3686-6.3022v4.9328c0 6.3185 1.8955 8.2688 8.0366 8.2688 2.5854 0 4.7007-0.13434 4.7007-0.29859zm-57.57 44.279c-5.6185-3.0486-6.1166-5.593-6.1166-31.243 0-18.891 0.31331-24.063 1.6101-26.571 1.809-3.4981 6.5048-6.3339 10.489-6.3339 2.4847 0 2.5814 0.19984 1.541 3.1843-0.61054 1.7514-1.7457 3.1843-2.5226 3.1843-0.77687 0-2.1631 0.75059-3.0805 1.668-2.4923 2.4923-2.4923 47.244 0 49.736 0.91741 0.91739 2.3036 1.668 3.0805 1.668 0.77686 0 1.912 1.4329 2.5226 3.1843 1.0562 3.0298 0.97107 3.1822-1.7537 3.1418-1.575-0.02331-4.1713-0.75194-5.7694-1.6191zm-16.983-4.2458c-5.4392-2.9512-6.1166-5.9415-6.1166-26.997 0-15.096 0.34502-19.878 1.6101-22.325 1.7476-3.3796 6.4758-6.3339 10.137-6.3339 1.8666 0 2.1789 0.44955 1.6594 2.3882-0.35182 1.3135-0.64653 2.7465-0.65452 3.1843-8e-3 0.43784-0.69683 0.79608-1.5308 0.79608-0.83397 0-2.2669 0.75059-3.1843 1.668-2.4767 2.4767-2.4767 38.768 0 41.245 0.9174 0.91739 2.2946 1.668 3.0605 1.668 1.196 0 2.6402 2.995 2.6871 5.5726 0.0241 1.3294-4.5804 0.80962-7.6676-0.8655z" fill-opacity=".47466" style="mix-blend-mode:lighten"/>
- </g>
- <path d="m128.48 88.913-24.027 4.6784c-0.39475 0.07685-0.68766 0.40944-0.71076 0.80849l-1.4782 24.805c-0.0347 0.58371 0.50497 1.0372 1.0792 0.90602l6.6886-1.5338c0.62676-0.14383 1.1916 0.40419 1.0635 1.0299l-1.9874 9.6702c-0.13438 0.65091 0.48084 1.2073 1.1202 1.0142l4.1322-1.2472c0.64041-0.19317 1.2556 0.36535 1.1202 1.0162l-3.158 15.191c-0.19842 0.95011 1.074 1.4677 1.6042 0.653l0.35485-0.54382 19.578-38.827c0.32755-0.64985-0.23727-1.391-0.95641-1.2535l-6.8849 1.3207c-0.6467 0.12389-1.1979-0.47453-1.0152-1.1034l4.4944-15.482c0.18266-0.63012-0.36955-1.2295-1.0173-1.1034z" fill="url(#linearGradient880)" stroke-width="1.0498"/>
- <rect x="3" y="3" width="169" height="169" rx="84.5" stroke="url(#paint2_linear)" stroke-width="6" style="mix-blend-mode:soft-light"/>
-</svg>
diff --git a/examples/vue-query/layouts/HeadDefault.vue b/examples/vue-query/layouts/HeadDefault.vue
deleted file mode 100644
index c06f9223..00000000
--- a/examples/vue-query/layouts/HeadDefault.vue
+++ /dev/null
@@ -1,8 +0,0 @@
-<template>
-  <meta name="description" content="Demo showcasing Vike + Vue + Pinia" />
-  <link rel="icon" :href="logoUrl" />
-</template>
-
-<script lang="ts" setup>
-import logoUrl from '../assets/logo.svg'
-</script>
diff --git a/examples/vue-query/layouts/LayoutDefault.vue b/examples/vue-query/layouts/LayoutDefault.vue
index 60c78c44..17e26bbc 100644
--- a/examples/vue-query/layouts/LayoutDefault.vue
+++ b/examples/vue-query/layouts/LayoutDefault.vue
@@ -1,10 +1,8 @@
 <template>
   <div class="layout">
     <div class="navigation">
-      <a href="/" class="logo">
-        <img src="../assets/logo.svg" height="64" width="64" />
-      </a>
       <Link href="/">Welcome</Link>
+      <Link href="/about">About</Link>
     </div>
     <div class="content"><slot /></div>
   </div>
@@ -47,10 +45,6 @@ a {
   line-height: 1.8em;
   border-right: 2px solid #eee;
 }
-.logo {
-  margin-top: 20px;
-  margin-bottom: 10px;
-}
 .content {
   transition: opacity 0.1s ease-in;
 }
diff --git a/examples/vue-query/package.json b/examples/vue-query/package.json
index 1e6b76b6..3bb445b6 100644
--- a/examples/vue-query/package.json
+++ b/examples/vue-query/package.json
@@ -9,15 +9,13 @@
     "@types/node-fetch": "^2.6.11",
     "@tanstack/vue-query": "^5.0.0",
     "node-fetch": "^3.3.2",
+    "typescript": "5.4.5",
     "vike": "^0.4.195",
     "vike-vue-query": "^0.1.2",
     "vike-vue": "^0.8.4",
     "vite": "^5.4.0",
-    "vue": "^3.4.36"
-  },
-  "type": "module",
-  "devDependencies": {
-    "typescript": "5.4.5",
+    "vue": "^3.4.36",
     "vue-tsc": "^1.8.27"
-  }
+  },
+  "type": "module"
 }
diff --git a/examples/vue-query/pages/+config.ts b/examples/vue-query/pages/+config.ts
index d1df26d8..9cdf0db7 100644
--- a/examples/vue-query/pages/+config.ts
+++ b/examples/vue-query/pages/+config.ts
@@ -1,15 +1,9 @@
 import type { Config } from 'vike/types'
 import Layout from '../layouts/LayoutDefault.vue'
-import Head from '../layouts/HeadDefault.vue'
 import vikeVue from 'vike-vue/config'
 import vikeVueQuery from 'vike-vue-query/config'
 
-// Default configs (can be overridden by pages)
 export default {
   Layout,
-  Head,
-  // <title>
-  title: 'My Vike + Vue + TanStack Query App',
-
   extends: [vikeVue, vikeVueQuery],
 } satisfies Config
diff --git a/examples/vue-query/pages/+queryClientConfig.ts b/examples/vue-query/pages/+queryClientConfig.ts
index 2792d3d8..3dada269 100644
--- a/examples/vue-query/pages/+queryClientConfig.ts
+++ b/examples/vue-query/pages/+queryClientConfig.ts
@@ -1,3 +1,5 @@
+export { queryClientConfig }
+
 import type { QueryClientConfig } from '@tanstack/vue-query'
 
 // set query client options - e.g. not refetching when window loses or gains focus during development
@@ -8,5 +10,3 @@ const queryClientConfig: QueryClientConfig = {
     },
   },
 }
-
-export default queryClientConfig
diff --git a/examples/vue-query/pages/_error/+Page.vue b/examples/vue-query/pages/_error/+Page.vue
deleted file mode 100644
index ae13b3f2..00000000
--- a/examples/vue-query/pages/_error/+Page.vue
+++ /dev/null
@@ -1,25 +0,0 @@
-<template>
-  <div class="center">
-    <p>{{ abortReason }}</p>
-  </div>
-</template>
-
-<script lang="ts" setup>
-import { usePageContext } from 'vike-vue/usePageContext'
-
-const ctx = usePageContext()
-let { is404, abortReason } = ctx
-if (!abortReason) {
-  abortReason = is404 ? 'Page not found.' : 'Something went wrong.'
-}
-</script>
-
-<style>
-.center {
-  height: calc(100vh - 100px);
-  display: flex;
-  font-size: 1.3em;
-  justify-content: center;
-  align-items: center;
-}
-</style>
diff --git a/examples/vue-query/pages/about/+Page.vue b/examples/vue-query/pages/about/+Page.vue
new file mode 100644
index 00000000..f957b96f
--- /dev/null
+++ b/examples/vue-query/pages/about/+Page.vue
@@ -0,0 +1,4 @@
+<template>
+  <h1>About</h1>
+  <p>Example of using TanStack Query.</p>
+</template>
diff --git a/examples/vue-query/pages/index/+Page.vue b/examples/vue-query/pages/index/+Page.vue
index 05895751..efaa30f7 100644
--- a/examples/vue-query/pages/index/+Page.vue
+++ b/examples/vue-query/pages/index/+Page.vue
@@ -14,12 +14,6 @@
     </template>
   </ol>
   <p>Source: <a href="https://brillout.github.io/star-wars">brillout.github.io/star-wars</a>.</p>
-  <p>
-    While initial data is fetched on the server, the client will refresh after rendering.<br>
-    <code>
-      Refreshing: {{ isFetching ? 'Yes' : 'No' }}
-    </code>
-  </p>
   <p>
   This page is:
   </p>
diff --git a/examples/vue-query/pages/index/+title.ts b/examples/vue-query/pages/index/+title.ts
deleted file mode 100644
index 8eeb1024..00000000
--- a/examples/vue-query/pages/index/+title.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const title = 'Star Wars Movies'
diff --git a/examples/vue-query/vite.config.ts b/examples/vue-query/vite.config.ts
index 92bc2a14..278c7ad2 100644
--- a/examples/vue-query/vite.config.ts
+++ b/examples/vue-query/vite.config.ts
@@ -2,13 +2,6 @@ import vue from '@vitejs/plugin-vue'
 import vike from 'vike/plugin'
 import { defineConfig } from 'vite'
 
-const config = defineConfig({
-  plugins: [
-    vike({ prerender: true }),
-    vue({
-      include: [/\.vue$/, /\.md$/],
-    }),
-  ],
+export default defineConfig({
+  plugins: [vike(), vue()],
 })
-
-export default config
diff --git a/packages/vike-vue-pinia/package.json b/packages/vike-vue-pinia/package.json
index 87343644..368f230a 100644
--- a/packages/vike-vue-pinia/package.json
+++ b/packages/vike-vue-pinia/package.json
@@ -51,7 +51,7 @@
     "vue-tsc": "^2.0.13"
   },
   "files": [
-    "dist"
+    "dist/"
   ],
   "license": "MIT"
 }
diff --git a/packages/vike-vue-query/integration/+config.ts b/packages/vike-vue-query/integration/+config.ts
index 7c7bf8eb..1f3ae3c0 100644
--- a/packages/vike-vue-query/integration/+config.ts
+++ b/packages/vike-vue-query/integration/+config.ts
@@ -1,15 +1,18 @@
+export { config as default }
+
 import type { DehydratedState, QueryClient, QueryClientConfig } from '@tanstack/vue-query'
 import type { Config } from 'vike/types'
 import type _ from 'vike-vue/config' // Needed for declaration merging of Config
 
-export default {
+const config = {
   name: 'vike-vue-query',
   require: {
     'vike-vue': '>=0.7.0',
   },
-  onCreateApp: 'import:vike-vue-query/__internal/integration/installVueQuery:installVueQuery',
-  onAfterRenderHtml: 'import:vike-vue-query/__internal/integration/dehydrateVueQuery:dehydrateVueQuery',
-  onBeforeRenderClient: 'import:vike-vue-query/__internal/integration/hydrateVueQuery:hydrateVueQuery',
+  passToClient: ['_vueQueryInitialState'],
+  onCreateApp: 'import:vike-vue-query/__internal/integration/onCreateApp:onCreateApp',
+  onAfterRenderHtml: 'import:vike-vue-query/__internal/integration/onAfterRenderHtml:onAfterRenderHtml',
+  onBeforeRenderClient: 'import:vike-vue-query/__internal/integration/onBeforeRenderClient:onBeforeRenderClient',
   meta: {
     queryClientConfig: {
       env: {
diff --git a/packages/vike-vue-query/integration/dehydrateVueQuery.ts b/packages/vike-vue-query/integration/dehydrateVueQuery.ts
deleted file mode 100644
index b646d6d9..00000000
--- a/packages/vike-vue-query/integration/dehydrateVueQuery.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { dehydrate } from '@tanstack/vue-query'
-import type { OnAfterRenderHtmlSync } from 'vike-vue/types'
-
-export { dehydrateVueQuery }
-
-const dehydrateVueQuery: OnAfterRenderHtmlSync = (pageContext): ReturnType<OnAfterRenderHtmlSync> => {
-  pageContext._vueQueryInitialState = dehydrate(pageContext.queryClient!)
-}
diff --git a/packages/vike-vue-query/integration/onAfterRenderHtml.ts b/packages/vike-vue-query/integration/onAfterRenderHtml.ts
new file mode 100644
index 00000000..adc02ef6
--- /dev/null
+++ b/packages/vike-vue-query/integration/onAfterRenderHtml.ts
@@ -0,0 +1,13 @@
+export { onAfterRenderHtml }
+
+import { dehydrate } from '@tanstack/vue-query'
+import type { OnAfterRenderHtmlSync } from 'vike-vue/types'
+
+const onAfterRenderHtml: OnAfterRenderHtmlSync = (pageContext): ReturnType<OnAfterRenderHtmlSync> => {
+  dehydrateVueQuery(pageContext)
+}
+
+type PageContext = Parameters<typeof onAfterRenderHtml>[0]
+function dehydrateVueQuery(pageContext: PageContext) {
+  pageContext._vueQueryInitialState = dehydrate(pageContext.queryClient!)
+}
diff --git a/packages/vike-vue-query/integration/hydrateVueQuery.ts b/packages/vike-vue-query/integration/onBeforeRenderClient.ts
similarity index 60%
rename from packages/vike-vue-query/integration/hydrateVueQuery.ts
rename to packages/vike-vue-query/integration/onBeforeRenderClient.ts
index b1ab2fe1..47cacef3 100644
--- a/packages/vike-vue-query/integration/hydrateVueQuery.ts
+++ b/packages/vike-vue-query/integration/onBeforeRenderClient.ts
@@ -1,9 +1,14 @@
+export { onBeforeRenderClient }
+
 import { hydrate } from '@tanstack/vue-query'
 import type { OnBeforeRenderClientSync } from 'vike-vue/types'
 
-export { hydrateVueQuery }
+const onBeforeRenderClient: OnBeforeRenderClientSync = (pageContext): ReturnType<OnBeforeRenderClientSync> => {
+  hydrateVueQuery(pageContext)
+}
 
-const hydrateVueQuery: OnBeforeRenderClientSync = (pageContext): ReturnType<OnBeforeRenderClientSync> => {
+type PageContext = Parameters<typeof onBeforeRenderClient>[0]
+function hydrateVueQuery(pageContext: PageContext) {
   if (!pageContext.isHydration) {
     return
   }
diff --git a/packages/vike-vue-query/integration/installVueQuery.ts b/packages/vike-vue-query/integration/onCreateApp.ts
similarity index 54%
rename from packages/vike-vue-query/integration/installVueQuery.ts
rename to packages/vike-vue-query/integration/onCreateApp.ts
index 685387c2..e632ebe2 100644
--- a/packages/vike-vue-query/integration/installVueQuery.ts
+++ b/packages/vike-vue-query/integration/onCreateApp.ts
@@ -1,9 +1,14 @@
+export { onCreateApp }
+
 import { QueryClient, VueQueryPlugin } from '@tanstack/vue-query'
 import type { OnCreateAppSync } from 'vike-vue/types'
 
-export { installVueQuery }
+const onCreateApp: OnCreateAppSync = (pageContext): ReturnType<OnCreateAppSync> => {
+  installVueQuery(pageContext)
+}
 
-const installVueQuery: OnCreateAppSync = (pageContext): ReturnType<OnCreateAppSync> => {
+type PageContext = Parameters<typeof onCreateApp>[0]
+function installVueQuery(pageContext: PageContext) {
   const queryClient = new QueryClient(pageContext.config.queryClientConfig)
   pageContext.app.use(VueQueryPlugin, { queryClient })
   Object.assign(pageContext, { queryClient })
diff --git a/packages/vike-vue-query/package.json b/packages/vike-vue-query/package.json
index 283bb313..3ec9847e 100644
--- a/packages/vike-vue-query/package.json
+++ b/packages/vike-vue-query/package.json
@@ -15,23 +15,23 @@
   },
   "exports": {
     "./config": "./dist/+config.js",
-    "./__internal/integration/installVueQuery": "./dist/installVueQuery.js",
-    "./__internal/integration/dehydrateVueQuery": "./dist/dehydrateVueQuery.js",
-    "./__internal/integration/hydrateVueQuery": "./dist/hydrateVueQuery.js"
+    "./__internal/integration/onCreateApp": "./dist/onCreateApp.js",
+    "./__internal/integration/onAfterRenderHtml": "./dist/onAfterRenderHtml.js",
+    "./__internal/integration/onBeforeRenderClient": "./dist/onBeforeRenderClient.js"
   },
   "typesVersions": {
     "*": {
       "config": [
         "./dist/+config.d.ts"
       ],
-      "__internal/integration/installVueQuery": [
-        "./dist/installVueQuery.d.ts"
+      "__internal/integration/onCreateApp": [
+        "./dist/onCreateApp.d.ts"
       ],
-      "__internal/integration/dehydrateVueQuery": [
-        "./dist/dehydrateVueQuery.d.ts"
+      "__internal/integration/onAfterRenderHtml": [
+        "./dist/onAfterRenderHtml.d.ts"
       ],
-      "__internal/integration/hydrateVueQuery": [
-        "./dist/hydrateVueQuery.d.ts"
+      "__internal/integration/onBeforeRenderClient": [
+        "./dist/onBeforeRenderClient.d.ts"
       ]
     }
   },
@@ -51,7 +51,7 @@
     "vue-tsc": "^2.0.13"
   },
   "files": [
-    "dist"
+    "dist/"
   ],
   "license": "MIT"
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index cc4e2814..bcdab934 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -134,6 +134,9 @@ importers:
       node-fetch:
         specifier: ^3.3.2
         version: 3.3.2
+      typescript:
+        specifier: 5.4.5
+        version: 5.4.5
       vike:
         specifier: ^0.4.195
         version: 0.4.195(vite@5.4.1(@types/node@22.3.0))
@@ -149,10 +152,6 @@ importers:
       vue:
         specifier: ^3.4.36
         version: 3.4.38(typescript@5.4.5)
-    devDependencies:
-      typescript:
-        specifier: 5.4.5
-        version: 5.4.5
       vue-tsc:
         specifier: ^1.8.27
         version: 1.8.27(typescript@5.4.5)