vike 0.4.237 → 0.4.238-commit-3c1a09d

package/dist/cjs/utils/path.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pathJoin = pathJoin;
 exports.pathIsRelative = pathIsRelative;
+exports.pathIsAbsolute = pathIsAbsolute;
 exports.toPosixPath = toPosixPath;
 exports.assertPosixPath = assertPosixPath;
 // Utilities for handling file paths.
@@ -22,12 +23,11 @@ function pathJoin(path1, path2) {
         joined = '/' + joined;
     return joined;
 }
-/* https://github.com/brillout/telefunc/blob/0fd44322acbd07857ae29361ba7c998607f17dd5/telefunc/utils/path-shim.ts#L17-L21
-const IS_ABSOLUTE_RE = /^[/\\](?![/\\])|^[/\\]{2}(?!\.)|^[A-Za-z]:[/\\]/
-function pathIsAbsolute(filePath: string) {
-  return IS_ABSOLUTE_RE.test(filePath)
+// https://github.com/brillout/telefunc/blob/0fd44322acbd07857ae29361ba7c998607f17dd5/telefunc/utils/path-shim.ts#L17-L21
+const IS_ABSOLUTE_RE = /^[/\\](?![/\\])|^[/\\]{2}(?!\.)|^[A-Za-z]:[/\\]/;
+function pathIsAbsolute(filePath) {
+    return IS_ABSOLUTE_RE.test(filePath);
 }
-//*/
 /**********************/
 /****** UTILS *********/
 /**********************/

package/dist/cjs/utils/requireResolve.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.requireResolveOptional = requireResolveOptional;
 exports.requireResolveOptionalDir = requireResolveOptionalDir;
 exports.requireResolveNpmPackage = requireResolveNpmPackage;
-exports.requireResolveVikeDistFile = requireResolveVikeDistFile;
-exports.getVikeNodeModulesRoot = getVikeNodeModulesRoot;
+exports.requireResolveDistFile = requireResolveDistFile;
+exports.getPackageNodeModulesDirectory = getPackageNodeModulesDirectory;
 const assert_js_1 = require("./assert.js");
 const assertIsNotBrowser_js_1 = require("./assertIsNotBrowser.js");
 const assertSetup_js_1 = require("./assertSetup.js");
@@ -109,11 +109,11 @@ function requireResolveNpmPackage({ importPathNpmPackage, userRootDir, }) {
         throw res.err;
     return res.importPathResolvedFilePath;
 }
-function requireResolveVikeDistFile(vikeDistFile) {
-    const vikeNodeModulesRoot = getVikeNodeModulesRoot();
-    (0, path_js_1.assertPosixPath)(vikeNodeModulesRoot);
-    (0, path_js_1.assertPosixPath)(vikeDistFile);
-    const importPathResolvedFilePath = makeNodeFriendly(node_path_1.default.posix.join(vikeNodeModulesRoot, vikeDistFile));
+function requireResolveDistFile(distFile) {
+    const packageNodeModulesDirectory = getPackageNodeModulesDirectory();
+    (0, path_js_1.assertPosixPath)(packageNodeModulesDirectory);
+    (0, path_js_1.assertPosixPath)(distFile);
+    const importPathResolvedFilePath = makeNodeFriendly(node_path_1.default.posix.join(packageNodeModulesDirectory, distFile));
     // Double check
     {
         const res = requireResolve_(importPathResolvedFilePath, 
@@ -171,11 +171,12 @@ function addFileExtensionsToRequireResolve(require_) {
         }
     });
 }
-function getVikeNodeModulesRoot() {
-    // [RELATIVE_PATH_FROM_DIST] Current file: vike/dist/esm/utils/requireResolve.js
-    (0, assert_js_1.assert)(importMetaUrl.includes('/dist/esm/') || importMetaUrl.includes('/dist/cjs/'));
-    const vikeNodeModulesRoot = node_path_1.default.posix.join(removeFilePrefix(importMetaUrl), '../../../../');
-    return vikeNodeModulesRoot;
+function getPackageNodeModulesDirectory() {
+    // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/${packageName}/dist/esm/utils/requireResolve.js
+    (0, assert_js_1.assert)(importMetaUrl.includes('/dist/esm/utils/') || importMetaUrl.includes('/dist/cjs/utils/'));
+    const packageNodeModulesDirectory = node_path_1.default.posix.join(removeFilePrefix(node_path_1.default.dirname(importMetaUrl)), '../../../');
+    // Return `node_modules/${packageName}/`
+    return packageNodeModulesDirectory;
 }
 function getFakeImporterFile(dirPath) {
     (0, path_js_1.assertPosixPath)(dirPath);

package/dist/cjs/utils/{augmentType.js → updateType.js}

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.augmentType = augmentType;
+exports.updateType = updateType;
 const assert_js_1 = require("./assert.js");
-/** Help TypeScript augment the type of objects. */
-function augmentType(thing, clone) {
+/** Help TypeScript update the type of dynamically modified objects. */
+function updateType(thing, clone) {
     // @ts-ignore
     (0, assert_js_1.assert)(thing === clone);
 }

package/dist/esm/__internal/index.d.ts

@@ -1,4 +1,4 @@
-export { setGlobalContext_buildEntry } from '../node/runtime/globalContext.js';
+export { setGlobalContext_prodBuildEntry } from '../node/runtime/globalContext.js';
 export { route, getPagesAndRoutes };
 export type { PageRoutes, PageFile, PageConfigRuntime as PageConfig };
 import { route as routeInternal, type PageRoutes } from '../shared/route/index.js';
@@ -16,5 +16,5 @@ declare function getPagesAndRoutes(): Promise<{
     allPageIds: string[];
 }>;
 declare function route(pageContext: Parameters<typeof routeInternal>[0]): Promise<{
-    pageContextAddendum: import("../shared/route/index.js").PageContextFromRoute;
+    pageContextAddendum: import("../shared/route/index.js").PageContextAfterRoute;
 }>;

package/dist/esm/__internal/index.js

@@ -1,6 +1,6 @@
-// Needed by Vike
-export { setGlobalContext_buildEntry } from '../node/runtime/globalContext.js';
-// Needed by vite-plugin-vercel
+// Used by vike:build:pluginProdBuildEntry
+export { setGlobalContext_prodBuildEntry } from '../node/runtime/globalContext.js';
+// Used by vite-plugin-vercel
 export { route, getPagesAndRoutes };
 import { route as routeInternal } from '../shared/route/index.js';
 import { getGlobalContextServerInternal, initGlobalContext_getPagesAndRoutes } from '../node/runtime/globalContext.js';

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

@@ -10,7 +10,7 @@ declare function createPageContextClientSide(urlOriginal: string): Promise<{
     _globalContext: {
         isGlobalContext: true;
         _isOriginalObject: true;
-        _virtualFileExports: unknown;
+        _virtualFileExportsGlobalEntry: unknown;
         _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
         _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
         _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
@@ -23,7 +23,7 @@ declare function createPageContextClientSide(urlOriginal: string): Promise<{
         };
         config: import("../../types/index.js").ConfigResolved;
         pages: {
-            [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEager;
+            [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEagerLoaded;
         };
     } & {
         isClientSide: true;

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

@@ -3,7 +3,7 @@ import { createPageContextObject, createPageContextShared } from '../../shared/c
 import { getPageContextUrlComputed } from '../../shared/getPageContextUrlComputed.js';
 import { getBaseServer } from './getBaseServer.js';
 import { getGlobalContextClientInternal } from './globalContext.js';
-import { assert, augmentType, isBaseServer, objectAssign } from './utils.js';
+import { assert, updateType, isBaseServer, objectAssign } from './utils.js';
 async function createPageContextClientSide(urlOriginal) {
     const globalContext = await getGlobalContextClientInternal();
     const baseServer = getBaseServer();
@@ -22,6 +22,6 @@ async function createPageContextClientSide(urlOriginal) {
     const pageContextUrlComputed = getPageContextUrlComputed(pageContextCreated);
     objectAssign(pageContextCreated, pageContextUrlComputed);
     const pageContextAugmented = createPageContextShared(pageContextCreated, globalContext._vikeConfigPublicGlobal);
-    augmentType(pageContextCreated, pageContextAugmented);
+    updateType(pageContextCreated, pageContextAugmented);
     return pageContextCreated;
 }

package/dist/esm/client/runtime-client-routing/getPageContextCurrent.d.ts

@@ -1,7 +1,7 @@
 export { setPageContextCurrent };
 export { getPageContextCurrent };
-import type { VikeConfigPublicPageLazy } from '../../shared/getPageFiles.js';
-type PageContextCurrent = VikeConfigPublicPageLazy & {
+import type { VikeConfigPublicPageLazyLoaded } from '../../shared/getPageFiles.js';
+type PageContextCurrent = VikeConfigPublicPageLazyLoaded & {
     urlPathname: string;
 };
 declare function getPageContextCurrent(): null | PageContextCurrent;

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

@@ -5,7 +5,7 @@ export { getPageContextFromClientHooks };
 export { setPageContextInitIsPassedToClient };
 export { execHookClient };
 export type { PageContextFromServerHooks };
-import type { VikeConfigPublicPageLazy, PageFile } from '../../shared/getPageFiles.js';
+import type { VikeConfigPublicPageLazyLoaded, PageFile } from '../../shared/getPageFiles.js';
 import type { HookName } from '../../types/Config.js';
 import type { PageContextCreated } from './createPageContextClientSide.js';
 import type { PageContextBegin } from './renderPageClientSide.js';
@@ -18,7 +18,7 @@ declare function getPageContextFromHooks_serialized(): PageContextSerialized & {
     routeParams: Record<string, string>;
     _hasPageContextFromServer: true;
 };
-declare function getPageContextFromHooks_isHydration(pageContext: PageContextSerialized & PageContextBegin & VikeConfigPublicPageLazy & {
+declare function getPageContextFromHooks_isHydration(pageContext: PageContextSerialized & PageContextBegin & VikeConfigPublicPageLazyLoaded & {
     _hasPageContextFromServer: true;
 } & PageContextForPublicUsageClient): Promise<PageContextSerialized & {
     _isOriginalObject: true;
@@ -30,7 +30,7 @@ declare function getPageContextFromHooks_isHydration(pageContext: PageContextSer
     _globalContext: {
         isGlobalContext: true;
         _isOriginalObject: true;
-        _virtualFileExports: unknown;
+        _virtualFileExportsGlobalEntry: unknown;
         _pageFilesAll: PageFile[];
         _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
         _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
@@ -43,7 +43,7 @@ declare function getPageContextFromHooks_isHydration(pageContext: PageContextSer
         };
         config: import("../../types/index.js").ConfigResolved;
         pages: {
-            [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEager;
+            [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEagerLoaded;
         };
     } & {
         isClientSide: true;
@@ -70,7 +70,7 @@ declare function getPageContextFromHooks_isHydration(pageContext: PageContextSer
     isHydration: boolean;
     previousPageContext: ({
         pageId: string;
-    } & VikeConfigPublicPageLazy & {
+    } & VikeConfigPublicPageLazyLoaded & {
         pageId: string;
         routeParams: Record<string, string>;
     } & import("../../shared/preparePageContextForPublicUsage.js").PageContextPrepareMinimum & import("../../types/PageContext.js").PageContextInternalClient & Omit<Partial<{
@@ -144,7 +144,7 @@ declare function getPageContextFromHooks_isHydration(pageContext: PageContextSer
     } & {
         urlOriginal: string;
     }) | null;
-} & VikeConfigPublicPageLazy & {
+} & VikeConfigPublicPageLazyLoaded & {
     _hasPageContextFromServer: true;
 } & import("../../shared/preparePageContextForPublicUsage.js").PageContextPrepareMinimum & Omit<Partial<{
     isPageContext: true;
@@ -231,7 +231,7 @@ declare function getPageContextFromServerHooks(pageContext: {
 declare function getPageContextFromClientHooks(pageContext: {
     pageId: string;
     _hasPageContextFromServer: boolean;
-} & PageContextBegin & VikeConfigPublicPageLazy & PageContextForPublicUsageClient, isErrorPage: boolean): Promise<{
+} & PageContextBegin & VikeConfigPublicPageLazyLoaded & PageContextForPublicUsageClient, isErrorPage: boolean): Promise<{
     pageId: string;
     _hasPageContextFromServer: boolean;
 } & {
@@ -244,7 +244,7 @@ declare function getPageContextFromClientHooks(pageContext: {
     _globalContext: {
         isGlobalContext: true;
         _isOriginalObject: true;
-        _virtualFileExports: unknown;
+        _virtualFileExportsGlobalEntry: unknown;
         _pageFilesAll: PageFile[];
         _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
         _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
@@ -257,7 +257,7 @@ declare function getPageContextFromClientHooks(pageContext: {
         };
         config: import("../../types/index.js").ConfigResolved;
         pages: {
-            [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEager;
+            [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEagerLoaded;
         };
     } & {
         isClientSide: true;
@@ -284,7 +284,7 @@ declare function getPageContextFromClientHooks(pageContext: {
     isHydration: boolean;
     previousPageContext: ({
         pageId: string;
-    } & VikeConfigPublicPageLazy & {
+    } & VikeConfigPublicPageLazyLoaded & {
         pageId: string;
         routeParams: Record<string, string>;
     } & import("../../shared/preparePageContextForPublicUsage.js").PageContextPrepareMinimum & import("../../types/PageContext.js").PageContextInternalClient & Omit<Partial<{
@@ -358,7 +358,7 @@ declare function getPageContextFromClientHooks(pageContext: {
     } & {
         urlOriginal: string;
     }) | null;
-} & VikeConfigPublicPageLazy & import("../../shared/preparePageContextForPublicUsage.js").PageContextPrepareMinimum & Omit<Partial<{
+} & VikeConfigPublicPageLazyLoaded & import("../../shared/preparePageContextForPublicUsage.js").PageContextPrepareMinimum & Omit<Partial<{
     isPageContext: true;
     Page: import("../../types/Config.js").Config["Page"];
     routeParams: Record<string, string>;
@@ -429,7 +429,7 @@ declare function getPageContextFromClientHooks(pageContext: {
 } & {
     urlOriginal: string;
 }>;
-type PageContextExecHookClient = VikeConfigPublicPageLazy & PageContextForPublicUsageClient;
+type PageContextExecHookClient = VikeConfigPublicPageLazyLoaded & PageContextForPublicUsageClient;
 declare function execHookClient(hookName: HookName, pageContext: PageContextExecHookClient): Promise<(import("../../shared/hooks/getHook.js").HookLoc & {
     hookFn: (arg: import("../../shared/preparePageContextForPublicUsage.js").PageContextPrepareMinimum | import("../../shared/prepareGlobalContextForPublicUsage.js").GlobalContextPrepareMinimum) => unknown;
     hookTimeout: import("../../shared/hooks/getHook.js").HookTimeout;

package/dist/esm/client/runtime-client-routing/globalContext.d.ts

@@ -7,7 +7,7 @@ type GlobalContextClientInternal = Awaited<ReturnType<typeof getGlobalContextCli
 declare const getGlobalContextClientInternal: () => Promise<{
     isGlobalContext: true;
     _isOriginalObject: true;
-    _virtualFileExports: unknown;
+    _virtualFileExportsGlobalEntry: unknown;
     _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
     _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
     _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
@@ -20,7 +20,7 @@ declare const getGlobalContextClientInternal: () => Promise<{
     };
     config: import("../../types/index.js").ConfigResolved;
     pages: {
-        [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEager;
+        [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEagerLoaded;
     };
 } & {
     isClientSide: true;

package/dist/esm/client/runtime-client-routing/globalContext.js

@@ -2,8 +2,8 @@ export { getGlobalContextClientInternal };
 import { createGetGlobalContextClient } from '../shared/createGetGlobalContextClient.js';
 import { loadPageRoutes } from '../../shared/route/loadPageRoutes.js';
 // @ts-ignore
-import * as virtualFileExports from 'virtual:vike:entry:client:client-routing';
-const getGlobalContextClientInternal = createGetGlobalContextClient(virtualFileExports, true, addGlobalContext);
+import * as virtualFileExportsGlobalEntry from 'virtual:vike:global-entry:client:client-routing';
+const getGlobalContextClientInternal = createGetGlobalContextClient(virtualFileExportsGlobalEntry, true, addGlobalContext);
 async function addGlobalContext(globalContext) {
     const { pageRoutes, onBeforeRouteHook } = await loadPageRoutes(globalContext._pageFilesAll, globalContext._pageConfigs, globalContext._pageConfigGlobal, globalContext._allPageIds);
     return {

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

@@ -1,10 +1,10 @@
 export { getPrefetchSettings };
 export { PAGE_CONTEXT_MAX_AGE_DEFAULT };
 export type { PrefetchSettingResolved };
-import type { VikeConfigPublicPageLazy } from '../../../shared/getPageFiles.js';
+import type { VikeConfigPublicPageLazyLoaded } from '../../../shared/getPageFiles.js';
 declare const PAGE_CONTEXT_MAX_AGE_DEFAULT = 5000;
 type PrefetchSettingResolved = {
     staticAssets: false | 'hover' | 'viewport';
     pageContext: false | number;
 };
-declare function getPrefetchSettings(pageContext: VikeConfigPublicPageLazy, linkTag: null | HTMLElement): PrefetchSettingResolved;
+declare function getPrefetchSettings(pageContext: VikeConfigPublicPageLazyLoaded, linkTag: null | HTMLElement): PrefetchSettingResolved;

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

@@ -7,14 +7,14 @@ export { addLinkPrefetchHandlers_watch };
 export { addLinkPrefetchHandlers_unwatch };
 import { type PageContextCreated } from './createPageContextClientSide.js';
 import { type PageContextFromServerHooks, getPageContextFromServerHooks } from './getPageContextFromHooks.js';
-import type { VikeConfigPublicPageLazy } from '../../shared/getPageFiles.js';
+import type { VikeConfigPublicPageLazyLoaded } from '../../shared/getPageFiles.js';
 type ResultPageContextFromServer = Awaited<ReturnType<typeof getPageContextFromServerHooks>>;
 type PageContextForPrefetch = PageContextCreated & {
     pageId: string;
 };
 declare function getPageContextPrefetched(pageContext: {
     urlPathname: string;
-} & VikeConfigPublicPageLazy): null | PageContextFromServerHooks;
+} & VikeConfigPublicPageLazyLoaded): null | PageContextFromServerHooks;
 declare function populatePageContextPrefetchCache(pageContext: PageContextForPrefetch, result: ResultPageContextFromServer): void;
 /**
  * Programmatically prefetch client assets.

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

@@ -60,8 +60,8 @@ async function prefetchPageContextFromServerHooks(pageContextLink, resultMaxAge)
     const result = await getPageContextFromServerHooks(pageContextLink, false);
     setPageContextPrefetchCache(pageContextLink, result, resultMaxAge);
 }
-function populatePageContextPrefetchCache(pageContext /*& VikeConfigPublicPageLazy*/, result) {
-    // TO-DO/pageContext-prefetch: replace with using pageContext.config.prerender instead. (For being able to do that: eager configs need to be accessible without have to use VikeConfigPublicPageLazy as it isn't available here.)
+function populatePageContextPrefetchCache(pageContext /*& VikeConfigPublicPageLazyLoaded*/, result) {
+    // TO-DO/pageContext-prefetch: replace with using pageContext.config.prerender instead. (For being able to do that: eager configs need to be accessible without have to use VikeConfigPublicPageLazyLoaded as it isn't available here.)
     if (!isBrilloutDocpress())
         return;
     setPageContextPrefetchCache(pageContext, result, null);

package/dist/esm/client/runtime-client-routing/preparePageContextForPublicUsageClient.d.ts

@@ -1,9 +1,9 @@
 export { preparePageContextForPublicUsageClient };
 export type { PageContextForPublicUsageClient };
-import type { VikeConfigPublicPageLazy } from '../../shared/getPageFiles.js';
+import type { VikeConfigPublicPageLazyLoaded } from '../../shared/getPageFiles.js';
 import type { PageContextInternalClient_ClientRouting } from '../../types/PageContext.js';
 import type { PageContextPrepareMinimum } from '../../shared/preparePageContextForPublicUsage.js';
-type PageContextForPublicUsageClient = PageContextPrepareMinimum & PageContextInternalClient_ClientRouting & VikeConfigPublicPageLazy & {
+type PageContextForPublicUsageClient = PageContextPrepareMinimum & PageContextInternalClient_ClientRouting & VikeConfigPublicPageLazyLoaded & {
     urlOriginal: string;
 };
 declare function preparePageContextForPublicUsageClient<PageContext extends PageContextForPublicUsageClient>(pageContext: PageContext): PageContext & {

package/dist/esm/client/runtime-client-routing/renderPageClientSide.d.ts

@@ -6,8 +6,9 @@ export { getPageContextClient };
 export type { PageContextBegin };
 import { type PageContextFromRewrite } from '../../shared/route/abort.js';
 import { type ScrollTarget } from './setScrollPosition.js';
-import type { VikeConfigPublicPageLazy } from '../../shared/getPageFiles.js';
+import type { VikeConfigPublicPageLazyLoaded } from '../../shared/getPageFiles.js';
 import type { PageContextClient } from '../../types/PageContext.js';
+import type { VikeGlobalInternal } from '../../types/VikeGlobalInternal.js';
 declare const firstRenderStartPromise: Promise<void>;
 type PageContextRouted = {
     pageId: string;
@@ -43,7 +44,7 @@ declare function getPageContextBegin(isForErrorPage: boolean, { urlOriginal, isB
     _globalContext: {
         isGlobalContext: true;
         _isOriginalObject: true;
-        _virtualFileExports: unknown;
+        _virtualFileExportsGlobalEntry: unknown;
         _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
         _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
         _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
@@ -56,7 +57,7 @@ declare function getPageContextBegin(isForErrorPage: boolean, { urlOriginal, isB
         };
         config: import("../../types/index.js").ConfigResolved;
         pages: {
-            [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEager;
+            [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEagerLoaded;
         };
     } & {
         isClientSide: true;
@@ -83,7 +84,7 @@ declare function getPageContextBegin(isForErrorPage: boolean, { urlOriginal, isB
     isHydration: boolean;
     previousPageContext: ({
         pageId: string;
-    } & VikeConfigPublicPageLazy & PageContextRouted & import("../../shared/preparePageContextForPublicUsage.js").PageContextPrepareMinimum & import("../../types/PageContext.js").PageContextInternalClient & Omit<Partial<{
+    } & VikeConfigPublicPageLazyLoaded & PageContextRouted & import("../../shared/preparePageContextForPublicUsage.js").PageContextPrepareMinimum & import("../../types/PageContext.js").PageContextInternalClient & Omit<Partial<{
         isPageContext: true;
         Page: import("../../types/Config.js").Config["Page"];
         routeParams: Record<string, string>;
@@ -156,9 +157,7 @@ declare function getPageContextBegin(isForErrorPage: boolean, { urlOriginal, isB
     }) | null;
 }>;
 declare global {
-    var _vike: {
-        fullyRenderedUrl?: string;
-    } | undefined;
+    var _vike: VikeGlobalInternal;
 }
 declare function disableClientRouting(err: unknown, log: boolean): void;
 declare function getRenderCount(): number;

package/dist/esm/client/runtime-client-routing/renderPageClientSide.js

@@ -3,7 +3,7 @@ export { getRenderCount };
 export { disableClientRouting };
 export { firstRenderStartPromise };
 export { getPageContextClient };
-import { assert, isSameErrorMessage, objectAssign, redirectHard, getGlobalObject, hasProp, augmentType, genPromise, isCallable, catchInfiniteLoop, } from './utils.js';
+import { assert, isSameErrorMessage, objectAssign, redirectHard, getGlobalObject, hasProp, updateType, genPromise, isCallable, catchInfiniteLoop, } from './utils.js';
 import { getPageContextFromClientHooks, getPageContextFromServerHooks, getPageContextFromHooks_isHydration, getPageContextFromHooks_serialized, setPageContextInitIsPassedToClient, } from './getPageContextFromHooks.js';
 import { createPageContextClientSide } from './createPageContextClientSide.js';
 import { addLinkPrefetchHandlers, addLinkPrefetchHandlers_unwatch, addLinkPrefetchHandlers_watch, getPageContextPrefetched, populatePageContextPrefetchCache, } from './prefetch.js';
@@ -159,7 +159,7 @@ async function renderPageClientSide(renderArgs) {
             await onError(res.err);
             return;
         }
-        augmentType(pageContext, res.pageContext);
+        updateType(pageContext, res.pageContext);
         setPageContextCurrent(pageContext);
         // Set global hydrationCanBeAborted
         if (pageContext.exports.hydrationCanBeAborted) {
@@ -184,7 +184,7 @@ async function renderPageClientSide(renderArgs) {
             }
             if (isRenderOutdated())
                 return;
-            augmentType(pageContext, pageContextAugmented);
+            updateType(pageContext, pageContextAugmented);
             // Render page view
             await renderPageView(pageContext);
         }
@@ -225,7 +225,7 @@ async function renderPageClientSide(renderArgs) {
             }
             if (isRenderOutdated())
                 return;
-            augmentType(pageContext, pageContextFromClientHooks);
+            updateType(pageContext, pageContextFromClientHooks);
             await renderPageView(pageContext);
         }
     }
@@ -336,7 +336,7 @@ async function renderPageClientSide(renderArgs) {
             onError(res.err);
             return;
         }
-        augmentType(pageContext, res.pageContext);
+        updateType(pageContext, res.pageContext);
         setPageContextCurrent(pageContext);
         let pageContextFromServerHooks;
         try {
@@ -364,7 +364,7 @@ async function renderPageClientSide(renderArgs) {
         }
         if (isRenderOutdated())
             return;
-        augmentType(pageContext, pageContextFromClientHooks);
+        updateType(pageContext, pageContextFromClientHooks);
         await renderPageView(pageContext, args);
     }
     async function renderPageView(pageContext, isErrorPage) {

package/dist/esm/client/runtime-client-routing/utils.d.ts

@@ -17,7 +17,7 @@ export * from '../../utils/slice.js';
 export * from '../../utils/throttle.js';
 export * from '../../utils/assertRoutingType.js';
 export * from '../../utils/onPageVisibilityChange.js';
-export * from '../../utils/augmentType.js';
+export * from '../../utils/updateType.js';
 export * from '../../utils/PROJECT_VERSION.js';
 export * from '../../utils/genPromise.js';
 export * from '../../utils/catchInfiniteLoop.js';

package/dist/esm/client/runtime-client-routing/utils.js

@@ -21,7 +21,7 @@ export * from '../../utils/slice.js';
 export * from '../../utils/throttle.js';
 export * from '../../utils/assertRoutingType.js';
 export * from '../../utils/onPageVisibilityChange.js';
-export * from '../../utils/augmentType.js';
+export * from '../../utils/updateType.js';
 export * from '../../utils/PROJECT_VERSION.js';
 export * from '../../utils/genPromise.js';
 export * from '../../utils/catchInfiniteLoop.js';

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

@@ -9,7 +9,7 @@ declare function createPageContextClientSide(): Promise<{
     _globalContext: {
         isGlobalContext: true;
         _isOriginalObject: true;
-        _virtualFileExports: unknown;
+        _virtualFileExportsGlobalEntry: unknown;
         _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
         _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
         _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
@@ -22,7 +22,7 @@ declare function createPageContextClientSide(): Promise<{
         };
         config: import("../../types/index.js").ConfigResolved;
         pages: {
-            [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEager;
+            [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEagerLoaded;
         };
     } & {
         isClientSide: true;
@@ -38,6 +38,6 @@ declare function createPageContextClientSide(): Promise<{
     _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
     _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
     _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
-} & import("../../shared/getPageFiles.js").VikeConfigPublicPageLazy & {
+} & import("../../shared/getPageFiles.js").VikeConfigPublicPageLazyLoaded & {
     _pageFilesLoaded: import("../../shared/getPageFiles.js").PageFile[];
 }>;

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

@@ -1,5 +1,5 @@
 export { createPageContextClientSide };
-import { assertUsage, augmentType, objectAssign } from './utils.js';
+import { assertUsage, updateType, objectAssign } from './utils.js';
 import { getPageContextSerializedInHtml } from '../shared/getJsonSerializedInHtml.js';
 import { loadPageConfigsLazyClientSide, } from '../shared/loadPageConfigsLazyClientSide.js';
 import { getCurrentUrl } from '../shared/getCurrentUrl.js';
@@ -22,9 +22,9 @@ async function createPageContextClientSide() {
     });
     objectAssign(pageContextCreated, getPageContextSerializedInHtml());
     // Sets pageContext.config to global configs
-    augmentType(pageContextCreated, createPageContextShared(pageContextCreated, globalContext._vikeConfigPublicGlobal));
+    updateType(pageContextCreated, createPageContextShared(pageContextCreated, globalContext._vikeConfigPublicGlobal));
     // Sets pageContext.config to local configs (overrides the pageContext.config set above)
-    augmentType(pageContextCreated, await loadPageConfigsLazyClientSideAndExecHook(pageContextCreated));
+    updateType(pageContextCreated, await loadPageConfigsLazyClientSideAndExecHook(pageContextCreated));
     assertPristineUrl();
     return pageContextCreated;
 }

package/dist/esm/client/runtime-server-routing/globalContext.d.ts

@@ -7,7 +7,7 @@ type GlobalContextClientInternalWithServerRouting = Awaited<ReturnType<typeof ge
 declare const getGlobalContextClientInternal: () => Promise<{
     isGlobalContext: true;
     _isOriginalObject: true;
-    _virtualFileExports: unknown;
+    _virtualFileExportsGlobalEntry: unknown;
     _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
     _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
     _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
@@ -20,7 +20,7 @@ declare const getGlobalContextClientInternal: () => Promise<{
     };
     config: import("../../types/index.js").ConfigResolved;
     pages: {
-        [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEager;
+        [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEagerLoaded;
     };
 } & {
     isClientSide: true;

package/dist/esm/client/runtime-server-routing/globalContext.js

@@ -1,5 +1,5 @@
 export { getGlobalContextClientInternal };
 import { createGetGlobalContextClient } from '../shared/createGetGlobalContextClient.js';
 // @ts-ignore
-import * as virtualFileExports from 'virtual:vike:entry:client:server-routing';
-const getGlobalContextClientInternal = createGetGlobalContextClient(virtualFileExports, false);
+import * as virtualFileExportsGlobalEntry from 'virtual:vike:global-entry:client:server-routing';
+const getGlobalContextClientInternal = createGetGlobalContextClient(virtualFileExportsGlobalEntry, false);

package/dist/esm/client/runtime-server-routing/preparePageContextForPublicUsageClient.d.ts

@@ -1,9 +1,9 @@
 export { preparePageContextForPublicUsageClient };
 export type { PageContextForPublicUsageClient };
-import type { VikeConfigPublicPageLazy } from '../../shared/getPageFiles.js';
+import type { VikeConfigPublicPageLazyLoaded } from '../../shared/getPageFiles.js';
 import type { PageContextInternalClient_ServerRouting } from '../../types/PageContext.js';
 import type { PageContextPrepareMinimum } from '../../shared/preparePageContextForPublicUsage.js';
-type PageContextForPublicUsageClient = PageContextPrepareMinimum & PageContextInternalClient_ServerRouting & VikeConfigPublicPageLazy;
+type PageContextForPublicUsageClient = PageContextPrepareMinimum & PageContextInternalClient_ServerRouting & VikeConfigPublicPageLazyLoaded;
 declare function preparePageContextForPublicUsageClient<PageContext extends PageContextForPublicUsageClient>(pageContext: PageContext): PageContext & {
     Page: unknown;
 };

package/dist/esm/client/runtime-server-routing/utils.d.ts

@@ -10,5 +10,5 @@ export * from '../../utils/parseUrl.js';
 export * from '../../utils/slice.js';
 export * from '../../utils/unique.js';
 export * from '../../utils/getPropAccessNotation.js';
-export * from '../../utils/augmentType.js';
+export * from '../../utils/updateType.js';
 export * from '../../utils/changeEnumerable.js';

package/dist/esm/client/runtime-server-routing/utils.js

@@ -14,5 +14,5 @@ export * from '../../utils/parseUrl.js';
 export * from '../../utils/slice.js';
 export * from '../../utils/unique.js'; // Only used by Server Routing (not needed for Client Routing)
 export * from '../../utils/getPropAccessNotation.js';
-export * from '../../utils/augmentType.js';
+export * from '../../utils/updateType.js';
 export * from '../../utils/changeEnumerable.js';

package/dist/esm/client/shared/createGetGlobalContextClient.d.ts

@@ -5,10 +5,10 @@ export type GlobalContextClientInternalShared = GlobalContextClientInternal | Gl
 import { type GlobalContextBase } from '../../shared/createGlobalContextShared.js';
 import type { GlobalContextClientInternal } from '../runtime-client-routing/globalContext.js';
 import type { GlobalContextClientInternalWithServerRouting } from '../runtime-server-routing/globalContext.js';
-declare function createGetGlobalContextClient<GlobalContextAddendum extends object>(virtualFileExports: unknown, isClientRouting: boolean, addGlobalContext?: (globalContext: GlobalContextBase) => Promise<GlobalContextAddendum>): () => Promise<{
+declare function createGetGlobalContextClient<GlobalContextAddendum extends object>(virtualFileExportsGlobalEntry: unknown, isClientRouting: boolean, addGlobalContext?: (globalContext: GlobalContextBase) => Promise<GlobalContextAddendum>): () => Promise<{
     isGlobalContext: true;
     _isOriginalObject: true;
-    _virtualFileExports: unknown;
+    _virtualFileExportsGlobalEntry: unknown;
     _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
     _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
     _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
@@ -21,7 +21,7 @@ declare function createGetGlobalContextClient<GlobalContextAddendum extends obje
     };
     config: import("../../types/index.js").ConfigResolved;
     pages: {
-        [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEager;
+        [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEagerLoaded;
     };
 } & {
     /**