vike 0.4.222-commit-207e079 → 0.4.222-commit-6647d1e

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

@@ -133,7 +133,7 @@ async function loadVikeConfig_withErrorHandling(userRootDir, isDev, vikeVitePlug
                     configDefinitions: {},
                     configValueSources: {}
                 },
-                global: (0, getPageConfigUserFriendly_js_1.getPageConfigUserFriendlyNew)({ configValues: {} }),
+                global: (0, getPageConfigUserFriendly_js_1.getPageConfigGlobalUserFriendly)({ pageConfigGlobalValues: {} }),
                 pages: {}
             };
             return dummyData;
@@ -149,18 +149,12 @@ async function loadVikeConfig(userRootDir, vikeVitePluginOptions) {
     // interop vike(options) in vite.config.js
     temp_interopVikeVitePlugin(pageConfigGlobal, vikeVitePluginOptions, userRootDir);
     // global
-    const configValuesGlobal = getConfigValues(pageConfigGlobal);
-    const global = (0, getPageConfigUserFriendly_js_1.getPageConfigUserFriendlyNew)({ configValues: configValuesGlobal });
-    // TODO/now DEDUPE
+    const pageConfigGlobalValues = getConfigValues(pageConfigGlobal);
+    const global = (0, getPageConfigUserFriendly_js_1.getPageConfigGlobalUserFriendly)({ pageConfigGlobalValues });
     // pages
     const pages = (0, utils_js_1.objectFromEntries)(pageConfigs.map((pageConfig) => {
-        const configValuesLocal = getConfigValues(pageConfig, true);
-        const configValues = { ...configValuesGlobal, ...configValuesLocal };
-        const page = {
-            ...(0, getPageConfigUserFriendly_js_1.getPageConfigUserFriendlyNew)({ configValues }),
-            route: pageConfig.routeFilesystem?.routeString ?? null
-        };
-        return [pageConfig.pageId, page];
+        const pageConfigValues = getConfigValues(pageConfig, true);
+        return (0, getPageConfigUserFriendly_js_1.getPageConfigUserFriendly)(pageConfigGlobalValues, pageConfig, pageConfigValues);
     }));
     return { pageConfigs, pageConfigGlobal, global, pages };
 }
@@ -225,13 +219,12 @@ function getPageConfigsBuildTime(configDefinitionsResolved, plusFilesAll, userRo
                 return;
             configValueSources[configName] = sources;
         });
-        const { routeFilesystem, isErrorPage } = determineRouteFilesystem(locationId, configValueSources);
+        const pageConfigRoute = determineRouteFilesystem(locationId, configValueSources);
         applyEffectsAll(configValueSources, configDefinitionsLocal);
         const configValuesComputed = getComputed(configValueSources, configDefinitionsLocal);
         const pageConfig = {
             pageId: locationId,
-            isErrorPage,
-            routeFilesystem,
+            ...pageConfigRoute,
             configDefinitions: configDefinitionsLocal,
             plusFiles: plusFilesRelevant,
             configValueSources,

package/dist/cjs/node/runtime/renderPage/loadUserFilesServerSide.js

@@ -102,7 +102,7 @@ async function loadPageUserFiles(pageFilesAll, pageConfig, pageConfigGlobal, pag
     const pageFilesServerSide = (0, getPageFiles_js_1.getPageFilesServerSide)(pageFilesAll, pageId);
     const pageConfigLoaded = !pageConfig ? null : await (0, loadConfigValues_js_1.loadConfigValues)(pageConfig, isDev);
     await Promise.all(pageFilesServerSide.map((p) => p.loadFile?.()));
-    const pageContextExports = (0, getPageConfigUserFriendly_js_1.getPageConfigUserFriendlyOld)(pageFilesServerSide, pageConfigLoaded, pageConfigGlobal);
+    const pageContextExports = (0, getPageConfigUserFriendly_js_1.getPageConfigUserFriendly_oldDesign)(pageFilesServerSide, pageConfigLoaded, pageConfigGlobal);
     return {
         pageContextExports,
         pageFilesLoaded: pageFilesServerSide

package/dist/cjs/shared/getPageConfigsRuntime.js

@@ -9,15 +9,9 @@ function getPageConfigsRuntime(virtualFileExports) {
     const { pageFilesAll, pageConfigs, pageConfigGlobal } = (0, parseGlobResults_js_1.parseGlobResults)(virtualFileExports);
     const allPageIds = getAllPageIds(pageFilesAll, pageConfigs);
     // TODO/now: re-use this call, instead of calling it twice
-    const globalConfig = (0, getPageConfigUserFriendly_js_1.getPageConfigUserFriendlyNew)(pageConfigGlobal);
-    // TODO/now DEDUPE
+    const globalConfig = (0, getPageConfigUserFriendly_js_1.getPageConfigGlobalUserFriendly)({ pageConfigGlobalValues: pageConfigGlobal.configValues });
     const pageConfigsUserFriendly = Object.fromEntries(pageConfigs.map((pageConfig) => {
-        const configValues = { ...pageConfigGlobal.configValues, ...pageConfig.configValues };
-        const page = {
-            ...(0, getPageConfigUserFriendly_js_1.getPageConfigUserFriendlyNew)({ configValues }),
-            route: pageConfig.routeFilesystem?.routeString ?? null
-        };
-        return [pageConfig.pageId, page];
+        return (0, getPageConfigUserFriendly_js_1.getPageConfigUserFriendly)(pageConfigGlobal.configValues, pageConfig, pageConfig.configValues);
     }));
     return { pageFilesAll, allPageIds, pageConfigs, pageConfigGlobal, globalConfig, pageConfigsUserFriendly };
 }

package/dist/cjs/shared/page-configs/getPageConfigUserFriendly.js

@@ -3,23 +3,54 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPageConfigUserFriendlyOld = getPageConfigUserFriendlyOld;
-exports.getPageConfigUserFriendlyNew = getPageConfigUserFriendlyNew;
+exports.getPageConfigUserFriendly = getPageConfigUserFriendly;
+exports.getPageConfigUserFriendly_oldDesign = getPageConfigUserFriendly_oldDesign;
+exports.getPageConfigGlobalUserFriendly = getPageConfigGlobalUserFriendly;
 const assert_exports_old_design_js_1 = require("../getPageFiles/assert_exports_old_design.js");
 const getConfigDefinedAt_js_1 = require("./getConfigDefinedAt.js");
 const helpers_js_1 = require("./helpers.js");
 const utils_js_1 = require("../utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-function getPageConfigUserFriendlyNew(pageConfig) {
-    const res = getPageConfigUserFriendlyV1Desin(pageConfig);
+function getPageConfigUserFriendly(pageConfigGlobalValues, pageConfig, pageConfigValues) {
+    const pageConfigUserFriendly = getPageConfigUserFriendly_public({ pageConfigGlobalValues, pageConfigValues });
+    let page;
+    if (!pageConfig.isErrorPage) {
+        const route = pageConfigUserFriendly.config.route ?? pageConfig.routeFilesystem.routeString;
+        page = {
+            ...pageConfigUserFriendly,
+            route
+        };
+    }
+    else {
+        page = {
+            ...pageConfigUserFriendly,
+            isErrorPage: true
+        };
+    }
+    return [pageConfig.pageId, page];
+}
+function getPageConfigUserFriendly_public({ pageConfigGlobalValues, pageConfigValues }) {
+    const pageConfigUserFriendly = getPageConfigUserFriendly_base({ pageConfigGlobalValues, pageConfigValues });
+    return getPublicCopy(pageConfigUserFriendly);
+}
+function getPublicCopy(pageConfigUserFriendly) {
+    const p = pageConfigUserFriendly;
     return {
-        config: res.config,
-        _source: res.source,
-        _sources: res.sources,
-        _from: res.from
+        config: p.config,
+        _source: p.source,
+        _sources: p.sources,
+        _from: p.from
     };
 }
-function getPageConfigUserFriendlyOld(pageFiles, pageConfig, pageConfigGlobal) {
+function getPageConfigUserFriendly_base({ pageConfigGlobalValues, pageConfigValues }) {
+    const configValues = { ...pageConfigGlobalValues, ...pageConfigValues };
+    return getPageConfigUserFriendly_V1Design({ configValues });
+}
+function getPageConfigGlobalUserFriendly({ pageConfigGlobalValues }) {
+    const pageConfigGlobalUserFriendly = getPageConfigUserFriendly_V1Design({ configValues: pageConfigGlobalValues });
+    return getPublicCopy(pageConfigGlobalUserFriendly);
+}
+function getPageConfigUserFriendly_oldDesign(pageFiles, pageConfig, pageConfigGlobal) {
     const config = {};
     const configEntries = {}; // TODO/v1-release: remove
     const exportsAll = {}; // TODO/v1-release: remove
@@ -44,8 +75,9 @@ function getPageConfigUserFriendlyOld(pageFiles, pageConfig, pageConfigGlobal) {
     let sources;
     let from;
     if (pageConfig) {
-        const res = getPageConfigUserFriendlyV1Desin({
-            configValues: { ...pageConfigGlobal.configValues, ...pageConfig.configValues }
+        const res = getPageConfigUserFriendly_base({
+            pageConfigGlobalValues: pageConfigGlobal.configValues,
+            pageConfigValues: pageConfig.configValues
         });
         source = res.source;
         sources = res.sources;
@@ -92,7 +124,7 @@ function getPageConfigUserFriendlyOld(pageFiles, pageConfig, pageConfigGlobal) {
     return pageContextExports;
 }
 // V1 design
-function getPageConfigUserFriendlyV1Desin(pageConfig) {
+function getPageConfigUserFriendly_V1Design(pageConfig) {
     const config = {};
     const configEntries = {};
     const exportsAll = {};

package/dist/cjs/shared/page-configs/serialize/parsePageConfigs.js

@@ -14,15 +14,9 @@ function parsePageConfigs(pageConfigsSerialized, pageConfigGlobalSerialized) {
     // pageConfigs
     const pageConfigs = pageConfigsSerialized.map((pageConfigSerialized) => {
         const configValues = parseConfigValuesSerialized(pageConfigSerialized.configValuesSerialized);
-        const { pageId, isErrorPage, routeFilesystem, loadConfigValuesAll } = pageConfigSerialized;
         assertRouteConfigValue(configValues);
-        return {
-            pageId,
-            isErrorPage,
-            routeFilesystem,
-            configValues,
-            loadConfigValuesAll
-        };
+        const pageConfig = { ...pageConfigSerialized, configValues };
+        return pageConfig;
     });
     // pageConfigsGlobal
     const pageConfigGlobal = { configValues: {} };

package/dist/cjs/utils/PROJECT_VERSION.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = void 0;
 // Automatically updated by @brillout/release-me
-exports.PROJECT_VERSION = '0.4.222-commit-207e079';
+exports.PROJECT_VERSION = '0.4.222-commit-6647d1e';

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

@@ -1,7 +1,7 @@
 export { setPageContextCurrent };
 export { getPageContextCurrent };
-import type { PageConfigUserFriendly } from '../../shared/getPageFiles.js';
-type PageContextCurrent = PageConfigUserFriendly & {
+import type { PageConfigUserFriendlyOld } from '../../shared/getPageFiles.js';
+type PageContextCurrent = PageConfigUserFriendlyOld & {
     urlPathname: string;
 };
 declare function getPageContextCurrent(): null | PageContextCurrent;

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

@@ -5,7 +5,7 @@ export { getPageContextFromClientHooks };
 export { setPageContextInitIsPassedToClient };
 export type { PageContextFromServerHooks };
 export type { PageContextFromClientHooks };
-import type { PageConfigUserFriendly, PageFile } from '../../shared/getPageFiles.js';
+import type { PageConfigUserFriendlyOld, PageFile } from '../../shared/getPageFiles.js';
 import type { PageConfigRuntime } from '../../shared/page-configs/PageConfig.js';
 type PageContext = {
     urlOriginal: string;
@@ -21,9 +21,9 @@ declare function getPageContextFromHooks_serialized(): PageContextSerialized & {
     routeParams: Record<string, string>;
     _hasPageContextFromServer: true;
 };
-declare function getPageContextFromHooks_isHydration(pageContext: PageContextSerialized & PageContext & PageConfigUserFriendly & {
+declare function getPageContextFromHooks_isHydration(pageContext: PageContextSerialized & PageContext & PageConfigUserFriendlyOld & {
     _hasPageContextFromServer: true;
-}): Promise<PageContextSerialized & PageContext & PageConfigUserFriendly & {
+}): Promise<PageContextSerialized & PageContext & PageConfigUserFriendlyOld & {
     _hasPageContextFromServer: true;
 } & {
     _hasPageContextFromClient: boolean;
@@ -45,5 +45,5 @@ type PageContextFromClientHooks = {
 declare function getPageContextFromClientHooks(pageContext: {
     pageId: string;
     _hasPageContextFromServer: boolean;
-} & PageContext & PageConfigUserFriendly, isErrorPage: boolean): Promise<PageContextFromClientHooks>;
+} & PageContext & PageConfigUserFriendlyOld, isErrorPage: boolean): Promise<PageContextFromClientHooks>;
 declare function setPageContextInitIsPassedToClient(pageContext: Record<string, unknown>): void;

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

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

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

@@ -6,7 +6,7 @@ export { addLinkPrefetchHandlers };
 export { addLinkPrefetchHandlers_watch };
 export { addLinkPrefetchHandlers_unwatch };
 import { type PageContextFromServerHooks, getPageContextFromServerHooks } from './getPageContextFromHooks.js';
-import type { PageConfigUserFriendly, PageFile } from '../../shared/getPageFiles.js';
+import type { PageConfigUserFriendlyOld, PageFile } from '../../shared/getPageFiles.js';
 import { type PageConfigRuntime } from '../../shared/page-configs/PageConfig.js';
 type ResultPageContextFromServer = Awaited<ReturnType<typeof getPageContextFromServerHooks>>;
 type PageContextForPrefetch = {
@@ -19,7 +19,7 @@ type PageContextForPrefetch = {
 };
 declare function getPageContextPrefetched(pageContext: {
     urlPathname: string;
-} & PageConfigUserFriendly): null | PageContextFromServerHooks;
+} & PageConfigUserFriendlyOld): null | PageContextFromServerHooks;
 declare function populatePageContextPrefetchCache(pageContext: PageContextForPrefetch, result: ResultPageContextFromServer): void;
 /**
  * Programmatically prefetch client assets.

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

@@ -60,8 +60,8 @@ async function prefetchPageContextFromServerHooks(pageContextLink, resultMaxAge)
     const result = await getPageContextFromServerHooks(pageContextLink, false);
     setPageContextPrefetchCache(pageContextLink, result, resultMaxAge);
 }
-function populatePageContextPrefetchCache(pageContext /*& PageConfigUserFriendly*/, 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 PageConfigUserFriendly as it isn't available here.)
+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.)
     if (!isBrilloutDocpress())
         return;
     setPageContextPrefetchCache(pageContext, result, null);

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

@@ -11,6 +11,6 @@ declare function getPageContext(): Promise<{
     _pageFilesAll: import("../../shared/getPageFiles.js").PageFile[];
     _pageConfigs: import("../../__internal/index.js").PageConfig[];
     _pageConfigGlobal: import("../../shared/page-configs/PageConfig.js").PageConfigGlobalRuntime;
-} & import("../../shared/getPageFiles.js").PageConfigUserFriendly & {
+} & import("../../shared/getPageFiles.js").PageConfigUserFriendlyOld & {
     _pageFilesLoaded: import("../../shared/getPageFiles.js").PageFile[];
 }>;

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

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

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

@@ -1,9 +1,9 @@
 export { loadUserFilesClientSide };
 export { isErrorFetchingStaticAssets };
 export type { PageContextUserFiles };
-import { type PageFile, type PageConfigUserFriendly } from '../../shared/getPageFiles.js';
+import { type PageFile, type PageConfigUserFriendlyOld } from '../../shared/getPageFiles.js';
 import type { PageConfigGlobalRuntime, PageConfigRuntime } from '../../shared/page-configs/PageConfig.js';
-type PageContextUserFilesLoaded = PageConfigUserFriendly & {
+type PageContextUserFilesLoaded = PageConfigUserFriendlyOld & {
     _pageFilesLoaded: PageFile[];
 };
 type PageContextUserFiles = {

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

@@ -1,7 +1,7 @@
 export { loadUserFilesClientSide };
 export { isErrorFetchingStaticAssets };
 import { getPageFilesClientSide } from '../../shared/getPageFiles.js';
-import { getPageConfigUserFriendlyOld } from '../../shared/page-configs/getPageConfigUserFriendly.js';
+import { getPageConfigUserFriendly_oldDesign } from '../../shared/page-configs/getPageConfigUserFriendly.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';
@@ -30,7 +30,7 @@ async function loadUserFilesClientSide(pageId, pageFilesAll, pageConfigs, pageCo
         }
         throw err;
     }
-    const pageContextExports = getPageConfigUserFriendlyOld(pageFilesClientSide, pageConfigLoaded, pageConfigGlobal);
+    const pageContextExports = getPageConfigUserFriendly_oldDesign(pageFilesClientSide, pageConfigLoaded, pageConfigGlobal);
     const pageContextAddendum = {};
     objectAssign(pageContextAddendum, pageContextExports);
     objectAssign(pageContextAddendum, { _pageFilesLoaded: pageFilesClientSide });

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

@@ -1,9 +1,9 @@
 export { preparePageContextForUserConsumptionClientSide };
 export type { PageContextForUserConsumptionClientSide };
-import type { PageConfigUserFriendly } from '../../shared/getPageFiles.js';
+import type { PageConfigUserFriendlyOld } from '../../shared/getPageFiles.js';
 import type { PageConfigRuntime } from '../../shared/page-configs/PageConfig.js';
 import { PageContextForPassToClientWarning } from './getPageContextProxyForUser.js';
-type PageContextForUserConsumptionClientSide = PageConfigUserFriendly & PageContextForPassToClientWarning & {
+type PageContextForUserConsumptionClientSide = PageConfigUserFriendlyOld & PageContextForPassToClientWarning & {
     pageId: string;
     _pageConfigs: PageConfigRuntime[];
 };

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

@@ -9,12 +9,12 @@ export type { VikeConfigObject };
 import type { PageConfigGlobalBuildTime, PageConfigBuildTime } from '../../../../../shared/page-configs/PageConfig.js';
 import { type ConfigDefinitions, type ConfigDefinitionInternal } from './getVikeConfig/configDefinitionsBuiltIn.js';
 import type { ResolvedConfig } from 'vite';
-import { type ConfigUserFriendly, type PageConfigsUserFriendly } from '../../../../../shared/page-configs/getPageConfigUserFriendly.js';
+import { type PageConfigUserFriendly, type PageConfigsUserFriendly } from '../../../../../shared/page-configs/getPageConfigUserFriendly.js';
 import { type PlusFile } from './getVikeConfig/getPlusFilesAll.js';
 type VikeConfigObject = {
     pageConfigs: PageConfigBuildTime[];
     pageConfigGlobal: PageConfigGlobalBuildTime;
-    global: ConfigUserFriendly;
+    global: PageConfigUserFriendly;
     pages: PageConfigsUserFriendly;
 };
 declare const vikeConfigDependencies: Set<string>;

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

@@ -19,7 +19,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 { getPageConfigUserFriendlyNew } from '../../../../../shared/page-configs/getPageConfigUserFriendly.js';
+import { getPageConfigGlobalUserFriendly, getPageConfigUserFriendly } from '../../../../../shared/page-configs/getPageConfigUserFriendly.js';
 import { getConfigValuesBase } from '../../../../../shared/page-configs/serialize/serializeConfigValues.js';
 import { getPlusFilesAll } from './getVikeConfig/getPlusFilesAll.js';
 assertIsNotProductionRuntime();
@@ -127,7 +127,7 @@ async function loadVikeConfig_withErrorHandling(userRootDir, isDev, vikeVitePlug
                     configDefinitions: {},
                     configValueSources: {}
                 },
-                global: getPageConfigUserFriendlyNew({ configValues: {} }),
+                global: getPageConfigGlobalUserFriendly({ pageConfigGlobalValues: {} }),
                 pages: {}
             };
             return dummyData;
@@ -143,18 +143,12 @@ async function loadVikeConfig(userRootDir, vikeVitePluginOptions) {
     // interop vike(options) in vite.config.js
     temp_interopVikeVitePlugin(pageConfigGlobal, vikeVitePluginOptions, userRootDir);
     // global
-    const configValuesGlobal = getConfigValues(pageConfigGlobal);
-    const global = getPageConfigUserFriendlyNew({ configValues: configValuesGlobal });
-    // TODO/now DEDUPE
+    const pageConfigGlobalValues = getConfigValues(pageConfigGlobal);
+    const global = getPageConfigGlobalUserFriendly({ pageConfigGlobalValues });
     // pages
     const pages = objectFromEntries(pageConfigs.map((pageConfig) => {
-        const configValuesLocal = getConfigValues(pageConfig, true);
-        const configValues = { ...configValuesGlobal, ...configValuesLocal };
-        const page = {
-            ...getPageConfigUserFriendlyNew({ configValues }),
-            route: pageConfig.routeFilesystem?.routeString ?? null
-        };
-        return [pageConfig.pageId, page];
+        const pageConfigValues = getConfigValues(pageConfig, true);
+        return getPageConfigUserFriendly(pageConfigGlobalValues, pageConfig, pageConfigValues);
     }));
     return { pageConfigs, pageConfigGlobal, global, pages };
 }
@@ -219,13 +213,12 @@ function getPageConfigsBuildTime(configDefinitionsResolved, plusFilesAll, userRo
                 return;
             configValueSources[configName] = sources;
         });
-        const { routeFilesystem, isErrorPage } = determineRouteFilesystem(locationId, configValueSources);
+        const pageConfigRoute = determineRouteFilesystem(locationId, configValueSources);
         applyEffectsAll(configValueSources, configDefinitionsLocal);
         const configValuesComputed = getComputed(configValueSources, configDefinitionsLocal);
         const pageConfig = {
             pageId: locationId,
-            isErrorPage,
-            routeFilesystem,
+            ...pageConfigRoute,
             configDefinitions: configDefinitionsLocal,
             plusFiles: plusFilesRelevant,
             configValueSources,

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

@@ -20,7 +20,7 @@ export type { GlobalContextInternal };
 export type { GlobalContextPublic };
 import type { ViteManifest } from '../shared/ViteManifest.js';
 import type { ResolvedConfig, ViteDevServer } from 'vite';
-import type { ConfigUserFriendly, PageConfigsUserFriendly } from '../../shared/page-configs/getPageConfigUserFriendly.js';
+import type { PageConfigUserFriendly, PageConfigsUserFriendly } from '../../shared/page-configs/getPageConfigUserFriendly.js';
 import type { ConfigVitePluginServerEntry } from '@brillout/vite-plugin-server-entry/plugin';
 import { type BaseUrlsResolved } from '../shared/resolveBase.js';
 type GlobalContextPublic = Pick<GlobalContext, 'assetsManifest' | 'config' | 'viteConfig' | 'pages' | 'baseAssets' | 'baseServer'>;
@@ -32,7 +32,7 @@ type GlobalContext = {
     viteConfigRuntime: {
         _baseViteOriginal: null | string;
     };
-    config: ConfigUserFriendly['config'];
+    config: PageConfigUserFriendly['config'];
     pages: PageConfigsUserFriendly;
 } & BaseUrlsResolved & PageRuntimeInfo & ({
     isProduction: false;

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

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

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

@@ -16,7 +16,7 @@ type PageContext_loadUserFilesServerSide = PageContextGetPageAssets & PageContex
 type PageFiles = PromiseType<ReturnType<typeof loadUserFilesServerSide>>;
 declare function loadUserFilesServerSide(pageContext: {
     pageId: string;
-} & PageContext_loadUserFilesServerSide): Promise<import("../../../shared/getPageFiles.js").PageConfigUserFriendly & {
+} & PageContext_loadUserFilesServerSide): Promise<import("../../../shared/getPageFiles.js").PageConfigUserFriendlyOld & {
     Page: unknown;
     _isHtmlOnly: boolean;
     _passToClient: string[];

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

@@ -1,6 +1,6 @@
 export { loadUserFilesServerSide };
 import { getPageFilesServerSide } from '../../../shared/getPageFiles.js';
-import { getPageConfigUserFriendlyOld } from '../../../shared/page-configs/getPageConfigUserFriendly.js';
+import { getPageConfigUserFriendly_oldDesign } from '../../../shared/page-configs/getPageConfigUserFriendly.js';
 import { analyzePageClientSideInit } from '../../../shared/getPageFiles/analyzePageClientSide.js';
 import { assert, assertUsage, assertWarning, hasProp, isArrayOfStrings, objectAssign, isArray } from '../utils.js';
 import { getPageAssets } from './getPageAssets.js';
@@ -100,7 +100,7 @@ async function loadPageUserFiles(pageFilesAll, pageConfig, pageConfigGlobal, pag
     const pageFilesServerSide = getPageFilesServerSide(pageFilesAll, pageId);
     const pageConfigLoaded = !pageConfig ? null : await loadConfigValues(pageConfig, isDev);
     await Promise.all(pageFilesServerSide.map((p) => p.loadFile?.()));
-    const pageContextExports = getPageConfigUserFriendlyOld(pageFilesServerSide, pageConfigLoaded, pageConfigGlobal);
+    const pageContextExports = getPageConfigUserFriendly_oldDesign(pageFilesServerSide, pageConfigLoaded, pageConfigGlobal);
     return {
         pageContextExports,
         pageFilesLoaded: pageFilesServerSide

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

@@ -2,10 +2,10 @@ export { preparePageContextForUserConsumptionServerSide };
 export type { PageContextForUserConsumptionServerSide };
 import { PageContextUrlInternal } from '../../../shared/getPageContextUrlComputed.js';
 import type { PageConfigRuntime } from '../../../shared/page-configs/PageConfig.js';
-import type { PageConfigUserFriendly } from '../../../shared/page-configs/getPageConfigUserFriendly.js';
+import type { PageConfigUserFriendlyOld } from '../../../shared/page-configs/getPageConfigUserFriendly.js';
 import { PageContextBuiltInServerInternal } from '../../../shared/types.js';
 import type { GlobalContextInternal, GlobalContextPublic } from '../globalContext.js';
-type PageContextForUserConsumptionServerSide = PageContextBuiltInServerInternal & PageConfigUserFriendly & {
+type PageContextForUserConsumptionServerSide = PageContextBuiltInServerInternal & PageConfigUserFriendlyOld & {
     urlOriginal: string;
     /** @deprecated */
     url: string;

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

@@ -63,7 +63,7 @@ declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles
         url: string;
     } & {
         headers: Record<string, string> | null;
-    } & import("../../../shared/getPageFiles.js").PageConfigUserFriendly & {
+    } & import("../../../shared/getPageFiles.js").PageConfigUserFriendlyOld & {
         Page: unknown;
         _isHtmlOnly: boolean;
         _passToClient: string[];
@@ -117,7 +117,7 @@ declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles
         url: string;
     } & {
         headers: Record<string, string> | null;
-    } & import("../../../shared/getPageFiles.js").PageConfigUserFriendly & {
+    } & import("../../../shared/getPageFiles.js").PageConfigUserFriendlyOld & {
         Page: unknown;
         _isHtmlOnly: boolean;
         _passToClient: string[];
@@ -172,7 +172,7 @@ declare function prerender404Page(pageContextInit_: Record<string, unknown> | nu
         url: string;
     } & {
         headers: Record<string, string> | null;
-    } & import("../../../shared/getPageFiles.js").PageConfigUserFriendly & {
+    } & import("../../../shared/getPageFiles.js").PageConfigUserFriendlyOld & {
         Page: unknown;
         _isHtmlOnly: boolean;
         _passToClient: string[];
@@ -226,7 +226,7 @@ declare function prerender404Page(pageContextInit_: Record<string, unknown> | nu
         url: string;
     } & {
         headers: Record<string, string> | null;
-    } & import("../../../shared/getPageFiles.js").PageConfigUserFriendly & {
+    } & import("../../../shared/getPageFiles.js").PageConfigUserFriendlyOld & {
         Page: unknown;
         _isHtmlOnly: boolean;
         _passToClient: string[];

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

@@ -1,14 +1,14 @@
 export { getPageConfigsRuntime };
 export { getAllPageIds };
 import type { PageFile } from './getPageFiles.js';
-import { type ConfigUserFriendly, type PageConfigsUserFriendly } from './page-configs/getPageConfigUserFriendly.js';
+import { type PageConfigUserFriendly, type PageConfigsUserFriendly } from './page-configs/getPageConfigUserFriendly.js';
 import type { PageConfigGlobalRuntime, PageConfigRuntime } from './page-configs/PageConfig.js';
 declare function getPageConfigsRuntime(virtualFileExports: unknown): {
     pageFilesAll: PageFile[];
     allPageIds: string[];
     pageConfigs: PageConfigRuntime[];
     pageConfigGlobal: PageConfigGlobalRuntime;
-    globalConfig: ConfigUserFriendly;
+    globalConfig: PageConfigUserFriendly;
     pageConfigsUserFriendly: PageConfigsUserFriendly;
 };
 declare function getAllPageIds(pageFilesAll: PageFile[], pageConfigs: PageConfigRuntime[]): string[];

package/dist/esm/shared/getPageConfigsRuntime.js

@@ -1,21 +1,15 @@
 export { getPageConfigsRuntime };
 export { getAllPageIds };
 import { parseGlobResults } from './getPageFiles/parseGlobResults.js';
-import { getPageConfigUserFriendlyNew } from './page-configs/getPageConfigUserFriendly.js';
+import { getPageConfigGlobalUserFriendly, getPageConfigUserFriendly } from './page-configs/getPageConfigUserFriendly.js';
 import { unique } from './utils.js';
 function getPageConfigsRuntime(virtualFileExports) {
     const { pageFilesAll, pageConfigs, pageConfigGlobal } = parseGlobResults(virtualFileExports);
     const allPageIds = getAllPageIds(pageFilesAll, pageConfigs);
     // TODO/now: re-use this call, instead of calling it twice
-    const globalConfig = getPageConfigUserFriendlyNew(pageConfigGlobal);
-    // TODO/now DEDUPE
+    const globalConfig = getPageConfigGlobalUserFriendly({ pageConfigGlobalValues: pageConfigGlobal.configValues });
     const pageConfigsUserFriendly = Object.fromEntries(pageConfigs.map((pageConfig) => {
-        const configValues = { ...pageConfigGlobal.configValues, ...pageConfig.configValues };
-        const page = {
-            ...getPageConfigUserFriendlyNew({ configValues }),
-            route: pageConfig.routeFilesystem?.routeString ?? null
-        };
-        return [pageConfig.pageId, page];
+        return getPageConfigUserFriendly(pageConfigGlobal.configValues, pageConfig, pageConfig.configValues);
     }));
     return { pageFilesAll, allPageIds, pageConfigs, pageConfigGlobal, globalConfig, pageConfigsUserFriendly };
 }

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

@@ -1,4 +1,4 @@
 export type { PageFile } from './getPageFiles/getPageFileObject.js';
-export type { ExportsAll, PageConfigUserFriendly } from './page-configs/getPageConfigUserFriendly.js';
+export type { ExportsAll, PageConfigUserFriendlyOld } from './page-configs/getPageConfigUserFriendly.js';
 export { getPageFilesClientSide } from './getPageFiles/getAllPageIdFiles.js';
 export { getPageFilesServerSide } from './getPageFiles/getAllPageIdFiles.js';

package/dist/esm/shared/hooks/getHook.d.ts

@@ -9,7 +9,7 @@ export type { HookLoc };
 export type { HookTimeout };
 export type { HooksTimeoutProvidedByUser };
 export { getHookTimeoutDefault };
-import type { PageConfigUserFriendly } from '../getPageFiles.js';
+import type { PageConfigUserFriendlyOld } from '../getPageFiles.js';
 import type { HookName, HookNamePage, HookNameGlobal } from '../page-configs/Config.js';
 import type { PageConfigGlobalRuntime, PageConfigRuntime } from '../page-configs/PageConfig.js';
 type Hook = HookLoc & {
@@ -26,10 +26,10 @@ type HookTimeout = {
     warning: number | false;
 };
 type HooksTimeoutProvidedByUser = false | Partial<Record<HookName, false | Partial<HookTimeout>>>;
-declare function getHook(pageContext: PageConfigUserFriendly, hookName: HookName): null | Hook;
+declare function getHook(pageContext: PageConfigUserFriendlyOld, hookName: HookName): null | Hook;
 declare function getHookFromPageConfig(pageConfig: PageConfigRuntime, hookName: HookNamePage): null | Hook;
 declare function getHookFromPageConfigGlobal(pageConfigGlobal: PageConfigGlobalRuntime, hookName: HookNameGlobal): null | Hook;
-declare function assertHook<TPageContext extends PageConfigUserFriendly, THookName extends PropertyKey & HookName>(pageContext: TPageContext, hookName: THookName): asserts pageContext is TPageContext & {
+declare function assertHook<TPageContext extends PageConfigUserFriendlyOld, THookName extends PropertyKey & HookName>(pageContext: TPageContext, hookName: THookName): asserts pageContext is TPageContext & {
     exports: Record<THookName, Function | undefined>;
 };
 declare function getHookTimeoutDefault(hookName: HookName): HookTimeout;

package/dist/esm/shared/page-configs/Config.d.ts

@@ -32,6 +32,7 @@ export type { OnRenderHtmlAsync };
 export type { OnRenderHtmlSync };
 export type { RouteAsync };
 export type { RouteSync };
+export type { Route };
 export type { KeepScrollPosition };
 import type { PrefetchSetting, PrefetchStaticAssets } from '../../client/client-routing-runtime/prefetch/PrefetchSetting.js';
 import type { ConfigDefinition } from '../../node/plugin/plugins/importUserCode/v1-design/getVikeConfig/configDefinitionsBuiltIn.js';
@@ -223,6 +224,7 @@ type RouteSync = (pageContext: PageContextServer | PageContextClient) => {
     routeParams?: Record<string, string>;
     precedence?: number;
 } | boolean;
+type Route = string | RouteSync | RouteAsync;
 /** Whether the page scrolls to the top upon navigation.
  *
  * https://vike.dev/keepScrollPosition
@@ -239,7 +241,7 @@ type ConfigBuiltIn = {
      *
      *  https://vike.dev/route
      */
-    route?: string | RouteAsync | RouteSync | ImportString;
+    route?: Route | ImportString;
     /** Protect page(s), e.g. forbid unauthorized access.
      *
      *  https://vike.dev/guard

package/dist/esm/shared/page-configs/PageConfig.d.ts

@@ -1,6 +1,8 @@
 export type { PageConfigRuntime };
 export type { PageConfigRuntimeLoaded };
 export type { PageConfigBuildTime };
+export type { PageConfigCommon };
+export type { PageConfigRoute };
 export type { ConfigEnv };
 export type { ConfigEnvInternal };
 export type { PageConfigGlobalRuntime };
@@ -23,8 +25,13 @@ import type { ConfigDefinitions } from '../../node/plugin/plugins/importUserCode
 import type { PlusFile, PlusFilesByLocationId } from '../../node/plugin/plugins/importUserCode/v1-design/getVikeConfig/getPlusFilesAll.js';
 type PageConfigCommon = {
     pageId: string;
-    isErrorPage?: true;
-    routeFilesystem?: {
+} & PageConfigRoute;
+type PageConfigRoute = {
+    isErrorPage: true;
+    routeFilesystem?: undefined;
+} | {
+    isErrorPage?: undefined;
+    routeFilesystem: {
         routeString: string;
         definedBy: string;
     };

package/dist/esm/shared/page-configs/getPageConfigUserFriendly.d.ts

@@ -1,8 +1,9 @@
-export { getPageConfigUserFriendlyOld };
-export { getPageConfigUserFriendlyNew };
-export type { ConfigUserFriendly };
-export type { PageConfigUserFriendly };
+export { getPageConfigUserFriendly };
+export { getPageConfigUserFriendly_oldDesign };
+export { getPageConfigGlobalUserFriendly };
 export type { PageConfigsUserFriendly };
+export type { PageConfigUserFriendly };
+export type { PageConfigUserFriendlyOld };
 export type { Source };
 export type { Sources };
 export type { From };
@@ -10,9 +11,10 @@ export type { ExportsAll };
 export type { ConfigEntries };
 import type { FileType } from '../getPageFiles/fileTypes.js';
 import type { PageFile } from '../getPageFiles/getPageFileObject.js';
-import type { ConfigValues, PageConfigGlobalRuntime, PageConfigRuntimeLoaded } from './PageConfig.js';
+import type { ConfigValues, PageConfigBuildTime, PageConfigGlobalRuntime, PageConfigRuntime, PageConfigRuntimeLoaded } from './PageConfig.js';
 import { type ConfigDefinedAtOptional } from './getConfigDefinedAt.js';
 import type { ConfigResolved } from './Config/PageContextConfig.js';
+import type { Route } from './Config.js';
 type ExportsAll = Record<string, {
     exportValue: unknown;
     exportSource: string;
@@ -33,7 +35,7 @@ type ConfigEntries = Record<string, {
     configDefinedAt: ConfigDefinedAtOptional;
     configDefinedByFile: string | null;
 }[]>;
-type PageConfigUserFriendly = {
+type PageConfigUserFriendlyOld = {
     config: ConfigResolved;
     source: Source;
     sources: Sources;
@@ -74,18 +76,24 @@ type SourceConfigsComputed = {
     type: 'configsComputed';
     value: unknown;
 };
-type PageConfigsUserFriendly = Record<string, // pageId
-// pageId
-ConfigUserFriendly & {
-    route: string | null;
-}>;
-type ConfigUserFriendly = {
+type PageConfigUserFriendly = {
     config: ConfigResolved;
     _source: Source;
     _sources: Sources;
     _from: From;
 };
-declare function getPageConfigUserFriendlyNew(pageConfig: {
-    configValues: ConfigValues;
-}): ConfigUserFriendly;
-declare function getPageConfigUserFriendlyOld(pageFiles: PageFile[], pageConfig: PageConfigRuntimeLoaded | null, pageConfigGlobal: PageConfigGlobalRuntime): PageConfigUserFriendly;
+type PageConfigsUserFriendly = Record<string, // pageId
+PageConfigUserFriendlyWithRoute>;
+type WithRoute = {
+    route: Route;
+    isErrorPage?: undefined;
+} | {
+    route?: undefined;
+    isErrorPage: true;
+};
+type PageConfigUserFriendlyWithRoute = PageConfigUserFriendly & WithRoute;
+declare function getPageConfigUserFriendly(pageConfigGlobalValues: ConfigValues, pageConfig: PageConfigRuntime | PageConfigBuildTime, pageConfigValues: ConfigValues): [string, PageConfigUserFriendlyWithRoute];
+declare function getPageConfigGlobalUserFriendly({ pageConfigGlobalValues }: {
+    pageConfigGlobalValues: ConfigValues;
+}): PageConfigUserFriendly;
+declare function getPageConfigUserFriendly_oldDesign(pageFiles: PageFile[], pageConfig: PageConfigRuntimeLoaded | null, pageConfigGlobal: PageConfigGlobalRuntime): PageConfigUserFriendlyOld;

package/dist/esm/shared/page-configs/getPageConfigUserFriendly.js

@@ -1,20 +1,51 @@
-export { getPageConfigUserFriendlyOld };
-export { getPageConfigUserFriendlyNew };
+export { getPageConfigUserFriendly };
+export { getPageConfigUserFriendly_oldDesign };
+export { getPageConfigGlobalUserFriendly };
 import { assertDefaultExports, forbiddenDefaultExports } from '../getPageFiles/assert_exports_old_design.js';
 import { getConfigDefinedAtOptional, getDefinedAtString } from './getConfigDefinedAt.js';
 import { getConfigValueFilePathToShowToUser } from './helpers.js';
 import { assert, isObject, assertWarning, assertUsage, makeLast, isBrowser, isScriptFile, isTemplateFile } from '../utils.js';
 import pc from '@brillout/picocolors';
-function getPageConfigUserFriendlyNew(pageConfig) {
-    const res = getPageConfigUserFriendlyV1Desin(pageConfig);
+function getPageConfigUserFriendly(pageConfigGlobalValues, pageConfig, pageConfigValues) {
+    const pageConfigUserFriendly = getPageConfigUserFriendly_public({ pageConfigGlobalValues, pageConfigValues });
+    let page;
+    if (!pageConfig.isErrorPage) {
+        const route = pageConfigUserFriendly.config.route ?? pageConfig.routeFilesystem.routeString;
+        page = {
+            ...pageConfigUserFriendly,
+            route
+        };
+    }
+    else {
+        page = {
+            ...pageConfigUserFriendly,
+            isErrorPage: true
+        };
+    }
+    return [pageConfig.pageId, page];
+}
+function getPageConfigUserFriendly_public({ pageConfigGlobalValues, pageConfigValues }) {
+    const pageConfigUserFriendly = getPageConfigUserFriendly_base({ pageConfigGlobalValues, pageConfigValues });
+    return getPublicCopy(pageConfigUserFriendly);
+}
+function getPublicCopy(pageConfigUserFriendly) {
+    const p = pageConfigUserFriendly;
     return {
-        config: res.config,
-        _source: res.source,
-        _sources: res.sources,
-        _from: res.from
+        config: p.config,
+        _source: p.source,
+        _sources: p.sources,
+        _from: p.from
     };
 }
-function getPageConfigUserFriendlyOld(pageFiles, pageConfig, pageConfigGlobal) {
+function getPageConfigUserFriendly_base({ pageConfigGlobalValues, pageConfigValues }) {
+    const configValues = { ...pageConfigGlobalValues, ...pageConfigValues };
+    return getPageConfigUserFriendly_V1Design({ configValues });
+}
+function getPageConfigGlobalUserFriendly({ pageConfigGlobalValues }) {
+    const pageConfigGlobalUserFriendly = getPageConfigUserFriendly_V1Design({ configValues: pageConfigGlobalValues });
+    return getPublicCopy(pageConfigGlobalUserFriendly);
+}
+function getPageConfigUserFriendly_oldDesign(pageFiles, pageConfig, pageConfigGlobal) {
     const config = {};
     const configEntries = {}; // TODO/v1-release: remove
     const exportsAll = {}; // TODO/v1-release: remove
@@ -39,8 +70,9 @@ function getPageConfigUserFriendlyOld(pageFiles, pageConfig, pageConfigGlobal) {
     let sources;
     let from;
     if (pageConfig) {
-        const res = getPageConfigUserFriendlyV1Desin({
-            configValues: { ...pageConfigGlobal.configValues, ...pageConfig.configValues }
+        const res = getPageConfigUserFriendly_base({
+            pageConfigGlobalValues: pageConfigGlobal.configValues,
+            pageConfigValues: pageConfig.configValues
         });
         source = res.source;
         sources = res.sources;
@@ -87,7 +119,7 @@ function getPageConfigUserFriendlyOld(pageFiles, pageConfig, pageConfigGlobal) {
     return pageContextExports;
 }
 // V1 design
-function getPageConfigUserFriendlyV1Desin(pageConfig) {
+function getPageConfigUserFriendly_V1Design(pageConfig) {
     const config = {};
     const configEntries = {};
     const exportsAll = {};

package/dist/esm/shared/page-configs/serialize/PageConfigSerialized.d.ts

@@ -2,11 +2,12 @@ export type { PageConfigRuntimeSerialized };
 export type { PageConfigGlobalRuntimeSerialized };
 export type { ConfigValueSerialized };
 export type { ValueSerialized };
-import type { ConfigValueStandard, ConfigValueComputed, ConfigValueCumulative, PageConfigRuntime } from '../PageConfig.js';
+import type { ConfigValueStandard, ConfigValueComputed, ConfigValueCumulative, PageConfigCommon, PageConfigRuntime } from '../PageConfig.js';
 /** Page config data structure serialized in virtual files: parsing it results in PageConfigRuntime */
-type PageConfigRuntimeSerialized = Omit<PageConfigRuntime, 'configValues'> & {
+type PageConfigRuntimeSerialized = PageConfigCommon & {
     /** Config values that are serializable and loaded eagerly such as config.passToClient */
     configValuesSerialized: Record<string, ConfigValueSerialized>;
+    loadConfigValuesAll: PageConfigRuntime['loadConfigValuesAll'];
 };
 type PageConfigGlobalRuntimeSerialized = {
     configValuesSerialized: Record<string, ConfigValueSerialized>;

package/dist/esm/shared/page-configs/serialize/parsePageConfigs.js

@@ -12,15 +12,9 @@ function parsePageConfigs(pageConfigsSerialized, pageConfigGlobalSerialized) {
     // pageConfigs
     const pageConfigs = pageConfigsSerialized.map((pageConfigSerialized) => {
         const configValues = parseConfigValuesSerialized(pageConfigSerialized.configValuesSerialized);
-        const { pageId, isErrorPage, routeFilesystem, loadConfigValuesAll } = pageConfigSerialized;
         assertRouteConfigValue(configValues);
-        return {
-            pageId,
-            isErrorPage,
-            routeFilesystem,
-            configValues,
-            loadConfigValuesAll
-        };
+        const pageConfig = { ...pageConfigSerialized, configValues };
+        return pageConfig;
     });
     // pageConfigsGlobal
     const pageConfigGlobal = { configValues: {} };

package/dist/esm/shared/route/executeGuardHook.d.ts

@@ -1,7 +1,7 @@
 export { executeGuardHook };
-import type { PageConfigUserFriendly, PageFile } from '../getPageFiles.js';
+import type { PageConfigUserFriendlyOld, PageFile } from '../getPageFiles.js';
 import type { PageConfigRuntime } from '../page-configs/PageConfig.js';
-declare function executeGuardHook<T extends PageConfigUserFriendly & {
+declare function executeGuardHook<T extends PageConfigUserFriendlyOld & {
     pageId: string;
     _pageFilesAll: PageFile[];
     _pageConfigs: PageConfigRuntime[];

package/dist/esm/utils/PROJECT_VERSION.d.ts

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.222-commit-207e079";
+export declare const PROJECT_VERSION: "0.4.222-commit-6647d1e";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.222-commit-207e079';
+export const PROJECT_VERSION = '0.4.222-commit-6647d1e';

package/dist/esm/utils/projectInfo.d.ts

@@ -1,4 +1,4 @@
 export declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.222-commit-207e079";
+    projectVersion: "0.4.222-commit-6647d1e";
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.222-commit-207e079",
+  "version": "0.4.222-commit-6647d1e",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {