vike 0.4.229-commit-845a4e0 → 0.4.229-commit-7056ef0

package/dist/esm/node/runtime/renderPage/createPageContextServerSide.d.ts

@@ -28,8 +28,17 @@ declare function createPageContextServerSide(pageContextInit: PageContextInit, g
         _pageConfigs: import("../../../__internal/index.js").PageConfig[];
         _pageConfigGlobal: import("../../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
         _allPageIds: string[];
+        _userFriendlyConfigsGlobal: import("../../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly;
         config: import("../../../types/index.js").ConfigResolved;
-        pages: import("../../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
+        pages: {
+            [k: string]: import("../../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly & ({
+                route: import("../../../shared/page-configs/Config.js").Route;
+                isErrorPage?: undefined;
+            } | {
+                route?: undefined;
+                isErrorPage: true;
+            });
+        };
     } & ({
         _isProduction: false;
         _isPrerendering: false;
@@ -57,8 +66,17 @@ declare function createPageContextServerSide(pageContextInit: PageContextInit, g
         _pageConfigs: import("../../../__internal/index.js").PageConfig[];
         _pageConfigGlobal: import("../../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
         _allPageIds: string[];
+        _userFriendlyConfigsGlobal: import("../../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly;
         config: import("../../../types/index.js").ConfigResolved;
-        pages: import("../../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
+        pages: {
+            [k: string]: import("../../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly & ({
+                route: import("../../../shared/page-configs/Config.js").Route;
+                isErrorPage?: undefined;
+            } | {
+                route?: undefined;
+                isErrorPage: true;
+            });
+        };
     } | {
         _isPrerendering: true;
         viteConfig: import("vite").ResolvedConfig;
@@ -87,8 +105,17 @@ declare function createPageContextServerSide(pageContextInit: PageContextInit, g
         _pageConfigs: import("../../../__internal/index.js").PageConfig[];
         _pageConfigGlobal: import("../../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
         _allPageIds: string[];
+        _userFriendlyConfigsGlobal: import("../../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly;
         config: import("../../../types/index.js").ConfigResolved;
-        pages: import("../../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
+        pages: {
+            [k: string]: import("../../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly & ({
+                route: import("../../../shared/page-configs/Config.js").Route;
+                isErrorPage?: undefined;
+            } | {
+                route?: undefined;
+                isErrorPage: true;
+            });
+        };
     } | {
         _isPrerendering: false;
         viteConfig: null;
@@ -117,8 +144,17 @@ declare function createPageContextServerSide(pageContextInit: PageContextInit, g
         _pageConfigs: import("../../../__internal/index.js").PageConfig[];
         _pageConfigGlobal: import("../../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
         _allPageIds: string[];
+        _userFriendlyConfigsGlobal: import("../../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly;
         config: import("../../../types/index.js").ConfigResolved;
-        pages: import("../../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
+        pages: {
+            [k: string]: import("../../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly & ({
+                route: import("../../../shared/page-configs/Config.js").Route;
+                isErrorPage?: undefined;
+            } | {
+                route?: undefined;
+                isErrorPage: true;
+            });
+        };
     });
     _baseServer: string;
     _baseAssets: string;
@@ -133,17 +169,13 @@ declare function createPageContextServerSide(pageContextInit: PageContextInit, g
     _urlRewrite: null;
     _urlHandler: ((url: string) => string) | null;
     isClientSideNavigation: boolean;
-} & {
+} & import("../../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly & {
     urlParsed: import("../utils.js").UrlPublic;
     urlPathname: string;
     url: string;
 } & {
     headers: Record<string, string> | null;
 } & {
-    config: import("../../../types/index.js").ConfigResolved;
-    _source: import("../../../shared/page-configs/getPageConfigUserFriendly.js").Source;
-    _sources: import("../../../shared/page-configs/getPageConfigUserFriendly.js").Sources;
-    _from: import("../../../shared/page-configs/getPageConfigUserFriendly.js").From;
     isPageContext: true;
 }>;
 declare function createPageContextServerSideWithoutGlobalContext(pageContextInit: PageContextInit): {

package/dist/esm/node/runtime/renderPage/createPageContextServerSide.js

@@ -33,6 +33,7 @@ async function createPageContextServerSide(pageContextInit, globalContext, globa
         _urlHandler: urlHandler,
         isClientSideNavigation
     });
+    objectAssign(pageContextCreated, globalContext._userFriendlyConfigsGlobal);
     // pageContext.urlParsed
     const pageContextUrlComputed = getPageContextUrlComputed(pageContextCreated);
     objectAssign(pageContextCreated, pageContextUrlComputed);
@@ -53,7 +54,7 @@ async function createPageContextServerSide(pageContextInit, globalContext, globa
         }
         objectAssign(pageContextCreated, { headers });
     }
-    const pageContextAugmented = await createPageContextShared(pageContextCreated, globalContext._pageConfigGlobal);
+    const pageContextAugmented = await createPageContextShared(pageContextCreated, globalContext._pageConfigGlobal, globalContext._userFriendlyConfigsGlobal);
     augmentType(pageContextCreated, pageContextAugmented);
     return pageContextCreated;
 }

package/dist/esm/node/runtime/renderPage/executeHookServer.d.ts

@@ -0,0 +1,13 @@
+export { executeHookServer };
+export type { PageContextExecuteHookServer };
+import { type PageContextForUserConsumptionServerSide } from './preparePageContextForUserConsumptionServerSide.js';
+import type { PageConfigUserFriendlyOld } from '../../../shared/getPageFiles.js';
+import type { HookName } from '../../../shared/page-configs/Config.js';
+type PageContextExecuteHookServer = PageConfigUserFriendlyOld & PageContextForUserConsumptionServerSide;
+declare function executeHookServer(hookName: HookName, pageContext: PageContextExecuteHookServer): Promise<{
+    hookResult: unknown;
+    hookName: import("../../../shared/page-configs/Config.js").HookNameOld;
+    hookFilePath: string;
+    hookFn: (arg: object) => unknown;
+    hookTimeout: import("../../../shared/hooks/getHook.js").HookTimeout;
+}[]>;

package/dist/esm/node/runtime/renderPage/executeHookServer.js

@@ -0,0 +1,9 @@
+export { executeHookServer };
+import { executeHookNew } from '../../../shared/hooks/executeHook.js';
+import { preparePageContextForUserConsumptionServerSide } from './preparePageContextForUserConsumptionServerSide.js';
+async function executeHookServer(hookName, pageContext) {
+    return await executeHookNew(hookName, pageContext, (p) => {
+        preparePageContextForUserConsumptionServerSide(p);
+        return p;
+    });
+}

package/dist/esm/node/runtime/renderPage/executeOnBeforeRenderAndDataHooks.d.ts

@@ -1,7 +1,6 @@
 export { executeOnBeforeRenderAndDataHooks };
-import { type PageConfigUserFriendlyOld } from '../../../shared/getPageFiles.js';
-import { type PageContextForUserConsumptionServerSide } from './preparePageContextForUserConsumptionServerSide.js';
+import { type PageContextExecuteHookServer } from './executeHookServer.js';
 declare function executeOnBeforeRenderAndDataHooks(pageContext: {
     pageId: string;
     _pageContextAlreadyProvidedByOnPrerenderHook?: true;
-} & PageConfigUserFriendlyOld & PageContextForUserConsumptionServerSide): Promise<void>;
+} & PageContextExecuteHookServer): Promise<void>;

package/dist/esm/node/runtime/renderPage/executeOnBeforeRenderAndDataHooks.js

@@ -1,35 +1,27 @@
 export { executeOnBeforeRenderAndDataHooks };
-import { getHookFromPageContext } from '../../../shared/hooks/getHook.js';
-import { preparePageContextForUserConsumptionServerSide } from './preparePageContextForUserConsumptionServerSide.js';
 import { assertOnBeforeRenderHookReturn } from '../../../shared/assertOnBeforeRenderHookReturn.js';
-import { executeHook } from '../../../shared/hooks/executeHook.js';
+import { executeHookServer } from './executeHookServer.js';
 async function executeOnBeforeRenderAndDataHooks(pageContext) {
     if (pageContext._pageContextAlreadyProvidedByOnPrerenderHook) {
         return;
     }
-    const dataHook = getHookFromPageContext(pageContext, 'data');
-    const onBeforeRenderHook = getHookFromPageContext(pageContext, 'onBeforeRender');
-    if (!dataHook && !onBeforeRenderHook) {
-        return;
-    }
-    preparePageContextForUserConsumptionServerSide(pageContext);
+    const hooks = await executeHookServer('data', pageContext);
+    const dataHook = hooks[0]; // TO-DO/soon: support cumulative
     if (dataHook) {
-        const hookResult = await executeHook(() => dataHook.hookFn(pageContext), dataHook, pageContext);
         // Note: hookResult can be anything (e.g. an object) and is to be assigned to pageContext.data
         const pageContextFromHook = {
-            data: hookResult
+            data: dataHook.hookResult
         };
         Object.assign(pageContext, pageContextFromHook);
         // Execute +onData
         if (!pageContext.isClientSideNavigation) {
-            const onDataHook = getHookFromPageContext(pageContext, 'onData');
-            if (onDataHook) {
-                await executeHook(() => onDataHook.hookFn(pageContext), dataHook, pageContext);
-            }
+            await executeHookServer('onData', pageContext);
         }
     }
+    const res = await executeHookServer('onBeforeRender', pageContext);
+    const onBeforeRenderHook = res[0]; // TO-DO/soon: support cumulative
     if (onBeforeRenderHook) {
-        const hookResult = await executeHook(() => onBeforeRenderHook.hookFn(pageContext), onBeforeRenderHook, pageContext);
+        const { hookResult } = onBeforeRenderHook;
         assertOnBeforeRenderHookReturn(hookResult, onBeforeRenderHook.hookFilePath);
         const pageContextFromHook = hookResult?.pageContext;
         Object.assign(pageContext, pageContextFromHook);

package/dist/esm/node/runtime/renderPage/{loadUserFilesServerSide.d.ts → loadPageConfigsLazyServerSide.d.ts}

@@ -1,22 +1,22 @@
-export { loadUserFilesServerSide };
+export { loadPageConfigsLazyServerSide };
 export type { PageFiles };
-export type { PageContext_loadUserFilesServerSide };
+export type { PageContext_loadPageConfigsLazyServerSide };
 import { type PageFile } from '../../../shared/getPageFiles.js';
 import { PromiseType } from '../utils.js';
 import { PageContextGetPageAssets, type PageAsset } from './getPageAssets.js';
 import { type PageContextDebugRouteMatches } from './debugPageFiles.js';
 import type { PageConfigRuntime } from '../../../shared/page-configs/PageConfig.js';
 import type { GlobalContextServerInternal } from '../globalContext.js';
-type PageContext_loadUserFilesServerSide = PageContextGetPageAssets & PageContextDebugRouteMatches & {
+type PageContext_loadPageConfigsLazyServerSide = PageContextGetPageAssets & PageContextDebugRouteMatches & {
     urlOriginal: string;
     _pageFilesAll: PageFile[];
     _pageConfigs: PageConfigRuntime[];
     _globalContext: GlobalContextServerInternal;
 };
-type PageFiles = PromiseType<ReturnType<typeof loadUserFilesServerSide>>;
-declare function loadUserFilesServerSide(pageContext: {
+type PageFiles = PromiseType<ReturnType<typeof loadPageConfigsLazyServerSide>>;
+declare function loadPageConfigsLazyServerSide(pageContext: {
     pageId: string;
-} & PageContext_loadUserFilesServerSide): Promise<import("../../../shared/getPageFiles.js").PageConfigUserFriendlyOld & {
+} & PageContext_loadPageConfigsLazyServerSide): Promise<import("../../../shared/getPageFiles.js").PageConfigUserFriendlyOld & {
     Page: unknown;
     _isHtmlOnly: boolean;
     _passToClient: string[];

package/dist/esm/node/runtime/renderPage/{loadUserFilesServerSide.js → loadPageConfigsLazyServerSide.js}

@@ -1,6 +1,6 @@
-export { loadUserFilesServerSide };
+export { loadPageConfigsLazyServerSide };
 import { getPageFilesServerSide } from '../../../shared/getPageFiles.js';
-import { getPageConfigUserFriendly_oldDesign } from '../../../shared/page-configs/getPageConfigUserFriendly.js';
+import { getUserFriendlyConfigsPageLazy } from '../../../shared/page-configs/getUserFriendlyConfigs.js';
 import { analyzePageClientSideInit } from '../../../shared/getPageFiles/analyzePageClientSide.js';
 import { assert, assertUsage, assertWarning, hasProp, isArrayOfStrings, objectAssign, isArray } from '../utils.js';
 import { getPageAssets } from './getPageAssets.js';
@@ -8,7 +8,7 @@ import { debugPageFiles } from './debugPageFiles.js';
 import { findPageConfig } from '../../../shared/page-configs/findPageConfig.js';
 import { analyzePage } from './analyzePage.js';
 import { loadConfigValues } from '../../../shared/page-configs/loadConfigValues.js';
-async function loadUserFilesServerSide(pageContext) {
+async function loadPageConfigsLazyServerSide(pageContext) {
     const pageConfig = findPageConfig(pageContext._pageConfigs, pageContext.pageId); // Make pageConfig globally available as pageContext._pageConfig?
     const globalContext = pageContext._globalContext;
     const [{ pageFilesLoaded, pageContextExports }] = await Promise.all([
@@ -100,7 +100,7 @@ async function loadPageUserFiles(pageFilesAll, pageConfig, pageConfigGlobal, pag
     const pageFilesServerSide = getPageFilesServerSide(pageFilesAll, pageId);
     const pageConfigLoaded = !pageConfig ? null : await loadConfigValues(pageConfig, isDev);
     await Promise.all(pageFilesServerSide.map((p) => p.loadFile?.()));
-    const pageContextExports = getPageConfigUserFriendly_oldDesign(pageFilesServerSide, pageConfigLoaded, pageConfigGlobal);
+    const pageContextExports = getUserFriendlyConfigsPageLazy(pageFilesServerSide, pageConfigLoaded, pageConfigGlobal);
     return {
         pageContextExports,
         pageFilesLoaded: pageFilesServerSide

package/dist/esm/node/runtime/renderPage/preparePageContextForUserConsumptionServerSide.d.ts

@@ -2,7 +2,7 @@ export { preparePageContextForUserConsumptionServerSide };
 export type { PageContextForUserConsumptionServerSide };
 import { PageContextUrlInternal } from '../../../shared/getPageContextUrlComputed.js';
 import type { PageConfigRuntime } from '../../../shared/page-configs/PageConfig.js';
-import type { PageConfigUserFriendlyOld } from '../../../shared/page-configs/getPageConfigUserFriendly.js';
+import type { PageConfigUserFriendlyOld } from '../../../shared/page-configs/getUserFriendlyConfigs.js';
 import { PageContextBuiltInServerInternal } from '../../../shared/types.js';
 import type { GlobalContextServerInternal, GlobalContextServer } from '../globalContext.js';
 type PageContextForUserConsumptionServerSide = PageContextBuiltInServerInternal & PageConfigUserFriendlyOld & {

package/dist/esm/node/runtime/renderPage/renderPageAlreadyRouted.d.ts

@@ -3,7 +3,7 @@ export { prerenderPage };
 export type { PageContextAfterRender };
 import { type PageContextUrlInternal } from '../../../shared/getPageContextUrlComputed.js';
 import { HttpResponse } from './createHttpResponse.js';
-import { PageContext_loadUserFilesServerSide, type PageFiles } from './loadUserFilesServerSide.js';
+import { PageContext_loadPageConfigsLazyServerSide, type PageFiles } from './loadPageConfigsLazyServerSide.js';
 import type { PageContextCreatedServerSide } from './createPageContextServerSide.js';
 type PageContextAfterRender = {
     httpResponse: HttpResponse;
@@ -16,7 +16,7 @@ declare function renderPageAlreadyRouted<PageContext extends {
     routeParams: Record<string, string>;
     errorWhileRendering: null | Error;
     _httpRequestId: number;
-} & PageContextCreatedServerSide & PageContextUrlInternal & PageContext_loadUserFilesServerSide>(pageContext: PageContext): Promise<PageContext & PageContextAfterRender>;
+} & PageContextCreatedServerSide & PageContextUrlInternal & PageContext_loadPageConfigsLazyServerSide>(pageContext: PageContext): Promise<PageContext & PageContextAfterRender>;
 declare function prerenderPage(pageContext: PageContextCreatedServerSide & PageFiles & {
     routeParams: Record<string, string>;
     pageId: string;
@@ -43,8 +43,17 @@ declare function prerenderPage(pageContext: PageContextCreatedServerSide & PageF
             _pageConfigs: import("../../../__internal/index.js").PageConfig[];
             _pageConfigGlobal: import("../../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
             _allPageIds: string[];
+            _userFriendlyConfigsGlobal: import("../../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly;
             config: import("../../../types/index.js").ConfigResolved;
-            pages: import("../../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
+            pages: {
+                [k: string]: import("../../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly & ({
+                    route: import("../../../shared/page-configs/Config.js").Route;
+                    isErrorPage?: undefined;
+                } | {
+                    route?: undefined;
+                    isErrorPage: true;
+                });
+            };
         } & ({
             _isProduction: false;
             _isPrerendering: false;
@@ -72,8 +81,17 @@ declare function prerenderPage(pageContext: PageContextCreatedServerSide & PageF
             _pageConfigs: import("../../../__internal/index.js").PageConfig[];
             _pageConfigGlobal: import("../../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
             _allPageIds: string[];
+            _userFriendlyConfigsGlobal: import("../../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly;
             config: import("../../../types/index.js").ConfigResolved;
-            pages: import("../../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
+            pages: {
+                [k: string]: import("../../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly & ({
+                    route: import("../../../shared/page-configs/Config.js").Route;
+                    isErrorPage?: undefined;
+                } | {
+                    route?: undefined;
+                    isErrorPage: true;
+                });
+            };
         } | {
             _isPrerendering: true;
             viteConfig: import("vite").ResolvedConfig;
@@ -102,8 +120,17 @@ declare function prerenderPage(pageContext: PageContextCreatedServerSide & PageF
             _pageConfigs: import("../../../__internal/index.js").PageConfig[];
             _pageConfigGlobal: import("../../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
             _allPageIds: string[];
+            _userFriendlyConfigsGlobal: import("../../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly;
             config: import("../../../types/index.js").ConfigResolved;
-            pages: import("../../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
+            pages: {
+                [k: string]: import("../../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly & ({
+                    route: import("../../../shared/page-configs/Config.js").Route;
+                    isErrorPage?: undefined;
+                } | {
+                    route?: undefined;
+                    isErrorPage: true;
+                });
+            };
         } | {
             _isPrerendering: false;
             viteConfig: null;
@@ -132,8 +159,17 @@ declare function prerenderPage(pageContext: PageContextCreatedServerSide & PageF
             _pageConfigs: import("../../../__internal/index.js").PageConfig[];
             _pageConfigGlobal: import("../../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
             _allPageIds: string[];
+            _userFriendlyConfigsGlobal: import("../../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly;
             config: import("../../../types/index.js").ConfigResolved;
-            pages: import("../../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
+            pages: {
+                [k: string]: import("../../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly & ({
+                    route: import("../../../shared/page-configs/Config.js").Route;
+                    isErrorPage?: undefined;
+                } | {
+                    route?: undefined;
+                    isErrorPage: true;
+                });
+            };
         });
         _baseServer: string;
         _baseAssets: string;
@@ -148,17 +184,13 @@ declare function prerenderPage(pageContext: PageContextCreatedServerSide & PageF
         _urlRewrite: null;
         _urlHandler: ((url: string) => string) | null;
         isClientSideNavigation: boolean;
-    } & {
+    } & import("../../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly & {
         urlParsed: import("../utils.js").UrlPublic;
         urlPathname: string;
         url: string;
     } & {
         headers: Record<string, string> | null;
     } & {
-        config: import("../../../types/index.js").ConfigResolved;
-        _source: import("../../../shared/page-configs/getPageConfigUserFriendly.js").Source;
-        _sources: import("../../../shared/page-configs/getPageConfigUserFriendly.js").Sources;
-        _from: import("../../../shared/page-configs/getPageConfigUserFriendly.js").From;
         isPageContext: true;
     } & import("../../../shared/getPageFiles.js").PageConfigUserFriendlyOld & {
         Page: unknown;
@@ -197,8 +229,17 @@ declare function prerenderPage(pageContext: PageContextCreatedServerSide & PageF
             _pageConfigs: import("../../../__internal/index.js").PageConfig[];
             _pageConfigGlobal: import("../../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
             _allPageIds: string[];
+            _userFriendlyConfigsGlobal: import("../../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly;
             config: import("../../../types/index.js").ConfigResolved;
-            pages: import("../../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
+            pages: {
+                [k: string]: import("../../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly & ({
+                    route: import("../../../shared/page-configs/Config.js").Route;
+                    isErrorPage?: undefined;
+                } | {
+                    route?: undefined;
+                    isErrorPage: true;
+                });
+            };
         } & ({
             _isProduction: false;
             _isPrerendering: false;
@@ -226,8 +267,17 @@ declare function prerenderPage(pageContext: PageContextCreatedServerSide & PageF
             _pageConfigs: import("../../../__internal/index.js").PageConfig[];
             _pageConfigGlobal: import("../../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
             _allPageIds: string[];
+            _userFriendlyConfigsGlobal: import("../../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly;
             config: import("../../../types/index.js").ConfigResolved;
-            pages: import("../../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
+            pages: {
+                [k: string]: import("../../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly & ({
+                    route: import("../../../shared/page-configs/Config.js").Route;
+                    isErrorPage?: undefined;
+                } | {
+                    route?: undefined;
+                    isErrorPage: true;
+                });
+            };
         } | {
             _isPrerendering: true;
             viteConfig: import("vite").ResolvedConfig;
@@ -256,8 +306,17 @@ declare function prerenderPage(pageContext: PageContextCreatedServerSide & PageF
             _pageConfigs: import("../../../__internal/index.js").PageConfig[];
             _pageConfigGlobal: import("../../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
             _allPageIds: string[];
+            _userFriendlyConfigsGlobal: import("../../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly;
             config: import("../../../types/index.js").ConfigResolved;
-            pages: import("../../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
+            pages: {
+                [k: string]: import("../../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly & ({
+                    route: import("../../../shared/page-configs/Config.js").Route;
+                    isErrorPage?: undefined;
+                } | {
+                    route?: undefined;
+                    isErrorPage: true;
+                });
+            };
         } | {
             _isPrerendering: false;
             viteConfig: null;
@@ -286,8 +345,17 @@ declare function prerenderPage(pageContext: PageContextCreatedServerSide & PageF
             _pageConfigs: import("../../../__internal/index.js").PageConfig[];
             _pageConfigGlobal: import("../../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
             _allPageIds: string[];
+            _userFriendlyConfigsGlobal: import("../../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly;
             config: import("../../../types/index.js").ConfigResolved;
-            pages: import("../../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
+            pages: {
+                [k: string]: import("../../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly & ({
+                    route: import("../../../shared/page-configs/Config.js").Route;
+                    isErrorPage?: undefined;
+                } | {
+                    route?: undefined;
+                    isErrorPage: true;
+                });
+            };
         });
         _baseServer: string;
         _baseAssets: string;
@@ -302,17 +370,13 @@ declare function prerenderPage(pageContext: PageContextCreatedServerSide & PageF
         _urlRewrite: null;
         _urlHandler: ((url: string) => string) | null;
         isClientSideNavigation: boolean;
-    } & {
+    } & import("../../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly & {
         urlParsed: import("../utils.js").UrlPublic;
         urlPathname: string;
         url: string;
     } & {
         headers: Record<string, string> | null;
     } & {
-        config: import("../../../types/index.js").ConfigResolved;
-        _source: import("../../../shared/page-configs/getPageConfigUserFriendly.js").Source;
-        _sources: import("../../../shared/page-configs/getPageConfigUserFriendly.js").Sources;
-        _from: import("../../../shared/page-configs/getPageConfigUserFriendly.js").From;
         isPageContext: true;
     } & import("../../../shared/getPageFiles.js").PageConfigUserFriendlyOld & {
         Page: unknown;

package/dist/esm/node/runtime/renderPage/renderPageAlreadyRouted.js

@@ -5,7 +5,7 @@ import { getHtmlString } from '../html/renderHtml.js';
 import { assert, assertUsage, hasProp, objectAssign } from '../utils.js';
 import { getPageContextClientSerialized } from '../html/serializeContext.js';
 import { createHttpResponsePage, createHttpResponsePageContextJson } from './createHttpResponse.js';
-import { loadUserFilesServerSide } from './loadUserFilesServerSide.js';
+import { loadPageConfigsLazyServerSide } from './loadPageConfigsLazyServerSide.js';
 import { executeOnRenderHtmlHook } from './executeOnRenderHtmlHook.js';
 import { executeOnBeforeRenderAndDataHooks } from './executeOnBeforeRenderAndDataHooks.js';
 import { logRuntimeError } from './loggerRuntime.js';
@@ -21,7 +21,7 @@ async function renderPageAlreadyRouted(pageContext) {
     assert(hasProp(pageContext, 'pageId', 'string'));
     const isError = pageContext.is404 || !!pageContext.errorWhileRendering;
     assert(isError === (pageContext.pageId === getErrorPageId(pageContext._pageFilesAll, pageContext._pageConfigs)));
-    objectAssign(pageContext, await loadUserFilesServerSide(pageContext));
+    objectAssign(pageContext, await loadPageConfigsLazyServerSide(pageContext));
     if (!isError) {
         await executeGuardHook(pageContext, (pageContext) => preparePageContextForUserConsumptionServerSide(pageContext));
     }

package/dist/esm/node/runtime/renderPage.d.ts

@@ -33,8 +33,17 @@ declare function getPageContextBegin(pageContextInit: PageContextInit, globalCon
         _pageConfigs: import("../../__internal/index.js").PageConfig[];
         _pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
         _allPageIds: string[];
+        _userFriendlyConfigsGlobal: import("../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly;
         config: import("../../types/index.js").ConfigResolved;
-        pages: import("../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
+        pages: {
+            [k: string]: import("../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly & ({
+                route: import("../../shared/page-configs/Config.js").Route;
+                isErrorPage?: undefined;
+            } | {
+                route?: undefined;
+                isErrorPage: true;
+            });
+        };
     } & ({
         _isProduction: false;
         _isPrerendering: false;
@@ -62,8 +71,17 @@ declare function getPageContextBegin(pageContextInit: PageContextInit, globalCon
         _pageConfigs: import("../../__internal/index.js").PageConfig[];
         _pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
         _allPageIds: string[];
+        _userFriendlyConfigsGlobal: import("../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly;
         config: import("../../types/index.js").ConfigResolved;
-        pages: import("../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
+        pages: {
+            [k: string]: import("../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly & ({
+                route: import("../../shared/page-configs/Config.js").Route;
+                isErrorPage?: undefined;
+            } | {
+                route?: undefined;
+                isErrorPage: true;
+            });
+        };
     } | {
         _isPrerendering: true;
         viteConfig: import("vite").ResolvedConfig;
@@ -92,8 +110,17 @@ declare function getPageContextBegin(pageContextInit: PageContextInit, globalCon
         _pageConfigs: import("../../__internal/index.js").PageConfig[];
         _pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
         _allPageIds: string[];
+        _userFriendlyConfigsGlobal: import("../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly;
         config: import("../../types/index.js").ConfigResolved;
-        pages: import("../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
+        pages: {
+            [k: string]: import("../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly & ({
+                route: import("../../shared/page-configs/Config.js").Route;
+                isErrorPage?: undefined;
+            } | {
+                route?: undefined;
+                isErrorPage: true;
+            });
+        };
     } | {
         _isPrerendering: false;
         viteConfig: null;
@@ -122,8 +149,17 @@ declare function getPageContextBegin(pageContextInit: PageContextInit, globalCon
         _pageConfigs: import("../../__internal/index.js").PageConfig[];
         _pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
         _allPageIds: string[];
+        _userFriendlyConfigsGlobal: import("../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly;
         config: import("../../types/index.js").ConfigResolved;
-        pages: import("../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
+        pages: {
+            [k: string]: import("../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly & ({
+                route: import("../../shared/page-configs/Config.js").Route;
+                isErrorPage?: undefined;
+            } | {
+                route?: undefined;
+                isErrorPage: true;
+            });
+        };
     });
     _baseServer: string;
     _baseAssets: string;
@@ -138,17 +174,13 @@ declare function getPageContextBegin(pageContextInit: PageContextInit, globalCon
     _urlRewrite: null;
     _urlHandler: ((url: string) => string) | null;
     isClientSideNavigation: boolean;
-} & {
+} & import("../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly & {
     urlParsed: import("./utils.js").UrlPublic;
     urlPathname: string;
     url: string;
 } & {
     headers: Record<string, string> | null;
 } & {
-    config: import("../../types/index.js").ConfigResolved;
-    _source: import("../../shared/page-configs/getPageConfigUserFriendly.js").Source;
-    _sources: import("../../shared/page-configs/getPageConfigUserFriendly.js").Sources;
-    _from: import("../../shared/page-configs/getPageConfigUserFriendly.js").From;
     isPageContext: true;
 } & {
     _httpRequestId: number;

package/dist/esm/node/runtime/renderPage.js

@@ -17,7 +17,7 @@ import pc from '@brillout/picocolors';
 import { getPageContextClientSerializedAbort, getPageContextClientSerialized } from './html/serializeContext.js';
 import { getErrorPageId } from '../../shared/error-page.js';
 import { handleErrorWithoutErrorPage } from './renderPage/handleErrorWithoutErrorPage.js';
-import { loadUserFilesServerSide } from './renderPage/loadUserFilesServerSide.js';
+import { loadPageConfigsLazyServerSide } from './renderPage/loadPageConfigsLazyServerSide.js';
 import { resolveRedirects } from './renderPage/resolveRedirects.js';
 const globalObject = getGlobalObject('runtime/renderPage.ts', {
     httpRequestsCount: 0
@@ -410,7 +410,7 @@ pageContextNominalPageBegin, httpRequestId, pageContextErrorPageInit, globalCont
             objectAssign(pageContext, { pageId: errorPageId });
             objectAssign(pageContext, pageContextAbort);
             objectAssign(pageContext, pageContextErrorPageInit, true);
-            objectAssign(pageContext, await loadUserFilesServerSide(pageContext));
+            objectAssign(pageContext, await loadPageConfigsLazyServerSide(pageContext));
             // We include pageContextInit: we don't only serialize pageContextAbort because the error page may need to access pageContextInit
             pageContextSerialized = getPageContextClientSerialized(pageContext);
         }