vike 0.4.168 → 0.4.169

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

@@ -41,6 +41,7 @@ const getPageFiles_js_1 = require("../../shared/getPageFiles.js");
 const getPageContextRequestUrl_js_1 = require("../../shared/getPageContextRequestUrl.js");
 const resolveRouteString_js_1 = require("../../shared/route/resolveRouteString.js");
 const helpers_js_1 = require("../../shared/page-configs/helpers.js");
+const getConfigValue_js_1 = require("../../shared/page-configs/getConfigValue.js");
 const loadConfigValues_js_1 = require("../../shared/page-configs/loadConfigValues.js");
 const error_page_js_1 = require("../../shared/error-page.js");
 const addUrlComputedProps_js_1 = require("../../shared/addUrlComputedProps.js");
@@ -103,7 +104,7 @@ async function runPrerender(options, manuallyTriggered) {
     }
     const { partial = false, noExtraDir = false, parallel = true } = prerenderConfig || {};
     const concurrencyLimit = (0, utils_js_1.pLimit)(parallel === false || parallel === 0 ? 1 : parallel === true || parallel === undefined ? (0, os_1.cpus)().length : parallel);
-    (0, utils_js_1.assertPathIsFilesystemAbsolute)(outDirRoot); // Needed for loadImportBuild(outDir) of @brillout/vite-plugin-server-entry
+    (0, utils_js_1.assertPathFilesystemAbsolute)(outDirRoot); // Needed for loadImportBuild(outDir) of @brillout/vite-plugin-server-entry
     await (0, globalContext_js_1.initGlobalContext)(true, outDirRoot);
     const renderContext = await (0, renderPageAlreadyRouted_js_1.getRenderContext)();
     renderContext.pageFilesAll.forEach(assertExportNames);
@@ -141,9 +142,9 @@ async function collectDoNoPrerenderList(renderContext, pageConfigs, doNotPrerend
     // V1 design
     pageConfigs.forEach((pageConfig) => {
         const configName = 'prerender';
-        const configValue = (0, helpers_js_1.getConfigValue)(pageConfig, configName, 'boolean');
+        const configValue = (0, getConfigValue_js_1.getConfigValue)(pageConfig, configName, 'boolean');
         if (configValue?.value === false) {
-            const configValueFilePathToShowToUser = (0, helpers_js_1.getConfigValueFilePathToShowToUser)(configValue);
+            const configValueFilePathToShowToUser = (0, helpers_js_1.getConfigValueFilePathToShowToUser)(configValue.definedAtData);
             (0, utils_js_1.assert)(configValueFilePathToShowToUser);
             doNotPrerenderList.push({
                 pageId: pageConfig.pageId,
@@ -501,7 +502,7 @@ async function routeAndPrerender(prerenderContext, concurrencyLimit, onComplete)
             if (pageContext._pageConfigs.length > 0) {
                 const pageConfig = pageContext._pageConfigs.find((p) => p.pageId === pageId);
                 (0, utils_js_1.assert)(pageConfig);
-                usesClientRouter = (0, helpers_js_1.getConfigValue)(pageConfig, 'clientRouting', 'boolean')?.value ?? false;
+                usesClientRouter = (0, getConfigValue_js_1.getConfigValue)(pageConfig, 'clientRouting', 'boolean')?.value ?? false;
             }
             else {
                 usesClientRouter = globalContext.pluginManifest.usesClientRouter;
@@ -637,7 +638,7 @@ async function write(urlOriginal, pageContext, fileExtension, fileContent, root,
     }
 }
 function normalizeOnPrerenderHookResult(prerenderResult, prerenderHookFile, hookName) {
-    if (Array.isArray(prerenderResult)) {
+    if ((0, utils_js_1.isArray)(prerenderResult)) {
         return prerenderResult.map(normalize);
     }
     else {

package/dist/cjs/node/prerender/utils.js

@@ -29,4 +29,5 @@ __exportStar(require("../../utils/urlToFile.js"), exports);
 __exportStar(require("../../utils/isPlainObject.js"), exports);
 __exportStar(require("../../utils/assertNodeEnv.js"), exports);
 __exportStar(require("../../utils/pLimit.js"), exports);
-__exportStar(require("../../utils/assertPathIsFilesystemAbsolute.js"), exports);
+__exportStar(require("../../utils/assertPathFilesystemAbsolute.js"), exports);
+__exportStar(require("../../utils/isArray.js"), exports);

package/dist/cjs/node/runtime/html/serializePageContextClientSide.js

@@ -23,6 +23,7 @@ const PASS_TO_CLIENT = [
     */
     pageContextInitIsPassedToClient_js_1.pageContextInitIsPassedToClient,
     '_pageId',
+    'routeParams',
     'data' // for data() hook
 ];
 const PASS_TO_CLIENT_ERROR_PAGE = ['pageProps', 'is404', isServerSideError_js_1.isServerSideError];

package/dist/cjs/node/runtime/index-common.js

@@ -22,7 +22,18 @@ Object.defineProperty(exports, "_injectAssets", { enumerable: true, get: functio
 // TODO/v1-release: remove
 var createPageRenderer_js_1 = require("../createPageRenderer.js");
 Object.defineProperty(exports, "createPageRenderer", { enumerable: true, get: function () { return createPageRenderer_js_1.createPageRenderer; } });
-// Help Telefunc detect the user's stack
-globalThis._isVitePluginSsr = true;
-globalThis._isVike = true;
+addEcosystemStamp();
 require("./page-files/setup.js");
+// Used by:
+// - Telefunc (to detect the user's stack https://github.com/brillout/telefunc/blob/8288310e88e06a42b710d39c39fb502364ca6d30/telefunc/utils/isVikeApp.ts#L4)
+function addEcosystemStamp() {
+    const g = globalThis;
+    g._isVikeApp =
+        /* Don't set to true so that consumers do `!!globalThis._isVikeApp` instead of `globalThis._isVikeApp === true`.
+        true
+        */
+        // We use an object so that we can eventually, in the future, add helpful information as needed. (E.g. the Vike version, or global settings.)
+        {};
+    // We keep the old stamp for older Telefunc versions
+    g._isVitePluginSsr = true;
+}

package/dist/cjs/node/runtime/renderPage/createHttpResponseObject/getCacheControl.js

@@ -2,13 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCacheControl = void 0;
 const helpers_js_1 = require("../../../../shared/page-configs/helpers.js");
+const getConfigValue_js_1 = require("../../../../shared/page-configs/getConfigValue.js");
 const defaultValue = 'no-store, max-age=0';
 function getCacheControl(pageId, pageConfigs) {
     // TODO/v1-release: remove
     if (pageConfigs.length === 0)
         return defaultValue;
     const pageConfig = (0, helpers_js_1.getPageConfig)(pageId, pageConfigs);
-    const configValue = (0, helpers_js_1.getConfigValue)(pageConfig, 'cacheControl', 'string');
+    const configValue = (0, getConfigValue_js_1.getConfigValue)(pageConfig, 'cacheControl', 'string');
     const value = configValue?.value;
     if (value)
         return value;

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

@@ -12,21 +12,36 @@ const globalContext_js_1 = require("../globalContext.js");
 const loadConfigValues_js_1 = require("../../../shared/page-configs/loadConfigValues.js");
 async function loadUserFilesServerSide(pageContext) {
     const pageConfig = (0, findPageConfig_js_1.findPageConfig)(pageContext._pageConfigs, pageContext._pageId); // Make pageConfig globally available as pageContext._pageConfig?
-    const [{ config, configEntries, exports, exportsAll, pageExports, pageFilesLoaded, pageConfigLoaded }] = await Promise.all([
+    const [{ pageFilesLoaded, pageConfigLoaded, ...pageContextExports }] = await Promise.all([
         loadPageUserFiles(pageContext._pageFilesAll, pageConfig, pageContext._pageId, !(0, globalContext_js_1.getGlobalContext)().isProduction),
         (0, analyzePageClientSide_js_1.analyzePageClientSideInit)(pageContext._pageFilesAll, pageContext._pageId, { sharedPageFilesAlreadyLoaded: true })
     ]);
     const { isHtmlOnly, isClientRouting, clientEntries, clientDependencies, pageFilesClientSide, pageFilesServerSide } = (0, analyzePage_js_1.analyzePage)(pageContext._pageFilesAll, pageConfig, pageContext._pageId);
+    const isV1Design = !!pageConfig;
+    const passToClient = [];
+    const errMsg = ' should be an array of strings.';
+    if (!isV1Design) {
+        pageContextExports.exportsAll.passToClient?.forEach((e) => {
+            (0, utils_js_1.assertUsage)((0, utils_js_1.hasProp)(e, 'exportValue', 'string[]'), `${e.exportSource}${errMsg}`);
+            passToClient.push(...e.exportValue);
+        });
+    }
+    else {
+        pageContextExports.configEntries.passToClient?.forEach((e) => {
+            const { configValue } = e;
+            (0, utils_js_1.assert)((0, utils_js_1.isArray)(configValue));
+            const vals = configValue.flat(1);
+            // TODO: improve error message by using (upcoming) new data structure instead of configEntries
+            (0, utils_js_1.assertUsage)((0, utils_js_1.isArrayOfStrings)(vals), `${e.configDefinedAt}${errMsg}`);
+            passToClient.push(...vals);
+        });
+    }
     const pageContextAddendum = {};
     (0, utils_js_1.objectAssign)(pageContextAddendum, {
-        config,
-        configEntries,
-        exports,
-        exportsAll,
-        pageExports,
-        Page: exports.Page,
+        ...pageContextExports,
+        Page: pageContextExports.exports.Page,
         _isHtmlOnly: isHtmlOnly,
-        _passToClient: (0, getPageFiles_js_1.getExportUnion)(exportsAll, 'passToClient'),
+        _passToClient: passToClient,
         _pageFilePathsLoaded: pageFilesLoaded.map((p) => p.filePath)
     });
     (0, utils_js_1.objectAssign)(pageContextAddendum, {
@@ -87,13 +102,9 @@ async function loadPageUserFiles(pageFilesAll, pageConfig, pageId, isDev) {
     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 { config, configEntries, exports, exportsAll, pageExports } = (0, getPageFiles_js_1.getExports)(pageFilesServerSide, pageConfigLoaded);
+    const pageContextExports = (0, getPageFiles_js_1.getPageContextExports)(pageFilesServerSide, pageConfigLoaded);
     return {
-        config,
-        configEntries,
-        exports,
-        exportsAll,
-        pageExports,
+        ...pageContextExports,
         pageFilesLoaded: pageFilesServerSide,
         pageConfigLoaded
     };

package/dist/cjs/node/runtime/renderPage/log404/index.js

@@ -42,8 +42,8 @@ function getRoutesInfo(pageRoutes) {
             routeDefinedBy = pageRoute.routeFilesystemDefinedBy;
         }
         else {
-            (0, utils_js_1.assert)(pageRoute.routeDefinedAt);
-            routeDefinedBy = pageRoute.routeDefinedAt;
+            (0, utils_js_1.assert)(pageRoute.routeDefinedAtString);
+            routeDefinedBy = pageRoute.routeDefinedAtString;
         }
         if (pageRoute.routeType === 'STRING') {
             routeStr = pageRoute.routeString;

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

@@ -83,7 +83,7 @@ function isCjsEsmError(error) {
 }
 exports.isCjsEsmError = isCjsEsmError;
 function normalizeRes(res) {
-    let packageNames = Array.isArray(res) ? res : [res];
+    let packageNames = (0, utils_js_1.isArray)(res) ? res : [res];
     packageNames = (0, utils_js_1.unique)(packageNames.filter(utils_js_1.isNotNullish).filter((packageName) => packageName !== '@brillout/import'));
     if (packageNames.length === 0)
         return false;

package/dist/cjs/node/runtime/utils.js

@@ -31,6 +31,7 @@ __exportStar(require("../../utils/parseUrl-extras.js"), exports);
 __exportStar(require("../../utils/slice.js"), exports);
 __exportStar(require("../../utils/sorter.js"), exports);
 __exportStar(require("../../utils/projectInfo.js"), exports);
+__exportStar(require("../../utils/isArray.js"), exports);
 __exportStar(require("../../utils/isObject.js"), exports);
 __exportStar(require("../../utils/objectAssign.js"), exports);
 __exportStar(require("../../utils/PromiseType.js"), exports);
@@ -54,7 +55,6 @@ __exportStar(require("../../utils/isNotNullish.js"), exports);
 __exportStar(require("../../utils/isScriptFile.js"), exports);
 __exportStar(require("../../utils/removeFileExtention.js"), exports);
 __exportStar(require("../../utils/objectKeys.js"), exports);
-__exportStar(require("../../utils/isStringRecord.js"), exports);
 __exportStar(require("../../utils/getFileExtension.js"), exports);
 __exportStar(require("../../utils/assertIsNotProductionRuntime.js"), exports);
 __exportStar(require("../../utils/virtual-files.js"), exports);
@@ -67,3 +67,4 @@ __exportStar(require("../../utils/getTerminWidth.js"), exports);
 __exportStar(require("../../utils/truncateString.js"), exports);
 __exportStar(require("../../utils/formatHintLog.js"), exports);
 __exportStar(require("../../utils/joinEnglish.js"), exports);
+__exportStar(require("../../utils/isArrayOfStrings.js"), exports);

package/dist/cjs/node/shared/assertV1Design.js

@@ -12,7 +12,7 @@ function assertV1Design(isOldDesign, pageConfigs, pageFilesAll) {
             const indent = '- ';
             const filesV1 = (0, utils_js_1.unique)(pageConfigs
                 .map((p) => Object.values(p.configValues)
-                .map(helpers_js_1.getConfigValueFilePathToShowToUser)
+                .map((c) => (0, helpers_js_1.getConfigValueFilePathToShowToUser)(c.definedAtData))
                 .filter(utils_js_1.isNotNullish)
                 .map((filePathToShowToUser) => indent + filePathToShowToUser))
                 .flat(2));

package/dist/cjs/node/shared/getClientEntry.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getClientEntry = void 0;
-const helpers_js_1 = require("../../shared/page-configs/helpers.js");
+const getConfigValue_js_1 = require("../../shared/page-configs/getConfigValue.js");
 function getClientEntry(pageConfig) {
     const configName = 'client';
-    const configValue = (0, helpers_js_1.getConfigValue)(pageConfig, configName, 'string');
+    const configValue = (0, getConfigValue_js_1.getConfigValue)(pageConfig, configName, 'string');
     if (!configValue)
         return null;
     return configValue.value;

package/dist/cjs/node/shared/prependEntriesDir.js

@@ -7,6 +7,7 @@ function prependEntriesDir(entryName) {
         entryName = entryName.slice(1);
     }
     (0, utils_js_1.assert)(!entryName.startsWith('/'));
+    (0, utils_js_1.assert)(entryName);
     entryName = `entries/${entryName}`;
     return entryName;
 }

package/dist/cjs/node/shared/utils.js

@@ -22,7 +22,6 @@ __exportStar(require("../../utils/isPlainObject.js"), exports);
 __exportStar(require("../../utils/projectInfo.js"), exports);
 __exportStar(require("../../utils/checkType.js"), exports);
 __exportStar(require("../../utils/hasProp.js"), exports);
-__exportStar(require("../../utils/isStringRecord.js"), exports);
 __exportStar(require("../../utils/objectAssign.js"), exports);
 __exportStar(require("../../utils/checkType.js"), exports);
 __exportStar(require("../../utils/hasProp.js"), exports);

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

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.analyzeClientSide = void 0;
-const helpers_js_1 = require("../page-configs/helpers.js");
+const getConfigValue_js_1 = require("../page-configs/getConfigValue.js");
 const analyzePageClientSide_js_1 = require("./analyzePageClientSide.js");
 function analyzeClientSide(pageConfig, pageFilesAll, pageId) {
     // V1 design
     if (pageConfig) {
-        const isClientRouting = (0, helpers_js_1.getConfigValue)(pageConfig, 'clientRouting', 'boolean')?.value ?? false;
-        const isClientSideRenderable = (0, helpers_js_1.getConfigValue)(pageConfig, 'isClientSideRenderable', 'boolean')?.value ?? false;
+        const isClientRouting = (0, getConfigValue_js_1.getConfigValue)(pageConfig, 'clientRouting', 'boolean')?.value ?? false;
+        const isClientSideRenderable = (0, getConfigValue_js_1.getConfigValue)(pageConfig, 'isClientSideRenderable', 'boolean')?.value ?? false;
         return { isClientSideRenderable, isClientRouting };
     }
     else {

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

@@ -3,13 +3,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getExports = exports.getExportUnion = void 0;
+exports.getPageContextExports = void 0;
 const isScriptFile_js_1 = require("../../utils/isScriptFile.js");
 const utils_js_1 = require("../utils.js");
 const assert_exports_old_design_js_1 = require("./assert_exports_old_design.js");
+const getConfigDefinedAt_js_1 = require("../page-configs/getConfigDefinedAt.js");
 const helpers_js_1 = require("../page-configs/helpers.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-function getExports(pageFiles, pageConfig) {
+function getPageContextExports(pageFiles, pageConfig) {
     const configEntries = {};
     const config = {};
     const exportsAll = {};
@@ -34,8 +35,8 @@ function getExports(pageFiles, pageConfig) {
     if (pageConfig) {
         Object.entries(pageConfig.configValues).forEach(([configName, configValue]) => {
             const { value } = configValue;
-            const configValueFilePathToShowToUser = (0, helpers_js_1.getConfigValueFilePathToShowToUser)(configValue);
-            const configDefinedAt = (0, helpers_js_1.getConfigDefinedAtString)('Config', configName, configValue);
+            const configValueFilePathToShowToUser = (0, helpers_js_1.getConfigValueFilePathToShowToUser)(configValue.definedAtData);
+            const configDefinedAt = (0, getConfigDefinedAt_js_1.getConfigDefinedAtOptional)('Config', configName, configValue.definedAtData);
             config[configName] = config[configName] ?? value;
             configEntries[configName] = configEntries[configName] ?? [];
             // Currently each configName has only one entry. Adding an entry for each overriden config value isn't implemented yet. (This is an isomorphic file and it isn't clear whether this can/should be implemented on the client-side. We should load a minimum amount of code on the client-side.)
@@ -73,7 +74,7 @@ function getExports(pageFiles, pageConfig) {
     });
     (0, utils_js_1.assert)(!('default' in exports));
     (0, utils_js_1.assert)(!('default' in exportsAll));
-    return {
+    const pageContextExports = {
         config,
         configEntries,
         // TODO/v1-release: remove
@@ -81,8 +82,9 @@ function getExports(pageFiles, pageConfig) {
         exportsAll,
         pageExports
     };
+    return pageContextExports;
 }
-exports.getExports = getExports;
+exports.getPageContextExports = getPageContextExports;
 function getExportValues(pageFile) {
     const { filePath, fileExports } = pageFile;
     (0, utils_js_1.assert)(fileExports); // assume pageFile.loadFile() was called
@@ -132,12 +134,3 @@ function createObjectWithDeprecationWarning() {
         }
     });
 }
-function getExportUnion(exportsAll, propName) {
-    return (exportsAll[propName]
-        ?.map((e) => {
-        (0, utils_js_1.assertUsage)((0, utils_js_1.hasProp)(e, 'exportValue', 'string[]'), `${e.exportSource} should be an array of strings.`);
-        return e.exportValue;
-    })
-        .flat() ?? []);
-}
-exports.getExportUnion = getExportUnion;

package/dist/cjs/shared/getPageFiles.js

@@ -1,9 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getExports = exports.getPageFilesServerSide = exports.getPageFilesClientSide = exports.setPageFilesAsync = exports.setPageFiles = exports.getPageFilesAll = exports.getExportUnion = void 0;
-// Utils
-var getExports_js_1 = require("./getPageFiles/getExports.js");
-Object.defineProperty(exports, "getExportUnion", { enumerable: true, get: function () { return getExports_js_1.getExportUnion; } });
+exports.getPageContextExports = exports.getPageFilesServerSide = exports.getPageFilesClientSide = exports.setPageFilesAsync = exports.setPageFiles = exports.getPageFilesAll = void 0;
 var setPageFiles_js_1 = require("./getPageFiles/setPageFiles.js");
 Object.defineProperty(exports, "getPageFilesAll", { enumerable: true, get: function () { return setPageFiles_js_1.getPageFilesAll; } });
 var setPageFiles_js_2 = require("./getPageFiles/setPageFiles.js");
@@ -14,5 +11,5 @@ var getAllPageIdFiles_js_1 = require("./getPageFiles/getAllPageIdFiles.js");
 Object.defineProperty(exports, "getPageFilesClientSide", { enumerable: true, get: function () { return getAllPageIdFiles_js_1.getPageFilesClientSide; } });
 var getAllPageIdFiles_js_2 = require("./getPageFiles/getAllPageIdFiles.js");
 Object.defineProperty(exports, "getPageFilesServerSide", { enumerable: true, get: function () { return getAllPageIdFiles_js_2.getPageFilesServerSide; } });
-var getExports_js_2 = require("./getPageFiles/getExports.js");
-Object.defineProperty(exports, "getExports", { enumerable: true, get: function () { return getExports_js_2.getExports; } });
+var getExports_js_1 = require("./getPageFiles/getExports.js");
+Object.defineProperty(exports, "getPageContextExports", { enumerable: true, get: function () { return getExports_js_1.getPageContextExports; } });

package/dist/cjs/shared/hooks/getHook.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getHookTimeoutDefault = exports.setIsPrerenderering = exports.assertHook = exports.getHookFromPageConfigGlobal = exports.getHookFromPageConfig = exports.getHook = void 0;
 const getGlobalObject_js_1 = require("../../utils/getGlobalObject.js");
 const helpers_js_1 = require("../page-configs/helpers.js");
+const getConfigValue_js_1 = require("../page-configs/getConfigValue.js");
 const utils_js_1 = require("../utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const globalObject = (0, getGlobalObject_js_1.getGlobalObject)('getHook.ts', {
@@ -30,15 +31,15 @@ function getHook(pageContext, hookName) {
 }
 exports.getHook = getHook;
 function getHookFromPageConfig(pageConfig, hookName) {
-    const configValue = (0, helpers_js_1.getConfigValue)(pageConfig, hookName);
-    const hooksTimeout = (0, helpers_js_1.getConfigValue)(pageConfig, 'hooksTimeout')?.value;
+    const configValue = (0, getConfigValue_js_1.getConfigValue)(pageConfig, hookName);
+    const hooksTimeout = (0, getConfigValue_js_1.getConfigValue)(pageConfig, 'hooksTimeout')?.value;
     if (!configValue)
         return null;
     const hookFn = configValue.value;
     if (!hookFn)
         return null;
-    const hookFilePath = (0, helpers_js_1.getHookFilePathToShowToUser)(configValue);
-    // hook isn't a computed nor a cumulative config => definedAt should always be defined
+    const hookFilePath = (0, helpers_js_1.getHookFilePathToShowToUser)(configValue.definedAtData);
+    // hook isn't a computed nor a cumulative config => hookFilePath should always be defined
     (0, utils_js_1.assert)(hookFilePath);
     assertHookFn(hookFn, { hookName, hookFilePath });
     const hookTimeout = getHookTimeout(hooksTimeout, hookName);
@@ -52,8 +53,8 @@ function getHookFromPageConfigGlobal(pageConfigGlobal, hookName) {
     const hookFn = configValue.value;
     if (!hookFn)
         return null;
-    const hookFilePath = (0, helpers_js_1.getHookFilePathToShowToUser)(configValue);
-    // hook isn't a computed nor a cumulative config => definedAt should always be defined
+    const hookFilePath = (0, helpers_js_1.getHookFilePathToShowToUser)(configValue.definedAtData);
+    // hook isn't a computed nor a cumulative config => hookFilePath should always be defined
     (0, utils_js_1.assert)(hookFilePath);
     assertHookFn(hookFn, { hookName, hookFilePath });
     // We could use the global value of configooksTimeout but it requires some non-trivial refactoring

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

@@ -0,0 +1,48 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getDefinedAtString = exports.getConfigDefinedAtOptional = exports.getConfigDefinedAt = void 0;
+const utils_js_1 = require("../utils.js");
+const picocolors_1 = __importDefault(require("@brillout/picocolors"));
+const getExportPath_js_1 = require("./getExportPath.js");
+function getConfigDefinedAt(sentenceBegin, configName, definedAtData) {
+    return `${begin(sentenceBegin, configName)} at ${getDefinedAtString(definedAtData, configName)}`;
+}
+exports.getConfigDefinedAt = getConfigDefinedAt;
+function getConfigDefinedAtOptional(sentenceBegin, configName, definedAtData) {
+    if (!definedAtData) {
+        return `${begin(sentenceBegin, configName)} internally`;
+    }
+    else {
+        return `${begin(sentenceBegin, configName)} at ${getDefinedAtString(definedAtData, configName)}`;
+    }
+}
+exports.getConfigDefinedAtOptional = getConfigDefinedAtOptional;
+function begin(sentenceBegin, configName) {
+    return `${sentenceBegin} ${picocolors_1.default.cyan(configName)} defined`;
+}
+function getDefinedAtString(definedAtData, configName) {
+    let files;
+    if ((0, utils_js_1.isArray)(definedAtData)) {
+        files = definedAtData;
+    }
+    else {
+        files = [definedAtData];
+    }
+    (0, utils_js_1.assert)(files.length >= 1);
+    const definedAtString = files
+        .map((source) => {
+        const { filePathToShowToUser, fileExportPathToShowToUser } = source;
+        let s = filePathToShowToUser;
+        const exportPath = (0, getExportPath_js_1.getExportPath)(fileExportPathToShowToUser, configName);
+        if (exportPath) {
+            s = `${s} > ${picocolors_1.default.cyan(exportPath)}`;
+        }
+        return s;
+    })
+        .join(' / ');
+    return definedAtString;
+}
+exports.getDefinedAtString = getDefinedAtString;

package/dist/cjs/shared/page-configs/{helpers/getConfigValue.js → getConfigValue.js}

@@ -4,22 +4,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getConfigValue = void 0;
-const utils_js_1 = require("../../utils.js");
+const utils_js_1 = require("../utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-const getConfigDefinedAtString_js_1 = require("./getConfigDefinedAtString.js");
+const getConfigDefinedAt_js_1 = require("./getConfigDefinedAt.js");
 // prettier-ignore
 // biome-ignore format:
 function getConfigValue(pageConfig, configName, type) {
     const configValue = getConfigValueEntry(pageConfig, configName);
     if (configValue === null)
         return null;
-    const { value, definedAt } = configValue;
+    const { value, definedAtData } = configValue;
     if (type)
-        assertConfigValueType(value, type, configName, definedAt);
+        assertConfigValueType(value, type, configName, definedAtData);
     return configValue;
 }
 exports.getConfigValue = getConfigValue;
-function assertConfigValueType(value, type, configName, definedAt) {
+function assertConfigValueType(value, type, configName, definedAtData) {
     (0, utils_js_1.assert)(value !== null);
     const typeActual = typeof value;
     if (typeActual === type)
@@ -28,9 +28,7 @@ function assertConfigValueType(value, type, configName, definedAt) {
     const problem = valuePrintable !== null
         ? `value ${picocolors_1.default.cyan(valuePrintable)}`
         : `type ${picocolors_1.default.cyan(typeActual)}`;
-    const configDefinedAt = (0, getConfigDefinedAtString_js_1.getConfigDefinedAtString)('Config', configName, {
-        definedAt
-    });
+    const configDefinedAt = (0, getConfigDefinedAt_js_1.getConfigDefinedAtOptional)('Config', configName, definedAtData);
     const errMsg = `${configDefinedAt} has an invalid ${problem}: it should be a ${picocolors_1.default.cyan(type)} instead`;
     (0, utils_js_1.assertUsage)(false, errMsg);
 }

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

@@ -1,11 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getConfigValue = exports.getDefinedAtString = exports.getConfigDefinedAtString = exports.getHookFilePathToShowToUser = exports.getConfigValueFilePathToShowToUser = exports.getPageConfig = void 0;
-var getConfigDefinedAtString_js_1 = require("./helpers/getConfigDefinedAtString.js");
-Object.defineProperty(exports, "getConfigDefinedAtString", { enumerable: true, get: function () { return getConfigDefinedAtString_js_1.getConfigDefinedAtString; } });
-Object.defineProperty(exports, "getDefinedAtString", { enumerable: true, get: function () { return getConfigDefinedAtString_js_1.getDefinedAtString; } });
-var getConfigValue_js_1 = require("./helpers/getConfigValue.js");
-Object.defineProperty(exports, "getConfigValue", { enumerable: true, get: function () { return getConfigValue_js_1.getConfigValue; } });
+exports.getHookFilePathToShowToUser = exports.getConfigValueFilePathToShowToUser = exports.getPageConfig = void 0;
 const utils_js_1 = require("../utils.js");
 function getPageConfig(pageId, pageConfigs) {
     const pageConfig = pageConfigs.find((p) => p.pageId === pageId);
@@ -14,19 +9,19 @@ function getPageConfig(pageId, pageConfigs) {
     return pageConfig;
 }
 exports.getPageConfig = getPageConfig;
-function getConfigValueFilePathToShowToUser({ definedAt }) {
+function getConfigValueFilePathToShowToUser(definedAtData) {
     // A unique file path only exists if the config value isn't cumulative nor computed:
     //  - cumulative config values have multiple file paths
     //  - computed values don't have any file path
-    if ('isComputed' in definedAt || 'files' in definedAt)
+    if (!definedAtData || (0, utils_js_1.isArray)(definedAtData))
         return null;
-    const { filePathToShowToUser } = definedAt;
+    const { filePathToShowToUser } = definedAtData;
     (0, utils_js_1.assert)(filePathToShowToUser);
     return filePathToShowToUser;
 }
 exports.getConfigValueFilePathToShowToUser = getConfigValueFilePathToShowToUser;
-function getHookFilePathToShowToUser({ definedAt }) {
-    const filePathToShowToUser = getConfigValueFilePathToShowToUser({ definedAt });
+function getHookFilePathToShowToUser(definedAtData) {
+    const filePathToShowToUser = getConfigValueFilePathToShowToUser(definedAtData);
     (0, utils_js_1.assert)(filePathToShowToUser);
     return filePathToShowToUser;
 }

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.assertPageConfigGlobalSerialized = exports.assertPageConfigsSerialized = void 0;
 const utils_js_1 = require("../../utils.js");
 function assertPageConfigsSerialized(pageConfigsSerialized) {
-    (0, utils_js_1.assert)(Array.isArray(pageConfigsSerialized));
+    (0, utils_js_1.assert)((0, utils_js_1.isArray)(pageConfigsSerialized));
     pageConfigsSerialized.forEach((pageConfigSerialized) => {
         (0, utils_js_1.assert)((0, utils_js_1.isObject)(pageConfigSerialized));
         (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageConfigSerialized, 'pageId', 'string'));

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

@@ -53,8 +53,9 @@ function parseConfigValuesImported(configValuesImported) {
             (0, utils_js_1.assert)(val);
             const { value, importPath, exportName } = val;
             configValues[configName] = {
+                type: 'classic',
                 value,
-                definedAt: {
+                definedAtData: {
                     // importPath cannot be relative to the current file, since the current file is a virtual file
                     filePathToShowToUser: importPath,
                     fileExportPathToShowToUser: [configName, 'default'].includes(exportName)

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

@@ -6,13 +6,18 @@ const parse_1 = require("@brillout/json-serializer/parse");
 function parseConfigValuesSerialized(configValuesSerialized) {
     const configValues = {};
     Object.entries(configValuesSerialized).forEach(([configName, configValueSeriliazed]) => {
-        const { valueSerialized, definedAt } = configValueSeriliazed;
-        (0, utils_js_1.assert)(valueSerialized);
         (0, utils_js_1.assert)(!configValues[configName]);
-        configValues[configName] = {
-            value: (0, parse_1.parse)(valueSerialized),
-            definedAt
-        };
+        const { valueSerialized, ...common } = configValueSeriliazed;
+        const value = (0, parse_1.parse)(valueSerialized);
+        let configValue;
+        if (common.type === 'cumulative') {
+            (0, utils_js_1.assert)((0, utils_js_1.isArray)(value));
+            configValue = { value, ...common };
+        }
+        else {
+            configValue = { value, ...common };
+        }
+        configValues[configName] = configValue;
     });
     return configValues;
 }

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.parsePageConfigs = void 0;
 const parseConfigValuesImported_js_1 = require("./parseConfigValuesImported.js");
 const utils_js_1 = require("../../utils.js");
-const helpers_js_1 = require("../helpers.js");
+const getConfigDefinedAt_js_1 = require("../getConfigDefinedAt.js");
 const parseConfigValuesSerialized_js_1 = require("./parseConfigValuesSerialized.js");
 function parsePageConfigs(pageConfigsSerialized, pageConfigGlobalSerialized) {
     const pageConfigs = pageConfigsSerialized.map((pageConfigSerialized) => {
@@ -41,9 +41,10 @@ function assertRouteConfigValue(configValues) {
     const configValue = configValues[configName];
     if (!configValue)
         return;
-    const { value } = configValue;
+    const { value, definedAtData } = configValue;
     const configValueType = typeof value;
-    const configDefinedAt = (0, helpers_js_1.getConfigDefinedAtString)('Config', configName, configValue);
+    (0, utils_js_1.assert)(definedAtData);
+    const configDefinedAt = (0, getConfigDefinedAt_js_1.getConfigDefinedAt)('Config', configName, definedAtData);
     (0, utils_js_1.assertUsage)(configValueType === 'string' || (0, utils_js_1.isCallable)(value), `${configDefinedAt} has an invalid type '${configValueType}': it should be a string or a function instead, see https://vike.dev/route`);
     /* We don't use assertRouteString() in order to avoid unnecessarily bloating the client-side bundle when using Server Routing:
     * - When using Server Routing, this file is loaded => loading assertRouteString() would bloat the client bundle.

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

@@ -14,7 +14,7 @@ function serializeConfigValue(lines, configName, configValueSerialized) {
     lines.push(`${whitespace}['${configName}']: {`);
     whitespace += '  ';
     Object.entries(configValueSerialized).forEach(([key, val]) => {
-        const valSerialized = key === 'definedAt' ? JSON.stringify(val) : val;
+        const valSerialized = key === 'valueSerialized' ? val : JSON.stringify(val);
         lines.push(`${whitespace}  ${key}: ${valSerialized},`);
     });
     whitespace = whitespace.slice(2);
@@ -24,9 +24,9 @@ exports.serializeConfigValue = serializeConfigValue;
 function serializeConfigValueImported(configValueSource, configName, whitespace, varCounterContainer, importStatements) {
     (0, utils_js_1.assert)(!configValueSource.valueIsFilePath);
     (0, utils_js_1.assert)(whitespace.replaceAll(' ', '').length === 0);
-    const { valueIsImportedAtRuntime, valueIsDefinedByValueFile, definedAt } = configValueSource;
+    const { valueIsImportedAtRuntime, valueIsDefinedByValueFile, definedAtFilePath } = configValueSource;
     (0, utils_js_1.assert)(valueIsImportedAtRuntime);
-    const { filePathAbsoluteVite, fileExportName } = definedAt;
+    const { filePathAbsoluteVite, fileExportName } = definedAtFilePath;
     if (valueIsDefinedByValueFile)
         (0, utils_js_1.assert)(fileExportName === undefined);
     const { importName, importStatement } = (0, generateEagerImport_js_1.generateEagerImport)(filePathAbsoluteVite, varCounterContainer.varCounter++, fileExportName);

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

@@ -74,8 +74,8 @@ async function route(pageContextForRoute) {
         }
         // Route Function defined in `.page.route.js`
         if (pageRoute.routeType === 'FUNCTION') {
-            const { routeFunction, routeDefinedAt } = pageRoute;
-            const match = await (0, resolveRouteFunction_js_1.resolveRouteFunction)(routeFunction, pageContext, routeDefinedAt);
+            const { routeFunction, routeDefinedAtString } = pageRoute;
+            const match = await (0, resolveRouteFunction_js_1.resolveRouteFunction)(routeFunction, pageContext, routeDefinedAtString);
             if (match) {
                 const { routeParams, precedence } = match;
                 routeMatches.push({ pageId, precedence, routeParams, routeType });