vike 0.4.230-commit-f07cc20 → 0.4.231-commit-a0ca5e4

package/dist/cjs/shared/createPageContextShared.js

@@ -5,8 +5,8 @@ exports.createPageContextObject = createPageContextObject;
 const execHook_js_1 = require("./hooks/execHook.js");
 const preparePageContextForPublicUsage_js_1 = require("./preparePageContextForPublicUsage.js");
 const utils_js_1 = require("./utils.js");
-async function createPageContextShared(pageContextCreated, pageConfigGlobal, userFriendlyConfigsGlobal) {
-    (0, utils_js_1.objectAssign)(pageContextCreated, userFriendlyConfigsGlobal);
+async function createPageContextShared(pageContextCreated, pageConfigGlobal, vikeConfigPublicGlobal) {
+    (0, utils_js_1.objectAssign)(pageContextCreated, vikeConfigPublicGlobal);
     await (0, execHook_js_1.execHookGlobal)('onCreatePageContext', pageConfigGlobal, pageContextCreated, pageContextCreated, preparePageContextForPublicUsage_js_1.preparePageContextForPublicUsage);
     return pageContextCreated;
 }

package/dist/cjs/shared/getPageFiles/analyzePageClientSide/determineClientEntry.js

@@ -25,6 +25,6 @@ function determineClientEntry({ pageFilesClientSide, pageFilesServerSide, isHtml
 }
 function getVikeClientEntry(isClientRouting) {
     return isClientRouting
-        ? '@@vike/dist/esm/client/client-routing-runtime/entry.js'
-        : '@@vike/dist/esm/client/server-routing-runtime/entry.js';
+        ? '@@vike/dist/esm/client/runtime-client-routing/entry.js'
+        : '@@vike/dist/esm/client/runtime-server-routing/entry.js';
 }

package/dist/cjs/shared/getPageFiles/analyzePageClientSide.js

@@ -34,7 +34,6 @@ async function analyzePageClientSideInit(pageFilesAll, pageId, { sharedPageFiles
         if (sharedPageFilesAlreadyLoaded && p.isEnv('CLIENT_AND_SERVER')) {
             return;
         }
-        // TODO: Is `loadExportNames()` cached ? Does it use filesExports if possible? HMR?
         await p.loadExportNames?.();
         /*
         if (pageFile.exportNames) {

package/dist/cjs/shared/getPageFiles/{parseGlobResults.js → parseVirtualFileExports.js}

@@ -1,29 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseGlobResults = parseGlobResults;
+exports.parseVirtualFileExports = parseVirtualFileExports;
 // TODO/v1-release: remove old design code, and remove all assertions.
 const utils_js_1 = require("../utils.js");
 const assert_exports_old_design_js_1 = require("./assert_exports_old_design.js");
 const getPageFileObject_js_1 = require("./getPageFileObject.js");
 const fileTypes_js_1 = require("./fileTypes.js");
 const parsePageConfigs_js_1 = require("../page-configs/serialize/parsePageConfigs.js");
-// TODO/now: rename
-function parseGlobResults(pageFilesExports) {
-    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageFilesExports, 'pageFilesLazy', 'object'));
-    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageFilesExports, 'pageFilesEager', 'object'));
-    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageFilesExports, 'pageFilesExportNamesLazy', 'object'));
-    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageFilesExports, 'pageFilesExportNamesEager', 'object'));
-    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageFilesExports.pageFilesLazy, '.page'));
-    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageFilesExports.pageFilesLazy, '.page.client') || (0, utils_js_1.hasProp)(pageFilesExports.pageFilesLazy, '.page.server'));
-    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageFilesExports, 'pageFilesList', 'string[]'));
-    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageFilesExports, 'pageConfigsSerialized'));
-    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageFilesExports, 'pageConfigGlobalSerialized'));
-    const { pageConfigsSerialized, pageConfigGlobalSerialized } = pageFilesExports;
+function parseVirtualFileExports(virtualFileExports) {
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(virtualFileExports, 'pageFilesLazy', 'object'));
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(virtualFileExports, 'pageFilesEager', 'object'));
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(virtualFileExports, 'pageFilesExportNamesLazy', 'object'));
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(virtualFileExports, 'pageFilesExportNamesEager', 'object'));
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(virtualFileExports.pageFilesLazy, '.page'));
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(virtualFileExports.pageFilesLazy, '.page.client') ||
+        (0, utils_js_1.hasProp)(virtualFileExports.pageFilesLazy, '.page.server'));
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(virtualFileExports, 'pageFilesList', 'string[]'));
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(virtualFileExports, 'pageConfigsSerialized'));
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(virtualFileExports, 'pageConfigGlobalSerialized'));
+    const { pageConfigsSerialized, pageConfigGlobalSerialized } = virtualFileExports;
     assertPageConfigsSerialized(pageConfigsSerialized);
     assertPageConfigGlobalSerialized(pageConfigGlobalSerialized);
     const { pageConfigs, pageConfigGlobal } = (0, parsePageConfigs_js_1.parsePageConfigs)(pageConfigsSerialized, pageConfigGlobalSerialized);
     const pageFilesMap = {};
-    parseGlobResult(pageFilesExports.pageFilesLazy).forEach(({ filePath, pageFile, globValue }) => {
+    parseGlobResult(virtualFileExports.pageFilesLazy).forEach(({ filePath, pageFile, globValue }) => {
         pageFile = pageFilesMap[filePath] = pageFilesMap[filePath] ?? pageFile;
         const loadModule = globValue;
         assertLoadModule(loadModule);
@@ -34,7 +34,7 @@ function parseGlobResults(pageFilesExports) {
             }
         };
     });
-    parseGlobResult(pageFilesExports.pageFilesExportNamesLazy).forEach(({ filePath, pageFile, globValue }) => {
+    parseGlobResult(virtualFileExports.pageFilesExportNamesLazy).forEach(({ filePath, pageFile, globValue }) => {
         pageFile = pageFilesMap[filePath] = pageFilesMap[filePath] ?? pageFile;
         const loadModule = globValue;
         assertLoadModule(loadModule);
@@ -47,20 +47,20 @@ function parseGlobResults(pageFilesExports) {
         };
     });
     // `pageFilesEager` contains `.page.route.js` files
-    parseGlobResult(pageFilesExports.pageFilesEager).forEach(({ filePath, pageFile, globValue }) => {
+    parseGlobResult(virtualFileExports.pageFilesEager).forEach(({ filePath, pageFile, globValue }) => {
         pageFile = pageFilesMap[filePath] = pageFilesMap[filePath] ?? pageFile;
         const moduleExports = globValue;
         (0, utils_js_1.assert)((0, utils_js_1.isObject)(moduleExports));
         pageFile.fileExports = moduleExports;
     });
-    parseGlobResult(pageFilesExports.pageFilesExportNamesEager).forEach(({ filePath, pageFile, globValue }) => {
+    parseGlobResult(virtualFileExports.pageFilesExportNamesEager).forEach(({ filePath, pageFile, globValue }) => {
         pageFile = pageFilesMap[filePath] = pageFilesMap[filePath] ?? pageFile;
         const moduleExports = globValue;
         (0, utils_js_1.assert)((0, utils_js_1.isObject)(moduleExports));
         (0, utils_js_1.assert)((0, utils_js_1.hasProp)(moduleExports, 'exportNames', 'string[]'), pageFile.filePath);
         pageFile.exportNames = moduleExports.exportNames;
     });
-    pageFilesExports.pageFilesList.forEach((filePath) => {
+    virtualFileExports.pageFilesList.forEach((filePath) => {
         pageFilesMap[filePath] = pageFilesMap[filePath] ?? (0, getPageFileObject_js_1.getPageFileObject)(filePath);
     });
     const pageFilesAll = Object.values(pageFilesMap);

package/dist/cjs/shared/getProxyForPublicUsage.js

@@ -47,7 +47,7 @@ function onInternalProp(propStr, objName) {
     //     - If Rolldown Vite + Rolldowns always transpiles node_modules/ then we can simply use import.meta.env.SSR
     if ((0, utils_js_1.isBrowser)())
         return;
-    // TODO/now remove this and only warn on built-in access instead
+    // TODO/now-proxy remove this and only warn on built-in access instead
     if (propStr === '_configFromHook')
         return;
     if (propStr.startsWith('_')) {

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

@@ -22,7 +22,7 @@ function assertPlusFileExport(fileExports, filePathToShowToUser, configName) {
     const exportDefault = picocolors_1.default.code('export default');
     const exportNamed = picocolors_1.default.code(`export { ${configName} }`);
     if (exportNamesValid.length === 0) {
-        (0, utils_js_1.assertUsage)(false, `${filePathToShowToUser} should have ${exportNamed} or ${exportDefault}`);
+        (0, utils_js_1.assertUsage)(false, `${filePathToShowToUser} should define ${exportNamed} or ${exportDefault}`);
     }
     if (exportNamesValid.length === 2) {
         (0, utils_js_1.assertUsage)(false, `${filePathToShowToUser} is ambiguous: remove ${exportDefault} or ${exportNamed}`);

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

@@ -9,7 +9,7 @@ async function loadConfigValues(pageConfig, isDev) {
         !isDev) {
         return pageConfig;
     }
-    const { moduleId, moduleExports } = pageConfig.loadConfigValuesAll();
+    const { moduleId, moduleExports } = pageConfig.loadConfigLazy();
     const configValuesLoaded = await moduleExports;
     // `configValuesLoaded` is sometimes `undefined` https://github.com/vikejs/vike/discussions/2092
     if (!configValuesLoaded)

package/dist/cjs/shared/page-configs/{getUserFriendlyConfigs.js → resolveVikeConfigPublic.js}

@@ -3,54 +3,50 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUserFriendlyConfigsGlobal = getUserFriendlyConfigsGlobal;
-exports.getUserFriendlyConfigsPageEager = getUserFriendlyConfigsPageEager;
-exports.getUserFriendlyConfigsPageLazy = getUserFriendlyConfigsPageLazy;
+exports.resolveVikeConfigPublicGlobal = resolveVikeConfigPublicGlobal;
+exports.resolveVikeConfigPublicPageEager = resolveVikeConfigPublicPageEager;
+exports.resolveVikeConfigPublicPageLazy = resolveVikeConfigPublicPageLazy;
 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 getUserFriendlyConfigsPageEager(pageConfigGlobalValues, pageConfig, pageConfigValues) {
-    const pageConfigUserFriendly = getUserFriendlyConfigs_public({ pageConfigGlobalValues, pageConfigValues });
+function resolveVikeConfigPublicPageEager(pageConfigGlobalValues, pageConfig, pageConfigValues) {
+    const vikeConfigPublicPage_ = resolveVikeConfigPublic_base({ pageConfigGlobalValues, pageConfigValues });
+    const vikeConfigPublicPage = getPublicCopy(vikeConfigPublicPage_);
     let page;
     if (!pageConfig.isErrorPage) {
-        const route = pageConfigUserFriendly.config.route ?? pageConfig.routeFilesystem.routeString;
+        const route = vikeConfigPublicPage.config.route ?? pageConfig.routeFilesystem.routeString;
         page = {
-            ...pageConfigUserFriendly,
+            ...vikeConfigPublicPage,
             route
         };
     }
     else {
         page = {
-            ...pageConfigUserFriendly,
+            ...vikeConfigPublicPage,
             isErrorPage: true
         };
     }
     return [pageConfig.pageId, page];
 }
-function getUserFriendlyConfigs_public({ pageConfigGlobalValues, pageConfigValues }) {
-    const pageConfigUserFriendly = getUserFriendlyConfigs_base({ pageConfigGlobalValues, pageConfigValues });
-    return getPublicCopy(pageConfigUserFriendly);
-}
-function getPublicCopy(pageConfigUserFriendly) {
-    const p = pageConfigUserFriendly;
+function getPublicCopy(vikeConfigPublic) {
     return {
-        config: p.config,
-        _source: p.source,
-        _sources: p.sources,
-        _from: p.from
+        config: vikeConfigPublic.config,
+        _source: vikeConfigPublic.source,
+        _sources: vikeConfigPublic.sources,
+        _from: vikeConfigPublic.from
     };
 }
-function getUserFriendlyConfigs_base({ pageConfigGlobalValues, pageConfigValues }) {
+function resolveVikeConfigPublic_base({ pageConfigGlobalValues, pageConfigValues }) {
     const configValues = { ...pageConfigGlobalValues, ...pageConfigValues };
-    return getUserFriendlyConfigs_V1Design({ configValues });
+    return resolveVikeConfigPublic_V1Design({ configValues });
 }
-function getUserFriendlyConfigsGlobal({ pageConfigGlobalValues }) {
-    const pageConfigGlobalUserFriendly = getUserFriendlyConfigs_V1Design({ configValues: pageConfigGlobalValues });
-    return getPublicCopy(pageConfigGlobalUserFriendly);
+function resolveVikeConfigPublicGlobal({ pageConfigGlobalValues }) {
+    const vikeConfigPublicGlobal = resolveVikeConfigPublic_V1Design({ configValues: pageConfigGlobalValues });
+    return getPublicCopy(vikeConfigPublicGlobal);
 }
-function getUserFriendlyConfigsPageLazy(pageFiles, // V0.4 design
+function resolveVikeConfigPublicPageLazy(pageFiles, // V0.4 design
 pageConfig, // V1 design
 pageConfigGlobal) {
     const config = {};
@@ -77,7 +73,7 @@ pageConfigGlobal) {
     let sources;
     let from;
     if (pageConfig) {
-        const res = getUserFriendlyConfigs_base({
+        const res = resolveVikeConfigPublic_base({
             pageConfigGlobalValues: pageConfigGlobal.configValues,
             pageConfigValues: pageConfig.configValues
         });
@@ -117,7 +113,7 @@ pageConfigGlobal) {
         from,
         source,
         sources,
-        // TODO/eventually: deprecate/remove every prop below
+        // TODO/now-flat-pageContext: deprecate every prop below
         configEntries,
         exports,
         exportsAll
@@ -140,7 +136,7 @@ pageConfigGlobal) {
     return pageContextExports;
 }
 // V1 design
-function getUserFriendlyConfigs_V1Design(pageConfig) {
+function resolveVikeConfigPublic_V1Design(pageConfig) {
     const config = {};
     const configEntries = {};
     const exportsAll = {};
@@ -193,6 +189,7 @@ function getUserFriendlyConfigs_V1Design(pageConfig) {
         if (configValue.type === 'cumulative') {
             const src = {
                 type: 'configsCumulative',
+                definedAt: (0, getConfigDefinedAt_js_1.getDefinedAtString)(configValue.definedAtData, configName),
                 values: configValue.value.map((value, i) => {
                     const definedAtFile = configValue.definedAtData[i];
                     (0, utils_js_1.assert)(definedAtFile);
@@ -210,6 +207,7 @@ function getUserFriendlyConfigs_V1Design(pageConfig) {
         if (configValue.type === 'computed') {
             const src = {
                 type: 'configsComputed',
+                definedAt: 'Vike', // Vike currently doesn't support user-land computed configs => computed configs are always defined by Vike => there isn't any file path to show.
                 value: configValue.value
             };
             addSrc(src, configName);

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

@@ -7,12 +7,12 @@ exports.serializeConfigValues = serializeConfigValues;
 exports.getConfigValuesBase = getConfigValuesBase;
 exports.isJsonValue = isJsonValue;
 const assertSetup_js_1 = require("../../../utils/assertSetup.js");
-const utils_js_1 = require("../../../node/plugin/utils.js");
-const pointerImports_js_1 = require("../../../node/plugin/plugins/importUserCode/v1-design/getVikeConfig/pointerImports.js");
+const utils_js_1 = require("../../../node/vite/utils.js");
+const pointerImports_js_1 = require("../../../node/vite/shared/resolveVikeConfigInternal/pointerImports.js");
 const helpers_js_1 = require("../helpers.js");
 const stringify_1 = require("@brillout/json-serializer/stringify");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-const getVikeConfig_js_1 = require("../../../node/plugin/plugins/importUserCode/v1-design/getVikeConfig.js");
+const resolveVikeConfigInternal_js_1 = require("../../../node/vite/shared/resolveVikeConfigInternal.js");
 const stringifyOptions = { forbidReactElements: true };
 const REPLACE_ME_BEFORE = '__VIKE__REPLACE_ME_BEFORE__';
 const REPLACE_ME_AFTER = '__VIKE__REPLACE_ME_AFTER__';
@@ -213,7 +213,7 @@ function getConfigValuesBase(pageConfig, isEnvMatch, isEager) {
         }
         else {
             const sourcesRelevant = sources
-                .filter((source) => !(0, getVikeConfig_js_1.isOverriden)(source, configName, pageConfig))
+                .filter((source) => !(0, resolveVikeConfigInternal_js_1.isOverriden)(source, configName, pageConfig))
                 .filter((source) => isEnvMatch(source.configEnv));
             if (sourcesRelevant.length === 0)
                 return 'SKIP';

package/dist/cjs/shared/preparePageContextForPublicUsage.js

@@ -29,7 +29,7 @@ function preparePageContextForPublicUsage(pageContext) {
     const globalContextPublic = (0, prepareGlobalContextForPublicUsage_js_1.prepareGlobalContextForPublicUsage)(pageContext._globalContext);
     const pageContextPublic = (0, getProxyForPublicUsage_js_1.getProxyForPublicUsage)(pageContext, 'pageContext', 
     // We must skip it in the client-side because of the reactivity mechanism of UI frameworks like Solid.
-    // - TODO/now: double check whether that's true
+    // - TODO/now-proxy: double check whether that's true
     true, (prop) => {
         if (prop === 'globalContext') {
             return globalContextPublic;

package/dist/cjs/shared/route/executeGuardHook.js

@@ -7,11 +7,11 @@ const execHook_js_1 = require("../hooks/execHook.js");
 const errIntro = 'The guard() hook defined by';
 async function executeGuardHook(pageContext, prepareForPublicUsage) {
     let hook;
-    if (pageContext._pageFilesAll.length > 0) {
+    if (pageContext._globalContext._pageFilesAll.length > 0) {
         // TODO/v1-release: remove
         // V0.4 design
-        (0, utils_js_1.assert)(pageContext._pageConfigs.length === 0);
-        hook = findPageGuard(pageContext.pageId, pageContext._pageFilesAll);
+        (0, utils_js_1.assert)(pageContext._globalContext._pageConfigs.length === 0);
+        hook = findPageGuard(pageContext.pageId, pageContext._globalContext._pageFilesAll);
     }
     else {
         // V1 design

package/dist/cjs/shared/route/executeOnBeforeRouteHook.js

@@ -12,9 +12,9 @@ const execHook_js_1 = require("../hooks/execHook.js");
 const preparePageContextForPublicUsage_js_1 = require("../preparePageContextForPublicUsage.js");
 async function executeOnBeforeRouteHook(pageContext) {
     const pageContextFromOnBeforeRouteHook = {};
-    if (!pageContext._onBeforeRouteHook)
+    if (!pageContext._globalContext._onBeforeRouteHook)
         return null;
-    const pageContextFromHook = await getPageContextFromHook(pageContext._onBeforeRouteHook, pageContext);
+    const pageContextFromHook = await getPageContextFromHook(pageContext._globalContext._onBeforeRouteHook, pageContext);
     if (pageContextFromHook) {
         (0, utils_js_1.objectAssign)(pageContextFromOnBeforeRouteHook, pageContextFromHook);
         if ((0, utils_js_1.hasProp)(pageContextFromOnBeforeRouteHook, 'pageId', 'string') ||
@@ -54,7 +54,7 @@ async function getPageContextFromHook(onBeforeRouteHook, pageContext) {
     if ((0, utils_js_1.hasProp)(hookReturn.pageContext, 'pageId') && !(0, utils_js_1.hasProp)(hookReturn.pageContext, 'pageId', 'null')) {
         const errPrefix2 = `${errPrefix} returned ${picocolors_1.default.cyan('{ pageContext: { pageId } }')} but ${picocolors_1.default.cyan('pageId')} should be`;
         (0, utils_js_1.assertUsage)((0, utils_js_1.hasProp)(hookReturn.pageContext, 'pageId', 'string'), `${errPrefix2} a string or null`);
-        (0, utils_js_1.assertUsage)(pageContext._allPageIds.includes(hookReturn.pageContext.pageId), `${errPrefix2} ${(0, utils_js_1.joinEnglish)(pageContext._allPageIds.map((s) => picocolors_1.default.cyan(s)), 'or')}`);
+        (0, utils_js_1.assertUsage)(pageContext._globalContext._allPageIds.includes(hookReturn.pageContext.pageId), `${errPrefix2} ${(0, utils_js_1.joinEnglish)(pageContext._globalContext._allPageIds.map((s) => picocolors_1.default.cyan(s)), 'or')}`);
     }
     if ((0, utils_js_1.hasProp)(hookReturn.pageContext, 'routeParams')) {
         (0, resolveRouteFunction_js_1.assertRouteParams)(hookReturn.pageContext, `${errPrefix} returned ${picocolors_1.default.cyan('{ pageContext: { routeParams } }')} but routeParams should`);

package/dist/cjs/shared/route/index.js

@@ -18,7 +18,7 @@ const executeOnBeforeRouteHook_js_1 = require("./executeOnBeforeRouteHook.js");
 const debug_js_1 = require("./debug.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 async function route(pageContext, skipOnBeforeRouteHook) {
-    (0, debug_js_1.debug)('Pages routes:', pageContext._pageRoutes);
+    (0, debug_js_1.debug)('Pages routes:', pageContext._globalContext._pageRoutes);
     const pageContextFromRoute = {};
     // onBeforeRoute()
     if (!skipOnBeforeRouteHook) {
@@ -36,13 +36,13 @@ async function route(pageContext, skipOnBeforeRouteHook) {
         (0, utils_js_1.objectAssign)(pageContext, pageContextFromOnBeforeRouteHook);
     }
     // Vike's routing
-    const allPageIds = pageContext._allPageIds;
+    const allPageIds = pageContext._globalContext._allPageIds;
     (0, utils_js_1.assertUsage)(allPageIds.length > 0, 'No page found. You must create at least one page.');
-    (0, utils_js_1.assert)(pageContext._pageFilesAll.length > 0 || pageContext._pageConfigs.length > 0);
+    (0, utils_js_1.assert)(pageContext._globalContext._pageFilesAll.length > 0 || pageContext._globalContext._pageConfigs.length > 0);
     const { urlPathname } = pageContext;
     (0, utils_js_1.assert)(urlPathname.startsWith('/'));
     const routeMatches = [];
-    await Promise.all(pageContext._pageRoutes.map(async (pageRoute) => {
+    await Promise.all(pageContext._globalContext._pageRoutes.map(async (pageRoute) => {
         const { pageId, routeType } = pageRoute;
         // Filesytem Routing
         if (pageRoute.routeType === 'FILESYSTEM') {

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.230-commit-f07cc20';
+exports.PROJECT_VERSION = '0.4.231-commit-a0ca5e4';

package/dist/cjs/utils/assertSetup.js

@@ -88,7 +88,7 @@ function markSetup_vitePreviewServer() {
         debug('markSetup_vitePreviewServer()', new Error().stack);
     setup.vitePreviewServer = true;
 }
-// Called by ../node/plugin/index.ts
+// Called by ../node/vite/index.ts
 function markSetup_vikeVitePlugin() {
     if (debug.isActivated)
         debug('markSetup_vikeVitePlugin()', new Error().stack);

package/dist/cjs/utils/assertSingleInstance.js

@@ -79,7 +79,7 @@ function assertSingleInstance_onClientEntryClientRouting(isProduction) {
         globalObject.checkSingleInstance = true;
     assertSingleInstance();
 }
-// Called by utils/assert.ts which is (most certainly) loaded by all entries. That way we don't have to call a callback for every entry. (There are a lot of entries: `client/router/`, `client/`, `node/runtime/`, `node/plugin/`, `node/cli`.)
+// Called by utils/assert.ts which is (most certainly) loaded by all entries. That way we don't have to call a callback for every entry. (There are a lot of entries: `client/router/`, `client/`, `node/runtime/`, `node/vite/`, `node/cli`.)
 function assertSingleInstance_onAssertModuleLoad() {
     const globalObject = getGlobalObjectSafe();
     globalObject.instances.push(PROJECT_VERSION_js_1.PROJECT_VERSION);

package/dist/cjs/utils/debug.js

@@ -21,8 +21,8 @@ const flags = [
     'vike:crawl',
     'vike:error',
     'vike:esbuild-resolve',
-    'vike:extractAssets',
-    'vike:extractExportNames',
+    'vike:pluginExtractAssets',
+    'vike:pluginExtractExportNames',
     'vike:glob',
     'vike:globalContext',
     'vike:log',
@@ -34,7 +34,7 @@ const flags = [
     'vike:routing',
     'vike:setup',
     'vike:stream',
-    'vike:virtual-files'
+    'vike:virtualFiles'
 ];
 const flagsSkipWildcard = ['vike:log'];
 const flagRegex = /\bvike:[a-zA-Z-]+/g;

package/dist/cjs/utils/genPromise.js

@@ -1,8 +1,45 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.genPromise = genPromise;
+// Simple implementation without timeout: https://github.com/vikejs/vike/blob/2e59b922e7e0f227d26018dc2b74877c9b0f581b/vike/utils/genPromise.ts
+const assert_js_1 = require("./assert.js");
+const timeoutSeconds = 25;
 function genPromise() {
     let resolve;
-    const promise = new Promise((r) => (resolve = r));
-    return { promise, resolve };
+    let reject;
+    let finished = false;
+    const promise_internal = new Promise((resolve_, reject_) => {
+        resolve = (...args) => {
+            finished = true;
+            timeoutClear();
+            return resolve_(...args);
+        };
+        reject = (...args) => {
+            finished = true;
+            timeoutClear();
+            return reject_(...args);
+        };
+    });
+    const timeoutClear = () => timeouts.forEach((t) => clearTimeout(t));
+    const timeouts = [];
+    const promise = new Proxy(promise_internal, {
+        get(target, prop) {
+            if (prop === 'then' && !finished) {
+                const err = new Error(`Promise hasn't resolved after ${timeoutSeconds} seconds`);
+                timeouts.push(setTimeout(() => {
+                    (0, assert_js_1.assert)(err.stack);
+                    (0, assert_js_1.assertWarning)(false, removeStackErrorPrefix(err.stack), { onlyOnce: false });
+                }, timeoutSeconds * 1000));
+            }
+            const value = Reflect.get(target, prop);
+            return typeof value === 'function' ? value.bind(target) : value;
+        }
+    });
+    return { promise, resolve, reject };
+}
+function removeStackErrorPrefix(errStack) {
+    const errorPrefix = 'Error: ';
+    if (errStack.startsWith(errorPrefix))
+        errStack = errStack.slice(errorPrefix.length);
+    return errStack;
 }

package/dist/cjs/utils/isDev.js

@@ -7,7 +7,7 @@ const assert_js_1 = require("./assert.js");
 function isDevCheck(configEnv) {
     const { isPreview, command } = configEnv;
     // Note that:
-    // - `assertVersion('Vite', version, '5.1.0')` at node/plugin/onLoad.ts isn't enough: https://github.com/vitejs/vite/pull/19355
+    // - `assertVersion('Vite', version, '5.1.0')` at node/vite/onLoad.ts isn't enough: https://github.com/vitejs/vite/pull/19355
     // - We'll eventually be able to make this an assert() instead of assertUsage() once Vike requires a Vite version that supports this.meta.viteVersion
     (0, assert_js_1.assertUsage)(typeof isPreview === 'boolean', 'You are using an old Vite version; make sure to use Vite 5.1.0 or above.');
     return command === 'serve' && !isPreview;

package/dist/esm/__internal/index.d.ts

@@ -3,7 +3,7 @@ export { route, getPagesAndRoutes };
 export type { PageRoutes, PageFile, PageConfigRuntime as PageConfig };
 import { route as routeInternal, type PageRoutes } from '../shared/route/index.js';
 import type { PageFile } from '../shared/getPageFiles/getPageFileObject.js';
-import { PageConfigRuntime } from '../shared/page-configs/PageConfig.js';
+import { PageConfigRuntime } from '../types/PageConfig.js';
 /**
  * Used by {@link https://github.com/magne4000/vite-plugin-vercel|vite-plugin-vercel} to compute some rewrite rules and extract { isr } configs.
  *

package/dist/esm/client/node.js

@@ -1,4 +1,4 @@
-import { assertUsage } from './server-routing-runtime/utils.js';
+import { assertUsage } from './runtime-server-routing/utils.js';
 assertUsage(false, [
     'Server imports are forbidden on the client-side:',
     "  import { something } from 'vike/server'",

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

@@ -12,19 +12,18 @@ declare function createPageContextClientSide(urlOriginal: string): Promise<{
         _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;
@@ -33,11 +32,6 @@ declare function createPageContextClientSide(urlOriginal: string): Promise<{
         _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("../../__internal/index.js").PageRoutes;
-    _onBeforeRouteHook: import("../../shared/hooks/getHook.js").Hook | null;
     _urlHandler: null;
     _urlRewrite: null | string;
     _baseServer: string;
@@ -45,4 +39,9 @@ declare function createPageContextClientSide(urlOriginal: string): Promise<{
     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;
+}>;

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

@@ -14,19 +14,14 @@ async function createPageContextClientSide(urlOriginal) {
         isPrerendering: false,
         urlOriginal,
         _globalContext: globalContext,
-        _pageFilesAll: globalContext._pageFilesAll,
-        _pageConfigs: globalContext._pageConfigs,
-        _pageConfigGlobal: globalContext._pageConfigGlobal,
-        _allPageIds: globalContext._allPageIds,
-        _pageRoutes: globalContext._pageRoutes,
-        _onBeforeRouteHook: globalContext._onBeforeRouteHook,
+        _pageFilesAll: globalContext._pageFilesAll, // TODO/v1-release: remove
         _urlHandler: null,
         _urlRewrite: null,
         _baseServer: baseServer
     });
     const pageContextUrlComputed = getPageContextUrlComputed(pageContextCreated);
     objectAssign(pageContextCreated, pageContextUrlComputed);
-    const pageContextAugmented = await createPageContextShared(pageContextCreated, globalContext._pageConfigGlobal, globalContext._userFriendlyConfigsGlobal);
+    const pageContextAugmented = await createPageContextShared(pageContextCreated, globalContext._pageConfigGlobal, globalContext._vikeConfigPublicGlobal);
     augmentType(pageContextCreated, pageContextAugmented);
     return pageContextCreated;
 }

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

@@ -1,5 +1,5 @@
 export { getBaseServer };
-import { assert } from '../server-routing-runtime/utils.js';
+import { assert } from '../runtime-server-routing/utils.js';
 function getBaseServer() {
     // @ts-ignore Since dist/cjs/client/ is never used, we can ignore this error.
     const baseServer = import.meta.env.BASE_SERVER;

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

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

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

@@ -1,7 +1,7 @@
 export { setPageContextCurrent };
 export { getPageContextCurrent };
 import { getGlobalObject } from './utils.js';
-const globalObject = getGlobalObject('client-routing-runtime/getPageContextCurrent.ts', {
+const globalObject = getGlobalObject('runtime-client-routing/getPageContextCurrent.ts', {
     pageContextCurrent: null
 });
 function getPageContextCurrent() {