vike 0.4.229-commit-58f7ed0 → 0.4.229-commit-5da80bf

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

@@ -3,8 +3,8 @@ 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 type { PageContextCreatedServerSide } from './createPageContextServerSide.js';
+import { PageContext_loadPageConfigsLazyServerSide, type PageFiles } from './loadPageConfigsLazyServerSide.js';
+import type { PageContextCreated } from './createPageContextServerSide.js';
 type PageContextAfterRender = {
     httpResponse: HttpResponse;
     errorWhileRendering: null | Error;
@@ -16,8 +16,8 @@ declare function renderPageAlreadyRouted<PageContext extends {
     routeParams: Record<string, string>;
     errorWhileRendering: null | Error;
     _httpRequestId: number;
-} & PageContextCreatedServerSide & PageContextUrlInternal & PageContext_loadUserFilesServerSide>(pageContext: PageContext): Promise<PageContext & PageContextAfterRender>;
-declare function prerenderPage(pageContext: PageContextCreatedServerSide & PageFiles & {
+} & PageContextCreated & PageContextUrlInternal & PageContext_loadPageConfigsLazyServerSide>(pageContext: PageContext): Promise<PageContext & PageContextAfterRender>;
+declare function prerenderPage(pageContext: PageContextCreated & PageFiles & {
     routeParams: Record<string, string>;
     pageId: string;
     _urlRewrite: null;
@@ -29,22 +29,34 @@ declare function prerenderPage(pageContext: PageContextCreatedServerSide & PageF
     documentHtml: string;
     pageContextSerialized: null;
     pageContext: {
-        isClientSide: boolean;
+        _isOriginalObject: true;
+        isPageContext: true;
+    } & {
+        isClientSide: false;
         isPrerendering: boolean;
-    } & Pick<import("../../../shared/types.js").PageContextBuiltInServerInternal, "urlOriginal" | "headersOriginal"> & {
+    } & Pick<import("../../../shared/types.js").PageContextInternalServer, "urlOriginal" | "headersOriginal"> & {
         url?: string;
         headers?: Record<string, string>;
     } & {
-        globalContext: import("../globalContext.js").GlobalContextServer;
         _globalContext: {
             isGlobalContext: true;
+            _isOriginalObject: true;
             _virtualFileExports: unknown;
             _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
             _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;
@@ -66,14 +78,6 @@ declare function prerenderPage(pageContext: PageContextCreatedServerSide & PageF
             isClientSide: false;
             _pageRoutes: import("../../../__internal/index.js").PageRoutes;
             _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
-            isGlobalContext: true;
-            _virtualFileExports: unknown;
-            _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
-            _pageConfigs: import("../../../__internal/index.js").PageConfig[];
-            _pageConfigGlobal: import("../../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
-            _allPageIds: string[];
-            config: import("../../../types/index.js").ConfigResolved;
-            pages: import("../../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
         } | {
             _isPrerendering: true;
             viteConfig: import("vite").ResolvedConfig;
@@ -96,14 +100,6 @@ declare function prerenderPage(pageContext: PageContextCreatedServerSide & PageF
             isClientSide: false;
             _pageRoutes: import("../../../__internal/index.js").PageRoutes;
             _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
-            isGlobalContext: true;
-            _virtualFileExports: unknown;
-            _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
-            _pageConfigs: import("../../../__internal/index.js").PageConfig[];
-            _pageConfigGlobal: import("../../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
-            _allPageIds: string[];
-            config: import("../../../types/index.js").ConfigResolved;
-            pages: import("../../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
         } | {
             _isPrerendering: false;
             viteConfig: null;
@@ -126,14 +122,6 @@ declare function prerenderPage(pageContext: PageContextCreatedServerSide & PageF
             isClientSide: false;
             _pageRoutes: import("../../../__internal/index.js").PageRoutes;
             _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
-            isGlobalContext: true;
-            _virtualFileExports: unknown;
-            _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
-            _pageConfigs: import("../../../__internal/index.js").PageConfig[];
-            _pageConfigGlobal: import("../../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
-            _allPageIds: string[];
-            config: import("../../../types/index.js").ConfigResolved;
-            pages: import("../../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
         });
         _baseServer: string;
         _baseAssets: string;
@@ -148,18 +136,12 @@ 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;
         _isHtmlOnly: boolean;
@@ -183,22 +165,34 @@ declare function prerenderPage(pageContext: PageContextCreatedServerSide & PageF
     documentHtml: string;
     pageContextSerialized: string;
     pageContext: {
-        isClientSide: boolean;
+        _isOriginalObject: true;
+        isPageContext: true;
+    } & {
+        isClientSide: false;
         isPrerendering: boolean;
-    } & Pick<import("../../../shared/types.js").PageContextBuiltInServerInternal, "urlOriginal" | "headersOriginal"> & {
+    } & Pick<import("../../../shared/types.js").PageContextInternalServer, "urlOriginal" | "headersOriginal"> & {
         url?: string;
         headers?: Record<string, string>;
     } & {
-        globalContext: import("../globalContext.js").GlobalContextServer;
         _globalContext: {
             isGlobalContext: true;
+            _isOriginalObject: true;
             _virtualFileExports: unknown;
             _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
             _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;
@@ -220,14 +214,6 @@ declare function prerenderPage(pageContext: PageContextCreatedServerSide & PageF
             isClientSide: false;
             _pageRoutes: import("../../../__internal/index.js").PageRoutes;
             _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
-            isGlobalContext: true;
-            _virtualFileExports: unknown;
-            _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
-            _pageConfigs: import("../../../__internal/index.js").PageConfig[];
-            _pageConfigGlobal: import("../../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
-            _allPageIds: string[];
-            config: import("../../../types/index.js").ConfigResolved;
-            pages: import("../../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
         } | {
             _isPrerendering: true;
             viteConfig: import("vite").ResolvedConfig;
@@ -250,14 +236,6 @@ declare function prerenderPage(pageContext: PageContextCreatedServerSide & PageF
             isClientSide: false;
             _pageRoutes: import("../../../__internal/index.js").PageRoutes;
             _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
-            isGlobalContext: true;
-            _virtualFileExports: unknown;
-            _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
-            _pageConfigs: import("../../../__internal/index.js").PageConfig[];
-            _pageConfigGlobal: import("../../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
-            _allPageIds: string[];
-            config: import("../../../types/index.js").ConfigResolved;
-            pages: import("../../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
         } | {
             _isPrerendering: false;
             viteConfig: null;
@@ -280,14 +258,6 @@ declare function prerenderPage(pageContext: PageContextCreatedServerSide & PageF
             isClientSide: false;
             _pageRoutes: import("../../../__internal/index.js").PageRoutes;
             _onBeforeRouteHook: import("../../../shared/hooks/getHook.js").Hook | null;
-            isGlobalContext: true;
-            _virtualFileExports: unknown;
-            _pageFilesAll: import("../../../shared/getPageFiles.js").PageFile[];
-            _pageConfigs: import("../../../__internal/index.js").PageConfig[];
-            _pageConfigGlobal: import("../../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
-            _allPageIds: string[];
-            config: import("../../../types/index.js").ConfigResolved;
-            pages: import("../../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
         });
         _baseServer: string;
         _baseAssets: string;
@@ -302,18 +272,12 @@ 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;
         _isHtmlOnly: boolean;

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

@@ -5,12 +5,12 @@ 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';
 import { isNewError } from './isNewError.js';
-import { preparePageContextForUserConsumptionServerSide } from './preparePageContextForUserConsumptionServerSide.js';
+import { preparePageContextForPublicUsageServer } from './preparePageContextForPublicUsageServer.js';
 import { executeGuardHook } from '../../../shared/route/executeGuardHook.js';
 import pc from '@brillout/picocolors';
 import { isServerSideError } from '../../../shared/misc/isServerSideError.js';
@@ -21,9 +21,9 @@ 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));
+        await executeGuardHook(pageContext, (pageContext) => preparePageContextForPublicUsageServer(pageContext));
     }
     if (!isError) {
         await executeOnBeforeRenderAndDataHooks(pageContext);
@@ -60,7 +60,7 @@ async function prerenderPage(pageContext) {
     });
     /* Should we execute the guard() hook upon pre-rendering? Is there a use case for this?
      *  - It isn't trivial to implement, as it requires to duplicate / factor out the isAbortError() handling
-    await executeGuardHook(pageContext, (pageContext) => preparePageContextForUserConsumptionServerSide(pageContext))
+    await executeGuardHook(pageContext, (pageContext) => preparePageContextForPublicUsageServer(pageContext))
     */
     await executeOnBeforeRenderAndDataHooks(pageContext);
     const { htmlRender, renderHook } = await executeOnRenderHtmlHook(pageContext);

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

@@ -2,11 +2,11 @@ export { renderPage };
 export { renderPage_addAsyncHookwrapper };
 export type { PageContextInit };
 export type { PageContextBegin };
-import { type GlobalContextServer, type GlobalContextServerInternal } from './globalContext.js';
+import { type GlobalContextServerInternal } from './globalContext.js';
 import { type HttpResponse } from './renderPage/createHttpResponse.js';
 import type { PageContextServer } from '../../types/index.js';
-import type { PageContextBuiltInServerInternal } from '../../shared/types.js';
-type PageContextInit = Pick<PageContextBuiltInServerInternal, 'urlOriginal' | 'headersOriginal'> & {
+import type { PageContextInternalServer } from '../../shared/types.js';
+type PageContextInit = Pick<PageContextInternalServer, 'urlOriginal' | 'headersOriginal'> & {
     /** @deprecated Set `pageContextInit.urlOriginal` instead  */ url?: string;
     /** @deprecated Set pageContextInit.headersOriginal instead */ headers?: Record<string, string>;
 };
@@ -18,23 +18,35 @@ declare let asyncHookWrapper: <PageContext>(_httpRequestId: number, ret: () => P
     pageContextReturn: Awaited<PageContext>;
 }>;
 declare function renderPage_addAsyncHookwrapper(wrapper: typeof asyncHookWrapper): void;
-declare function getPageContextBegin(pageContextInit: PageContextInit, globalContext: GlobalContextServerInternal, globalContext_public: GlobalContextServer, httpRequestId: number): Promise<{
-    isClientSide: boolean;
+declare function getPageContextBegin(pageContextInit: PageContextInit, globalContext: GlobalContextServerInternal, httpRequestId: number): Promise<{
+    _isOriginalObject: true;
+    isPageContext: true;
+} & {
+    isClientSide: false;
     isPrerendering: boolean;
-} & Pick<PageContextBuiltInServerInternal, "urlOriginal" | "headersOriginal"> & {
+} & Pick<PageContextInternalServer, "urlOriginal" | "headersOriginal"> & {
     /** @deprecated Set `pageContextInit.urlOriginal` instead  */ url?: string;
     /** @deprecated Set pageContextInit.headersOriginal instead */ headers?: Record<string, string>;
 } & {
-    globalContext: GlobalContextServer;
     _globalContext: {
         isGlobalContext: true;
+        _isOriginalObject: true;
         _virtualFileExports: unknown;
         _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
         _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;
@@ -56,14 +68,6 @@ declare function getPageContextBegin(pageContextInit: PageContextInit, globalCon
         isClientSide: false;
         _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
         _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
-        isGlobalContext: true;
-        _virtualFileExports: unknown;
-        _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
-        _pageConfigs: import("../../__internal/index.js").PageConfig[];
-        _pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
-        _allPageIds: string[];
-        config: import("../../types/index.js").ConfigResolved;
-        pages: import("../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
     } | {
         _isPrerendering: true;
         viteConfig: import("vite").ResolvedConfig;
@@ -86,14 +90,6 @@ declare function getPageContextBegin(pageContextInit: PageContextInit, globalCon
         isClientSide: false;
         _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
         _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
-        isGlobalContext: true;
-        _virtualFileExports: unknown;
-        _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
-        _pageConfigs: import("../../__internal/index.js").PageConfig[];
-        _pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
-        _allPageIds: string[];
-        config: import("../../types/index.js").ConfigResolved;
-        pages: import("../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
     } | {
         _isPrerendering: false;
         viteConfig: null;
@@ -116,14 +112,6 @@ declare function getPageContextBegin(pageContextInit: PageContextInit, globalCon
         isClientSide: false;
         _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
         _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
-        isGlobalContext: true;
-        _virtualFileExports: unknown;
-        _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
-        _pageConfigs: import("../../__internal/index.js").PageConfig[];
-        _pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
-        _allPageIds: string[];
-        config: import("../../types/index.js").ConfigResolved;
-        pages: import("../../shared/page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
     });
     _baseServer: string;
     _baseAssets: string;
@@ -138,18 +126,12 @@ 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,8 +17,9 @@ 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';
+import { getProxyForMutationTracking } from '../../shared/getProxyForPublicUsage.js';
 const globalObject = getGlobalObject('runtime/renderPage.ts', {
     httpRequestsCount: 0
 });
@@ -76,8 +77,8 @@ async function renderPagePrepare(pageContextInit, httpRequestId) {
     else {
         // `globalContext` now contains the entire Vike config and getVikeConfig() isn't called anymore for this request.
     }
-    const { globalContext, globalContext_public } = await getGlobalContextServerInternal();
-    const pageContextBegin = await getPageContextBegin(pageContextInit, globalContext, globalContext_public, httpRequestId);
+    const { globalContext } = await getGlobalContextServerInternal();
+    const pageContextBegin = await getPageContextBegin(pageContextInit, globalContext, httpRequestId);
     // Check Base URL
     {
         const pageContextHttpResponse = await checkBaseUrl(pageContextBegin, globalContext);
@@ -299,9 +300,9 @@ async function getPageContextErrorPageInit(pageContextBegin, errNominalPage, pag
     assert(pageContext.errorWhileRendering);
     return pageContext;
 }
-async function getPageContextBegin(pageContextInit, globalContext, globalContext_public, httpRequestId) {
+async function getPageContextBegin(pageContextInit, globalContext, httpRequestId) {
     const { isClientSideNavigation, _urlHandler } = handlePageContextUrl(pageContextInit.urlOriginal);
-    const pageContextBegin = await createPageContextServerSide(pageContextInit, globalContext, globalContext_public, {
+    const pageContextBegin = await createPageContextServerSide(pageContextInit, globalContext, {
         isPrerendering: false,
         ssr: {
             urlHandler: _urlHandler,
@@ -410,7 +411,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);
         }
@@ -483,5 +484,6 @@ function getPageContextInvalidVikeConfig(err, pageContextInit, httpRequestId) {
 function forkPageContext(pageContextBegin) {
     const pageContext = {};
     objectAssign(pageContext, pageContextBegin, true);
-    return pageContext;
+    const pageContextWithProxy = getProxyForMutationTracking(pageContext);
+    return pageContextWithProxy;
 }

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

@@ -54,5 +54,5 @@ export * from '../../utils/isVikeReactApp.js';
 export * from '../../utils/getPropAccessNotation.js';
 export * from '../../utils/PROJECT_VERSION.js';
 export * from '../../utils/genPromise.js';
-export * from '../../utils/getPublicProxy.js';
 export * from '../../utils/augmentType.js';
+export * from '../../utils/changeEnumerable.js';

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

@@ -58,5 +58,5 @@ export * from '../../utils/isVikeReactApp.js';
 export * from '../../utils/getPropAccessNotation.js';
 export * from '../../utils/PROJECT_VERSION.js';
 export * from '../../utils/genPromise.js';
-export * from '../../utils/getPublicProxy.js';
 export * from '../../utils/augmentType.js';
+export * from '../../utils/changeEnumerable.js';

package/dist/esm/shared/NOT_SERIALIZABLE.js

@@ -1,2 +1 @@
-// TODO: move to ../node/runtime/html/NOT_SERIALIZABLE.ts once code is distributed as ESM
 export const NOT_SERIALIZABLE = '__VIKE__NOT_SERIALIZABLE__';

package/dist/esm/shared/addIs404ToPageProps.d.ts

@@ -1,7 +1,2 @@
 export { addIs404ToPageProps };
-import type { PageConfigRuntime } from './page-configs/PageConfig.js';
-declare function addIs404ToPageProps(pageContext: Record<string, unknown> & PageContextAssertIs404): void;
-type PageContextAssertIs404 = {
-    pageId: string;
-    _pageConfigs: PageConfigRuntime[];
-};
+declare function addIs404ToPageProps(pageContext: Record<string, unknown>): void;

package/dist/esm/shared/addIs404ToPageProps.js

@@ -1,15 +1,8 @@
 export { addIs404ToPageProps };
-import { assert, assertWarning, hasProp, isObject } from './utils.js';
-import { isErrorPage } from './error-page.js';
+import { assertWarning, isObject } from './utils.js';
 function addIs404ToPageProps(pageContext) {
-    assertIs404(pageContext);
     addIs404(pageContext);
 }
-function assertIs404(pageContext) {
-    if (isErrorPage(pageContext.pageId, pageContext._pageConfigs)) {
-        assert(hasProp(pageContext, 'is404', 'boolean'));
-    }
-}
 function addIs404(pageContext) {
     if (pageContext.is404 === undefined || pageContext.is404 === null)
         return;

package/dist/esm/shared/createGlobalContextShared.d.ts

@@ -2,6 +2,8 @@ export { createGlobalContextShared };
 export { getGlobalContextSyncErrMsg };
 export type { GlobalContextShared };
 export type { GlobalContextSharedPublic };
+import type { PageFile } from './getPageFiles.js';
+import type { PageConfigRuntime } from './page-configs/PageConfig.js';
 declare const getGlobalContextSyncErrMsg = "The global context isn't set yet, call getGlobalContextSync() later or use getGlobalContext() instead.";
 declare function createGlobalContextShared<GlobalContextAddendum extends object>(virtualFileExports: unknown, globalObject: {
     globalContext?: Record<string, unknown>;
@@ -12,13 +14,23 @@ declare function createGlobalContextShared<GlobalContextAddendum extends object>
      * https://vike.dev/globalContext#typescript
      */
     isGlobalContext: true;
+    _isOriginalObject: true;
     _virtualFileExports: unknown;
-    _pageFilesAll: import("./getPageFiles.js").PageFile[];
-    _pageConfigs: import("./page-configs/PageConfig.js").PageConfigRuntime[];
+    _pageFilesAll: PageFile[];
+    _pageConfigs: PageConfigRuntime[];
     _pageConfigGlobal: import("./page-configs/PageConfig.js").PageConfigGlobalRuntime;
     _allPageIds: string[];
+    _userFriendlyConfigsGlobal: import("./page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly;
     config: import("./page-configs/Config/PageContextConfig.js").ConfigResolved;
-    pages: import("./page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
+    pages: {
+        [k: string]: import("./page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly & ({
+            route: import("./page-configs/Config.js").Route;
+            isErrorPage?: undefined;
+        } | {
+            route?: undefined;
+            isErrorPage: true;
+        });
+    };
 } & Awaited<GlobalContextAddendum>>;
 type GlobalContextSharedPublic = Pick<GlobalContextShared, 'config' | 'pages' | 'isGlobalContext'>;
 type GlobalContextShared = ReturnType<typeof createGlobalContextBase>;
@@ -29,11 +41,21 @@ declare function createGlobalContextBase(virtualFileExports: unknown): {
      * https://vike.dev/globalContext#typescript
      */
     isGlobalContext: true;
+    _isOriginalObject: true;
     _virtualFileExports: unknown;
-    _pageFilesAll: import("./getPageFiles.js").PageFile[];
-    _pageConfigs: import("./page-configs/PageConfig.js").PageConfigRuntime[];
+    _pageFilesAll: PageFile[];
+    _pageConfigs: PageConfigRuntime[];
     _pageConfigGlobal: import("./page-configs/PageConfig.js").PageConfigGlobalRuntime;
     _allPageIds: string[];
+    _userFriendlyConfigsGlobal: import("./page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly;
     config: import("./page-configs/Config/PageContextConfig.js").ConfigResolved;
-    pages: import("./page-configs/getPageConfigUserFriendly.js").PageConfigsUserFriendly;
+    pages: {
+        [k: string]: import("./page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly & ({
+            route: import("./page-configs/Config.js").Route;
+            isErrorPage?: undefined;
+        } | {
+            route?: undefined;
+            isErrorPage: true;
+        });
+    };
 };

package/dist/esm/shared/createGlobalContextShared.js

@@ -1,9 +1,11 @@
 export { createGlobalContextShared };
 export { getGlobalContextSyncErrMsg };
+import { changeEnumerable, objectAssign, unique } from './utils.js';
+import { parseGlobResults } from './getPageFiles/parseGlobResults.js';
+import { getUserFriendlyConfigsGlobal, getUserFriendlyConfigsPageEager } from './page-configs/getUserFriendlyConfigs.js';
+import { execHookGlobal } from './hooks/execHook.js';
+import { prepareGlobalContextForPublicUsage } from './prepareGlobalContextForPublicUsage.js';
 const getGlobalContextSyncErrMsg = "The global context isn't set yet, call getGlobalContextSync() later or use getGlobalContext() instead.";
-import { getPageConfigsRuntime } from './getPageConfigsRuntime.js';
-import { executeHookGenericGlobalCumulative } from './hooks/executeHookGeneric.js';
-import { objectAssign } from './utils.js';
 async function createGlobalContextShared(virtualFileExports, globalObject, addGlobalContext) {
     const globalContext = createGlobalContextBase(virtualFileExports);
     const globalContextAddendum = await addGlobalContext?.(globalContext);
@@ -21,17 +23,17 @@ async function createGlobalContextShared(virtualFileExports, globalObject, addGl
         //      - globalContext._viteDevServer.hot.send()
         //        - Send 'full-server-reload' signal whenever a onCreateGlobalContext() function is modified => we need a globalObject to track all hooks and see if one of them is new/modified.
         //        - Seems less idiomatic
-        await executeHookGenericGlobalCumulative('onCreateGlobalContext', globalContext._pageConfigGlobal, null, globalContext);
+        await execHookGlobal('onCreateGlobalContext', globalContext._pageConfigGlobal, null, globalContext, prepareGlobalContextForPublicUsage);
     }
     else {
         // Singleton: ensure all `globalContext` user-land references are preserved & updated.
         // We don't use objectReplace() in order to keep user-land properties.
-        objectAssign(globalObject.globalContext, globalContext);
+        objectAssign(globalObject.globalContext, globalContext, true);
     }
     return globalObject.globalContext;
 }
 function createGlobalContextBase(virtualFileExports) {
-    const { pageFilesAll, allPageIds, pageConfigs, pageConfigGlobal, globalConfig, pageConfigsUserFriendly } = getPageConfigsRuntime(virtualFileExports);
+    const { pageFilesAll, allPageIds, pageConfigs, pageConfigGlobal, userFriendlyConfigsGlobal, userFriendlyConfigsPageEager } = getConfigsAll(virtualFileExports);
     const globalContext = {
         /**
          * Useful for distinguishing `globalContext` from other objects and narrowing down TypeScript unions.
@@ -39,13 +41,40 @@ function createGlobalContextBase(virtualFileExports) {
          * https://vike.dev/globalContext#typescript
          */
         isGlobalContext: true,
+        _isOriginalObject: true,
         _virtualFileExports: virtualFileExports,
         _pageFilesAll: pageFilesAll,
         _pageConfigs: pageConfigs,
         _pageConfigGlobal: pageConfigGlobal,
         _allPageIds: allPageIds,
-        config: globalConfig.config,
-        pages: pageConfigsUserFriendly
+        _userFriendlyConfigsGlobal: userFriendlyConfigsGlobal,
+        config: userFriendlyConfigsGlobal.config,
+        pages: userFriendlyConfigsPageEager
     };
+    changeEnumerable(globalContext, '_isOriginalObject', false);
     return globalContext;
 }
+function getConfigsAll(virtualFileExports) {
+    const { pageFilesAll, pageConfigs, pageConfigGlobal } = parseGlobResults(virtualFileExports);
+    const allPageIds = getAllPageIds(pageFilesAll, pageConfigs);
+    const userFriendlyConfigsGlobal = getUserFriendlyConfigsGlobal({
+        pageConfigGlobalValues: pageConfigGlobal.configValues
+    });
+    const userFriendlyConfigsPageEager = Object.fromEntries(pageConfigs.map((pageConfig) => {
+        return getUserFriendlyConfigsPageEager(pageConfigGlobal.configValues, pageConfig, pageConfig.configValues);
+    }));
+    return {
+        pageFilesAll,
+        allPageIds,
+        pageConfigs,
+        pageConfigGlobal,
+        userFriendlyConfigsGlobal,
+        userFriendlyConfigsPageEager
+    };
+}
+function getAllPageIds(pageFilesAll, pageConfigs) {
+    const fileIds = pageFilesAll.filter(({ isDefaultPageFile }) => !isDefaultPageFile).map(({ pageId }) => pageId);
+    const allPageIds = unique(fileIds);
+    const allPageIds2 = pageConfigs.map((p) => p.pageId);
+    return [...allPageIds, ...allPageIds2];
+}