vike 0.4.252-commit-1d0a050 → 0.4.252-commit-a938132

package/dist/client/runtime-client-routing/createPageContextClient.d.ts

@@ -66,7 +66,7 @@ declare function createPageContextClient(urlOriginal: string): Promise<{
         isClientSide: true;
     } & {
         _pageRoutes: import("../../shared-server-client/route/loadPageRoutes.js").PageRoutes;
-        _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").Hook | null;
+        _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").HookInternal | null;
     };
     _pageFilesAll: import("../../shared-server-client/getPageFiles.js").PageFile[];
 } & import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").GlobalConfigPublic>;

package/dist/client/runtime-client-routing/entry.js

@@ -4,11 +4,7 @@ assertClientRouting();
 import { initClientRouter } from './initClientRouter.js';
 import { assertSingleInstance_onClientEntryClientRouting } from '../../utils/assertSingleInstance.js';
 import { removeFoucBuster } from '../shared/removeFoucBuster.js';
-import { setVirtualFileExportsGlobalEntry } from '../shared/getGlobalContextClientInternalShared.js';
-// @ts-expect-error
-import * as virtualFileExportsGlobalEntry from 'virtual:vike:global-entry:client:client-routing';
 assertSingleInstance_onClientEntryClientRouting(import.meta.env.PROD);
-setVirtualFileExportsGlobalEntry(virtualFileExportsGlobalEntry);
 initClientRouter();
 if (import.meta.env.DEV)
     removeFoucBuster();

package/dist/client/runtime-client-routing/getGlobalContextClientInternal.d.ts

@@ -52,5 +52,5 @@ declare function getGlobalContextClientInternal(): Promise<{
     isClientSide: true;
 } & {
     _pageRoutes: import("../../shared-server-client/route/loadPageRoutes.js").PageRoutes;
-    _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").Hook | null;
+    _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").HookInternal | null;
 }>;

package/dist/client/runtime-client-routing/getPageContextCurrent.js

@@ -2,7 +2,7 @@ import '../assertEnvClient.js';
 export { setPageContextCurrent };
 export { getPageContextCurrent };
 import { getGlobalObject } from '../../utils/getGlobalObject.js';
-const globalObject = getGlobalObject('runtime-client-routing/getPageContextCurrent.ts', {
+const globalObject = getGlobalObject('getPageContextCurrent.ts', {
     pageContextCurrent: null,
 });
 function getPageContextCurrent() {

package/dist/client/runtime-client-routing/getPageContextFromHooks.d.ts

@@ -84,7 +84,7 @@ declare function getPageContextFromHooksClient_firstRender(pageContext: PageCont
         isClientSide: true;
     } & {
         _pageRoutes: import("../../shared-server-client/route/loadPageRoutes.js").PageRoutes;
-        _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").Hook | null;
+        _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").HookInternal | null;
     };
     _pageFilesAll: PageFile[];
 } & import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").GlobalConfigPublic & {
@@ -162,7 +162,7 @@ declare function getPageContextFromHooksClient_firstRender(pageContext: PageCont
             isClientSide: true;
         } & {
             _pageRoutes: import("../../shared-server-client/route/loadPageRoutes.js").PageRoutes;
-            _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").Hook | null;
+            _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").HookInternal | null;
         };
         _pageFilesAll: PageFile[];
     } & import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").GlobalConfigPublic & import("../../shared-server-client/createPageContextShared.js").PageContextCreated & Omit<Partial<PageContextConfig & {
@@ -366,7 +366,7 @@ declare function getPageContextFromHooksClient(pageContext: {
         isClientSide: true;
     } & {
         _pageRoutes: import("../../shared-server-client/route/loadPageRoutes.js").PageRoutes;
-        _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").Hook | null;
+        _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").HookInternal | null;
     };
     _pageFilesAll: PageFile[];
 } & import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").GlobalConfigPublic & {
@@ -444,7 +444,7 @@ declare function getPageContextFromHooksClient(pageContext: {
             isClientSide: true;
         } & {
             _pageRoutes: import("../../shared-server-client/route/loadPageRoutes.js").PageRoutes;
-            _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").Hook | null;
+            _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").HookInternal | null;
         };
         _pageFilesAll: PageFile[];
     } & import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").GlobalConfigPublic & import("../../shared-server-client/createPageContextShared.js").PageContextCreated & Omit<Partial<PageContextConfig & {

package/dist/client/runtime-client-routing/getPageContextFromHooks.js

@@ -24,7 +24,7 @@ import { pageContextInitIsPassedToClient } from '../../shared-server-client/misc
 import { isServerSideError } from '../../shared-server-client/misc/isServerSideError.js';
 import { execHook } from '../../shared-server-client/hooks/execHook.js';
 import { getPageContextPublicClient } from './getPageContextPublicClient.js';
-const globalObject = getGlobalObject('runtime-client-routing/getPageContextFromHooks.ts', {});
+const globalObject = getGlobalObject('getPageContextFromHooks.ts', {});
 // TO-DO/soon/cumulative-hooks: filter & execute all client-only hooks (see other TO-DO/soon/cumulative-hooks comments)
 // - The client-side needs to know what hooks are client-only
 //   - Possible implementation: new computed prop `clientOnlyHooks: string[]` (list of hook ids) and add `hookId` to serialized config values

package/dist/client/runtime-client-routing/history.d.ts

@@ -17,7 +17,7 @@ type ScrollPosition = {
     x: number;
     y: number;
 };
-declare function saveScrollPosition(): void;
+declare function saveScrollPosition(scrollPosition?: ScrollPosition): void;
 declare function pushHistoryState(url: string, overwriteLastHistoryEntry: boolean): void;
 declare function replaceHistoryStateOriginal(state: unknown, url?: Parameters<typeof window.history.replaceState>[2]): void;
 type HistoryInfo = {

package/dist/client/runtime-client-routing/history.js

@@ -48,8 +48,8 @@ function getScrollPosition() {
 function getTimestamp() {
     return new Date().getTime();
 }
-function saveScrollPosition() {
-    const scrollPosition = getScrollPosition();
+function saveScrollPosition(scrollPosition) {
+    scrollPosition || (scrollPosition = getScrollPosition());
     // Don't overwrite history.state if it was set by a non-Vike history.pushState() call.
     // https://github.com/vikejs/vike/issues/2801#issuecomment-3490431479
     if (!isEnhanced(window.history.state))

package/dist/client/runtime-client-routing/initClientRouter.d.ts

@@ -1,3 +1,3 @@
 import '../assertEnvClient.js';
 export { initClientRouter };
-declare function initClientRouter(): Promise<void>;
+declare function initClientRouter(): void;

package/dist/client/runtime-client-routing/initClientRouter.js

@@ -1,6 +1,7 @@
 import '../assertEnvClient.js';
 export { initClientRouter };
 import { assert } from '../../utils/assert.js';
+import { getGlobalObject } from '../../utils/getGlobalObject.js';
 import { getRenderCount, renderPageClient } from './renderPageClient.js';
 import { initOnPopState } from './initOnPopState.js';
 import { initOnLinkClick } from './initOnLinkClick.js';
@@ -8,21 +9,27 @@ import { scrollRestoration_init } from './scrollRestoration.js';
 import { autoSaveScrollPosition } from './setScrollPosition.js';
 import { initLinkPrefetchHandlers } from './prefetch.js';
 import { initHistory } from './history.js';
-async function initClientRouter() {
+import { setVirtualFileExportsGlobalEntry } from '../shared/getGlobalContextClientInternalShared.js';
+// @ts-expect-error
+import * as virtualFileExportsGlobalEntry from 'virtual:vike:global-entry:client:client-routing';
+const globalObject = getGlobalObject('initClientRouter.ts', {});
+function initClientRouter() {
+    setVirtualFileExportsGlobalEntry(virtualFileExportsGlobalEntry);
+    if (globalObject.done)
+        return;
+    globalObject.done = true;
     // Init navigation history and scroll restoration
     initHistoryAndScroll();
     // Render/hydrate
-    const renderFirstPagePromise = renderFirstPage();
+    renderFirstPage();
     // Intercept <a> clicks
     initOnLinkClick();
     // Add <a> prefetch handlers
     initLinkPrefetchHandlers();
-    // Preserve stack track
-    await renderFirstPagePromise;
 }
-async function renderFirstPage() {
+function renderFirstPage() {
     assert(getRenderCount() === 0);
-    await renderPageClient({
+    renderPageClient({
         scrollTarget: { preserveScroll: true },
         isClientSideNavigation: false,
     });

package/dist/client/runtime-client-routing/navigate.js

@@ -4,8 +4,9 @@ export { reload };
 // import { modifyUrlSameOrigin, ModifyUrlSameOriginOptions } from '../../shared/modifyUrlSameOrigin.js'
 import { getCurrentUrl } from '../shared/getCurrentUrl.js';
 import { normalizeUrlArgument } from './normalizeUrlArgument.js';
-import { firstRenderStartPromise, renderPageClient } from './renderPageClient.js';
+import { renderPageClient } from './renderPageClient.js';
 import { assertClientRouting } from '../../utils/assertRoutingType.js';
+import { initClientRouter } from './initClientRouter.js';
 assertClientRouting();
 /** Programmatically navigate to a new page.
  *
@@ -19,8 +20,8 @@ async function navigate(url, options) {
     // let url = normalizeUrlArgument(options.url ?? getCurrentUrl(), 'navigate')
     // url = modifyUrlSameOrigin(url, options)
     normalizeUrlArgument(url, 'navigate');
-    // If `hydrationCanBeAborted === false` (e.g. Vue) then we can apply navigate() only after hydration is done
-    await firstRenderStartPromise;
+    // Ensure initClientRouter() is called before navigate() — otherwise race condition when +client.js calls navigate() before initClientRouter() is called in runtime-client-routing/entry.ts
+    initClientRouter();
     const { keepScrollPosition, overwriteLastHistoryEntry, pageContext } = options ?? {};
     const scrollTarget = { preserveScroll: keepScrollPosition ?? false };
     await renderPageClient({

package/dist/client/runtime-client-routing/prefetch.js

@@ -24,7 +24,7 @@ import { PAGE_CONTEXT_MAX_AGE_DEFAULT, getPrefetchSettings, } from './prefetch/g
 import pc from '@brillout/picocolors';
 import { normalizeUrlArgument } from './normalizeUrlArgument.js';
 assertClientRouting();
-const globalObject = getGlobalObject('runtime-client-routing/prefetch.ts', {
+const globalObject = getGlobalObject('prefetch.ts', {
     linkPrefetchHandlerAdded: new WeakSet(),
     addLinkPrefetchHandlers_debounce: null,
     mutationObserver: new MutationObserver(addLinkPrefetchHandlers),

package/dist/client/runtime-client-routing/renderPageClient.d.ts

@@ -2,7 +2,6 @@ import '../assertEnvClient.js';
 export { renderPageClient };
 export { getRenderCount };
 export { disableClientRouting };
-export { firstRenderStartPromise };
 export { getPageContextClient };
 export type { PageContextBegin };
 export type { PageContextInternalClientAfterRender };
@@ -14,7 +13,6 @@ import type { PageContextClient } from '../../types/PageContext.js';
 import { type PageContextPublicClient } from './getPageContextPublicClient.js';
 import type { VikeGlobalInternal } from '../../types/VikeGlobalInternal.js';
 type PageContextInternalClientAfterRender = NonNullable<Awaited<ReturnType<typeof renderPageClient>>>;
-declare const firstRenderStartPromise: Promise<void>;
 type PreviousPageContext = {
     pageId: string;
 } & PageContextConfig & PageContextRouted & PageContextCreatedClient & PageContextPublicClient;
@@ -105,7 +103,7 @@ declare function renderPageClient(renderArgs: RenderArgs): Promise<({
         isClientSide: true;
     } & {
         _pageRoutes: import("../../shared-server-client/route/loadPageRoutes.js").PageRoutes;
-        _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").Hook | null;
+        _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").HookInternal | null;
     };
     _pageFilesAll: import("../../shared-server-client/getPageFiles.js").PageFile[];
 } & import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").GlobalConfigPublic & PageContextConfig & {
@@ -200,7 +198,7 @@ declare function renderPageClient(renderArgs: RenderArgs): Promise<({
         isClientSide: true;
     } & {
         _pageRoutes: import("../../shared-server-client/route/loadPageRoutes.js").PageRoutes;
-        _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").Hook | null;
+        _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").HookInternal | null;
     };
     _pageFilesAll: import("../../shared-server-client/getPageFiles.js").PageFile[];
 } & import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").GlobalConfigPublic & PageContextConfig & {
@@ -296,7 +294,7 @@ declare function renderPageClient(renderArgs: RenderArgs): Promise<({
         isClientSide: true;
     } & {
         _pageRoutes: import("../../shared-server-client/route/loadPageRoutes.js").PageRoutes;
-        _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").Hook | null;
+        _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").HookInternal | null;
     };
     _pageFilesAll: import("../../shared-server-client/getPageFiles.js").PageFile[];
 } & import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").GlobalConfigPublic & PageContextConfig & {
@@ -395,7 +393,7 @@ declare function getPageContextBegin(isForErrorPage: boolean, { urlOriginal, isB
         isClientSide: true;
     } & {
         _pageRoutes: import("../../shared-server-client/route/loadPageRoutes.js").PageRoutes;
-        _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").Hook | null;
+        _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").HookInternal | null;
     };
     _pageFilesAll: import("../../shared-server-client/getPageFiles.js").PageFile[];
 } & import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").GlobalConfigPublic & {

package/dist/client/runtime-client-routing/renderPageClient.js

@@ -2,7 +2,6 @@ import '../assertEnvClient.js';
 export { renderPageClient };
 export { getRenderCount };
 export { disableClientRouting };
-export { firstRenderStartPromise };
 export { getPageContextClient };
 import { assert, assertInfo, assertWarning } from '../../utils/assert.js';
 import { catchInfiniteLoop } from '../../utils/catchInfiniteLoop.js';
@@ -19,11 +18,11 @@ import { createPageContextClient } from './createPageContextClient.js';
 import { addLinkPrefetchHandlers, addLinkPrefetchHandlers_unwatch, addLinkPrefetchHandlers_watch, getPageContextPrefetched, populatePageContextPrefetchCache, } from './prefetch.js';
 import { execHookOnRenderClient } from '../shared/execHookOnRenderClient.js';
 import { isErrorFetchingStaticAssets, loadPageConfigsLazyClientSide, } from '../shared/loadPageConfigsLazyClientSide.js';
-import { pushHistoryState } from './history.js';
+import { pushHistoryState, saveScrollPosition } from './history.js';
 import { addNewPageContextAborted, getPageContextAddendumAbort, isAbortError, logAbort, } from '../../shared-server-client/route/abort.js';
 import { route } from '../../shared-server-client/route/index.js';
 import { isClientSideRoutable } from './isClientSideRoutable.js';
-import { setScrollPosition } from './setScrollPosition.js';
+import { isScrollPosition, setScrollPosition } from './setScrollPosition.js';
 import { scrollRestoration_initialRenderIsDone } from './scrollRestoration.js';
 import { getErrorPageId, isErrorPage } from '../../shared-server-client/error-page.js';
 import { setPageContextCurrent } from './getPageContextCurrent.js';
@@ -34,15 +33,14 @@ import { getPageContextPublicClient } from './getPageContextPublicClient.js';
 import { getHooksFromPageContextNew } from '../../shared-server-client/hooks/getHook.js';
 import { getPageContextPublicClientMinimal } from '../shared/getPageContextPublicClientShared.js';
 import { logErrorClient } from './logErrorClient.js';
-const globalObject = getGlobalObject('runtime-client-routing/renderPageClient.ts', (() => {
-    const { promise: firstRenderStartPromise, resolve: firstRenderStartPromiseResolve } = genPromise();
+const globalObject = getGlobalObject('renderPageClient.ts', (() => {
+    const { promise: hydrationAwaitPromise, resolve: hydrationAwaitPromiseResolve } = genPromise();
     return {
         renderCounter: 0,
-        firstRenderStartPromise,
-        firstRenderStartPromiseResolve,
+        hydrationAwaitPromise,
+        hydrationAwaitPromiseResolve,
     };
 })());
-const { firstRenderStartPromise } = globalObject;
 async function renderPageClient(renderArgs) {
     catchInfiniteLoop('renderPageClient()');
     const { urlOriginal = getCurrentUrl(), overwriteLastHistoryEntry = false, isBackwardNavigation = false, isHistoryNavigation = false, doNotRenderIfSamePage, isClientSideNavigation = true, pageContextInitClient, pageContextsAborted = [], } = renderArgs;
@@ -63,7 +61,15 @@ async function renderPageClient(renderArgs) {
         redirectHard(urlOriginal);
         return;
     }
-    globalObject.firstRenderStartPromiseResolve();
+    // Await hydration (unless +hydrationCanBeAborted)
+    if (!isFirstRender) {
+        await globalObject.hydrationAwaitPromise;
+        if (isRenderOutdated())
+            return;
+    }
+    // Ensure no concurrent onRenderClient() calls.
+    // - We could `await globalObject.onRenderClientPreviousPromise` later just before execHookOnRenderClient() but we prefer doing it early to ensure `getPageContext() === usePageContext()` (and maybe it prevents other potential inconsistencies?).
+    await globalObject.onRenderClientPreviousPromise;
     if (isRenderOutdated())
         return;
     return await renderPageNominal();
@@ -175,7 +181,9 @@ async function renderPageClient(renderArgs) {
             setHydrationCanBeAborted();
         }
         else {
-            assertWarning(!isReact(), 'You seem to be using React; we recommend setting hydrationCanBeAborted to true, see https://vike.dev/hydrationCanBeAborted', { onlyOnce: true });
+            if (globalThis.__VIKE__IS_DEV) {
+                assertWarning(!isReact(), 'You seem to be using React; we recommend setting hydrationCanBeAborted to true, see https://vike.dev/hydrationCanBeAborted', { onlyOnce: true });
+            }
         }
         // There wasn't any `await` but the isRenderOutdated() return value may have changed because we called setHydrationCanBeAborted()
         if (isRenderOutdated())
@@ -396,16 +404,9 @@ async function renderPageClient(renderArgs) {
                 logErrorClient(err);
             }
         };
-        // We use globalObject.onRenderClientPreviousPromise in order to ensure that there is never two concurrent onRenderClient() calls
-        if (globalObject.onRenderClientPreviousPromise) {
-            // Make sure that the previous render has finished
-            await globalObject.onRenderClientPreviousPromise;
-            assert(globalObject.onRenderClientPreviousPromise === undefined);
-            if (isRenderOutdated())
-                return;
-        }
         changeUrl(urlOriginal, overwriteLastHistoryEntry);
         globalObject.previousPageContext = pageContext;
+        // There should never be concurrent onRenderClient() calls
         assert(globalObject.onRenderClientPreviousPromise === undefined);
         const onRenderClientPromise = (async () => {
             let onRenderClientError;
@@ -422,7 +423,6 @@ async function renderPageClient(renderArgs) {
         })();
         globalObject.onRenderClientPreviousPromise = onRenderClientPromise;
         const onRenderClientError = await onRenderClientPromise;
-        assert(globalObject.onRenderClientPreviousPromise === undefined);
         if (onRenderClientError) {
             await onError(onRenderClientError);
             if (!isErrorPage)
@@ -474,6 +474,10 @@ async function renderPageClient(renderArgs) {
         }
         // Page scrolling
         setScrollPosition(scrollTarget, urlOriginal);
+        if (isScrollPosition(scrollTarget)) {
+            // Restore window.history.state.vike.scrollPosition (in case scrolling occurred during rendering)
+            saveScrollPosition(scrollTarget);
+        }
         scrollRestoration_initialRenderIsDone();
         if (pageContext._hasPageContextFromServer)
             setPageContextInitIsPassedToClient(pageContext);
@@ -482,6 +486,7 @@ async function renderPageClient(renderArgs) {
         addLinkPrefetchHandlers();
         globalObject.renderedPageContext = pageContext;
         stampFinished(urlOriginal);
+        globalObject.hydrationAwaitPromiseResolve();
         return pageContext;
     }
 }
@@ -549,6 +554,7 @@ function getIsRenderOutdated() {
     let hydrationCanBeAborted = false;
     const setHydrationCanBeAborted = () => {
         hydrationCanBeAborted = true;
+        globalObject.hydrationAwaitPromiseResolve();
     };
     /** Whether the rendering should be aborted because a new rendering has started. We should call this after each `await`. */
     const isRenderOutdated = (isRenderCleanup) => {

package/dist/client/runtime-client-routing/scrollRestoration.js

@@ -8,7 +8,7 @@ export { scrollRestoration_initialRenderIsDone };
 // See also: https://github.com/cyco130/knave/blob/e9e1bc7687848504293197f1b314b7d12ad0d228/design.md#scroll-restoration
 import { getGlobalObject } from '../../utils/getGlobalObject.js';
 import { onPageHide, onPageShow } from '../../utils/onPageVisibilityChange.js';
-const globalObject = getGlobalObject('runtime-client-routing/scrollRestoration.ts', {});
+const globalObject = getGlobalObject('scrollRestoration.ts', {});
 function scrollRestoration_init() {
     // Use the native scroll restoration mechanism only for the first render
     scrollRestoration_enable();

package/dist/client/runtime-client-routing/setScrollPosition.d.ts

@@ -2,11 +2,14 @@ import '../assertEnvClient.js';
 export { setScrollPosition };
 export { autoSaveScrollPosition };
 export { scrollToHashOrTop };
+export { isScrollPosition };
 export type { ScrollTarget };
 import { type ScrollPosition } from './history.js';
 type ScrollTarget = undefined | {
     preserveScroll: boolean;
+    y?: undefined;
 } | ScrollPosition;
 declare function setScrollPosition(scrollTarget: ScrollTarget, url?: string): void;
 declare function scrollToHashOrTop(hash: null | string): void;
+declare function isScrollPosition(scrollTarget: ScrollTarget | undefined): scrollTarget is ScrollPosition;
 declare function autoSaveScrollPosition(): void;

package/dist/client/runtime-client-routing/setScrollPosition.js

@@ -2,6 +2,7 @@ import '../assertEnvClient.js';
 export { setScrollPosition };
 export { autoSaveScrollPosition };
 export { scrollToHashOrTop };
+export { isScrollPosition };
 import { assert } from '../../utils/assert.js';
 import { onPageHide } from '../../utils/onPageVisibilityChange.js';
 import { sleep } from '../../utils/sleep.js';
@@ -12,7 +13,7 @@ function setScrollPosition(scrollTarget, url) {
         scrollToTextFragment(url);
         return;
     }
-    if (scrollTarget && 'x' in scrollTarget) {
+    if (isScrollPosition(scrollTarget)) {
         setScroll(scrollTarget);
         return;
     }
@@ -58,6 +59,9 @@ function scrollToHashOrTop(hash) {
 function scrollToTop() {
     setScroll({ x: 0, y: 0 });
 }
+function isScrollPosition(scrollTarget) {
+    return scrollTarget?.y !== undefined;
+}
 /**
  * Change the browser's scroll position, in a way that works during a repaint.
  *
@@ -118,6 +122,6 @@ function getUrlHash() {
 // Save scroll position (needed for back-/forward navigation)
 function autoSaveScrollPosition() {
     // Safari cannot handle more than 100 `history.replaceState()` calls within 30 seconds (https://github.com/vikejs/vike/issues/46)
-    window.addEventListener('scroll', throttle(saveScrollPosition, Math.ceil(1000 / 3)), { passive: true });
+    window.addEventListener('scroll', throttle(saveScrollPosition, 300), { passive: true });
     onPageHide(saveScrollPosition);
 }

package/dist/node/prerender/runPrerender.d.ts

@@ -127,7 +127,7 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
         viteConfig: ResolvedConfig | undefined;
         isClientSide: false;
         _pageRoutes: import("../../shared-server-client/route/loadPageRoutes.js").PageRoutes;
-        _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").Hook | null;
+        _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").HookInternal | null;
     } | {
         _isPrerendering: true;
         viteConfig: ResolvedConfig;
@@ -137,7 +137,7 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
         _usesClientRouter: boolean;
         isClientSide: false;
         _pageRoutes: import("../../shared-server-client/route/loadPageRoutes.js").PageRoutes;
-        _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").Hook | null;
+        _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").HookInternal | null;
     } | {
         _isPrerendering: false;
         viteConfig: null;
@@ -147,7 +147,7 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
         _usesClientRouter: boolean;
         isClientSide: false;
         _pageRoutes: import("../../shared-server-client/route/loadPageRoutes.js").PageRoutes;
-        _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").Hook | null;
+        _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").HookInternal | null;
     }) & {
         baseServer: string;
         baseAssets: string;

package/dist/node/vite/shared/resolveVikeConfigInternal/configDefinitionsBuiltIn.js

@@ -35,7 +35,7 @@ const configDefinitionsBuiltIn = {
         cumulative: true,
     },
     onHookCall: {
-        env: { server: true, client: true },
+        env: { server: true },
         global: true,
         cumulative: true,
     },
@@ -219,7 +219,12 @@ const configDefinitionsBuiltIn = {
     keepScrollPosition: {
         env: { client: true },
     },
-    middleware: { env: { server: true }, cumulative: true, eager: true, global: true },
+    middleware: {
+        env: { server: true },
+        cumulative: true,
+        eager: true,
+        global: true,
+    },
     cli: {
         env: { config: true },
         global: true,
@@ -229,7 +234,6 @@ const configDefinitionsBuiltIn = {
         eager: true,
         global: true,
     },
-    // TODO: align all meta configs
     prerender: {
         env: { config: true },
         global: (value, { isGlobalLocation }) => typeof value === 'object' || isGlobalLocation,

package/dist/server/runtime/globalContext.d.ts

@@ -26,7 +26,7 @@ import type { ResolvedConfig, ViteDevServer } from 'vite';
 import { type PageRoutes } from '../../shared-server-client/route/loadPageRoutes.js';
 import type { ViteConfigRuntime } from '../../node/vite/shared/getViteConfigRuntime.js';
 import type { GlobalContext } from '../../types/GlobalContext.js';
-import type { Hook } from '../../shared-server-client/hooks/getHook.js';
+import type { HookInternal } from '../../shared-server-client/hooks/getHook.js';
 import type { PrerenderContext } from '../../types/index.js';
 declare const vikeConfigErrorRecoverMsg: "Vike config loaded";
 type GlobalContextServerInternal = Awaited<ReturnType<typeof createGlobalContext>>;
@@ -85,7 +85,7 @@ declare function getGlobalContextServerInternal(): Promise<{
         viteConfig: ResolvedConfig | undefined;
         isClientSide: false;
         _pageRoutes: PageRoutes;
-        _onBeforeRouteHook: Hook | null;
+        _onBeforeRouteHook: HookInternal | null;
     } & {
         baseServer: string;
         baseAssets: string;
@@ -156,7 +156,7 @@ declare function getGlobalContextServerInternal(): Promise<{
         _usesClientRouter: boolean;
         isClientSide: false;
         _pageRoutes: PageRoutes;
-        _onBeforeRouteHook: Hook | null;
+        _onBeforeRouteHook: HookInternal | null;
     } & {
         baseServer: string;
         baseAssets: string;
@@ -227,7 +227,7 @@ declare function getGlobalContextServerInternal(): Promise<{
         _usesClientRouter: boolean;
         isClientSide: false;
         _pageRoutes: PageRoutes;
-        _onBeforeRouteHook: Hook | null;
+        _onBeforeRouteHook: HookInternal | null;
     } & {
         baseServer: string;
         baseAssets: string;
@@ -299,7 +299,7 @@ declare function getGlobalContextServerInternalOptional(): (Record<string, unkno
     viteConfig: ResolvedConfig | undefined;
     isClientSide: false;
     _pageRoutes: PageRoutes;
-    _onBeforeRouteHook: Hook | null;
+    _onBeforeRouteHook: HookInternal | null;
 } | {
     _isPrerendering: true;
     viteConfig: ResolvedConfig;
@@ -309,7 +309,7 @@ declare function getGlobalContextServerInternalOptional(): (Record<string, unkno
     _usesClientRouter: boolean;
     isClientSide: false;
     _pageRoutes: PageRoutes;
-    _onBeforeRouteHook: Hook | null;
+    _onBeforeRouteHook: HookInternal | null;
 } | {
     _isPrerendering: false;
     viteConfig: null;
@@ -319,7 +319,7 @@ declare function getGlobalContextServerInternalOptional(): (Record<string, unkno
     _usesClientRouter: boolean;
     isClientSide: false;
     _pageRoutes: PageRoutes;
-    _onBeforeRouteHook: Hook | null;
+    _onBeforeRouteHook: HookInternal | null;
 }) & {
     baseServer: string;
     baseAssets: string;
@@ -428,7 +428,7 @@ declare function createGlobalContext(virtualFileExportsGlobalEntry: unknown): Pr
     viteConfig: ResolvedConfig | undefined;
     isClientSide: false;
     _pageRoutes: PageRoutes;
-    _onBeforeRouteHook: Hook | null;
+    _onBeforeRouteHook: HookInternal | null;
 } | {
     _isPrerendering: true;
     viteConfig: ResolvedConfig;
@@ -438,7 +438,7 @@ declare function createGlobalContext(virtualFileExportsGlobalEntry: unknown): Pr
     _usesClientRouter: boolean;
     isClientSide: false;
     _pageRoutes: PageRoutes;
-    _onBeforeRouteHook: Hook | null;
+    _onBeforeRouteHook: HookInternal | null;
 } | {
     _isPrerendering: false;
     viteConfig: null;
@@ -448,7 +448,7 @@ declare function createGlobalContext(virtualFileExportsGlobalEntry: unknown): Pr
     _usesClientRouter: boolean;
     isClientSide: false;
     _pageRoutes: PageRoutes;
-    _onBeforeRouteHook: Hook | null;
+    _onBeforeRouteHook: HookInternal | null;
 }) & {
     baseServer: string;
     baseAssets: string;

package/dist/server/runtime/renderPageServer/createPageContextServer.d.ts

@@ -76,7 +76,7 @@ declare function createPageContextServer(pageContextInit: PageContextInit, globa
         viteConfig: import("vite").ResolvedConfig | undefined;
         isClientSide: false;
         _pageRoutes: import("../../__internal/index.js").PageRoutes;
-        _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").Hook | null;
+        _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").HookInternal | null;
     } | {
         _isPrerendering: true;
         viteConfig: import("vite").ResolvedConfig;
@@ -86,7 +86,7 @@ declare function createPageContextServer(pageContextInit: PageContextInit, globa
         _usesClientRouter: boolean;
         isClientSide: false;
         _pageRoutes: import("../../__internal/index.js").PageRoutes;
-        _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").Hook | null;
+        _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").HookInternal | null;
     } | {
         _isPrerendering: false;
         viteConfig: null;
@@ -96,7 +96,7 @@ declare function createPageContextServer(pageContextInit: PageContextInit, globa
         _usesClientRouter: boolean;
         isClientSide: false;
         _pageRoutes: import("../../__internal/index.js").PageRoutes;
-        _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").Hook | null;
+        _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").HookInternal | null;
     }) & {
         baseServer: string;
         baseAssets: string;

package/dist/server/runtime/renderPageServer/execHookOnRenderHtml.d.ts

@@ -2,14 +2,14 @@ import '../../assertEnvServer.js';
 export { execHookOnRenderHtml };
 export type { RenderHook };
 import { type HtmlRender } from './html/renderHtml.js';
-import { type Hook } from '../../../shared-server-client/hooks/getHook.js';
+import { type HookInternal } from '../../../shared-server-client/hooks/getHook.js';
 import type { PageAsset } from './getPageAssets.js';
 import type { PageContextSerialization } from './html/serializeContext.js';
 import { type PageContextExecHook } from '../../../shared-server-client/hooks/execHook.js';
 import type { PageContextConfig } from '../../../shared-server-client/getPageFiles.js';
 import type { PageContextInternalServer } from '../../../types/PageContext.js';
 type GetPageAssets = () => Promise<PageAsset[]>;
-type RenderHook = Hook & {
+type RenderHook = HookInternal & {
     hookName: HookName;
 };
 type HookName = 'onRenderHtml' | 'render';

package/dist/server/runtime/renderPageServer/loadPageConfigsLazyServerSide.d.ts

@@ -77,7 +77,7 @@ declare function loadPageConfigsLazyServerSide(pageContext: PageContext_loadPage
         viteConfig: import("vite").ResolvedConfig | undefined;
         isClientSide: false;
         _pageRoutes: import("../../../shared-server-client/route/loadPageRoutes.js").PageRoutes;
-        _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").Hook | null;
+        _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").HookInternal | null;
     } | {
         _isPrerendering: true;
         viteConfig: import("vite").ResolvedConfig;
@@ -87,7 +87,7 @@ declare function loadPageConfigsLazyServerSide(pageContext: PageContext_loadPage
         _usesClientRouter: boolean;
         isClientSide: false;
         _pageRoutes: import("../../../shared-server-client/route/loadPageRoutes.js").PageRoutes;
-        _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").Hook | null;
+        _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").HookInternal | null;
     } | {
         _isPrerendering: false;
         viteConfig: null;
@@ -97,7 +97,7 @@ declare function loadPageConfigsLazyServerSide(pageContext: PageContext_loadPage
         _usesClientRouter: boolean;
         isClientSide: false;
         _pageRoutes: import("../../../shared-server-client/route/loadPageRoutes.js").PageRoutes;
-        _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").Hook | null;
+        _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").HookInternal | null;
     }) & {
         baseServer: string;
         baseAssets: string;

package/dist/server/runtime/renderPageServer/renderPageServerAfterRoute.d.ts

@@ -85,7 +85,7 @@ declare function prerenderPage(pageContext: Parameters<typeof prerenderPageEntry
             viteConfig: import("vite").ResolvedConfig | undefined;
             isClientSide: false;
             _pageRoutes: import("../../__internal/index.js").PageRoutes;
-            _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").Hook | null;
+            _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").HookInternal | null;
         } | {
             _isPrerendering: true;
             viteConfig: import("vite").ResolvedConfig;
@@ -95,7 +95,7 @@ declare function prerenderPage(pageContext: Parameters<typeof prerenderPageEntry
             _usesClientRouter: boolean;
             isClientSide: false;
             _pageRoutes: import("../../__internal/index.js").PageRoutes;
-            _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").Hook | null;
+            _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").HookInternal | null;
         } | {
             _isPrerendering: false;
             viteConfig: null;
@@ -105,7 +105,7 @@ declare function prerenderPage(pageContext: Parameters<typeof prerenderPageEntry
             _usesClientRouter: boolean;
             isClientSide: false;
             _pageRoutes: import("../../__internal/index.js").PageRoutes;
-            _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").Hook | null;
+            _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").HookInternal | null;
         }) & {
             baseServer: string;
             baseAssets: string;
@@ -246,7 +246,7 @@ declare function prerenderPage(pageContext: Parameters<typeof prerenderPageEntry
             viteConfig: import("vite").ResolvedConfig | undefined;
             isClientSide: false;
             _pageRoutes: import("../../__internal/index.js").PageRoutes;
-            _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").Hook | null;
+            _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").HookInternal | null;
         } | {
             _isPrerendering: true;
             viteConfig: import("vite").ResolvedConfig;
@@ -256,7 +256,7 @@ declare function prerenderPage(pageContext: Parameters<typeof prerenderPageEntry
             _usesClientRouter: boolean;
             isClientSide: false;
             _pageRoutes: import("../../__internal/index.js").PageRoutes;
-            _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").Hook | null;
+            _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").HookInternal | null;
         } | {
             _isPrerendering: false;
             viteConfig: null;
@@ -266,7 +266,7 @@ declare function prerenderPage(pageContext: Parameters<typeof prerenderPageEntry
             _usesClientRouter: boolean;
             isClientSide: false;
             _pageRoutes: import("../../__internal/index.js").PageRoutes;
-            _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").Hook | null;
+            _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").HookInternal | null;
         }) & {
             baseServer: string;
             baseAssets: string;
@@ -415,7 +415,7 @@ declare function prerenderPageEntry(pageContext: PageContextCreatedServer & Page
             viteConfig: import("vite").ResolvedConfig | undefined;
             isClientSide: false;
             _pageRoutes: import("../../__internal/index.js").PageRoutes;
-            _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").Hook | null;
+            _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").HookInternal | null;
         } | {
             _isPrerendering: true;
             viteConfig: import("vite").ResolvedConfig;
@@ -425,7 +425,7 @@ declare function prerenderPageEntry(pageContext: PageContextCreatedServer & Page
             _usesClientRouter: boolean;
             isClientSide: false;
             _pageRoutes: import("../../__internal/index.js").PageRoutes;
-            _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").Hook | null;
+            _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").HookInternal | null;
         } | {
             _isPrerendering: false;
             viteConfig: null;
@@ -435,7 +435,7 @@ declare function prerenderPageEntry(pageContext: PageContextCreatedServer & Page
             _usesClientRouter: boolean;
             isClientSide: false;
             _pageRoutes: import("../../__internal/index.js").PageRoutes;
-            _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").Hook | null;
+            _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").HookInternal | null;
         }) & {
             baseServer: string;
             baseAssets: string;
@@ -576,7 +576,7 @@ declare function prerenderPageEntry(pageContext: PageContextCreatedServer & Page
             viteConfig: import("vite").ResolvedConfig | undefined;
             isClientSide: false;
             _pageRoutes: import("../../__internal/index.js").PageRoutes;
-            _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").Hook | null;
+            _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").HookInternal | null;
         } | {
             _isPrerendering: true;
             viteConfig: import("vite").ResolvedConfig;
@@ -586,7 +586,7 @@ declare function prerenderPageEntry(pageContext: PageContextCreatedServer & Page
             _usesClientRouter: boolean;
             isClientSide: false;
             _pageRoutes: import("../../__internal/index.js").PageRoutes;
-            _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").Hook | null;
+            _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").HookInternal | null;
         } | {
             _isPrerendering: false;
             viteConfig: null;
@@ -596,7 +596,7 @@ declare function prerenderPageEntry(pageContext: PageContextCreatedServer & Page
             _usesClientRouter: boolean;
             isClientSide: false;
             _pageRoutes: import("../../__internal/index.js").PageRoutes;
-            _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").Hook | null;
+            _onBeforeRouteHook: import("../../../shared-server-client/hooks/getHook.js").HookInternal | null;
         }) & {
             baseServer: string;
             baseAssets: string;

package/dist/server/runtime/renderPageServer.d.ts

@@ -76,7 +76,7 @@ declare function getPageContextBegin(pageContextInit: PageContextInit, globalCon
         viteConfig: import("vite").ResolvedConfig | undefined;
         isClientSide: false;
         _pageRoutes: import("../../shared-server-client/route/loadPageRoutes.js").PageRoutes;
-        _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").Hook | null;
+        _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").HookInternal | null;
     } | {
         _isPrerendering: true;
         viteConfig: import("vite").ResolvedConfig;
@@ -86,7 +86,7 @@ declare function getPageContextBegin(pageContextInit: PageContextInit, globalCon
         _usesClientRouter: boolean;
         isClientSide: false;
         _pageRoutes: import("../../shared-server-client/route/loadPageRoutes.js").PageRoutes;
-        _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").Hook | null;
+        _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").HookInternal | null;
     } | {
         _isPrerendering: false;
         viteConfig: null;
@@ -96,7 +96,7 @@ declare function getPageContextBegin(pageContextInit: PageContextInit, globalCon
         _usesClientRouter: boolean;
         isClientSide: false;
         _pageRoutes: import("../../shared-server-client/route/loadPageRoutes.js").PageRoutes;
-        _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").Hook | null;
+        _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").HookInternal | null;
     }) & {
         baseServer: string;
         baseAssets: string;

package/dist/shared-server-client/assertVirtualFileExports.js

@@ -1,7 +1,9 @@
+// TO-DO/eventually: remove
 export { assertVirtualFileExports };
 import { assert } from '../utils/assert.js';
 function assertVirtualFileExports(moduleExports, test, moduleId) {
-    if (!moduleExports || !test(moduleExports)) {
+    assert(moduleExports, typeof moduleExports);
+    if (!test(moduleExports)) {
         /* https://github.com/vikejs/vike/issues/2903#issuecomment-3642285811
         throw getProjectError('@cloudflare/vite-plugin error https://github.com/vikejs/vike/issues/2903#issuecomment-3642285811')
         /*/
@@ -10,7 +12,5 @@ function assertVirtualFileExports(moduleExports, test, moduleId) {
     }
 }
 function getKeys(obj) {
-    if (obj === undefined)
-        return null;
     return [...Object.getOwnPropertyNames(obj), ...Object.getOwnPropertySymbols(obj), ...Object.keys(obj)];
 }

package/dist/shared-server-client/createGlobalContextShared.d.ts

@@ -8,11 +8,11 @@ import type { PageConfigRuntime } from '../types/PageConfig.js';
 import { type GlobalContextPublicMinimum } from './getGlobalContextPublicShared.js';
 import type { GlobalContextServerInternal } from '../server/runtime/globalContext.js';
 import type { GlobalContextClientInternal } from '../client/runtime-client-routing/getGlobalContextClientInternal.js';
-import { type Hook } from './hooks/getHook.js';
+import { type HookInternal } from './hooks/getHook.js';
 declare const getGlobalContextSyncErrMsg = "The global context isn't set yet, call getGlobalContextSync() later or use getGlobalContext() instead.";
 declare function createGlobalContextShared<GlobalContextAdded extends {}, GlobalContextAddedAsync extends {}>(virtualFileExportsGlobalEntry: unknown, globalObject: {
     globalContext?: {};
-    onCreateGlobalContextHooks?: Hook<GlobalContextPublicMinimum>[];
+    onCreateGlobalContextHooks?: HookInternal<GlobalContextPublicMinimum>[];
     previousCreateGlobalContextPromise?: Promise<void>;
 }, addGlobalContext?: (globalContext: GlobalContextBase) => GlobalContextAdded, addGlobalContextTmp?: (globalContext: GlobalContextBase) => Promise<GlobalContextAdded>, addGlobalContextAsync?: (globalContext: GlobalContextBase) => Promise<GlobalContextAddedAsync>): Promise<{
     _globalConfigPublic: {

package/dist/shared-server-client/hooks/execHook.d.ts

@@ -9,28 +9,34 @@ export { getPageContext_sync };
 export { providePageContext };
 export { isUserHookError };
 export type { PageContextExecHook };
+export type { HookPublic };
 import type { PageContextClient, PageContextServer } from '../../types/PageContext.js';
-import type { Hook, HookLoc } from './getHook.js';
+import type { HookInternal, HookLoc } from './getHook.js';
 import type { PageContextConfig } from '../getPageFiles.js';
 import type { HookName, HookNameGlobal } from '../../types/Config.js';
 import { type PageContextPublicMinimum } from '../getPageContextPublicShared.js';
 import type { GlobalContextPublicMinimum } from '../getGlobalContextPublicShared.js';
-type HookWithResult = Hook & {
+type HookWithResult = HookInternal & {
     hookReturn: unknown;
 };
 type PageContextExecHook = PageContextPublicMinimum;
 declare function execHook<PageContext extends PageContextExecHook & PageContextConfig>(hookName: HookName, pageContext: PageContext, getPageContextPublic: (pageContext: PageContext) => PageContext): Promise<HookWithResult[]>;
 declare function execHookGlobal(hookName: HookNameGlobal, globalContext: GlobalContextPublicMinimum, getGlobalContextPublic: (globalContext: GlobalContextPublicMinimum) => GlobalContextPublicMinimum): Promise<void>;
-declare function execHookList<PageContext extends PageContextExecHook>(hooks: Hook[], pageContext: PageContext, getPageContextPublic: (pageContext: PageContext) => PageContext): Promise<HookWithResult[]>;
-declare function execHookSingle<PageContext extends PageContextExecHook>(hook: Hook, pageContext: PageContext, getPageContextPublic: (pageContext: PageContext) => PageContext): Promise<void>;
-declare function execHookSingleWithReturn<PageContext extends PageContextExecHook>(hook: Hook, pageContext: PageContext, getPageContextPublic: (pageContext: PageContext) => PageContext): Promise<{
+declare function execHookList<PageContext extends PageContextExecHook>(hooks: HookInternal[], pageContext: PageContext, getPageContextPublic: (pageContext: PageContext) => PageContext): Promise<HookWithResult[]>;
+declare function execHookSingle<PageContext extends PageContextExecHook>(hook: HookInternal, pageContext: PageContext, getPageContextPublic: (pageContext: PageContext) => PageContext): Promise<void>;
+declare function execHookSingleWithReturn<PageContext extends PageContextExecHook>(hook: HookInternal, pageContext: PageContext, getPageContextPublic: (pageContext: PageContext) => PageContext): Promise<{
     hookReturn: unknown;
 }>;
 declare function isUserHookError(err: unknown): false | HookLoc;
-declare function execHookSingleWithoutPageContext<HookReturn>(hook: Omit<Hook, 'hookFn'>, globalContext: GlobalContextPublicMinimum, hookFnCaller: () => HookReturn): Promise<HookReturn>;
-declare function execHookSingleSync<PageContext extends PageContextExecHook>(hook: Omit<Hook<PageContext>, 'hookTimeout'>, globalContext: GlobalContextPublicMinimum, pageContext: PageContext | null, getPageContextPublic: (pageContext: PageContext) => PageContext, hookFnCaller?: () => unknown): {
+declare function execHookSingleWithoutPageContext<HookReturn>(hook: Omit<HookInternal, 'hookFn'>, globalContext: GlobalContextPublicMinimum, hookFnCaller: () => HookReturn): Promise<HookReturn>;
+declare function execHookSingleSync<PageContext extends PageContextExecHook>(hook: Omit<HookInternal<PageContext>, 'hookTimeout'>, globalContext: GlobalContextPublicMinimum, pageContext: PageContext | null, getPageContextPublic: (pageContext: PageContext) => PageContext, hookFnCaller?: () => unknown): {
     hookReturn: unknown;
 };
+type HookPublic = {
+    name: HookName;
+    filePath: string;
+    call: () => void | Promise<void>;
+};
 declare function getPageContext_sync<PageContext = PageContextClient | PageContextServer>(): null | PageContext;
 /**
  * Provide `pageContext` for universal hooks.

package/dist/shared-server-client/hooks/execHook.js

@@ -136,6 +136,7 @@ function execHookBase(hookFnCaller, hook, globalContext, pageContext) {
         return originalReturn;
     };
     for (const onHookCall of configValue.value) {
+        // @ts-expect-error
         const hookPublic = { name: hookName, filePath: hookFilePath, call };
         // Recursively wrap callOriginal() so +onHookCall can use async hooks. (E.g. vike-react-sentry integrates Sentry's `Tracer.startActiveSpan()`.)
         call = () => {

package/dist/shared-server-client/hooks/getHook.d.ts

@@ -4,7 +4,7 @@ export { getHookFromPageConfig };
 export { getHookFromPageConfigGlobal };
 export { getHooksFromPageConfigGlobalCumulative };
 export { getHook_setIsPrerenderering };
-export type { Hook };
+export type { HookInternal };
 export type { HookLoc };
 export type { HookTimeout };
 export type { HooksTimeoutProvidedByUser };
@@ -15,7 +15,7 @@ import type { PageConfigGlobalRuntime, PageConfigRuntime } from '../../types/Pag
 import type { GlobalContextPublicMinimum } from '../getGlobalContextPublicShared.js';
 import type { PageContextPublicMinimum } from '../getPageContextPublicShared.js';
 type HookArgDefault = PageContextPublicMinimum;
-type Hook<HookArg = HookArgDefault> = HookLoc & {
+type HookInternal<HookArg = HookArgDefault> = HookLoc & {
     hookFn: HookFn<HookArg>;
     hookTimeout: HookTimeout;
 };
@@ -29,10 +29,10 @@ type HookTimeout = {
     warning: number | false;
 };
 type HooksTimeoutProvidedByUser = false | Partial<Record<HookNameOld, false | Partial<HookTimeout>>>;
-declare function getHookFromPageContext(pageContext: PageContextConfig, hookName: HookNameOld): null | Hook;
-declare function getHooksFromPageContextNew(hookName: HookName, pageContext: PageContextConfig): Hook[];
-declare function getHookFromPageConfig(pageConfig: PageConfigRuntime, hookName: HookNamePage): null | Hook;
-declare function getHookFromPageConfigGlobal(pageConfigGlobal: PageConfigGlobalRuntime, hookName: HookNameGlobal): null | Hook;
-declare function getHooksFromPageConfigGlobalCumulative<HookArg = GlobalContextPublicMinimum>(pageConfigGlobal: PageConfigGlobalRuntime, hookName: HookNameGlobal): Hook<HookArg>[];
+declare function getHookFromPageContext(pageContext: PageContextConfig, hookName: HookNameOld): null | HookInternal;
+declare function getHooksFromPageContextNew(hookName: HookName, pageContext: PageContextConfig): HookInternal[];
+declare function getHookFromPageConfig(pageConfig: PageConfigRuntime, hookName: HookNamePage): null | HookInternal;
+declare function getHookFromPageConfigGlobal(pageConfigGlobal: PageConfigGlobalRuntime, hookName: HookNameGlobal): null | HookInternal;
+declare function getHooksFromPageConfigGlobalCumulative<HookArg = GlobalContextPublicMinimum>(pageConfigGlobal: PageConfigGlobalRuntime, hookName: HookNameGlobal): HookInternal<HookArg>[];
 declare function getHookTimeoutDefault(hookName: HookNameOld): HookTimeout;
 declare function getHook_setIsPrerenderering(): void;

package/dist/shared-server-client/route/loadPageRoutes.d.ts

@@ -4,7 +4,7 @@ export type { PageRoutes };
 export type { RouteType };
 import type { PageFile } from '../getPageFiles.js';
 import type { PageConfigRuntime, PageConfigGlobalRuntime } from '../../types/PageConfig.js';
-import { type Hook } from '../hooks/getHook.js';
+import { type HookInternal } from '../hooks/getHook.js';
 type PageRoute = {
     pageId: string;
     comesFromV1PageConfig: boolean;
@@ -27,9 +27,9 @@ type PageRoutes = PageRoute[];
 type RouteType = 'STRING' | 'FUNCTION' | 'FILESYSTEM';
 declare function loadPageRoutes(pageFilesAll: PageFile[], pageConfigs: PageConfigRuntime[], pageConfigGlobal: PageConfigGlobalRuntime, allPageIds: string[]): Promise<{
     pageRoutes: PageRoutes;
-    onBeforeRouteHook: null | Hook;
+    onBeforeRouteHook: null | HookInternal;
 }>;
 declare function loadPageRoutesSync(pageFilesAll: PageFile[], pageConfigs: PageConfigRuntime[], pageConfigGlobal: PageConfigGlobalRuntime, allPageIds: string[]): {
     pageRoutes: PageRoutes;
-    onBeforeRouteHook: null | Hook;
+    onBeforeRouteHook: null | HookInternal;
 };

package/dist/types/Config.d.ts

@@ -48,6 +48,7 @@ import type { PassToClientPublic } from '../server/runtime/renderPageServer/html
 import type { CliPreviewConfig } from '../node/api/preview.js';
 import type { StaticReplace } from '../node/vite/plugins/pluginStaticReplace/applyStaticReplace.js';
 import type { ImportStringList } from '../node/vite/shared/importString.js';
+import type { HookPublic } from '../shared-server-client/hooks/execHook.js';
 type HookNameOld = HookName | HookNameOldDesign;
 type HookName = HookNamePage | HookNameGlobal;
 type HookNamePage = 'onHydrationEnd' | 'onBeforePrerenderStart' | 'onBeforeRender' | 'onPageTransitionStart' | 'onPageTransitionEnd' | 'onRenderHtml' | 'onRenderClient' | 'guard' | 'data' | 'onData' | 'route';
@@ -296,11 +297,7 @@ type ConfigBuiltIn = {
      *
      *  https://vike.dev/onHookCall
      */
-    onHookCall?: ((hook: {
-        name: HookName;
-        filePath: string;
-        call: () => void | Promise<void>;
-    }, pageContext: PageContextClient | PageContextServer | null) => void | Promise<void>) | ImportStringList;
+    onHookCall?: ((hook: HookPublic, pageContext: PageContextServer | null) => void | Promise<void>) | ImportStringList;
     /** Hook for fetching data.
      *
      *  https://vike.dev/data

package/dist/utils/PROJECT_VERSION.d.ts

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.252-commit-1d0a050";
+export declare const PROJECT_VERSION: "0.4.252-commit-a938132";

package/dist/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.252-commit-1d0a050';
+export const PROJECT_VERSION = '0.4.252-commit-a938132';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.252-commit-1d0a050",
+  "version": "0.4.252-commit-a938132",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {
@@ -153,7 +153,7 @@
     "node": ">=20.19.0"
   },
   "license": "MIT",
-  "description": "(Replaces Next.js/Nuxt) 🔨 Composable framework to build (advanced) applications with flexibility and stability.",
+  "description": "(Replaces Next.js/Nuxt) 🔨 Composable framework to build advanced applications with flexibility and stability.",
   "keywords": [
     "vite-plugin",
     "ssr",