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

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

@@ -21,3 +21,4 @@ export * from '../../utils/augmentType.js';
 export * from '../../utils/PROJECT_VERSION.js';
 export * from '../../utils/genPromise.js';
 export * from '../../utils/catchInfiniteLoop.js';
+export * from '../../utils/changeEnumerable.js';

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

@@ -25,3 +25,4 @@ export * from '../../utils/augmentType.js';
 export * from '../../utils/PROJECT_VERSION.js';
 export * from '../../utils/genPromise.js';
 export * from '../../utils/catchInfiniteLoop.js';
+export * from '../../utils/changeEnumerable.js';

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

@@ -1,14 +1,30 @@
 export { createPageContextClientSide };
 declare function createPageContextClientSide(): Promise<{
-    globalContext: {
+    _isOriginalObject: true;
+    isPageContext: true;
+} & {
+    isClientSide: true;
+    isPrerendering: false;
+    isHydration: true;
+    _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;
+            });
+        };
     } & {
         isClientSide: true;
     } & object;
@@ -16,21 +32,11 @@ declare function createPageContextClientSide(): Promise<{
     _pageConfigs: import("../../__internal/index.js").PageConfig[];
     _pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
     _allPageIds: string[];
-    isPrerendering: boolean;
-    isClientSide: boolean;
-    isHydration: true;
     isBackwardNavigation: null;
     _hasPageContextFromServer: true;
-    _hasPageContextFromClient: false;
 } & {
     pageId: string;
     routeParams: Record<string, string>;
-} & {
-    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 & {
+} & import("../../shared/page-configs/getUserFriendlyConfigs.js").PageConfigUserFriendly & import("../../shared/getPageFiles.js").PageConfigUserFriendlyOld & {
     _pageFilesLoaded: import("../../shared/getPageFiles.js").PageFile[];
 }>;

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

@@ -1,35 +1,32 @@
 export { createPageContextClientSide };
 import { assertUsage, augmentType, objectAssign } from './utils.js';
 import { getPageContextSerializedInHtml } from '../shared/getJsonSerializedInHtml.js';
-import { loadUserFilesClientSide } from '../shared/loadUserFilesClientSide.js';
+import { loadPageConfigsLazyClientSide } from '../shared/loadPageConfigsLazyClientSide.js';
 import { getCurrentUrl } from '../shared/getCurrentUrl.js';
-import { createPageContextShared } from '../../shared/createPageContextShared.js';
+import { createPageContextObject, createPageContextShared } from '../../shared/createPageContextShared.js';
 import { getGlobalContextClientInternal } from './globalContext.js';
 const urlFirst = getCurrentUrl({ withoutHash: true });
 async function createPageContextClientSide() {
     const globalContext = await getGlobalContextClientInternal();
-    const pageContextCreated = {
-        /* Don't spread globalContext for now? Or never spread it as it leads to confusion? The convenience isn't worth the added confusion?
-        ...globalContext, // least precedence
-        */
-        globalContext,
+    const pageContextCreated = createPageContextObject();
+    objectAssign(pageContextCreated, {
+        isClientSide: true,
+        isPrerendering: false,
+        isHydration: true,
+        _globalContext: globalContext,
         _pageFilesAll: globalContext._pageFilesAll,
         _pageConfigs: globalContext._pageConfigs,
         _pageConfigGlobal: globalContext._pageConfigGlobal,
         _allPageIds: globalContext._allPageIds,
-        isPrerendering: false,
-        isClientSide: true,
-        isHydration: true,
         isBackwardNavigation: null,
-        _hasPageContextFromServer: true,
-        _hasPageContextFromClient: false
-    };
+        _hasPageContextFromServer: true
+    });
     objectAssign(pageContextCreated, getPageContextSerializedInHtml());
     // Sets pageContext.config to global configs
-    const pageContextAugmented = await createPageContextShared(pageContextCreated, globalContext._pageConfigGlobal);
+    const pageContextAugmented = await createPageContextShared(pageContextCreated, globalContext._pageConfigGlobal, globalContext._userFriendlyConfigsGlobal);
     augmentType(pageContextCreated, pageContextAugmented);
     // Sets pageContext.config to local configs (overrides the pageContext.config set above)
-    objectAssign(pageContextCreated, await loadUserFilesClientSide(pageContextCreated.pageId, pageContextCreated._pageFilesAll, pageContextCreated._pageConfigs, pageContextCreated._pageConfigGlobal));
+    objectAssign(pageContextCreated, await loadPageConfigsLazyClientSide(pageContextCreated.pageId, pageContextCreated._pageFilesAll, pageContextCreated._pageConfigs, pageContextCreated._pageConfigGlobal));
     assertPristineUrl();
     return pageContextCreated;
 }

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

@@ -2,9 +2,10 @@ import { assertServerRouting } from '../../utils/assertRoutingType.js';
 assertServerRouting();
 import { createPageContextClientSide } from './createPageContextClientSide.js';
 import { executeOnRenderClientHook } from '../shared/executeOnRenderClientHook.js';
-import { assertHook } from '../../shared/hooks/getHook.js';
 import { assertSingleInstance_onClientEntryServerRouting } from './utils.js';
 import { removeFoucBuster } from '../shared/removeFoucBuster.js';
+import { execHook } from '../../shared/hooks/execHook.js';
+import { preparePageContextForPublicUsageClient } from './preparePageContextForPublicUsageClient.js';
 // @ts-ignore Since dist/cjs/client/ is never used, we can ignore this error.
 const isProd = import.meta.env.PROD;
 assertSingleInstance_onClientEntryServerRouting(isProd);
@@ -13,7 +14,6 @@ if (import.meta.env.DEV)
 hydrate();
 async function hydrate() {
     const pageContext = await createPageContextClientSide();
-    await executeOnRenderClientHook(pageContext, false);
-    assertHook(pageContext, 'onHydrationEnd');
-    await pageContext.exports.onHydrationEnd?.(pageContext);
+    await executeOnRenderClientHook(pageContext, preparePageContextForPublicUsageClient);
+    await execHook('onHydrationEnd', pageContext, preparePageContextForPublicUsageClient);
 }

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

@@ -5,13 +5,23 @@ type GlobalContextClientWithServerRouting = GlobalContextSharedPublic & Pick<Glo
 type GlobalContextClientInternal = Awaited<ReturnType<typeof getGlobalContextClientInternal>>;
 declare const getGlobalContextClientInternal: () => Promise<{
     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;
+        });
+    };
 } & {
     isClientSide: true;
 } & object>;

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

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

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

@@ -0,0 +1,5 @@
+export { preparePageContextForPublicUsageClient };
+import { preparePageContextForPublicUsageClientShared } from '../shared/preparePageContextForPublicUsageClientShared.js';
+function preparePageContextForPublicUsageClient(pageContext) {
+    return preparePageContextForPublicUsageClientShared(pageContext);
+}

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

@@ -11,3 +11,4 @@ export * from '../../utils/slice.js';
 export * from '../../utils/unique.js';
 export * from '../../utils/getPropAccessNotation.js';
 export * from '../../utils/augmentType.js';
+export * from '../../utils/changeEnumerable.js';

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

@@ -15,3 +15,4 @@ export * from '../../utils/slice.js';
 export * from '../../utils/unique.js'; // Only used by Server Routing (not needed for Client Routing)
 export * from '../../utils/getPropAccessNotation.js';
 export * from '../../utils/augmentType.js';
+export * from '../../utils/changeEnumerable.js';

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

@@ -4,13 +4,23 @@ export { createGetGlobalContextClient };
 import { type GlobalContextShared } from '../../shared/createGlobalContextShared.js';
 declare function createGetGlobalContextClient<GlobalContextAddendum extends object>(virtualFileExports: unknown, isClientRouting: boolean, addGlobalContext?: (globalContext: GlobalContextShared) => Promise<GlobalContextAddendum>): () => Promise<{
     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;
+        });
+    };
 } & Awaited<{
     /**
      * Whether the environment is client-side or server-side / pre-rendering.

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

@@ -1,7 +1,7 @@
 export { executeOnRenderClientHook };
 export type { PageContextBeforeRenderClient };
 import type { PageFile, PageConfigUserFriendlyOld } from '../../shared/getPageFiles.js';
-import { type PageContextForUserConsumptionClientSide } from './preparePageContextForUserConsumptionClientSide.js';
+import type { PageContextForPublicUsageClientShared } from './preparePageContextForPublicUsageClientShared.js';
 import type { PageConfigRuntime } from '../../shared/page-configs/PageConfig.js';
 type PageContextBeforeRenderClient = {
     _pageFilesLoaded: PageFile[];
@@ -9,5 +9,5 @@ type PageContextBeforeRenderClient = {
     urlPathname?: string;
     pageId: string;
     _pageConfigs: PageConfigRuntime[];
-} & PageConfigUserFriendlyOld & PageContextForUserConsumptionClientSide;
-declare function executeOnRenderClientHook<PC extends PageContextBeforeRenderClient>(pageContext: PC, isClientRouting: boolean): Promise<void>;
+} & PageConfigUserFriendlyOld & PageContextForPublicUsageClientShared;
+declare function executeOnRenderClientHook<PageContext extends PageContextBeforeRenderClient>(pageContext: PageContext, prepareForPublicUsage: (pageConfig: PageContext) => PageContext): Promise<void>;

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

@@ -1,22 +1,17 @@
 export { executeOnRenderClientHook };
 import { assert, assertUsage } from '../server-routing-runtime/utils.js';
 import { getHookFromPageContext } from '../../shared/hooks/getHook.js';
-import { preparePageContextForUserConsumptionClientSide } from './preparePageContextForUserConsumptionClientSide.js';
-import { executeHook } from '../../shared/hooks/executeHook.js';
-async function executeOnRenderClientHook(pageContext, isClientRouting) {
-    const pageContextForUserConsumption = preparePageContextForUserConsumptionClientSide(pageContext, isClientRouting);
+import { execHookSingle } from '../../shared/hooks/execHook.js';
+async function executeOnRenderClientHook(pageContext, prepareForPublicUsage) {
     let hook = null;
-    let hookName;
     {
         const renderHook = getHookFromPageContext(pageContext, 'render');
         hook = renderHook;
-        hookName = 'render';
     }
     {
         const renderHook = getHookFromPageContext(pageContext, 'onRenderClient');
         if (renderHook) {
             hook = renderHook;
-            hookName = 'onRenderClient';
         }
     }
     if (!hook) {
@@ -42,16 +37,12 @@ async function executeOnRenderClientHook(pageContext, isClientRouting) {
             assertUsage(false, errMsg);
         }
     }
-    assert(hook);
-    const renderHook = hook.hookFn;
-    assert(hookName);
     // We don't use a try-catch wrapper because rendering errors are usually handled by the UI framework. (E.g. React's Error Boundaries.)
-    const hookResult = await executeHook(() => renderHook(pageContextForUserConsumption), hook, pageContext);
-    assertUsage(hookResult === undefined, `The ${hookName}() hook defined by ${hook.hookFilePath} isn't allowed to return a value`);
+    await execHookSingle(hook, pageContext, prepareForPublicUsage);
 }
 function getUrlToShowToUser(pageContext) {
     let url;
-    // try/catch to avoid passToClient assertUsage() (although: this may not be needed anymore, since we're now accessing pageContext and not pageContextForUserConsumption)
+    // try/catch to avoid passToClient assertUsage() (although: this may not be needed anymore, since we're now accessing pageContext and not pageContextForPublicUsage)
     try {
         url =
             // Client Routing

package/dist/esm/client/shared/{loadUserFilesClientSide.d.ts → loadPageConfigsLazyClientSide.d.ts}

@@ -1,4 +1,4 @@
-export { loadUserFilesClientSide };
+export { loadPageConfigsLazyClientSide };
 export { isErrorFetchingStaticAssets };
 export type { PageContextUserFiles };
 import { type PageFile, type PageConfigUserFriendlyOld } from '../../shared/getPageFiles.js';
@@ -11,5 +11,5 @@ type PageContextUserFiles = {
     _pageConfigs: PageConfigRuntime[];
     _pageConfigGlobal: PageConfigGlobalRuntime;
 };
-declare function loadUserFilesClientSide(pageId: string, pageFilesAll: PageFile[], pageConfigs: PageConfigRuntime[], pageConfigGlobal: PageConfigGlobalRuntime): Promise<PageContextUserFilesLoaded>;
+declare function loadPageConfigsLazyClientSide(pageId: string, pageFilesAll: PageFile[], pageConfigs: PageConfigRuntime[], pageConfigGlobal: PageConfigGlobalRuntime): Promise<PageContextUserFilesLoaded>;
 declare function isErrorFetchingStaticAssets(err: unknown): boolean;

package/dist/esm/client/shared/{loadUserFilesClientSide.js → loadPageConfigsLazyClientSide.js}

@@ -1,12 +1,12 @@
-export { loadUserFilesClientSide };
+export { loadPageConfigsLazyClientSide };
 export { isErrorFetchingStaticAssets };
 import { getPageFilesClientSide } from '../../shared/getPageFiles.js';
-import { getPageConfigUserFriendly_oldDesign } from '../../shared/page-configs/getPageConfigUserFriendly.js';
+import { getUserFriendlyConfigsPageLazy } from '../../shared/page-configs/getUserFriendlyConfigs.js';
 import { findPageConfig } from '../../shared/page-configs/findPageConfig.js';
 import { loadConfigValues } from '../../shared/page-configs/loadConfigValues.js';
 import { objectAssign } from '../server-routing-runtime/utils.js';
 const stamp = '__whileFetchingAssets';
-async function loadUserFilesClientSide(pageId, pageFilesAll, pageConfigs, pageConfigGlobal) {
+async function loadPageConfigsLazyClientSide(pageId, pageFilesAll, pageConfigs, pageConfigGlobal) {
     const pageFilesClientSide = getPageFilesClientSide(pageFilesAll, pageId);
     const pageConfig = findPageConfig(pageConfigs, pageId);
     let pageConfigLoaded;
@@ -30,7 +30,7 @@ async function loadUserFilesClientSide(pageId, pageFilesAll, pageConfigs, pageCo
         }
         throw err;
     }
-    const pageContextExports = getPageConfigUserFriendly_oldDesign(pageFilesClientSide, pageConfigLoaded, pageConfigGlobal);
+    const pageContextExports = getUserFriendlyConfigsPageLazy(pageFilesClientSide, pageConfigLoaded, pageConfigGlobal);
     const pageContextAddendum = {};
     objectAssign(pageContextAddendum, pageContextExports);
     objectAssign(pageContextAddendum, { _pageFilesLoaded: pageFilesClientSide });

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

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

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

@@ -0,0 +1,40 @@
+export { preparePageContextForPublicUsageClientShared };
+export { preparePageContextForPublicUsageClientMinimal };
+import { objectAssign } from '../server-routing-runtime/utils.js';
+import { assertPropertyGetters, preparePageContextForPublicUsage } from '../../shared/preparePageContextForPublicUsage.js';
+function preparePageContextForPublicUsageClientShared(pageContext) {
+    // TODO/now use proxy
+    const Page = pageContext.config?.Page ||
+        // TODO/next-major-release: remove
+        pageContext.exports?.Page;
+    objectAssign(pageContext, { Page });
+    // TODO/next-major-release: after we remove supportVueReactiviy() we can call this later inside the agnostic preparePageContextForPublicUsage()
+    assertPropertyGetters(pageContext);
+    // TODO/next-major-release: remove
+    // - Requires https://github.com/vikejs/vike-vue/issues/198
+    // - Last time I tried to remove it (https://github.com/vikejs/vike/commit/705fd23598d9d69bf46a52c8550216cd7117ce71) the tests were failing as expected: only the Vue integrations that used shallowReactive() failed.
+    supportVueReactiviy(pageContext);
+    return preparePageContextForPublicUsageClientMinimal(pageContext);
+}
+function preparePageContextForPublicUsageClientMinimal(pageContext) {
+    const pageContextPublic = preparePageContextForPublicUsage(pageContext);
+    return pageContextPublic;
+}
+// With Vue + Cient Routing, the `pageContext` is made reactive:
+// ```js
+// import { reactive } from 'vue'
+// // See /examples/vue-full/renderer/createVueApp.ts
+// const pageContextReactive = reactive(pageContext)
+// ```
+function supportVueReactiviy(pageContext) {
+    resolveGetters(pageContext);
+}
+// Remove propery descriptor getters because they break Vue's reactivity.
+// E.g. resolve the `pageContext.urlPathname` getter.
+function resolveGetters(pageContext) {
+    return;
+    Object.entries(pageContext).forEach(([key, val]) => {
+        delete pageContext[key];
+        pageContext[key] = val;
+    });
+}

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

@@ -1,10 +1,9 @@
 export { build };
 import { prepareViteApiCall } from './prepareViteApiCall.js';
 import { build as buildVite, version, createBuilder } from 'vite';
-import assert from 'assert';
 import { isVikeCli } from '../cli/context.js';
 import { isPrerendering } from '../prerender/context.js';
-import { assertVersion } from './utils.js';
+import { assert, assertVersion } from './utils.js';
 /**
  * Programmatically trigger `$ vike build`
  *

package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig/configDefinitionsBuiltIn.js

@@ -56,6 +56,10 @@ const configDefinitionsBuiltIn = {
     data: {
         env: { server: true }
     },
+    onData: {
+        env: { server: true, client: true },
+        cumulative: true
+    },
     iKnowThePerformanceRisksOfAsyncRouteFunctions: {
         env: { server: true, client: 'if-client-routing' },
         eager: true

package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig.d.ts

@@ -11,7 +11,7 @@ export type { VikeConfigObject };
 import type { PageConfigGlobalBuildTime, ConfigValueSource, PageConfigBuildTime } from '../../../../../shared/page-configs/PageConfig.js';
 import { type ConfigDefinitions, type ConfigDefinitionInternal } from './getVikeConfig/configDefinitionsBuiltIn.js';
 import type { ResolvedConfig, UserConfig } from 'vite';
-import { type PageConfigUserFriendly, type PageConfigsUserFriendly } from '../../../../../shared/page-configs/getPageConfigUserFriendly.js';
+import { type PageConfigUserFriendly, type PageConfigsUserFriendly } from '../../../../../shared/page-configs/getUserFriendlyConfigs.js';
 import { type PlusFile } from './getVikeConfig/getPlusFilesAll.js';
 type VikeConfigObject = {
     pageConfigs: PageConfigBuildTime[];

package/dist/esm/node/plugin/plugins/importUserCode/v1-design/getVikeConfig.js

@@ -21,7 +21,7 @@ import { resolvePointerImport } from './getVikeConfig/resolvePointerImport.js';
 import { getFilePathResolved } from '../../../shared/getFilePath.js';
 import { getConfigValueBuildTime } from '../../../../../shared/page-configs/getConfigValueBuildTime.js';
 import { assertExtensionsRequire } from './getVikeConfig/assertExtensions.js';
-import { getPageConfigGlobalUserFriendly, getPageConfigUserFriendly } from '../../../../../shared/page-configs/getPageConfigUserFriendly.js';
+import { getUserFriendlyConfigsGlobal, getUserFriendlyConfigsPageEager } from '../../../../../shared/page-configs/getUserFriendlyConfigs.js';
 import { getConfigValuesBase, isJsonValue } from '../../../../../shared/page-configs/serialize/serializeConfigValues.js';
 import { getPlusFilesAll } from './getVikeConfig/getPlusFilesAll.js';
 import { getEnvVarObject } from '../../../shared/getEnvVarObject.js';
@@ -137,7 +137,7 @@ async function loadVikeConfig_withErrorHandling(userRootDir, isDev, vikeVitePlug
                     configDefinitions: {},
                     configValueSources: {}
                 },
-                global: getPageConfigGlobalUserFriendly({ pageConfigGlobalValues: {} }),
+                global: getUserFriendlyConfigsGlobal({ pageConfigGlobalValues: {} }),
                 pages: {},
                 vikeConfigDependencies: new Set()
             };
@@ -158,13 +158,19 @@ async function loadVikeConfig(userRootDir, vikeVitePluginOptions) {
     setCliAndApiOptions(pageConfigGlobal, configDefinitionsResolved);
     // global
     const pageConfigGlobalValues = getConfigValues(pageConfigGlobal);
-    const global = getPageConfigGlobalUserFriendly({ pageConfigGlobalValues });
+    const userFriendlyConfigsGlobal = getUserFriendlyConfigsGlobal({ pageConfigGlobalValues });
     // pages
-    const pages = objectFromEntries(pageConfigs.map((pageConfig) => {
+    const userFriendlyConfigsPageEager = objectFromEntries(pageConfigs.map((pageConfig) => {
         const pageConfigValues = getConfigValues(pageConfig, true);
-        return getPageConfigUserFriendly(pageConfigGlobalValues, pageConfig, pageConfigValues);
+        return getUserFriendlyConfigsPageEager(pageConfigGlobalValues, pageConfig, pageConfigValues);
     }));
-    return { pageConfigs, pageConfigGlobal, global, pages, vikeConfigDependencies: esbuildCache.vikeConfigDependencies };
+    return {
+        pageConfigs,
+        pageConfigGlobal,
+        global: userFriendlyConfigsGlobal,
+        pages: userFriendlyConfigsPageEager,
+        vikeConfigDependencies: esbuildCache.vikeConfigDependencies
+    };
 }
 async function resolveConfigDefinitions(plusFilesAll, userRootDir, esbuildCache) {
     const plusFilesAllOrdered = Object.values(plusFilesAll)

package/dist/esm/node/plugin/shared/loggerNotProd.js

@@ -22,7 +22,7 @@ import { logWithVikeTag, logWithViteTag, logDirectly, applyViteSourceMapToStackT
 import pc from '@brillout/picocolors';
 import { setAlreadyLogged } from '../../runtime/renderPage/isNewError.js';
 import { onRuntimeError } from '../../runtime/renderPage/loggerProd.js';
-import { isUserHookError } from '../../../shared/hooks/executeHook.js';
+import { isUserHookError } from '../../../shared/hooks/execHook.js';
 assertIsNotProductionRuntime();
 overwriteRuntimeProductionLogger(logRuntimeError, logRuntimeInfo);
 overwriteAssertProductionLogger(assertLogger);