vike 0.4.249 → 0.4.250-commit-6161324

package/bin.js

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+
+import './dist/node/cli/entry.js'

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

@@ -1,5 +1,6 @@
 export { createPageContextClientSide };
-export type PageContextCreated = Awaited<ReturnType<typeof createPageContextClientSide>>;
+export type PageContextCreatedClient = Awaited<ReturnType<typeof createPageContextClientSide>>;
+export type PageContextCreatedClientBase = Awaited<ReturnType<typeof createPageContextBase>>;
 declare function createPageContextClientSide(urlOriginal: string): Promise<{
     _isOriginalObject: true;
     isPageContext: true;
@@ -7,6 +8,14 @@ declare function createPageContextClientSide(urlOriginal: string): Promise<{
     isClientSide: true;
     isPrerendering: false;
     urlOriginal: string;
+    _urlHandler: null;
+} & {
+    _baseServer: string;
+} & {
+    urlParsed: import("./utils.js").UrlPublic;
+    urlPathname: string;
+    url: string;
+} & {
     _globalContext: {
         _globalConfigPublic: {
             pages: {
@@ -60,10 +69,19 @@ declare function createPageContextClientSide(urlOriginal: string): Promise<{
         _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").Hook | null;
     };
     _pageFilesAll: import("../../shared-server-client/getPageFiles.js").PageFile[];
+} & import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").GlobalConfigPublic>;
+declare function createPageContextBase(urlOriginal: string): {
+    _isOriginalObject: true;
+    isPageContext: true;
+} & {
+    isClientSide: true;
+    isPrerendering: false;
+    urlOriginal: string;
     _urlHandler: null;
+} & {
     _baseServer: string;
 } & {
     urlParsed: import("./utils.js").UrlPublic;
     urlPathname: string;
     url: string;
-} & import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").GlobalConfigPublic>;
+};

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

@@ -5,22 +5,30 @@ import { getBaseServer } from './getBaseServer.js';
 import { getGlobalContextClientInternal } from './getGlobalContextClientInternal.js';
 import { assert, updateType, isBaseServer, objectAssign } from './utils.js';
 async function createPageContextClientSide(urlOriginal) {
+    const pageContext = createPageContextBase(urlOriginal);
     const globalContext = await getGlobalContextClientInternal();
-    const baseServer = getBaseServer();
-    assert(isBaseServer(baseServer));
-    const pageContextCreated = createPageContextObject();
-    objectAssign(pageContextCreated, {
+    objectAssign(pageContext, {
+        _globalContext: globalContext,
+        _pageFilesAll: globalContext._pageFilesAll, // TO-DO/next-major-release: remove
+    });
+    const pageContextAugmented = createPageContextShared(pageContext, globalContext._globalConfigPublic);
+    updateType(pageContext, pageContextAugmented);
+    return pageContext;
+}
+function createPageContextBase(urlOriginal) {
+    const pageContext = createPageContextObject();
+    objectAssign(pageContext, {
         isClientSide: true,
         isPrerendering: false,
         urlOriginal,
-        _globalContext: globalContext,
-        _pageFilesAll: globalContext._pageFilesAll, // TO-DO/next-major-release: remove
         _urlHandler: null,
+    });
+    const baseServer = getBaseServer();
+    assert(isBaseServer(baseServer));
+    objectAssign(pageContext, {
         _baseServer: baseServer,
     });
-    const pageContextUrlComputed = getPageContextUrlComputed(pageContextCreated);
-    objectAssign(pageContextCreated, pageContextUrlComputed);
-    const pageContextAugmented = createPageContextShared(pageContextCreated, globalContext._globalConfigPublic);
-    updateType(pageContextCreated, pageContextAugmented);
-    return pageContextCreated;
+    const pageContextUrlComputed = getPageContextUrlComputed(pageContext);
+    objectAssign(pageContext, pageContextUrlComputed);
+    return pageContext;
 }

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

@@ -1,8 +1,6 @@
 export { getPageContext };
 export { providePageContext };
 // TO-DO/eventually: create new setting `+asyncHook: true` that sets the default value of the `asyncHook` parameter below to `true`
-// TODO/next-release: update vike-{react,vue,solid} usage
-// TODO/next-release: contact Da-Jin about `window.history.state?.vike` https://vike.dev/navigate#history-pushstate
 import { getPageContext_sync, providePageContext } from '../../shared-server-client/hooks/execHook.js';
 import { getPageContextClient } from './renderPageClient.js';
 function getPageContext({ asyncHook } = {}) {

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

@@ -5,7 +5,7 @@ export { getPageContextFromHooksServer_firstRender };
 export { setPageContextInitIsPassedToClient };
 export type { PageContextFromHooksServer };
 import type { PageContextConfig, PageFile } from '../../shared-server-client/getPageFiles.js';
-import type { PageContextCreated } from './createPageContextClientSide.js';
+import type { PageContextCreatedClient } from './createPageContextClientSide.js';
 import type { PageContextBegin } from './renderPageClient.js';
 import { type PageContextForPublicUsageClient } from './preparePageContextForPublicUsageClient.js';
 type PageContextSerialized = {
@@ -25,6 +25,14 @@ declare function getPageContextFromHooksClient_firstRender(pageContext: PageCont
     isClientSide: true;
     isPrerendering: false;
     urlOriginal: string;
+    _urlHandler: null;
+} & {
+    _baseServer: string;
+} & {
+    urlParsed: import("./utils.js").UrlPublic;
+    urlPathname: string;
+    url: string;
+} & {
     _globalContext: {
         _globalConfigPublic: {
             pages: {
@@ -78,12 +86,6 @@ declare function getPageContextFromHooksClient_firstRender(pageContext: PageCont
         _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").Hook | null;
     };
     _pageFilesAll: PageFile[];
-    _urlHandler: null;
-    _baseServer: string;
-} & {
-    urlParsed: import("./utils.js").UrlPublic;
-    urlPathname: string;
-    url: string;
 } & import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").GlobalConfigPublic & {
     isBackwardNavigation: boolean | null;
     isHistoryNavigation: boolean;
@@ -94,14 +96,81 @@ declare function getPageContextFromHooksClient_firstRender(pageContext: PageCont
     } & PageContextConfig & {
         pageId: string;
         routeParams: Record<string, string>;
-    } & import("../../shared-server-client/preparePageContextForPublicUsage.js").PageContextPrepareMinimum & import("../../types/PageContext.js").PageContextInternalClient & Omit<Partial<PageContextConfig & {
+    } & {
+        _isOriginalObject: true;
+        isPageContext: true;
+    } & {
+        isClientSide: true;
+        isPrerendering: false;
+        urlOriginal: string;
+        _urlHandler: null;
+    } & {
+        _baseServer: string;
+    } & {
+        urlParsed: import("./utils.js").UrlPublic;
+        urlPathname: string;
+        url: string;
+    } & {
+        _globalContext: {
+            _globalConfigPublic: {
+                pages: {
+                    [k: string]: {
+                        config: import("../../types/index.js").ConfigResolved;
+                        _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
+                        _sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
+                        _from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
+                    } & ({
+                        route: import("../../types/Config.js").Route;
+                        isErrorPage?: undefined;
+                    } | {
+                        route?: undefined;
+                        isErrorPage: true;
+                    });
+                };
+                config: import("../../types/index.js").ConfigResolved;
+                _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
+                _sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
+                _from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
+            };
+            pages: {
+                [k: string]: {
+                    config: import("../../types/index.js").ConfigResolved;
+                    _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
+                    _sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
+                    _from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
+                } & ({
+                    route: import("../../types/Config.js").Route;
+                    isErrorPage?: undefined;
+                } | {
+                    route?: undefined;
+                    isErrorPage: true;
+                });
+            };
+            config: import("../../types/index.js").ConfigResolved;
+            _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
+            _sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
+            _from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
+            isGlobalContext: true;
+            _isOriginalObject: true;
+            _virtualFileExportsGlobalEntry: unknown;
+            _pageFilesAll: PageFile[];
+            _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
+            _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
+            _allPageIds: string[];
+        } & {
+            isClientSide: true;
+        } & {
+            _pageRoutes: import("../../shared-server-client/route/loadPageRoutes.js").PageRoutes;
+            _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").Hook | null;
+        };
+        _pageFilesAll: PageFile[];
+    } & import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").GlobalConfigPublic & {
+        _globalContext: import("../../shared-server-client/prepareGlobalContextForPublicUsage.js").GlobalContextPrepareMinimum;
+    } & import("../../shared-server-client/createPageContextShared.js").PageContextCreatedBase & import("../../types/PageContext.js").PageContextInternalClient & Omit<Partial<PageContextConfig & {
         isPageContext: true;
         Page: import("../../types/Config.js").Config["Page"];
         routeParams: Record<string, string>;
         data: unknown;
-        urlOriginal: string;
-        headers: Record<string, string> | null;
-        headersOriginal?: unknown;
         headersResponse: Headers;
         is404: boolean | null;
         isClientSideNavigation: boolean;
@@ -112,7 +181,6 @@ declare function getPageContextFromHooksClient_firstRender(pageContext: PageCont
         from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
         source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
         sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
-        url: string;
         pageExports: Record<string, unknown>;
         isBaseMissing?: true;
     }> & Pick<PageContextConfig & {
@@ -120,9 +188,6 @@ declare function getPageContextFromHooksClient_firstRender(pageContext: PageCont
         Page: import("../../types/Config.js").Config["Page"];
         routeParams: Record<string, string>;
         data: unknown;
-        urlOriginal: string;
-        headers: Record<string, string> | null;
-        headersOriginal?: unknown;
         headersResponse: Headers;
         is404: boolean | null;
         isClientSideNavigation: boolean;
@@ -133,13 +198,13 @@ declare function getPageContextFromHooksClient_firstRender(pageContext: PageCont
         from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
         source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
         sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
-        url: string;
         pageExports: Record<string, unknown>;
         isBaseMissing?: true;
-    }, "pageExports" | "exports" | "pageId" | "config" | "Page" | "data" | "routeParams" | "source" | "sources" | "from" | "configEntries" | "exportsAll" | "abortReason"> & {
+    }, "exports" | "pageId" | "config" | "Page" | "data" | "source" | "sources" | "from" | "configEntries" | "exportsAll" | "pageExports" | "routeParams" | "abortReason"> & {
         isClientSide: true;
         isPrerendering: false;
     } & {
+        urlOriginal: string;
         isHydration: boolean;
         isBackwardNavigation: boolean | null;
         isHistoryNavigation: boolean;
@@ -152,7 +217,7 @@ declare function getPageContextFromHooksClient_firstRender(pageContext: PageCont
         urlParsed: import("./utils.js").UrlPublic;
         urlPathname: string;
         url: string;
-    }, "pageContextsAborted" | "previousPageContext" | ("globalContext" | "Page" | "data")> & {
+    }, ("globalContext" | "Page" | "data") | "previousPageContext" | "pageContextsAborted"> & {
         previousPageContext: {
             pageId: string;
         } | null;
@@ -162,14 +227,13 @@ declare function getPageContextFromHooksClient_firstRender(pageContext: PageCont
     pageContextsAborted: import("../../shared-server-client/route/abort.js").PageContextAborted[];
 } & (import("../../shared-server-client/route/abort.js").PageContextAbort | null))) & PageContextConfig & {
     _hasPageContextFromServer: true;
-}) & import("../../shared-server-client/preparePageContextForPublicUsage.js").PageContextPrepareMinimum & Omit<Partial<PageContextConfig & {
+}) & {
+    _globalContext: import("../../shared-server-client/prepareGlobalContextForPublicUsage.js").GlobalContextPrepareMinimum;
+} & import("../../shared-server-client/createPageContextShared.js").PageContextCreatedBase & Omit<Partial<PageContextConfig & {
     isPageContext: true;
     Page: import("../../types/Config.js").Config["Page"];
     routeParams: Record<string, string>;
     data: unknown;
-    urlOriginal: string;
-    headers: Record<string, string> | null;
-    headersOriginal?: unknown;
     headersResponse: Headers;
     is404: boolean | null;
     isClientSideNavigation: boolean;
@@ -180,7 +244,6 @@ declare function getPageContextFromHooksClient_firstRender(pageContext: PageCont
     from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
     source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
     sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
-    url: string;
     pageExports: Record<string, unknown>;
     isBaseMissing?: true;
 }> & Pick<PageContextConfig & {
@@ -188,9 +251,6 @@ declare function getPageContextFromHooksClient_firstRender(pageContext: PageCont
     Page: import("../../types/Config.js").Config["Page"];
     routeParams: Record<string, string>;
     data: unknown;
-    urlOriginal: string;
-    headers: Record<string, string> | null;
-    headersOriginal?: unknown;
     headersResponse: Headers;
     is404: boolean | null;
     isClientSideNavigation: boolean;
@@ -201,13 +261,13 @@ declare function getPageContextFromHooksClient_firstRender(pageContext: PageCont
     from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
     source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
     sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
-    url: string;
     pageExports: Record<string, unknown>;
     isBaseMissing?: true;
-}, "pageExports" | "exports" | "pageId" | "config" | "Page" | "data" | "routeParams" | "source" | "sources" | "from" | "configEntries" | "exportsAll" | "abortReason"> & {
+}, "exports" | "pageId" | "config" | "Page" | "data" | "source" | "sources" | "from" | "configEntries" | "exportsAll" | "pageExports" | "routeParams" | "abortReason"> & {
     isClientSide: true;
     isPrerendering: false;
 } & {
+    urlOriginal: string;
     isHydration: boolean;
     isBackwardNavigation: boolean | null;
     isHistoryNavigation: boolean;
@@ -220,7 +280,7 @@ declare function getPageContextFromHooksClient_firstRender(pageContext: PageCont
     urlParsed: import("./utils.js").UrlPublic;
     urlPathname: string;
     url: string;
-}, "pageContextsAborted" | "previousPageContext" | ("globalContext" | "Page" | "data")> & {
+}, ("globalContext" | "Page" | "data") | "previousPageContext" | "pageContextsAborted"> & {
     previousPageContext: {
         pageId: string;
     } | null;
@@ -232,7 +292,7 @@ type PageContextFromHooksServer = {
 };
 declare function getPageContextFromHooksServer(pageContext: {
     pageId: string;
-} & PageContextCreated, isErrorPage: boolean): Promise<{
+} & PageContextCreatedClient, isErrorPage: boolean): Promise<{
     is404ServerSideRouted: true;
 } | {
     is404ServerSideRouted?: undefined;
@@ -241,16 +301,24 @@ declare function getPageContextFromHooksServer(pageContext: {
 declare function getPageContextFromHooksClient(pageContext: {
     pageId: string;
     _hasPageContextFromServer: boolean;
-} & PageContextBegin & PageContextConfig & PageContextForPublicUsageClient, isErrorPage: boolean): Promise<({
+} & PageContextBegin & PageContextConfig & PageContextForPublicUsageClient, isErrorPage: boolean): Promise<(({
     pageId: string;
     _hasPageContextFromServer: boolean;
-} & (({
+} & ({
     _isOriginalObject: true;
     isPageContext: true;
 } & {
     isClientSide: true;
     isPrerendering: false;
     urlOriginal: string;
+    _urlHandler: null;
+} & {
+    _baseServer: string;
+} & {
+    urlParsed: import("./utils.js").UrlPublic;
+    urlPathname: string;
+    url: string;
+} & {
     _globalContext: {
         _globalConfigPublic: {
             pages: {
@@ -304,12 +372,6 @@ declare function getPageContextFromHooksClient(pageContext: {
         _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").Hook | null;
     };
     _pageFilesAll: PageFile[];
-    _urlHandler: null;
-    _baseServer: string;
-} & {
-    urlParsed: import("./utils.js").UrlPublic;
-    urlPathname: string;
-    url: string;
 } & import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").GlobalConfigPublic & {
     isBackwardNavigation: boolean | null;
     isHistoryNavigation: boolean;
@@ -320,14 +382,81 @@ declare function getPageContextFromHooksClient(pageContext: {
     } & PageContextConfig & {
         pageId: string;
         routeParams: Record<string, string>;
-    } & import("../../shared-server-client/preparePageContextForPublicUsage.js").PageContextPrepareMinimum & import("../../types/PageContext.js").PageContextInternalClient & Omit<Partial<PageContextConfig & {
+    } & {
+        _isOriginalObject: true;
+        isPageContext: true;
+    } & {
+        isClientSide: true;
+        isPrerendering: false;
+        urlOriginal: string;
+        _urlHandler: null;
+    } & {
+        _baseServer: string;
+    } & {
+        urlParsed: import("./utils.js").UrlPublic;
+        urlPathname: string;
+        url: string;
+    } & {
+        _globalContext: {
+            _globalConfigPublic: {
+                pages: {
+                    [k: string]: {
+                        config: import("../../types/index.js").ConfigResolved;
+                        _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
+                        _sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
+                        _from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
+                    } & ({
+                        route: import("../../types/Config.js").Route;
+                        isErrorPage?: undefined;
+                    } | {
+                        route?: undefined;
+                        isErrorPage: true;
+                    });
+                };
+                config: import("../../types/index.js").ConfigResolved;
+                _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
+                _sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
+                _from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
+            };
+            pages: {
+                [k: string]: {
+                    config: import("../../types/index.js").ConfigResolved;
+                    _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
+                    _sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
+                    _from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
+                } & ({
+                    route: import("../../types/Config.js").Route;
+                    isErrorPage?: undefined;
+                } | {
+                    route?: undefined;
+                    isErrorPage: true;
+                });
+            };
+            config: import("../../types/index.js").ConfigResolved;
+            _source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
+            _sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
+            _from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
+            isGlobalContext: true;
+            _isOriginalObject: true;
+            _virtualFileExportsGlobalEntry: unknown;
+            _pageFilesAll: PageFile[];
+            _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
+            _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
+            _allPageIds: string[];
+        } & {
+            isClientSide: true;
+        } & {
+            _pageRoutes: import("../../shared-server-client/route/loadPageRoutes.js").PageRoutes;
+            _onBeforeRouteHook: import("../../shared-server-client/hooks/getHook.js").Hook | null;
+        };
+        _pageFilesAll: PageFile[];
+    } & import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").GlobalConfigPublic & {
+        _globalContext: import("../../shared-server-client/prepareGlobalContextForPublicUsage.js").GlobalContextPrepareMinimum;
+    } & import("../../shared-server-client/createPageContextShared.js").PageContextCreatedBase & import("../../types/PageContext.js").PageContextInternalClient & Omit<Partial<PageContextConfig & {
         isPageContext: true;
         Page: import("../../types/Config.js").Config["Page"];
         routeParams: Record<string, string>;
         data: unknown;
-        urlOriginal: string;
-        headers: Record<string, string> | null;
-        headersOriginal?: unknown;
         headersResponse: Headers;
         is404: boolean | null;
         isClientSideNavigation: boolean;
@@ -338,7 +467,6 @@ declare function getPageContextFromHooksClient(pageContext: {
         from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
         source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
         sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
-        url: string;
         pageExports: Record<string, unknown>;
         isBaseMissing?: true;
     }> & Pick<PageContextConfig & {
@@ -346,9 +474,6 @@ declare function getPageContextFromHooksClient(pageContext: {
         Page: import("../../types/Config.js").Config["Page"];
         routeParams: Record<string, string>;
         data: unknown;
-        urlOriginal: string;
-        headers: Record<string, string> | null;
-        headersOriginal?: unknown;
         headersResponse: Headers;
         is404: boolean | null;
         isClientSideNavigation: boolean;
@@ -359,13 +484,13 @@ declare function getPageContextFromHooksClient(pageContext: {
         from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
         source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
         sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
-        url: string;
         pageExports: Record<string, unknown>;
         isBaseMissing?: true;
-    }, "pageExports" | "exports" | "pageId" | "config" | "Page" | "data" | "routeParams" | "source" | "sources" | "from" | "configEntries" | "exportsAll" | "abortReason"> & {
+    }, "exports" | "pageId" | "config" | "Page" | "data" | "source" | "sources" | "from" | "configEntries" | "exportsAll" | "pageExports" | "routeParams" | "abortReason"> & {
         isClientSide: true;
         isPrerendering: false;
     } & {
+        urlOriginal: string;
         isHydration: boolean;
         isBackwardNavigation: boolean | null;
         isHistoryNavigation: boolean;
@@ -378,7 +503,7 @@ declare function getPageContextFromHooksClient(pageContext: {
         urlParsed: import("./utils.js").UrlPublic;
         urlPathname: string;
         url: string;
-    }, "pageContextsAborted" | "previousPageContext" | ("globalContext" | "Page" | "data")> & {
+    }, ("globalContext" | "Page" | "data") | "previousPageContext" | "pageContextsAborted"> & {
         previousPageContext: {
             pageId: string;
         } | null;
@@ -386,14 +511,13 @@ declare function getPageContextFromHooksClient(pageContext: {
         urlOriginal: string;
     }) | null;
     pageContextsAborted: import("../../shared-server-client/route/abort.js").PageContextAborted[];
-} & (import("../../shared-server-client/route/abort.js").PageContextAbort | null)) & PageContextConfig)) & import("../../shared-server-client/preparePageContextForPublicUsage.js").PageContextPrepareMinimum & Omit<Partial<PageContextConfig & {
+} & (import("../../shared-server-client/route/abort.js").PageContextAbort | null))) & PageContextConfig & {
+    _globalContext: import("../../shared-server-client/prepareGlobalContextForPublicUsage.js").GlobalContextPrepareMinimum;
+}) & import("../../shared-server-client/createPageContextShared.js").PageContextCreatedBase & Omit<Partial<PageContextConfig & {
     isPageContext: true;
     Page: import("../../types/Config.js").Config["Page"];
     routeParams: Record<string, string>;
     data: unknown;
-    urlOriginal: string;
-    headers: Record<string, string> | null;
-    headersOriginal?: unknown;
     headersResponse: Headers;
     is404: boolean | null;
     isClientSideNavigation: boolean;
@@ -404,7 +528,6 @@ declare function getPageContextFromHooksClient(pageContext: {
     from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
     source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
     sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
-    url: string;
     pageExports: Record<string, unknown>;
     isBaseMissing?: true;
 }> & Pick<PageContextConfig & {
@@ -412,9 +535,6 @@ declare function getPageContextFromHooksClient(pageContext: {
     Page: import("../../types/Config.js").Config["Page"];
     routeParams: Record<string, string>;
     data: unknown;
-    urlOriginal: string;
-    headers: Record<string, string> | null;
-    headersOriginal?: unknown;
     headersResponse: Headers;
     is404: boolean | null;
     isClientSideNavigation: boolean;
@@ -425,13 +545,13 @@ declare function getPageContextFromHooksClient(pageContext: {
     from: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").From;
     source: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Source;
     sources: import("../../shared-server-client/page-configs/resolveVikeConfigPublic.js").Sources;
-    url: string;
     pageExports: Record<string, unknown>;
     isBaseMissing?: true;
-}, "pageExports" | "exports" | "pageId" | "config" | "Page" | "data" | "routeParams" | "source" | "sources" | "from" | "configEntries" | "exportsAll" | "abortReason"> & {
+}, "exports" | "pageId" | "config" | "Page" | "data" | "source" | "sources" | "from" | "configEntries" | "exportsAll" | "pageExports" | "routeParams" | "abortReason"> & {
     isClientSide: true;
     isPrerendering: false;
 } & {
+    urlOriginal: string;
     isHydration: boolean;
     isBackwardNavigation: boolean | null;
     isHistoryNavigation: boolean;
@@ -444,7 +564,7 @@ declare function getPageContextFromHooksClient(pageContext: {
     urlParsed: import("./utils.js").UrlPublic;
     urlPathname: string;
     url: string;
-}, "pageContextsAborted" | "previousPageContext" | ("globalContext" | "Page" | "data")> & {
+}, ("globalContext" | "Page" | "data") | "previousPageContext" | "pageContextsAborted"> & {
     previousPageContext: {
         pageId: string;
     } | null;

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

@@ -18,7 +18,7 @@ type ScrollPosition = {
 };
 declare function saveScrollPosition(): void;
 declare function pushHistoryState(url: string, overwriteLastHistoryEntry: boolean): void;
-declare function replaceHistoryStateOriginal(state: unknown, url: Parameters<typeof window.history.replaceState>[2]): void;
+declare function replaceHistoryStateOriginal(state: unknown, url?: Parameters<typeof window.history.replaceState>[2]): void;
 type HistoryInfo = {
     url: `/${string}`;
     state: StateEnhanced;

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

@@ -4,7 +4,7 @@ export { onPopStateBegin };
 export { saveScrollPosition };
 export { initHistory };
 import { getCurrentUrl } from '../shared/getCurrentUrl.js';
-import { assert, assertUsage, getGlobalObject, isObject, deepEqual, redirectHard } from './utils.js';
+import { assert, assertUsage, getGlobalObject, isObject, redirectHard } from './utils.js';
 const globalObject = getGlobalObject('history.ts', {
     monkeyPatched: false,
     previous: undefined,
@@ -102,26 +102,19 @@ function monkeyPatchHistoryAPI() {
                         triggeredBy: 'user',
                     },
                 };
-            assertIsEnhanced(state);
             funcOriginal(state, ...rest);
-            // TO-DO/eventually remove excessive assertions to save client-side KBs
-            assert(isEqual(state, window.history.state));
+            assertIsEnhanced(window.history.state);
             globalObject.previous = getHistoryInfo();
             // Workaround https://github.com/vikejs/vike/issues/2504#issuecomment-3149764736
             queueMicrotask(() => {
-                if (isEqual(state, window.history.state))
+                if (isEnhanced(window.history.state))
                     return;
                 Object.assign(state, window.history.state);
-                assertIsEnhanced(state);
-                replaceHistoryStateOriginal(state, rest[1]);
-                assert(isEqual(state, window.history.state));
+                replaceHistoryStateOriginal(state);
             });
         };
     });
 }
-function isEqual(state1, state2) {
-    return deepEqual(state1?.vike, state2?.vike);
-}
 function isEnhanced(state) {
     if (state?.vike) {
         /* We don't use the assert() below to save client-side KBs.

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

@@ -5,11 +5,11 @@ export { populatePageContextPrefetchCache };
 export { addLinkPrefetchHandlers };
 export { addLinkPrefetchHandlers_watch };
 export { addLinkPrefetchHandlers_unwatch };
-import { type PageContextCreated } from './createPageContextClientSide.js';
+import { type PageContextCreatedClient } from './createPageContextClientSide.js';
 import { type PageContextFromHooksServer, getPageContextFromHooksServer } from './getPageContextFromHooks.js';
 import type { PageContextConfig } from '../../shared-server-client/getPageFiles.js';
 type ResultPageContextFromServer = Awaited<ReturnType<typeof getPageContextFromHooksServer>>;
-type PageContextForPrefetch = PageContextCreated & {
+type PageContextForPrefetch = PageContextCreatedClient & {
     pageId: string;
 };
 declare function getPageContextPrefetched(pageContext: {