vike 0.4.144 → 0.4.145-commit-2520555

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

@@ -3,7 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPagesAndRoutesInfo = exports.log404 = void 0;
+exports.getRoutesInfo = exports.log404 = void 0;
+const noRouteMatch_js_1 = require("../../../../shared/route/noRouteMatch.js");
 const globalContext_js_1 = require("../../globalContext.js");
 const utils_js_1 = require("../../utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
@@ -17,15 +18,20 @@ async function log404(pageContext) {
     );
     const globalContext = (0, globalContext_js_1.getGlobalContext)();
     if (!globalContext.isProduction && !isFileRequest(urlPathname) && !pageContext.isClientSideNavigation) {
-        (0, utils_js_1.assertInfo)(false, [
-            `URL ${picocolors_1.default.cyan(urlPathname)} doesn't match the route of any of your pages:`,
-            getPagesAndRoutesInfo(pageRoutes),
-            'See https://vike.dev/routing for more information about routing.'
-        ].join('\n'), { onlyOnce: false });
+        const routesInfo = getRoutesInfo(pageRoutes);
+        let msg = `URL ${picocolors_1.default.cyan(urlPathname)} ${noRouteMatch_js_1.noRouteMatch}`;
+        const outro = 'See https://vike.dev/routing for more information about routing.';
+        if (!routesInfo) {
+            msg = `${msg}. ${picocolors_1.default.dim(outro)}`;
+        }
+        else {
+            msg = `${msg}:\n${routesInfo}\n${outro}`;
+        }
+        (0, utils_js_1.assertInfo)(false, msg, { onlyOnce: false });
     }
 }
 exports.log404 = log404;
-function getPagesAndRoutesInfo(pageRoutes) {
+function getRoutesInfo(pageRoutes) {
     const entries = pageRoutes
         .map((pageRoute) => {
         let routeStr;
@@ -74,19 +80,24 @@ function getPagesAndRoutesInfo(pageRoutes) {
     const terminalWidth = (0, utils_js_1.getTerminalWidth)() || 134;
     let width2 = Math.max(...linesContent.map(({ routeTypeSrc }) => (0, utils_js_1.stripAnsi)(routeTypeSrc).length));
     let width3 = Math.max(...linesContent.map(({ routeDefinedBy }) => (0, utils_js_1.stripAnsi)(routeDefinedBy).length));
-    let width1 = terminalWidth - width3 - width2 - 10;
+    const width1_max = terminalWidth -
+        width3 -
+        width2 -
+        // Total width of table border & padding
+        10;
+    if (width1_max < 10)
+        return null;
     linesContent.forEach((lineContent) => {
         let { routeStr } = lineContent;
-        if (lineContent.routeTypeSrc !== 'Route Function') {
-            routeStr = (0, utils_js_1.truncateString)(routeStr, width1, (s) => picocolors_1.default.dim(s));
-        }
-        else {
-            routeStr = truncateRouteFunction(routeStr, width1);
+        if (lineContent.routeTypeSrc === 'Route Function') {
+            routeStr = truncateRouteFunction(routeStr, width1_max);
+            (0, utils_js_1.assert)((0, utils_js_1.stripAnsi)(routeStr).length <= width1_max);
         }
-        (0, utils_js_1.assert)((0, utils_js_1.stripAnsi)(routeStr).length <= width1);
         lineContent.routeStr = routeStr;
     });
-    width1 = Math.max(...linesContent.map(({ routeStr }) => (0, utils_js_1.stripAnsi)(routeStr).length));
+    let width1 = Math.max(...linesContent.map(({ routeStr }) => (0, utils_js_1.stripAnsi)(routeStr).length));
+    if (width1 > width1_max)
+        return null;
     let lines = linesContent.map(({ routeStr, routeTypeSrc, routeDefinedBy }, i) => {
         let cell1 = padEnd(routeStr, width1 + ((0, utils_js_1.stripAnsi)(routeStr).length - (0, utils_js_1.stripAnsi)(routeStr).length));
         let cell2 = padEnd(routeTypeSrc, width2);
@@ -117,12 +128,12 @@ function getPagesAndRoutesInfo(pageRoutes) {
     });
     return lines.join('\n');
 }
-exports.getPagesAndRoutesInfo = getPagesAndRoutesInfo;
+exports.getRoutesInfo = getRoutesInfo;
 function truncateRouteFunction(routeStr, lenMax) {
     routeStr = (0, utils_js_1.stripAnsi)(routeStr);
     routeStr = removeNonAscii(routeStr);
     routeStr = routeStr.split(/\s/).filter(Boolean).join(' ');
-    routeStr = (0, utils_js_1.truncateString)(routeStr, lenMax, (s) => picocolors_1.default.dim(s));
+    routeStr = (0, utils_js_1.truncateString)(routeStr, lenMax);
     return routeStr;
 }
 /** Same as String.prototype.padEnd but with stripAnsi() */

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

@@ -21,7 +21,7 @@ const preparePageContextForUserConsumptionServerSide_js_1 = require("./preparePa
 const executeGuardHook_js_1 = require("../../../shared/route/executeGuardHook.js");
 const loadPageRoutes_js_1 = require("../../../shared/route/loadPageRoutes.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-const utils_js_2 = require("../../../shared/page-configs/utils.js");
+const helpers_js_1 = require("../../../shared/page-configs/helpers.js");
 async function renderPageAlreadyRouted(pageContext) {
     // pageContext._pageId can either be the:
     //  - ID of the page matching the routing, or the
@@ -105,7 +105,7 @@ async function prerender404Page(renderContext, pageContextInit_) {
         routeParams: {},
         // `prerender404Page()` is about generating `dist/client/404.html` for static hosts; there is no Client Routing.
         _usesClientRouter: false,
-        _routeMatches: []
+        _debugRouteMatches: []
     };
     const pageContextInit = {
         urlOriginal: '/fake-404-url',
@@ -173,7 +173,7 @@ function assertNonMixedDesign(pageFilesAll, pageConfigs) {
     const indent = '- ';
     const v1Files = (0, utils_js_1.unique)(pageConfigs
         .map((p) => Object.values(p.configValues)
-        .map(utils_js_2.getConfigValueFilePathToShowToUser)
+        .map(helpers_js_1.getConfigValueFilePathToShowToUser)
         .filter(utils_js_1.isNotNullish)
         .map((filePathToShowToUser) => indent + filePathToShowToUser))
         .flat(2));

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

@@ -246,8 +246,8 @@ async function renderPageNominal(pageContext) {
     }
     // Route
     {
-        const routeResult = await (0, index_js_1.route)(pageContext);
-        (0, utils_js_1.objectAssign)(pageContext, routeResult.pageContextAddendum);
+        const pageContextFromRoute = await (0, index_js_1.route)(pageContext);
+        (0, utils_js_1.objectAssign)(pageContext, pageContextFromRoute);
         (0, utils_js_1.objectAssign)(pageContext, { is404: pageContext._pageId ? null : true });
         if (pageContext._pageId === null) {
             const errorPageId = (0, error_page_js_1.getErrorPageId)(pageContext._pageFilesAll, pageContext._pageConfigs);
@@ -274,7 +274,7 @@ async function getPageContextErrorPageInit(pageContextInit, errNominalPage, page
         routeParams: {}
     };
     (0, utils_js_1.objectAssign)(pageContext, {
-        _routeMatches: pageContextNominalPagePartial._routeMatches || 'ROUTE_ERROR'
+        _debugRouteMatches: pageContextNominalPagePartial._debugRouteMatches || 'ROUTING_ERROR'
     });
     (0, utils_js_1.assert)(pageContext.errorWhileRendering);
     return pageContext;

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

@@ -44,7 +44,7 @@ __exportStar(require("../../utils/capitalizeFirstLetter.js"), exports);
 __exportStar(require("../../utils/debugGlob.js"), exports);
 __exportStar(require("../../utils/isEquivalentError.js"), exports);
 __exportStar(require("../../utils/styleFileRE.js"), exports);
-__exportStar(require("../../utils/hasPropertyGetter.js"), exports);
+__exportStar(require("../../utils/isPropertyGetter.js"), exports);
 __exportStar(require("../../utils/debug.js"), exports);
 __exportStar(require("../../utils/urlToFile.js"), exports);
 __exportStar(require("../../utils/getGlobalObject.js"), exports);

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

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

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

@@ -1,8 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getConfigVike = void 0;
+const utils_js_1 = require("./utils.js");
 async function getConfigVike(config) {
-    const configVike = (await config.configVikePromise);
+    const { configVikePromise } = config;
+    (0, utils_js_1.assert)(configVikePromise);
+    const configVike = await configVikePromise;
     return configVike;
 }
 exports.getConfigVike = getConfigVike;

package/dist/cjs/shared/addUrlComputedProps.js

@@ -6,24 +6,36 @@ const utils_js_1 = require("./utils.js");
 function addUrlComputedProps(pageContext, enumerable = true) {
     (0, utils_js_1.assert)(pageContext.urlOriginal);
     if ('urlPathname' in pageContext) {
-        (0, utils_js_1.assert)((0, utils_js_1.hasPropertyGetter)(pageContext, 'urlPathname'));
+        (0, utils_js_1.assert)(typeof pageContext.urlPathname === 'string');
+        /* If this assert() fails then it's most likely because Object.assign() was used instead of objectAssign(), i.e.:
+           ```js
+           // Add property getters such as pageContext.urlPathname to pageContext
+           addUrlComputedProps(pageContext)
+           // ❌ Breaks the property getters of pageContext set by addUrlComputedProps() such as pageContext.urlPathname
+           Object.assign(pageContext2, pageContext)
+           // ❌ Also breaks the property getters
+           const pageContext3 = { ...pageContext }
+           // ✅ Preserves property getters of pageContext (see objectAssign() implementation)
+           objectAssign(pageContext2, pageContext)
+           ```
+        */
+        (0, utils_js_1.assert)((0, utils_js_1.isPropertyGetter)(pageContext, 'urlPathname'));
     }
+    if ('urlParsed' in pageContext)
+        (0, utils_js_1.assert)((0, utils_js_1.isPropertyGetter)(pageContext, 'urlParsed'));
+    // TODO/v1-release: move pageContext.urlParsed to pageContext.url
+    if ('url' in pageContext)
+        (0, utils_js_1.assert)((0, utils_js_1.isPropertyGetter)(pageContext, 'url'));
     Object.defineProperty(pageContext, 'urlPathname', {
         get: urlPathnameGetter,
         enumerable,
         configurable: true
     });
-    // TODO/v1-release: move pageContext.urlParsed to pageContext.url
-    if ('url' in pageContext)
-        (0, utils_js_1.assert)((0, utils_js_1.hasPropertyGetter)(pageContext, 'url'));
     Object.defineProperty(pageContext, 'url', {
         get: urlGetter,
         enumerable: false,
         configurable: true
     });
-    if ('urlParsed' in pageContext) {
-        (0, utils_js_1.assert)((0, utils_js_1.hasPropertyGetter)(pageContext, 'urlParsed'));
-    }
     Object.defineProperty(pageContext, 'urlParsed', {
         get: urlParsedGetter,
         enumerable,
@@ -32,17 +44,17 @@ function addUrlComputedProps(pageContext, enumerable = true) {
 }
 exports.addUrlComputedProps = addUrlComputedProps;
 function getUrlParsed(pageContext) {
-    // We use a url handler function because the onBeforeRoute() hook may modify pageContext.urlOriginal (e.g. for i18n)
+    // We need a url handler function because the onBeforeRoute() hook may set pageContext.urlLogical (typically for i18n)
     let urlHandler = pageContext._urlHandler;
     if (!urlHandler) {
         urlHandler = (url) => url;
     }
-    const url = pageContext._urlRewrite ?? pageContext.urlOriginal;
-    (0, utils_js_1.assert)(url && typeof url === 'string');
-    const urlLogical = urlHandler(url);
+    let urlResolved = pageContext._urlRewrite ?? pageContext.urlLogical ?? pageContext.urlOriginal;
+    urlResolved = urlHandler(urlResolved);
     const baseServer = pageContext._baseServer;
+    (0, utils_js_1.assert)(urlResolved && typeof urlResolved === 'string');
     (0, utils_js_1.assert)(baseServer.startsWith('/'));
-    return (0, utils_js_1.parseUrl)(urlLogical, baseServer);
+    return (0, utils_js_1.parseUrl)(urlResolved, baseServer);
 }
 function urlPathnameGetter() {
     const { pathname } = getUrlParsed(this);

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

@@ -1,19 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.analyzeClientSide = void 0;
-const utils_js_1 = require("../page-configs/utils.js");
+const helpers_js_1 = require("../page-configs/helpers.js");
 const analyzePageClientSide_js_1 = require("./analyzePageClientSide.js");
 function analyzeClientSide(pageConfig, pageFilesAll, pageId) {
     // V1 design
     if (pageConfig) {
-        const isClientRouting = (0, utils_js_1.getConfigValue)(pageConfig, 'clientRouting', 'boolean')?.value ?? false;
-        const isClientSideRenderable = (0, utils_js_1.getConfigValue)(pageConfig, 'isClientSideRenderable', 'boolean')?.value ?? false;
+        const isClientRouting = (0, helpers_js_1.getConfigValue)(pageConfig, 'clientRouting', 'boolean')?.value ?? false;
+        const isClientSideRenderable = (0, helpers_js_1.getConfigValue)(pageConfig, 'isClientSideRenderable', 'boolean')?.value ?? false;
         return { isClientSideRenderable, isClientRouting };
     }
     else {
-        // TODO/v1-release:
-        //  - remove V0.4 implementation
-        //  - globally rename isHtmlOnly to !isClientSideRenderable
+        // TODO/v1-release: remove
         // V0.4 design
         const { isHtmlOnly, isClientRouting } = (0, analyzePageClientSide_js_1.analyzePageClientSide)(pageFilesAll, pageId);
         return { isClientSideRenderable: !isHtmlOnly, isClientRouting };

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

@@ -7,7 +7,7 @@ exports.getExports = exports.getExportUnion = 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 utils_js_2 = require("../page-configs/utils.js");
+const helpers_js_1 = require("../page-configs/helpers.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 function getExports(pageFiles, pageConfig) {
     const configEntries = {};
@@ -34,8 +34,8 @@ function getExports(pageFiles, pageConfig) {
     if (pageConfig) {
         Object.entries(pageConfig.configValues).forEach(([configName, configValue]) => {
             const { value } = configValue;
-            const configValueFilePathToShowToUser = (0, utils_js_2.getConfigValueFilePathToShowToUser)(configValue);
-            const configDefinedAt = (0, utils_js_2.getConfigDefinedAtString)(configName, configValue, true);
+            const configValueFilePathToShowToUser = (0, helpers_js_1.getConfigValueFilePathToShowToUser)(configValue);
+            const configDefinedAt = (0, helpers_js_1.getConfigDefinedAtString)('Config', configName, configValue);
             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.)

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

@@ -25,7 +25,7 @@ exports.assertHook = assertHook;
 function assertHookFn(hookFn, { hookName, hookFilePath }) {
     (0, utils_js_1.assert)(hookName && hookFilePath);
     (0, utils_js_1.assert)(!hookName.endsWith(')'));
-    (0, utils_js_1.assertUsage)((0, utils_js_1.isCallable)(hookFn), `hook ${hookName}() defined by ${hookFilePath} should be a function`);
+    (0, utils_js_1.assertUsage)((0, utils_js_1.isCallable)(hookFn), `Hook ${hookName}() defined by ${hookFilePath} should be a function`);
     (0, utils_js_1.checkType)(hookFn);
 }
 exports.assertHookFn = assertHookFn;

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

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getExportPath = void 0;
 const utils_js_1 = require("../utils.js");
-function getExportPath(fileExportPath, configName) {
-    if (!fileExportPath)
+function getExportPath(fileExportPathToShowToUser, configName) {
+    if (!fileExportPathToShowToUser)
         return null;
-    let [exportName, ...exportObjectPath] = fileExportPath;
+    let [exportName, ...exportObjectPath] = fileExportPathToShowToUser;
     if (!exportName)
         return null;
     if (exportObjectPath.length === 0 && ['*', 'default', configName].includes(exportName))

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

@@ -0,0 +1,43 @@
+"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.getConfigDefinedAtString = void 0;
+const utils_js_1 = require("../../utils.js");
+const picocolors_1 = __importDefault(require("@brillout/picocolors"));
+const getExportPath_js_1 = require("../getExportPath.js");
+function getConfigDefinedAtString(sentenceBegin, configName, { definedAt }) {
+    const definedAtString = getDefinedAtString(definedAt, configName);
+    const definedAtStr = definedAtString === 'internally' ? definedAtString : `at ${definedAtString}`;
+    let configNameStr = `${configName}${sentenceBegin === 'Hook' ? '()' : ''}`;
+    const configDefinedAt = `${sentenceBegin} ${picocolors_1.default.cyan(configNameStr)} defined ${definedAtStr}`;
+    return configDefinedAt;
+}
+exports.getConfigDefinedAtString = getConfigDefinedAtString;
+function getDefinedAtString(definedAt, configName) {
+    if ('isComputed' in definedAt) {
+        return 'internally';
+    }
+    let files;
+    if ('files' in definedAt) {
+        files = definedAt.files;
+    }
+    else {
+        files = [definedAt];
+    }
+    (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

@@ -0,0 +1,44 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getConfigValue = void 0;
+const utils_js_1 = require("../../utils.js");
+const picocolors_1 = __importDefault(require("@brillout/picocolors"));
+const getConfigDefinedAtString_js_1 = require("./getConfigDefinedAtString.js");
+// prettier-ignore
+function getConfigValue(pageConfig, configName, type) {
+    const configValue = getConfigValueEntry(pageConfig, configName);
+    if (configValue === null)
+        return null;
+    const { value, definedAt } = configValue;
+    if (type)
+        assertConfigValueType(value, type, configName, definedAt);
+    return configValue;
+}
+exports.getConfigValue = getConfigValue;
+function assertConfigValueType(value, type, configName, definedAt) {
+    (0, utils_js_1.assert)(value !== null);
+    const typeActual = typeof value;
+    if (typeActual === type)
+        return;
+    const valuePrintable = (0, utils_js_1.getValuePrintable)(value);
+    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 errMsg = `${configDefinedAt} has an invalid ${problem}: it should be a ${picocolors_1.default.cyan(type)} instead`;
+    (0, utils_js_1.assertUsage)(false, errMsg);
+}
+function getConfigValueEntry(pageConfig, configName) {
+    const configValue = pageConfig.configValues[configName];
+    if (!configValue)
+        return null;
+    // Enable users to suppress global config values by setting the local config value to null
+    if (configValue.value === null)
+        return null;
+    return configValue;
+}

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

@@ -0,0 +1,33 @@
+"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; } });
+const utils_js_1 = require("../utils.js");
+function getPageConfig(pageId, pageConfigs) {
+    const pageConfig = pageConfigs.find((p) => p.pageId === pageId);
+    (0, utils_js_1.assert)(pageConfigs.length > 0);
+    (0, utils_js_1.assert)(pageConfig);
+    return pageConfig;
+}
+exports.getPageConfig = getPageConfig;
+function getConfigValueFilePathToShowToUser({ definedAt }) {
+    // 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)
+        return null;
+    const { filePathToShowToUser } = definedAt;
+    (0, utils_js_1.assert)(filePathToShowToUser);
+    return filePathToShowToUser;
+}
+exports.getConfigValueFilePathToShowToUser = getConfigValueFilePathToShowToUser;
+function getHookFilePathToShowToUser({ definedAt }) {
+    const filePathToShowToUser = getConfigValueFilePathToShowToUser({ definedAt });
+    (0, utils_js_1.assert)(filePathToShowToUser);
+    return filePathToShowToUser;
+}
+exports.getHookFilePathToShowToUser = getHookFilePathToShowToUser;

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

@@ -4,7 +4,7 @@ exports.loadConfigValues = void 0;
 const utils_js_1 = require("../utils.js");
 const parseConfigValuesImported_js_1 = require("./serialize/parseConfigValuesImported.js");
 async function loadConfigValues(pageConfig, isDev) {
-    if ('isLoaded' in pageConfig &&
+    if ('isAllLoaded' in pageConfig &&
         // We don't need to cache in dev, since Vite already caches the virtual module
         !isDev) {
         return pageConfig;
@@ -12,7 +12,7 @@ async function loadConfigValues(pageConfig, isDev) {
     const configValuesImported = await pageConfig.loadConfigValuesAll();
     const configValuesAddendum = (0, parseConfigValuesImported_js_1.parseConfigValuesImported)(configValuesImported);
     Object.assign(pageConfig.configValues, configValuesAddendum);
-    (0, utils_js_1.objectAssign)(pageConfig, { isLoaded: true });
+    (0, utils_js_1.objectAssign)(pageConfig, { isAllLoaded: true });
     return pageConfig;
 }
 exports.loadConfigValues = loadConfigValues;

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

@@ -1,26 +1,20 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseConfigValuesImported = void 0;
 const utils_js_1 = require("../../utils.js");
 const assertExports_js_1 = require("../assertExports.js");
-const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 function parseConfigValuesImported(configValuesImported) {
     const configValues = {};
     const addConfigValue = (configName, value, importPath, exportName) => {
         configValues[configName] = {
             value,
             definedAt: {
-                file: {
-                    // importPath cannot be relative to the current file, since the current file is a virtual file
-                    filePathToShowToUser: importPath,
-                    fileExportPath: [configName, 'default'].includes(exportName)
-                        ? []
-                        : // Side-effect config
-                            [exportName]
-                }
+                // importPath cannot be relative to the current file, since the current file is a virtual file
+                filePathToShowToUser: importPath,
+                fileExportPathToShowToUser: [configName, 'default'].includes(exportName)
+                    ? []
+                    : // Side-effect config
+                        [exportName]
             }
         };
         assertIsNotNull(value, configName, importPath);
@@ -52,5 +46,12 @@ function parseConfigValuesImported(configValuesImported) {
 exports.parseConfigValuesImported = parseConfigValuesImported;
 function assertIsNotNull(configValue, configName, importPath) {
     (0, utils_js_1.assert)(!importPath.includes('+config.'));
-    (0, utils_js_1.assertUsage)(configValue !== null, `Set ${picocolors_1.default.cyan(configName)} to ${picocolors_1.default.cyan('null')} in a +config.h.js file instead of ${importPath}`);
+    /* Re-use this for:
+     *  - upcoming config.requestPageContextOnNavigation
+     *  - for cumulative values in the future: we don't need this for now because, currently, cumulative values are never imported.
+    assertUsage(
+      configValue !== null,
+      `Set ${pc.cyan(configName)} to ${pc.cyan('null')} in a +config.h.js file instead of ${importPath}`
+    )
+    */
 }

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

@@ -4,7 +4,7 @@ exports.parsePageConfigs = void 0;
 const parse_1 = require("@brillout/json-serializer/parse");
 const parseConfigValuesImported_js_1 = require("./parseConfigValuesImported.js");
 const utils_js_1 = require("../../utils.js");
-const utils_js_2 = require("../utils.js");
+const helpers_js_1 = require("../helpers.js");
 function parsePageConfigs(pageConfigsSerialized, pageConfigGlobalSerialized) {
     const pageConfigs = pageConfigsSerialized.map((pageConfigSerialized) => {
         const configValues = {};
@@ -52,7 +52,7 @@ function assertRouteConfigValue(configValues) {
         return;
     const { value } = configValue;
     const configValueType = typeof value;
-    const configDefinedAt = (0, utils_js_2.getConfigDefinedAtString)(configName, configValue, true);
+    const configDefinedAt = (0, helpers_js_1.getConfigDefinedAtString)('Config', configName, configValue);
     (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

@@ -28,29 +28,28 @@ 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, definedAtInfo } = configValueSource;
+    const { valueIsImportedAtRuntime, definedAt } = configValueSource;
     (0, utils_js_1.assert)(valueIsImportedAtRuntime);
-    const { filePathRelativeToUserRootDir, importPathAbsolute, exportName } = definedAtInfo;
-    const importPath = filePathRelativeToUserRootDir ?? importPathAbsolute;
-    (0, utils_js_1.assertPosixPath)(importPath);
-    const fileName = path_1.default.posix.basename(importPath);
+    const { filePathAbsoluteVite, fileExportName } = definedAt;
+    (0, utils_js_1.assertPosixPath)(filePathAbsoluteVite);
+    const fileName = path_1.default.posix.basename(filePathAbsoluteVite);
     const isValueFile = fileName.startsWith('+');
     if (isValueFile)
-        (0, utils_js_1.assert)(exportName === undefined);
-    const { importName, importStatement } = (0, generateEagerImport_js_1.generateEagerImport)(importPath, varCounterContainer.varCounter++, exportName);
+        (0, utils_js_1.assert)(fileExportName === undefined);
+    const { importName, importStatement } = (0, generateEagerImport_js_1.generateEagerImport)(filePathAbsoluteVite, varCounterContainer.varCounter++, fileExportName);
     importStatements.push(importStatement);
     const lines = [];
     lines.push(`  {`);
     lines.push(`    configName: '${configName}',`);
-    lines.push(`    importPath: '${importPath}',`);
+    lines.push(`    importPath: '${filePathAbsoluteVite}',`);
     lines.push(`    isValueFile: ${JSON.stringify(isValueFile)},`);
     if (isValueFile) {
         lines.push(`    exportValues: ${importName},`);
     }
     else {
         lines.push(`    exportValue: ${importName},`);
-        (0, utils_js_1.assert)(exportName);
-        lines.push(`    exportName: ${JSON.stringify(exportName)},`);
+        (0, utils_js_1.assert)(fileExportName);
+        lines.push(`    exportName: ${JSON.stringify(fileExportName)},`);
     }
     lines.push(`  },`);
     return lines;

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

@@ -39,7 +39,7 @@ exports.redirect = redirect;
 function render(value, abortReason) {
     const args = [typeof value === 'number' ? String(value) : JSON.stringify(value)];
     if (abortReason !== undefined)
-        args.push((0, utils_js_1.truncateString)(JSON.stringify(abortReason), 30, null));
+        args.push((0, utils_js_1.truncateString)(JSON.stringify(abortReason), 30));
     const abortCaller = 'throw render()';
     const abortCall = `throw render(${args.join(', ')})`;
     return render_(value, abortReason, abortCall, abortCaller);