vike 0.4.238 → 0.4.239-commit-050a4a3

package/dist/cjs/utils/assert.js

@@ -152,6 +152,7 @@ function addPrefixProjectName(msg, showProjectVersion = false) {
     const prefix = showProjectVersion ? projectTagWithVersion : projectTag;
     return `${prefix}${msg}`;
 }
+// TO-DO/eventually: remove this (refactor the whole log handling)
 function getAssertErrMsg(thing) {
     let errMsg;
     let errStack;
@@ -175,7 +176,21 @@ function getAssertErrMsg(thing) {
             }
         }
         else if (errStack?.includes(tag)) {
-            throw new Error('Internal Vike error');
+            // The following assert can fail, e.g. with following error:
+            // ```
+            // Error: Error running module "/home/rom/code/vike-server/examples/cloudflare-react/cloudflare-entry.js".
+            // Error running module "photon:cloudflare:/home/rom/code/vike-server/examples/cloudflare-react/server.js".
+            // Error running module "/home/rom/code/vike-server/examples/cloudflare-react/server.js".
+            // Error running module "/home/rom/code/vike-server/node_modules/.pnpm/@photonjs+hono@0.0.6_@hattip+core@0.0.49_elysia@1.3.13_exact-mirror@0.1.6_@sinclair+typ_c39d432d43266746f390ace81b426601/node_modules/@photonjs/hono/dist/index.js?v=6ca51a04".
+            // Error running module "/home/rom/code/vike-server/node_modules/.pnpm/@photonjs+hono@0.0.6_@hattip+core@0.0.49_elysia@1.3.13_exact-mirror@0.1.6_@sinclair+typ_c39d432d43266746f390ace81b426601/node_modules/@photonjs/hono/dist/apply.dev.js?v=6ca51a04".
+            // Error running module "photon:get-middlewares:dev:hono".
+            // Error running module "/home/rom/code/vike-server/packages/vike-server/dist/universal.dev.js".
+            // [vike][Wrong Usage] The global context isn't set yet, use getGlobalContextAsync() instead........
+            //     at async ProxyServer.fetch (file:///home/rom/code/vike-server/node_modules/.pnpm/miniflare@4.20250829.0/node_modules/miniflare/src/workers/core/proxy.worker.ts:174:11)
+            // ```
+            /*
+            throw new Error('Internal Vike error')
+            */
         }
         if (errMsg?.startsWith(tag)) {
             const assertMsg = errMsg.slice(tag.length);

package/dist/cjs/utils/assertNodeVersion.js

@@ -8,5 +8,7 @@ function assertNodeVersion() {
     if (!(0, isNodeJS_js_1.isNodeJS)())
         return;
     const version = process.versions.node;
-    (0, assertVersion_js_1.assertVersion)('Node.js', version, '18.0.0');
+    (0, assertVersion_js_1.assertVersion)('Node.js', version, 
+    // https://gist.github.com/brillout/8e0133716e169b981b6c4e8a938b0134
+    ['20.19.0', '22.12.0', '23.0.0']);
 }

package/dist/cjs/utils/assertVersion.js

@@ -1,16 +1,37 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.assertVersion = assertVersion;
-exports.isVersionOrAbove = isVersionOrAbove;
+exports.isVersionMatch = isVersionMatch;
+const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const assert_js_1 = require("./assert.js");
 const assertIsNotBrowser_js_1 = require("./assertIsNotBrowser.js");
+const joinEnglish_js_1 = require("./joinEnglish.js");
 (0, assertIsNotBrowser_js_1.assertIsNotBrowser)();
-function assertVersion(dependencyName, versionActual, versionExpected) {
+function assertVersion(dependencyName, versionActual, versionExpectedList) {
+    (0, assert_js_1.assertUsage)(isVersionMatch(versionActual, versionExpectedList), `${picocolors_1.default.bold(dependencyName)} ${picocolors_1.default.red(picocolors_1.default.bold(versionActual))} isn't supported, use ${picocolors_1.default.bold(dependencyName)} ${(0, joinEnglish_js_1.joinEnglish)([...versionExpectedList, 'above'].map((v) => picocolors_1.default.green(picocolors_1.default.bold(v))), 'or')}.`);
+}
+function isVersionMatch(versionActual, versionExpectedList) {
     (0, assert_js_1.assert)(versionActual);
-    (0, assert_js_1.assert)(versionExpected);
-    (0, assert_js_1.assertUsage)(isVersionOrAbove(versionActual, versionExpected), `${dependencyName} ${versionActual} isn't supported, use ${dependencyName} >= ${versionExpected} instead.`);
+    (0, assert_js_1.assert)(versionExpectedList);
+    (0, assert_js_1.assert)(versionExpectedList.length > 0);
+    const versionActualMajor = parseVersion(versionActual)[0];
+    const versionExpectedListSameMajor = versionExpectedList.filter((versionExpected) => {
+        const versionExpectedMajor = parseVersion(versionExpected)[0];
+        return versionExpectedMajor === versionActualMajor;
+    });
+    (0, assert_js_1.assert)(versionExpectedListSameMajor.length <= 1);
+    const versionExpectedSameMajor = versionExpectedListSameMajor[0];
+    if (versionExpectedSameMajor) {
+        return isSameOrAbove(versionActual, versionExpectedSameMajor);
+    }
+    else {
+        return versionExpectedList.every((versionExpected) => isSameOrAbove(versionActual, versionExpected));
+    }
 }
-function isVersionOrAbove(versionActual, versionExpected) {
+function isSameOrAbove(versionActual, versionExpected) {
     const p1 = parseVersion(versionActual);
     const p2 = parseVersion(versionExpected);
     // major

package/dist/cjs/utils/joinEnglish.js

@@ -9,5 +9,6 @@ function joinEnglish(arr, conjunction, colorizer = (s) => s) {
         return colorizer(arr[0]);
     const firsts = arr.slice(0, arr.length - 1);
     const last = arr[arr.length - 1];
-    return firsts.map(colorizer).join(', ') + `, ${conjunction} ` + colorizer(last);
+    const lastComma = arr.length > 2 ? ',' : '';
+    return firsts.map(colorizer).join(', ') + `${lastComma} ${conjunction} ` + colorizer(last);
 }

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

@@ -8,23 +8,51 @@ declare function createPageContextClientSide(urlOriginal: string): Promise<{
     isPrerendering: false;
     urlOriginal: string;
     _globalContext: {
-        isGlobalContext: true;
-        _isOriginalObject: true;
-        _virtualFileExportsGlobalEntry: unknown;
-        _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
-        _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
-        _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
-        _allPageIds: string[];
-        _vikeConfigPublicGlobal: {
+        _globalConfigPublic: {
+            pages: {
+                [k: string]: {
+                    config: import("../../types/index.js").ConfigResolved;
+                    _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+                    _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+                    _from: import("../../shared/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/page-configs/resolveVikeConfigPublic.js").Source;
             _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
             _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
         };
-        config: import("../../types/index.js").ConfigResolved;
         pages: {
-            [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEagerLoaded;
+            [k: string]: {
+                config: import("../../types/index.js").ConfigResolved;
+                _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+                _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+                _from: import("../../shared/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/page-configs/resolveVikeConfigPublic.js").Source;
+        _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+        _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
+        isGlobalContext: true;
+        _isOriginalObject: true;
+        _virtualFileExportsGlobalEntry: unknown;
+        _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
+        _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
+        _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
+        _allPageIds: string[];
     } & {
         isClientSide: true;
     } & {
@@ -39,9 +67,4 @@ declare function createPageContextClientSide(urlOriginal: string): Promise<{
     urlParsed: import("./utils.js").UrlPublic;
     urlPathname: string;
     url: string;
-} & {
-    config: import("../../types/index.js").ConfigResolved;
-    _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/page-configs/resolveVikeConfigPublic.js").GlobalConfigPublic>;

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

@@ -21,7 +21,7 @@ async function createPageContextClientSide(urlOriginal) {
     });
     const pageContextUrlComputed = getPageContextUrlComputed(pageContextCreated);
     objectAssign(pageContextCreated, pageContextUrlComputed);
-    const pageContextAugmented = createPageContextShared(pageContextCreated, globalContext._vikeConfigPublicGlobal);
+    const pageContextAugmented = createPageContextShared(pageContextCreated, globalContext._globalConfigPublic);
     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 { VikeConfigPublicPageLazyLoaded } from '../../shared/getPageFiles.js';
-type PageContextCurrent = VikeConfigPublicPageLazyLoaded & {
+import type { PageContextConfig } from '../../shared/getPageFiles.js';
+type PageContextCurrent = PageContextConfig & {
     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 { VikeConfigPublicPageLazyLoaded, PageFile } from '../../shared/getPageFiles.js';
+import type { PageContextConfig, 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 & VikeConfigPublicPageLazyLoaded & {
+declare function getPageContextFromHooks_isHydration(pageContext: PageContextSerialized & PageContextBegin & PageContextConfig & {
     _hasPageContextFromServer: true;
 } & PageContextForPublicUsageClient): Promise<PageContextSerialized & {
     _isOriginalObject: true;
@@ -28,23 +28,51 @@ declare function getPageContextFromHooks_isHydration(pageContext: PageContextSer
     isPrerendering: false;
     urlOriginal: string;
     _globalContext: {
-        isGlobalContext: true;
-        _isOriginalObject: true;
-        _virtualFileExportsGlobalEntry: unknown;
-        _pageFilesAll: PageFile[];
-        _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
-        _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
-        _allPageIds: string[];
-        _vikeConfigPublicGlobal: {
+        _globalConfigPublic: {
+            pages: {
+                [k: string]: {
+                    config: import("../../types/index.js").ConfigResolved;
+                    _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+                    _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+                    _from: import("../../shared/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/page-configs/resolveVikeConfigPublic.js").Source;
             _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
             _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
         };
-        config: import("../../types/index.js").ConfigResolved;
         pages: {
-            [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEagerLoaded;
+            [k: string]: {
+                config: import("../../types/index.js").ConfigResolved;
+                _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+                _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+                _from: import("../../shared/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/page-configs/resolveVikeConfigPublic.js").Source;
+        _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+        _from: import("../../shared/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;
     } & {
@@ -59,29 +87,20 @@ declare function getPageContextFromHooks_isHydration(pageContext: PageContextSer
     urlParsed: import("./utils.js").UrlPublic;
     urlPathname: string;
     url: string;
-} & {
-    config: import("../../types/index.js").ConfigResolved;
-    _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/page-configs/resolveVikeConfigPublic.js").GlobalConfigPublic & {
     isBackwardNavigation: boolean | null;
     isClientSideNavigation: boolean;
     isHydration: boolean;
     previousPageContext: ({
         pageId: string;
-    } & VikeConfigPublicPageLazyLoaded & {
+    } & PageContextConfig & {
         pageId: string;
         routeParams: Record<string, string>;
-    } & import("../../shared/preparePageContextForPublicUsage.js").PageContextPrepareMinimum & import("../../types/PageContext.js").PageContextInternalClient & Omit<Partial<{
+    } & import("../../shared/preparePageContextForPublicUsage.js").PageContextPrepareMinimum & import("../../types/PageContext.js").PageContextInternalClient & Omit<Partial<PageContextConfig & {
         isPageContext: true;
         Page: import("../../types/Config.js").Config["Page"];
         routeParams: Record<string, string>;
         data: unknown;
-        config: import("../../types/Config/PageContextConfig.js").PageContextConfig;
-        configEntries: import("../../types/index.js").ConfigEntries;
-        exports: Record<string, unknown>;
-        exportsAll: import("../../shared/getPageFiles.js").ExportsAll;
         urlOriginal: string;
         headers: Record<string, string> | null;
         headersOriginal?: unknown;
@@ -98,15 +117,11 @@ declare function getPageContextFromHooks_isHydration(pageContext: PageContextSer
         url: string;
         pageExports: Record<string, unknown>;
         isBaseMissing?: true;
-    }> & Pick<{
+    }> & Pick<PageContextConfig & {
         isPageContext: true;
         Page: import("../../types/Config.js").Config["Page"];
         routeParams: Record<string, string>;
         data: unknown;
-        config: import("../../types/Config/PageContextConfig.js").PageContextConfig;
-        configEntries: import("../../types/index.js").ConfigEntries;
-        exports: Record<string, unknown>;
-        exportsAll: import("../../shared/getPageFiles.js").ExportsAll;
         urlOriginal: string;
         headers: Record<string, string> | null;
         headersOriginal?: unknown;
@@ -123,7 +138,7 @@ declare function getPageContextFromHooks_isHydration(pageContext: PageContextSer
         url: string;
         pageExports: Record<string, unknown>;
         isBaseMissing?: true;
-    }, "exports" | "pageId" | "pageExports" | "Page" | "data" | "config" | "routeParams" | "configEntries" | "exportsAll" | "abortReason" | "from" | "source" | "sources"> & {
+    }, "exports" | "pageId" | "pageExports" | "config" | "Page" | "data" | "source" | "sources" | "from" | "configEntries" | "exportsAll" | "routeParams" | "abortReason"> & {
         isClientSide: true;
         isPrerendering: false;
     } & {
@@ -144,17 +159,13 @@ declare function getPageContextFromHooks_isHydration(pageContext: PageContextSer
     } & {
         urlOriginal: string;
     }) | null;
-} & VikeConfigPublicPageLazyLoaded & {
+} & PageContextConfig & {
     _hasPageContextFromServer: true;
-} & import("../../shared/preparePageContextForPublicUsage.js").PageContextPrepareMinimum & Omit<Partial<{
+} & import("../../shared/preparePageContextForPublicUsage.js").PageContextPrepareMinimum & Omit<Partial<PageContextConfig & {
     isPageContext: true;
     Page: import("../../types/Config.js").Config["Page"];
     routeParams: Record<string, string>;
     data: unknown;
-    config: import("../../types/Config/PageContextConfig.js").PageContextConfig;
-    configEntries: import("../../types/index.js").ConfigEntries;
-    exports: Record<string, unknown>;
-    exportsAll: import("../../shared/getPageFiles.js").ExportsAll;
     urlOriginal: string;
     headers: Record<string, string> | null;
     headersOriginal?: unknown;
@@ -171,15 +182,11 @@ declare function getPageContextFromHooks_isHydration(pageContext: PageContextSer
     url: string;
     pageExports: Record<string, unknown>;
     isBaseMissing?: true;
-}> & Pick<{
+}> & Pick<PageContextConfig & {
     isPageContext: true;
     Page: import("../../types/Config.js").Config["Page"];
     routeParams: Record<string, string>;
     data: unknown;
-    config: import("../../types/Config/PageContextConfig.js").PageContextConfig;
-    configEntries: import("../../types/index.js").ConfigEntries;
-    exports: Record<string, unknown>;
-    exportsAll: import("../../shared/getPageFiles.js").ExportsAll;
     urlOriginal: string;
     headers: Record<string, string> | null;
     headersOriginal?: unknown;
@@ -196,7 +203,7 @@ declare function getPageContextFromHooks_isHydration(pageContext: PageContextSer
     url: string;
     pageExports: Record<string, unknown>;
     isBaseMissing?: true;
-}, "exports" | "pageId" | "pageExports" | "Page" | "data" | "config" | "routeParams" | "configEntries" | "exportsAll" | "abortReason" | "from" | "source" | "sources"> & {
+}, "exports" | "pageId" | "pageExports" | "config" | "Page" | "data" | "source" | "sources" | "from" | "configEntries" | "exportsAll" | "routeParams" | "abortReason"> & {
     isClientSide: true;
     isPrerendering: false;
 } & {
@@ -231,7 +238,7 @@ declare function getPageContextFromServerHooks(pageContext: {
 declare function getPageContextFromClientHooks(pageContext: {
     pageId: string;
     _hasPageContextFromServer: boolean;
-} & PageContextBegin & VikeConfigPublicPageLazyLoaded & PageContextForPublicUsageClient, isErrorPage: boolean): Promise<{
+} & PageContextBegin & PageContextConfig & PageContextForPublicUsageClient, isErrorPage: boolean): Promise<{
     pageId: string;
     _hasPageContextFromServer: boolean;
 } & {
@@ -242,23 +249,51 @@ declare function getPageContextFromClientHooks(pageContext: {
     isPrerendering: false;
     urlOriginal: string;
     _globalContext: {
-        isGlobalContext: true;
-        _isOriginalObject: true;
-        _virtualFileExportsGlobalEntry: unknown;
-        _pageFilesAll: PageFile[];
-        _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
-        _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
-        _allPageIds: string[];
-        _vikeConfigPublicGlobal: {
+        _globalConfigPublic: {
+            pages: {
+                [k: string]: {
+                    config: import("../../types/index.js").ConfigResolved;
+                    _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+                    _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+                    _from: import("../../shared/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/page-configs/resolveVikeConfigPublic.js").Source;
             _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
             _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
         };
-        config: import("../../types/index.js").ConfigResolved;
         pages: {
-            [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEagerLoaded;
+            [k: string]: {
+                config: import("../../types/index.js").ConfigResolved;
+                _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+                _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+                _from: import("../../shared/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/page-configs/resolveVikeConfigPublic.js").Source;
+        _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+        _from: import("../../shared/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;
     } & {
@@ -273,29 +308,20 @@ declare function getPageContextFromClientHooks(pageContext: {
     urlParsed: import("./utils.js").UrlPublic;
     urlPathname: string;
     url: string;
-} & {
-    config: import("../../types/index.js").ConfigResolved;
-    _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/page-configs/resolveVikeConfigPublic.js").GlobalConfigPublic & {
     isBackwardNavigation: boolean | null;
     isClientSideNavigation: boolean;
     isHydration: boolean;
     previousPageContext: ({
         pageId: string;
-    } & VikeConfigPublicPageLazyLoaded & {
+    } & PageContextConfig & {
         pageId: string;
         routeParams: Record<string, string>;
-    } & import("../../shared/preparePageContextForPublicUsage.js").PageContextPrepareMinimum & import("../../types/PageContext.js").PageContextInternalClient & Omit<Partial<{
+    } & import("../../shared/preparePageContextForPublicUsage.js").PageContextPrepareMinimum & import("../../types/PageContext.js").PageContextInternalClient & Omit<Partial<PageContextConfig & {
         isPageContext: true;
         Page: import("../../types/Config.js").Config["Page"];
         routeParams: Record<string, string>;
         data: unknown;
-        config: import("../../types/Config/PageContextConfig.js").PageContextConfig;
-        configEntries: import("../../types/index.js").ConfigEntries;
-        exports: Record<string, unknown>;
-        exportsAll: import("../../shared/getPageFiles.js").ExportsAll;
         urlOriginal: string;
         headers: Record<string, string> | null;
         headersOriginal?: unknown;
@@ -312,15 +338,11 @@ declare function getPageContextFromClientHooks(pageContext: {
         url: string;
         pageExports: Record<string, unknown>;
         isBaseMissing?: true;
-    }> & Pick<{
+    }> & Pick<PageContextConfig & {
         isPageContext: true;
         Page: import("../../types/Config.js").Config["Page"];
         routeParams: Record<string, string>;
         data: unknown;
-        config: import("../../types/Config/PageContextConfig.js").PageContextConfig;
-        configEntries: import("../../types/index.js").ConfigEntries;
-        exports: Record<string, unknown>;
-        exportsAll: import("../../shared/getPageFiles.js").ExportsAll;
         urlOriginal: string;
         headers: Record<string, string> | null;
         headersOriginal?: unknown;
@@ -337,7 +359,7 @@ declare function getPageContextFromClientHooks(pageContext: {
         url: string;
         pageExports: Record<string, unknown>;
         isBaseMissing?: true;
-    }, "exports" | "pageId" | "pageExports" | "Page" | "data" | "config" | "routeParams" | "configEntries" | "exportsAll" | "abortReason" | "from" | "source" | "sources"> & {
+    }, "exports" | "pageId" | "pageExports" | "config" | "Page" | "data" | "source" | "sources" | "from" | "configEntries" | "exportsAll" | "routeParams" | "abortReason"> & {
         isClientSide: true;
         isPrerendering: false;
     } & {
@@ -358,15 +380,11 @@ declare function getPageContextFromClientHooks(pageContext: {
     } & {
         urlOriginal: string;
     }) | null;
-} & VikeConfigPublicPageLazyLoaded & import("../../shared/preparePageContextForPublicUsage.js").PageContextPrepareMinimum & Omit<Partial<{
+} & PageContextConfig & import("../../shared/preparePageContextForPublicUsage.js").PageContextPrepareMinimum & Omit<Partial<PageContextConfig & {
     isPageContext: true;
     Page: import("../../types/Config.js").Config["Page"];
     routeParams: Record<string, string>;
     data: unknown;
-    config: import("../../types/Config/PageContextConfig.js").PageContextConfig;
-    configEntries: import("../../types/index.js").ConfigEntries;
-    exports: Record<string, unknown>;
-    exportsAll: import("../../shared/getPageFiles.js").ExportsAll;
     urlOriginal: string;
     headers: Record<string, string> | null;
     headersOriginal?: unknown;
@@ -383,15 +401,11 @@ declare function getPageContextFromClientHooks(pageContext: {
     url: string;
     pageExports: Record<string, unknown>;
     isBaseMissing?: true;
-}> & Pick<{
+}> & Pick<PageContextConfig & {
     isPageContext: true;
     Page: import("../../types/Config.js").Config["Page"];
     routeParams: Record<string, string>;
     data: unknown;
-    config: import("../../types/Config/PageContextConfig.js").PageContextConfig;
-    configEntries: import("../../types/index.js").ConfigEntries;
-    exports: Record<string, unknown>;
-    exportsAll: import("../../shared/getPageFiles.js").ExportsAll;
     urlOriginal: string;
     headers: Record<string, string> | null;
     headersOriginal?: unknown;
@@ -408,7 +422,7 @@ declare function getPageContextFromClientHooks(pageContext: {
     url: string;
     pageExports: Record<string, unknown>;
     isBaseMissing?: true;
-}, "exports" | "pageId" | "pageExports" | "Page" | "data" | "config" | "routeParams" | "configEntries" | "exportsAll" | "abortReason" | "from" | "source" | "sources"> & {
+}, "exports" | "pageId" | "pageExports" | "config" | "Page" | "data" | "source" | "sources" | "from" | "configEntries" | "exportsAll" | "routeParams" | "abortReason"> & {
     isClientSide: true;
     isPrerendering: false;
 } & {
@@ -429,7 +443,7 @@ declare function getPageContextFromClientHooks(pageContext: {
 } & {
     urlOriginal: string;
 }>;
-type PageContextExecHookClient = VikeConfigPublicPageLazyLoaded & PageContextForPublicUsageClient;
+type PageContextExecHookClient = PageContextConfig & 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

@@ -5,23 +5,51 @@ import type { GlobalContextBasePublic } from '../../shared/createGlobalContextSh
 type GlobalContextClient = GlobalContextBasePublic & Pick<GlobalContextClientInternal, 'isClientSide'> & Vike.GlobalContext & Vike.GlobalContextClient & {};
 type GlobalContextClientInternal = Awaited<ReturnType<typeof getGlobalContextClientInternal>>;
 declare const getGlobalContextClientInternal: () => Promise<{
-    isGlobalContext: true;
-    _isOriginalObject: true;
-    _virtualFileExportsGlobalEntry: unknown;
-    _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
-    _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
-    _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
-    _allPageIds: string[];
-    _vikeConfigPublicGlobal: {
+    _globalConfigPublic: {
+        pages: {
+            [k: string]: {
+                config: import("../../types/index.js").ConfigResolved;
+                _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+                _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+                _from: import("../../shared/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/page-configs/resolveVikeConfigPublic.js").Source;
         _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
         _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
     };
-    config: import("../../types/index.js").ConfigResolved;
     pages: {
-        [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEagerLoaded;
+        [k: string]: {
+            config: import("../../types/index.js").ConfigResolved;
+            _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+            _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+            _from: import("../../shared/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/page-configs/resolveVikeConfigPublic.js").Source;
+    _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+    _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
+    isGlobalContext: true;
+    _isOriginalObject: true;
+    _virtualFileExportsGlobalEntry: unknown;
+    _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
+    _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
+    _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
+    _allPageIds: string[];
 } & {
     isClientSide: true;
 } & {

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 { VikeConfigPublicPageLazyLoaded } from '../../../shared/getPageFiles.js';
+import type { PageContextConfig } 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: VikeConfigPublicPageLazyLoaded, linkTag: null | HTMLElement): PrefetchSettingResolved;
+declare function getPrefetchSettings(pageContext: PageContextConfig, linkTag: null | HTMLElement): PrefetchSettingResolved;