vike 0.4.231 → 0.4.232-commit-134207d

package/dist/esm/client/{client-routing-runtime → runtime-client-routing}/getPageContextFromHooks.js

@@ -4,7 +4,7 @@ export { getPageContextFromServerHooks };
 export { getPageContextFromClientHooks };
 export { setPageContextInitIsPassedToClient };
 export { execHookClient };
-import { assert, assertUsage, hasProp, objectAssign, getProjectError, redirectHard, isObject, getGlobalObject } from './utils.js';
+import { assert, assertUsage, hasProp, objectAssign, getProjectError, redirectHard, isObject, getGlobalObject, } from './utils.js';
 import { parse } from '@brillout/json-serializer/parse';
 import { getPageContextSerializedInHtml } from '../shared/getJsonSerializedInHtml.js';
 import { analyzePageServerSide } from '../../shared/getPageFiles/analyzePageServerSide.js';
@@ -18,15 +18,15 @@ import { AbortRender, isAbortPageContext } from '../../shared/route/abort.js';
 import { pageContextInitIsPassedToClient } from '../../shared/misc/pageContextInitIsPassedToClient.js';
 import { isServerSideError } from '../../shared/misc/isServerSideError.js';
 import { execHook } from '../../shared/hooks/execHook.js';
-import { preparePageContextForPublicUsageClient } from './preparePageContextForPublicUsageClient.js';
-const globalObject = getGlobalObject('client-routing-runtime/getPageContextFromHooks.ts', {});
+import { preparePageContextForPublicUsageClient, } from './preparePageContextForPublicUsageClient.js';
+const globalObject = getGlobalObject('runtime-client-routing/getPageContextFromHooks.ts', {});
 // TO-DO/eventually: rename
 function getPageContextFromHooks_serialized() {
     const pageContextSerialized = getPageContextSerializedInHtml();
     assertUsage(!('urlOriginal' in pageContextSerialized), "Adding 'urlOriginal' to passToClient is forbidden");
     processPageContextFromServer(pageContextSerialized);
     objectAssign(pageContextSerialized, {
-        _hasPageContextFromServer: true
+        _hasPageContextFromServer: true,
     });
     return pageContextSerialized;
 }
@@ -41,7 +41,7 @@ async function getPageContextFromHooks_isHydration(pageContext) {
 }
 async function getPageContextFromServerHooks(pageContext, isErrorPage) {
     const pageContextFromServerHooks = {
-        _hasPageContextFromServer: false
+        _hasPageContextFromServer: false,
     };
     // If pageContextInit has some client data or if one of the hooks guard(), data() or onBeforeRender() is server-side
     // only, then we need to fetch pageContext from the server.
@@ -165,9 +165,9 @@ async function hasPageContextServer(pageContext) {
  * @returns `true` if the given page has a `hookName` hook defined with a server-only env.
  */
 async function hookServerOnlyExists(hookName, pageContext) {
-    if (pageContext._pageConfigs.length > 0) {
+    if (pageContext._globalContext._pageConfigs.length > 0) {
         // V1
-        const pageConfig = getPageConfig(pageContext.pageId, pageContext._pageConfigs);
+        const pageConfig = getPageConfig(pageContext.pageId, pageContext._globalContext._pageConfigs);
         const hookEnv = getConfigValueRuntime(pageConfig, `${hookName}Env`)?.value;
         if (hookEnv === null)
             return false;
@@ -194,9 +194,9 @@ function hookClientOnlyExists(hookName, pageContext) {
     return !!hookEnv.client && !hookEnv.server;
 }
 function getHookEnv(hookName, pageContext) {
-    if (pageContext._pageConfigs.length > 0) {
+    if (pageContext._globalContext._pageConfigs.length > 0) {
         // V1
-        const pageConfig = getPageConfig(pageContext.pageId, pageContext._pageConfigs);
+        const pageConfig = getPageConfig(pageContext.pageId, pageContext._globalContext._pageConfigs);
         // No runtime validation to save client-side KBs
         const hookEnv = (getConfigValueRuntime(pageConfig, `${hookName}Env`)?.value ?? {});
         return hookEnv;
@@ -227,7 +227,7 @@ async function fetchPageContextFromServer(pageContext) {
     if (isAbortPageContext(pageContextFromServer)) {
         throw AbortRender(pageContextFromServer);
     }
-    // Is there a reason for having two different properties? Can't we use only one property? I guess/think the isServerSideError property was an attempt (a bad idea really) for rendering the error page even though an error occured on the server-side (which is a bad idea because the added complexity is non-negligible while the added value is minuscule since the error page usually doesn't have any (meaningful / server-side) hooks).
+    // Is there a reason for having two different properties? Can't we use only one property? I guess/think the isServerSideError property was an attempt (a bad idea really) for rendering the error page even though an error occurred on the server-side (which is a bad idea because the added complexity is non-negligible while the added value is minuscule since the error page usually doesn't have any (meaningful / server-side) hooks).
     if ('serverSideError' in pageContextFromServer || isServerSideError in pageContextFromServer) {
         throw getProjectError(`pageContext couldn't be fetched because an error occurred on the server-side`);
     }

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

@@ -0,0 +1,30 @@
+export { getGlobalContextClientInternal };
+export type { GlobalContextClient };
+export type { GlobalContextClientInternal };
+import type { GlobalContextBasePublic } from '../../shared/createGlobalContextShared.js';
+type GlobalContextClient = GlobalContextBasePublic & Pick<GlobalContextClientInternal, 'isClientSide'> & Vike.GlobalContext & Vike.GlobalContextClient & {};
+type GlobalContextClientInternal = Awaited<ReturnType<typeof getGlobalContextClientInternal>>;
+declare const getGlobalContextClientInternal: () => Promise<{
+    isGlobalContext: true;
+    _isOriginalObject: true;
+    _virtualFileExports: unknown;
+    _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
+    _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
+    _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
+    _allPageIds: string[];
+    _vikeConfigPublicGlobal: {
+        config: import("../../types/index.js").ConfigResolved;
+        _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+        _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+        _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
+    };
+    config: import("../../types/index.js").ConfigResolved;
+    pages: {
+        [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEager;
+    };
+} & {
+    isClientSide: true;
+} & {
+    _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
+    _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
+}>;

package/dist/esm/client/{client-routing-runtime → runtime-client-routing}/globalContext.js

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

package/dist/esm/client/{client-routing-runtime → runtime-client-routing}/history.js

@@ -7,7 +7,7 @@ export { monkeyPatchHistoryAPI };
 import { getCurrentUrl } from '../shared/getCurrentUrl.js';
 import { assert, assertUsage, getGlobalObject, isObject } from './utils.js';
 initHistoryState(); // we redundantly call initHistoryState() to ensure it's called early
-const globalObject = getGlobalObject('client-routing-runtime/history.ts', { previous: getHistoryInfo() });
+const globalObject = getGlobalObject('runtime-client-routing/history.ts', { previous: getHistoryInfo() });
 // `window.history.state === null` when:
 // - The very first render
 // - Click on `<a href="#some-hash" />`
@@ -29,7 +29,7 @@ function enhance(stateNotEnhanced) {
             timestamp,
             scrollPosition,
             triggeredBy,
-            _isVikeEnhanced: true
+            _isVikeEnhanced: true,
         };
     }
     else {
@@ -38,7 +38,7 @@ function enhance(stateNotEnhanced) {
             timestamp: stateNotEnhanced.timestamp ?? timestamp,
             scrollPosition: stateNotEnhanced.scrollPosition ?? scrollPosition,
             triggeredBy: stateNotEnhanced.triggeredBy ?? triggeredBy,
-            _isVikeEnhanced: true
+            _isVikeEnhanced: true,
         };
     }
     assert(isVikeEnhanced(stateVikeEnhanced));
@@ -77,9 +77,9 @@ function pushHistoryState(url, overwriteLastHistoryEntry) {
             // I don't remember why I set it to `null`, maybe because setting it now would be too early? (Maybe there is a delay between renderPageClientSide() is finished and the browser updating the scroll position.) Anyways, it seems like autoSaveScrollPosition() is enough.
             scrollPosition: null,
             triggeredBy: 'vike',
-            _isVikeEnhanced: true
+            _isVikeEnhanced: true,
         };
-        // Calling the monkey patched history.pushState() (and not the orignal) so that other tools (e.g. user tracking) can listen to Vike's pushState() calls.
+        // Calling the monkey patched history.pushState() (and not the original) so that other tools (e.g. user tracking) can listen to Vike's pushState() calls.
         // - https://github.com/vikejs/vike/issues/1582
         window.history.pushState(state, '', url);
     }
@@ -112,7 +112,7 @@ function monkeyPatchHistoryAPI() {
                     scrollPosition: getScrollPosition(),
                     timestamp: getTimestamp(),
                     triggeredBy: 'user',
-                    ...stateOriginal
+                    ...stateOriginal,
                 };
             assert(isVikeEnhanced(stateEnhanced));
             const ret = funcOriginal(stateEnhanced, ...rest);
@@ -139,7 +139,7 @@ function isVikeEnhanced(state) {
 function getHistoryInfo() {
     return {
         url: getCurrentUrl(),
-        state: getState()
+        state: getState(),
     };
 }
 function onPopStateBegin() {

package/dist/esm/client/{client-routing-runtime → runtime-client-routing}/index.d.ts

@@ -2,7 +2,7 @@ export { navigate, reload } from './navigate.js';
 export { prefetch } from './prefetch.js';
 export { getPageContextClient } from './renderPageClientSide.js';
 export { PROJECT_VERSION as version } from './utils.js';
-import type { PageContextBuiltInClientWithClientRouting } from '../../shared/types.js';
+import type { PageContextBuiltInClientWithClientRouting } from '../../types/PageContext.js';
 /** @deprecated
  * Replace:
  *   ```

package/dist/esm/client/{client-routing-runtime → runtime-client-routing}/initClientRouter.js

@@ -24,7 +24,7 @@ async function renderFirstPage() {
     await renderPageClientSide({
         scrollTarget: { preserveScroll: true },
         isBackwardNavigation: null,
-        isClientSideNavigation: false
+        isClientSideNavigation: false,
     });
 }
 function initHistoryAndScroll() {

package/dist/esm/client/{client-routing-runtime → runtime-client-routing}/initOnLinkClick.js

@@ -36,7 +36,7 @@ async function onLinkClick(ev) {
     await renderPageClientSide({
         scrollTarget,
         urlOriginal: href,
-        isBackwardNavigation: false
+        isBackwardNavigation: false,
     });
 }
 function isNormalLeftClick(ev) {

package/dist/esm/client/{client-routing-runtime → runtime-client-routing}/initOnPopState.js

@@ -3,7 +3,7 @@ import { onPopStateBegin } from './history.js';
 import { renderPageClientSide } from './renderPageClientSide.js';
 import { setScrollPosition } from './setScrollPosition.js';
 import { catchInfiniteLoop } from './utils.js';
-// The 'popstate' event is trigged when the browser doesn't fully load the new URL, for example:
+// The 'popstate' event is triggered when the browser doesn't fully load the new URL, for example:
 // - `location.hash='#foo'` triggers the popstate event while `location.href='/foo'` doesn't.
 // - Clicking on the browser's back-/forward button triggers a popstate event only if the history entry was generated with history.pushState() — no popstate event is fired upon Server Routing.
 // Concretely, 'popstate' is fired when:

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

@@ -0,0 +1,7 @@
+export { isClientSideRoutable };
+import type { GlobalContextClientInternal } from './globalContext.js';
+import type { PageFile } from '../../shared/getPageFiles.js';
+declare function isClientSideRoutable(pageId: string, pageContext: {
+    _globalContext: GlobalContextClientInternal;
+    _pageFilesAll: PageFile[];
+}): Promise<boolean>;

package/dist/esm/client/{client-routing-runtime → runtime-client-routing}/isClientSideRoutable.js

@@ -5,9 +5,9 @@ import { analyzeClientSide } from '../../shared/getPageFiles/analyzeClientSide.j
 // TODO/next-major-release: make it sync
 async function isClientSideRoutable(pageId, pageContext) {
     await analyzePageClientSideInit(pageContext._pageFilesAll, pageId, {
-        sharedPageFilesAlreadyLoaded: false
+        sharedPageFilesAlreadyLoaded: false,
     });
-    const pageConfig = findPageConfig(pageContext._pageConfigs, pageId);
+    const pageConfig = findPageConfig(pageContext._globalContext._pageConfigs, pageId);
     const { isClientRuntimeLoaded, isClientRouting } = analyzeClientSide(pageConfig, pageContext._pageFilesAll, pageId);
     return isClientRuntimeLoaded && isClientRouting;
 }

package/dist/esm/client/{client-routing-runtime → runtime-client-routing}/navigate.js

@@ -27,7 +27,7 @@ async function navigate(url, options) {
         urlOriginal: url,
         overwriteLastHistoryEntry,
         isBackwardNavigation: false,
-        pageContextInitClient: pageContext
+        pageContextInitClient: pageContext,
     });
 }
 async function reload() {

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

@@ -1,10 +1,10 @@
 export { getPrefetchSettings };
 export { PAGE_CONTEXT_MAX_AGE_DEFAULT };
 export type { PrefetchSettingResolved };
-import type { PageConfigUserFriendlyOld } from '../../../shared/getPageFiles.js';
+import type { VikeConfigPublicPageLazy } 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: PageConfigUserFriendlyOld, linkTag: null | HTMLElement): PrefetchSettingResolved;
+declare function getPrefetchSettings(pageContext: VikeConfigPublicPageLazy, linkTag: null | HTMLElement): PrefetchSettingResolved;

package/dist/esm/client/{client-routing-runtime → runtime-client-routing}/prefetch/getPrefetchSettings.js

@@ -6,11 +6,11 @@ import { assertUsage, assertInfo } from '../utils.js';
 const PAGE_CONTEXT_MAX_AGE_DEFAULT = 5000;
 const prefetchSettingTrue = {
     staticAssets: 'hover',
-    pageContext: PAGE_CONTEXT_MAX_AGE_DEFAULT
+    pageContext: PAGE_CONTEXT_MAX_AGE_DEFAULT,
 };
 const prefetchSettingFalse = {
     staticAssets: 'hover',
-    pageContext: false
+    pageContext: false,
 };
 // TODO/v1-release: change to `prefetchSettingTrue`?
 const prefetchSettingDefault = prefetchSettingFalse;

package/dist/esm/client/{client-routing-runtime → 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 { PageConfigUserFriendlyOld } from '../../shared/getPageFiles.js';
+import type { VikeConfigPublicPageLazy } from '../../shared/getPageFiles.js';
 type ResultPageContextFromServer = Awaited<ReturnType<typeof getPageContextFromServerHooks>>;
 type PageContextForPrefetch = PageContextCreated & {
     pageId: string;
 };
 declare function getPageContextPrefetched(pageContext: {
     urlPathname: string;
-} & PageConfigUserFriendlyOld): null | PageContextFromServerHooks;
+} & VikeConfigPublicPageLazy): null | PageContextFromServerHooks;
 declare function populatePageContextPrefetchCache(pageContext: PageContextForPrefetch, result: ResultPageContextFromServer): void;
 /**
  * Programmatically prefetch client assets.

package/dist/esm/client/{client-routing-runtime → runtime-client-routing}/prefetch.js

@@ -5,7 +5,7 @@ export { populatePageContextPrefetchCache };
 export { addLinkPrefetchHandlers };
 export { addLinkPrefetchHandlers_watch };
 export { addLinkPrefetchHandlers_unwatch };
-import { assert, assertClientRouting, assertUsage, assertWarning, checkIfClientRouting, getGlobalObject, hasProp, objectAssign } from './utils.js';
+import { assert, assertClientRouting, assertUsage, assertWarning, checkIfClientRouting, getGlobalObject, hasProp, objectAssign, } from './utils.js';
 import { isErrorFetchingStaticAssets, loadPageConfigsLazyClientSide } from '../shared/loadPageConfigsLazyClientSide.js';
 import { skipLink } from './skipLink.js';
 import { disableClientRouting } from './renderPageClientSide.js';
@@ -15,17 +15,17 @@ import { route } from '../../shared/route/index.js';
 import { noRouteMatch } from '../../shared/route/noRouteMatch.js';
 import { getPageContextFromServerHooks } from './getPageContextFromHooks.js';
 import { getPageContextCurrent } from './getPageContextCurrent.js';
-import { PAGE_CONTEXT_MAX_AGE_DEFAULT, getPrefetchSettings } from './prefetch/getPrefetchSettings.js';
+import { PAGE_CONTEXT_MAX_AGE_DEFAULT, getPrefetchSettings, } from './prefetch/getPrefetchSettings.js';
 import pc from '@brillout/picocolors';
 import { normalizeUrlArgument } from './normalizeUrlArgument.js';
 assertClientRouting();
-const globalObject = getGlobalObject('client-routing-runtime/prefetch.ts', {
+const globalObject = getGlobalObject('runtime-client-routing/prefetch.ts', {
     linkPrefetchHandlerAdded: new WeakSet(),
     addLinkPrefetchHandlers_debounce: null,
     mutationObserver: new MutationObserver(addLinkPrefetchHandlers),
     // `linkTags` [is automatically updated](https://developer.mozilla.org/en-US/docs/Web/API/HTMLCollection#:~:text=An%20HTMLCollection%20in%20the%20HTML%20DOM%20is%20live%3B%20it%20is%20automatically%20updated%20when%20the%20underlying%20document%20is%20changed.)
     linkTags: document.getElementsByTagName('A'),
-    prefetchedPageContexts: {}
+    prefetchedPageContexts: {},
 });
 function getPageContextPrefetched(pageContext) {
     const prefetchSettings = getPrefetchSettings(pageContext, null);
@@ -45,7 +45,7 @@ function getPageContextPrefetched(pageContext) {
 }
 async function prefetchAssets(pageContextLink) {
     try {
-        await loadPageConfigsLazyClientSide(pageContextLink.pageId, pageContextLink._pageFilesAll, pageContextLink._pageConfigs, pageContextLink._pageConfigGlobal);
+        await loadPageConfigsLazyClientSide(pageContextLink.pageId, pageContextLink._pageFilesAll, pageContextLink._globalContext._pageConfigs, pageContextLink._globalContext._pageConfigGlobal);
     }
     catch (err) {
         if (isErrorFetchingStaticAssets(err)) {
@@ -60,8 +60,8 @@ async function prefetchPageContextFromServerHooks(pageContextLink, resultMaxAge)
     const result = await getPageContextFromServerHooks(pageContextLink, false);
     setPageContextPrefetchCache(pageContextLink, result, resultMaxAge);
 }
-function populatePageContextPrefetchCache(pageContext /*& PageConfigUserFriendlyOld*/, result) {
-    // TODO/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 PageConfigUserFriendlyOld as it isn't available here.)
+function populatePageContextPrefetchCache(pageContext /*& VikeConfigPublicPageLazy*/, result) {
+    // TODO/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.)
     if (!isBrilloutDocpress())
         return;
     setPageContextPrefetchCache(pageContext, result, null);
@@ -74,7 +74,7 @@ function setPageContextPrefetchCache(pageContext, result, resultMaxAge) {
     globalObject.prefetchedPageContexts[key] = {
         resultFetchedAt: Date.now(),
         resultMaxAge,
-        result
+        result,
     };
 }
 function getResultMaxAge() {
@@ -103,17 +103,17 @@ options?: {
 options_) {
     const options = {
         staticAssets: true,
-        pageContext: options_?.pageContext ?? false
+        pageContext: options_?.pageContext ?? false,
     };
     assertUsage(checkIfClientRouting(), 'prefetch() only works with Client Routing, see https://vike.dev/prefetch', {
-        showStackTrace: true
+        showStackTrace: true,
     });
     url = normalizeUrlArgument(url, 'prefetch');
     const pageContextLink = await getPageContextLink(url);
     if (!pageContextLink?.pageId) {
         assertWarning(false, `[prefetch(url)] ${pc.string(url)} ${noRouteMatch}`, {
             showStackTrace: true,
-            onlyOnce: false
+            onlyOnce: false,
         });
         return;
     }
@@ -130,7 +130,7 @@ options_) {
                 const resultMaxAge = typeof options?.pageContext === 'number' ? options.pageContext : null;
                 await prefetchPageContextFromServerHooks(pageContextLink, resultMaxAge);
             }
-        })()
+        })(),
     ]);
 }
 // Lazy execution logic copied from: https://github.com/withastro/astro/blob/2594eb088d53a98181ac820243bcb1a765856ecf/packages/astro/src/runtime/client/dev-toolbar/apps/audit/index.ts#L53-L72
@@ -159,7 +159,7 @@ function addLinkPrefetchHandlers_watch() {
     // - https://stackoverflow.com/questions/55046093/listening-for-changes-in-htmlcollection-or-achieving-a-similar-effect
     globalObject.mutationObserver.observe(document.body, {
         childList: true,
-        subtree: true
+        subtree: true,
     });
 }
 function addLinkPrefetchHandlers_unwatch() {
@@ -230,7 +230,7 @@ async function prefetchOnEvent(linkTag, event) {
                     await prefetchPageContextFromServerHooks(pageContextLink, resultMaxAge);
                 }
             }
-        })()
+        })(),
     ]);
 }
 function isExpired(found) {

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

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

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

@@ -6,8 +6,8 @@ export { getPageContextClient };
 export type { PageContextBegin };
 import { type PageContextFromRewrite } from '../../shared/route/abort.js';
 import { type ScrollTarget } from './setScrollPosition.js';
-import type { PageConfigUserFriendlyOld } from '../../shared/getPageFiles.js';
-import type { PageContextClient } from '../../shared/types.js';
+import type { VikeConfigPublicPageLazy } from '../../shared/getPageFiles.js';
+import type { PageContextClient } from '../../types/PageContext.js';
 declare const firstRenderStartPromise: Promise<void>;
 type PageContextRouted = {
     pageId: string;
@@ -26,7 +26,7 @@ type RenderArgs = {
     pageContextInitClient?: Record<string, unknown>;
 };
 declare function renderPageClientSide(renderArgs: RenderArgs): Promise<void>;
-declare function getPageContextBegin(isForErrorPage: boolean, { urlOriginal, isBackwardNavigation, pageContextsFromRewrite, isClientSideNavigation, pageContextInitClient, isFirstRender }: {
+declare function getPageContextBegin(isForErrorPage: boolean, { urlOriginal, isBackwardNavigation, pageContextsFromRewrite, isClientSideNavigation, pageContextInitClient, isFirstRender, }: {
     urlOriginal: string;
     isBackwardNavigation: boolean | null;
     pageContextsFromRewrite: PageContextFromRewrite[];
@@ -45,19 +45,18 @@ declare function getPageContextBegin(isForErrorPage: boolean, { urlOriginal, isB
         _isOriginalObject: true;
         _virtualFileExports: unknown;
         _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
-        _pageConfigs: import("../../__internal/index.js").PageConfig[];
-        _pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
+        _pageConfigs: import("../../types/PageConfig.js").PageConfigRuntime[];
+        _pageConfigGlobal: import("../../types/PageConfig.js").PageConfigGlobalRuntime;
         _allPageIds: string[];
-        _userFriendlyConfigsGlobal: import("../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly;
+        _vikeConfigPublicGlobal: {
+            config: import("../../types/index.js").ConfigResolved;
+            _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+            _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+            _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
+        };
         config: import("../../types/index.js").ConfigResolved;
         pages: {
-            [k: string]: import("../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly & ({
-                route: import("../../shared/page-configs/Config.js").Route;
-                isErrorPage?: undefined;
-            } | {
-                route?: undefined;
-                isErrorPage: true;
-            });
+            [k: string]: import("../../shared/page-configs/resolveVikeConfigPublic.js").VikeConfigPublicPageEager;
         };
     } & {
         isClientSide: true;
@@ -66,11 +65,6 @@ declare function getPageContextBegin(isForErrorPage: boolean, { urlOriginal, isB
         _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
     };
     _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
-    _pageConfigs: import("../../__internal/index.js").PageConfig[];
-    _pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
-    _allPageIds: string[];
-    _pageRoutes: import("../../shared/route/loadPageRoutes.js").PageRoutes;
-    _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
     _urlHandler: null;
     _urlRewrite: null | string;
     _baseServer: string;
@@ -78,18 +72,23 @@ declare function getPageContextBegin(isForErrorPage: boolean, { urlOriginal, isB
     urlParsed: import("./utils.js").UrlPublic;
     urlPathname: string;
     url: string;
-} & import("../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly & {
+} & {
+    config: import("../../types/index.js").ConfigResolved;
+    _source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+    _sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
+    _from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
+} & {
     isBackwardNavigation: boolean | null;
     isClientSideNavigation: boolean;
     isHydration: boolean;
     previousPageContext: ({
         pageId: string;
-    } & PageConfigUserFriendlyOld & PageContextRouted & import("../../shared/preparePageContextForPublicUsage.js").PageContextPrepareMinimum & import("../../shared/types.js").PageContextInternalClient & Omit<Partial<{
+    } & VikeConfigPublicPageLazy & PageContextRouted & import("../../shared/preparePageContextForPublicUsage.js").PageContextPrepareMinimum & import("../../types/PageContext.js").PageContextInternalClient & Omit<Partial<{
         isPageContext: true;
-        Page: import("../../types/index.js").Config["Page"];
+        Page: import("../../types/Config.js").Config["Page"];
         routeParams: Record<string, string>;
         data: unknown;
-        config: import("../../shared/page-configs/Config/PageContextConfig.js").PageContextConfig;
+        config: import("../../types/Config/PageContextConfig.js").PageContextConfig;
         configEntries: import("../../types/index.js").ConfigEntries;
         exports: Record<string, unknown>;
         exportsAll: import("../../shared/getPageFiles.js").ExportsAll;
@@ -102,18 +101,18 @@ declare function getPageContextBegin(isForErrorPage: boolean, { urlOriginal, isB
         abortStatusCode?: import("../../shared/route/abort.js").AbortStatusCode;
         errorWhileRendering?: unknown;
         pageId: string | null;
-        from: import("../../shared/page-configs/getUserFriendlyConfigs.js").From;
-        source: import("../../shared/page-configs/getUserFriendlyConfigs.js").Source;
-        sources: import("../../shared/page-configs/getUserFriendlyConfigs.js").Sources;
+        from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
+        source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+        sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
         url: string;
         pageExports: Record<string, unknown>;
         isBaseMissing?: true;
     }> & Pick<{
         isPageContext: true;
-        Page: import("../../types/index.js").Config["Page"];
+        Page: import("../../types/Config.js").Config["Page"];
         routeParams: Record<string, string>;
         data: unknown;
-        config: import("../../shared/page-configs/Config/PageContextConfig.js").PageContextConfig;
+        config: import("../../types/Config/PageContextConfig.js").PageContextConfig;
         configEntries: import("../../types/index.js").ConfigEntries;
         exports: Record<string, unknown>;
         exportsAll: import("../../shared/getPageFiles.js").ExportsAll;
@@ -126,13 +125,13 @@ declare function getPageContextBegin(isForErrorPage: boolean, { urlOriginal, isB
         abortStatusCode?: import("../../shared/route/abort.js").AbortStatusCode;
         errorWhileRendering?: unknown;
         pageId: string | null;
-        from: import("../../shared/page-configs/getUserFriendlyConfigs.js").From;
-        source: import("../../shared/page-configs/getUserFriendlyConfigs.js").Source;
-        sources: import("../../shared/page-configs/getUserFriendlyConfigs.js").Sources;
+        from: import("../../shared/page-configs/resolveVikeConfigPublic.js").From;
+        source: import("../../shared/page-configs/resolveVikeConfigPublic.js").Source;
+        sources: import("../../shared/page-configs/resolveVikeConfigPublic.js").Sources;
         url: string;
         pageExports: Record<string, unknown>;
         isBaseMissing?: true;
-    }, "exports" | "pageId" | "Page" | "data" | "config" | "pageExports" | "routeParams" | "configEntries" | "exportsAll" | "abortReason" | "source" | "sources" | "from"> & {
+    }, "exports" | "pageId" | "pageExports" | "Page" | "data" | "config" | "routeParams" | "configEntries" | "exportsAll" | "abortReason" | "from" | "source" | "sources"> & {
         isClientSide: true;
         isPrerendering: false;
     } & {