vike 0.4.236-commit-eab75f6 → 0.4.237-commit-85e89b1

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

@@ -6,7 +6,7 @@ import { initOnLinkClick } from './initOnLinkClick.js';
 import { scrollRestoration_init } from './scrollRestoration.js';
 import { autoSaveScrollPosition } from './setScrollPosition.js';
 import { initLinkPrefetchHandlers } from './prefetch.js';
-import { initHistoryState, monkeyPatchHistoryAPI } from './history.js';
+import { initHistory } from './history.js';
 async function initClientRouter() {
     // Init navigation history and scroll restoration
     initHistoryAndScroll();
@@ -29,8 +29,7 @@ async function renderFirstPage() {
 }
 function initHistoryAndScroll() {
     scrollRestoration_init();
-    monkeyPatchHistoryAPI();
-    initHistoryState(); // we redundantly call initHistoryState() to ensure it's called early
+    initHistory(); // we redundantly call initHistory() to ensure it's called early
     autoSaveScrollPosition();
     // Handle back-/forward navigation
     initOnPopState();

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

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

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

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

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

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

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

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

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

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

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

@@ -22,3 +22,5 @@ export * from '../../utils/PROJECT_VERSION.js';
 export * from '../../utils/genPromise.js';
 export * from '../../utils/catchInfiniteLoop.js';
 export * from '../../utils/changeEnumerable.js';
+export * from '../../utils/deepEqual.js';
+export * from '../../utils/cast.js';

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

@@ -26,3 +26,5 @@ export * from '../../utils/PROJECT_VERSION.js';
 export * from '../../utils/genPromise.js';
 export * from '../../utils/catchInfiniteLoop.js';
 export * from '../../utils/changeEnumerable.js';
+export * from '../../utils/deepEqual.js';
+export * from '../../utils/cast.js';

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

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

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

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

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

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

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

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

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

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

package/dist/esm/client/shared/createGetGlobalContextClient.js

@@ -13,25 +13,23 @@ const globalObject = getGlobalObject('createGetGlobalContextClient.ts', (() => {
         globalContextInitialPromiseResolve,
     };
 })());
-function createGetGlobalContextClient(virtualFileExports, isClientRouting, addGlobalContext) {
+function createGetGlobalContextClient(virtualFileExportsGlobalEntry, isClientRouting, addGlobalContext) {
     assert(globalObject.isClientRouting === undefined || globalObject.isClientRouting === isClientRouting);
     globalObject.isClientRouting = isClientRouting;
     // Eagerly call onCreateGlobalContext() hook
     getGlobalContext();
     return getGlobalContext;
     async function getGlobalContext() {
-        // Cache
-        if (globalObject.virtualFileExports &&
-            // Don't break HMR
-            globalObject.virtualFileExports === virtualFileExports) {
+        // HMR => virtualFileExportsGlobalEntry differ
+        if (globalObject.virtualFileExportsGlobalEntry === virtualFileExportsGlobalEntry) {
             const globalContext = await globalObject.globalContextPromise;
             return globalContext;
         }
         else {
-            globalObject.virtualFileExports = virtualFileExports;
+            globalObject.virtualFileExportsGlobalEntry = virtualFileExportsGlobalEntry;
         }
         // Create
-        const globalContextPromise = createGlobalContextShared(virtualFileExports, globalObject, undefined, async (globalContext) => {
+        const globalContextPromise = createGlobalContextShared(virtualFileExportsGlobalEntry, globalObject, undefined, async (globalContext) => {
             const globalContextAddendum = {
                 /**
                  * Whether the environment is client-side or server-side / pre-rendering.

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

@@ -1,6 +1,6 @@
 export { execHookOnRenderClient };
 export type { PageContextBeforeRenderClient };
-import type { PageFile, VikeConfigPublicPageLazy } from '../../shared/getPageFiles.js';
+import type { PageFile, VikeConfigPublicPageLazyLoaded } from '../../shared/getPageFiles.js';
 import type { PageContextForPublicUsageClientShared } from './preparePageContextForPublicUsageClientShared.js';
 import type { GlobalContextClientInternalShared } from './createGetGlobalContextClient.js';
 type PageContextBeforeRenderClient = {
@@ -9,5 +9,5 @@ type PageContextBeforeRenderClient = {
     urlPathname?: string;
     pageId: string;
     _globalContext: GlobalContextClientInternalShared;
-} & VikeConfigPublicPageLazy & PageContextForPublicUsageClientShared;
+} & VikeConfigPublicPageLazyLoaded & PageContextForPublicUsageClientShared;
 declare function execHookOnRenderClient<PageContext extends PageContextBeforeRenderClient>(pageContext: PageContext, prepareForPublicUsage: (pageConfig: PageContext) => PageContext): Promise<void>;

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

@@ -11,7 +11,7 @@ type PageContext_loadPageConfigsLazyClientSide = {
         _pageConfigGlobal: PageConfigGlobalRuntime;
     };
 };
-declare function loadPageConfigsLazyClientSide(pageId: string, pageFilesAll: PageFile[], pageConfigs: PageConfigRuntime[], pageConfigGlobal: PageConfigGlobalRuntime): Promise<import("../../shared/getPageFiles.js").VikeConfigPublicPageLazy & {
+declare function loadPageConfigsLazyClientSide(pageId: string, pageFilesAll: PageFile[], pageConfigs: PageConfigRuntime[], pageConfigGlobal: PageConfigGlobalRuntime): Promise<import("../../shared/getPageFiles.js").VikeConfigPublicPageLazyLoaded & {
     _pageFilesLoaded: PageFile[];
 }>;
 declare function isErrorFetchingStaticAssets(err: unknown): boolean;

package/dist/esm/client/shared/loadPageConfigsLazyClientSide.js

@@ -1,9 +1,9 @@
 export { loadPageConfigsLazyClientSide };
 export { isErrorFetchingStaticAssets };
 import { getPageFilesClientSide } from '../../shared/getPageFiles.js';
-import { resolveVikeConfigPublicPageLazy } from '../../shared/page-configs/resolveVikeConfigPublic.js';
+import { resolveVikeConfigPublicPageLazyLoaded } from '../../shared/page-configs/resolveVikeConfigPublic.js';
 import { findPageConfig } from '../../shared/page-configs/findPageConfig.js';
-import { loadConfigValues } from '../../shared/page-configs/loadConfigValues.js';
+import { loadPageEntry } from '../../shared/page-configs/loadPageEntry.js';
 import { objectAssign } from '../runtime-server-routing/utils.js';
 const errStamp = '_isAssetsError';
 async function loadPageConfigsLazyClientSide(pageId, pageFilesAll, pageConfigs, pageConfigGlobal) {
@@ -16,7 +16,7 @@ async function loadPageConfigsLazyClientSide(pageId, pageFilesAll, pageConfigs,
         // prettier-ignore
         // biome-ignore format:
         const result = await Promise.all([
-            pageConfig && loadConfigValues(pageConfig, isDev),
+            pageConfig && loadPageEntry(pageConfig, isDev),
             ...pageFilesClientSide.map((p) => p.loadFile?.()),
         ]);
         pageConfigLoaded = result[0];
@@ -30,7 +30,7 @@ async function loadPageConfigsLazyClientSide(pageId, pageFilesAll, pageConfigs,
         }
         throw err;
     }
-    const configPublicPageLazy = resolveVikeConfigPublicPageLazy(pageFilesClientSide, pageConfigLoaded, pageConfigGlobal);
+    const configPublicPageLazy = resolveVikeConfigPublicPageLazyLoaded(pageFilesClientSide, pageConfigLoaded, pageConfigGlobal);
     const pageContextAddendum = {};
     objectAssign(pageContextAddendum, configPublicPageLazy);
     objectAssign(pageContextAddendum, { _pageFilesLoaded: pageFilesClientSide });

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

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

package/dist/esm/node/api/preview.js

@@ -16,7 +16,7 @@ async function preview(options = {}) {
     onSetupPreview();
     const { viteConfigFromUserEnhanced, viteConfigResolved } = await prepareViteApiCall(options, 'preview');
     if (viteConfigResolved.vitePluginServerEntry?.inject) {
-        const outDir = getOutDirs(viteConfigResolved).outDirRoot;
+        const outDir = getOutDirs(viteConfigResolved, undefined).outDirRoot;
         const { outServerIndex } = await importServerProductionIndex({ outDir });
         const outServerIndexRelative = path.relative(viteConfigResolved.root, outServerIndex);
         assertWarning(false, `Never run ${pc.cyan('$ vike preview')} in production, run ${pc.cyan(`$ node ${outServerIndexRelative}`)} instead (or Bun/Deno).`, { onlyOnce: true });

package/dist/esm/node/prerender/runPrerender.d.ts

@@ -77,7 +77,7 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
     _globalContext: {
         isGlobalContext: true;
         _isOriginalObject: true;
-        _virtualFileExports: unknown;
+        _virtualFileExportsGlobalEntry: unknown;
         _pageFilesAll: PageFile[];
         _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
         _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
@@ -90,7 +90,7 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
         };
         config: import("../../types/index.js").ConfigResolved;
         pages: {
-            [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEager;
+            [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEagerLoaded;
         };
     } & (({
         _isProduction: false;
@@ -175,7 +175,7 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
     _globalContext: {
         isGlobalContext: true;
         _isOriginalObject: true;
-        _virtualFileExports: unknown;
+        _virtualFileExportsGlobalEntry: unknown;
         _pageFilesAll: PageFile[];
         _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
         _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
@@ -188,7 +188,7 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
         };
         config: import("../../types/index.js").ConfigResolved;
         pages: {
-            [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEager;
+            [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEagerLoaded;
         };
     } & (({
         _isProduction: false;
@@ -277,7 +277,7 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
     _globalContext: {
         isGlobalContext: true;
         _isOriginalObject: true;
-        _virtualFileExports: unknown;
+        _virtualFileExportsGlobalEntry: unknown;
         _pageFilesAll: PageFile[];
         _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
         _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
@@ -290,7 +290,7 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
         };
         config: import("../../types/index.js").ConfigResolved;
         pages: {
-            [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEager;
+            [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEagerLoaded;
         };
     } & (({
         _isProduction: false;
@@ -375,7 +375,7 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
     _globalContext: {
         isGlobalContext: true;
         _isOriginalObject: true;
-        _virtualFileExports: unknown;
+        _virtualFileExportsGlobalEntry: unknown;
         _pageFilesAll: PageFile[];
         _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
         _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
@@ -388,7 +388,7 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
         };
         config: import("../../types/index.js").ConfigResolved;
         pages: {
-            [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEager;
+            [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEagerLoaded;
         };
     } & (({
         _isProduction: false;
@@ -464,7 +464,7 @@ declare function createPageContextPrerendering(urlOriginal: string, prerenderCon
     pageId: string;
     _debugRouteMatches: never[];
     routeParams: {};
-})) & import("../../shared/getPageFiles.js").VikeConfigPublicPageLazy) & {
+})) & import("../../shared/getPageFiles.js").VikeConfigPublicPageLazyLoaded) & {
     Page: unknown;
     _isHtmlOnly: boolean;
     _passToClient: import("../runtime/html/serializeContext.js").PassToClient;

package/dist/esm/node/prerender/runPrerender.js

@@ -15,7 +15,7 @@ import { getPageFilesServerSide } from '../../shared/getPageFiles.js';
 import { getPageContextRequestUrl } from '../../shared/getPageContextRequestUrl.js';
 import { getUrlFromRouteString } from '../../shared/route/resolveRouteString.js';
 import { getConfigValueRuntime } from '../../shared/page-configs/getConfigValueRuntime.js';
-import { loadConfigValues } from '../../shared/page-configs/loadConfigValues.js';
+import { loadPageEntry } from '../../shared/page-configs/loadPageEntry.js';
 import { getErrorPageId, isErrorPage } from '../../shared/error-page.js';
 import { isAbortError } from '../../shared/route/abort.js';
 import { loadPageConfigsLazyServerSideAndExecHook } from '../runtime/renderPage/loadPageConfigsLazyServerSide.js';
@@ -44,7 +44,7 @@ async function runPrerender(options = {}, trigger) {
     await disableReactStreaming();
     const viteConfig = await resolveViteConfig(options.viteConfig || {}, 'build', 'production');
     const vikeConfig = await getVikeConfigInternal();
-    const { outDirServer } = getOutDirs(viteConfig);
+    const { outDirServer } = getOutDirs(viteConfig, undefined);
     const prerenderConfigGlobal = resolvePrerenderConfigGlobal(vikeConfig);
     const { partial, noExtraDir, parallel, defaultLocalValue, isPrerenderingEnabled } = prerenderConfigGlobal;
     if (!isPrerenderingEnabled) {
@@ -174,7 +174,7 @@ async function callOnBeforePrerenderStartHooks(prerenderContext, globalContext,
     // V1 design
     await Promise.all(globalContext._pageConfigs.map((pageConfig) => concurrencyLimit(async () => {
         const hookName = 'onBeforePrerenderStart';
-        const pageConfigLoaded = await loadConfigValues(pageConfig, false);
+        const pageConfigLoaded = await loadPageEntry(pageConfig, false);
         const hook = getHookFromPageConfig(pageConfigLoaded, hookName);
         if (!hook)
             return;
@@ -552,7 +552,7 @@ async function writeFiles({ pageContext, htmlString, pageContextSerialized }, vi
 async function write(pageContext, fileType, fileContent, viteConfig, onPagePrerender, prerenderContext, logLevel) {
     const { urlOriginal } = pageContext;
     assert(urlOriginal.startsWith('/'));
-    const { outDirClient } = getOutDirs(viteConfig);
+    const { outDirClient } = getOutDirs(viteConfig, undefined);
     const { root } = viteConfig;
     let fileUrl;
     if (fileType === 'HTML') {

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

@@ -32,7 +32,7 @@ declare function getGlobalContextServerInternal(): Promise<{
     globalContext: (Record<string, unknown> & {
         isGlobalContext: true;
         _isOriginalObject: true;
-        _virtualFileExports: unknown;
+        _virtualFileExportsGlobalEntry: unknown;
         _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
         _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
         _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
@@ -45,7 +45,7 @@ declare function getGlobalContextServerInternal(): Promise<{
         };
         config: import("../../types/index.js").ConfigResolved;
         pages: {
-            [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEager;
+            [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEagerLoaded;
         };
     } & {
         _isProduction: false;
@@ -72,7 +72,7 @@ declare function getGlobalContextServerInternal(): Promise<{
     }) | (Record<string, unknown> & {
         isGlobalContext: true;
         _isOriginalObject: true;
-        _virtualFileExports: unknown;
+        _virtualFileExportsGlobalEntry: unknown;
         _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
         _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
         _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
@@ -85,7 +85,7 @@ declare function getGlobalContextServerInternal(): Promise<{
         };
         config: import("../../types/index.js").ConfigResolved;
         pages: {
-            [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEager;
+            [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEagerLoaded;
         };
     } & {
         _isPrerendering: true;
@@ -113,7 +113,7 @@ declare function getGlobalContextServerInternal(): Promise<{
     }) | (Record<string, unknown> & {
         isGlobalContext: true;
         _isOriginalObject: true;
-        _virtualFileExports: unknown;
+        _virtualFileExportsGlobalEntry: unknown;
         _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
         _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
         _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
@@ -126,7 +126,7 @@ declare function getGlobalContextServerInternal(): Promise<{
         };
         config: import("../../types/index.js").ConfigResolved;
         pages: {
-            [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEager;
+            [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEagerLoaded;
         };
     } & {
         _isPrerendering: false;
@@ -174,7 +174,7 @@ declare function getGlobalContextSync(): GlobalContext;
 declare function setGlobalContext_viteDevServer(viteDevServer: ViteDevServer): Promise<void>;
 declare function setGlobalContext_viteConfig(viteConfig: ResolvedConfig, viteConfigRuntime: ViteConfigRuntime): void;
 declare function setGlobalContext_isPrerendering(): void;
-declare function setGlobalContext_isProduction(isProduction: boolean, tolerateContraditction?: boolean): void;
+declare function setGlobalContext_isProduction(isProduction: boolean, tolerateContradiction?: boolean): void;
 declare function getViteDevServer(): ViteDevServer | null;
 declare function getViteConfig(): ResolvedConfig | null;
 declare function initGlobalContext_renderPage(): Promise<void>;
@@ -190,10 +190,10 @@ declare function assertBuildInfo(buildInfo: unknown): asserts buildInfo is Build
 declare function updateUserFiles(): Promise<{
     success: boolean;
 }>;
-declare function createGlobalContext(virtualFileExports: unknown): Promise<{
+declare function createGlobalContext(virtualFileExportsGlobalEntry: unknown): Promise<{
     isGlobalContext: true;
     _isOriginalObject: true;
-    _virtualFileExports: unknown;
+    _virtualFileExportsGlobalEntry: unknown;
     _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
     _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
     _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
@@ -206,7 +206,7 @@ declare function createGlobalContext(virtualFileExports: unknown): Promise<{
     };
     config: import("../../types/index.js").ConfigResolved;
     pages: {
-        [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEager;
+        [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEagerLoaded;
     };
 } & (({
     _isProduction: false;