vike 0.4.144-commit-d6e4411 → 0.4.144-commit-6aef8a6

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

@@ -13,7 +13,6 @@ const utils_js_1 = require("../../../utils.js");
 const replaceImportStatements_js_1 = require("./replaceImportStatements.js");
 const getVikeConfig_js_1 = require("./getVikeConfig.js");
 require("source-map-support/register.js");
-const getFilePathToShowToUser_js_1 = require("./getFilePathToShowToUser.js");
 const assertExports_js_1 = require("../../../../../shared/page-configs/assertExports.js");
 (0, utils_js_1.assertIsNotProductionRuntime)();
 async function transpileAndExecuteFile(filePath, isValueFile, userRootDir) {
@@ -39,14 +38,13 @@ async function transpileFile(filePath, isValueFile, userRootDir) {
 }
 function transpileImports(codeOriginal, filePath, isValueFile) {
     // Do we need to remove the imports?
-    const { filePathAbsoluteFilesystem } = filePath;
+    const { filePathAbsoluteFilesystem, filePathToShowToUser } = filePath;
     (0, utils_js_1.assertPosixPath)(filePathAbsoluteFilesystem);
     const isHeader = isHeaderFile(filePathAbsoluteFilesystem);
     const isPageConfigFile = !isValueFile;
     if (!isHeader && !isPageConfigFile) {
         return null;
     }
-    const filePathToShowToUser = (0, getFilePathToShowToUser_js_1.getFilePathToShowToUser)(filePath);
     (0, utils_js_1.assertWarning)(isPageConfigFile, `${filePathToShowToUser} is a JavaScript header file (.h.js), but JavaScript header files should only be used for +config.h.js, see https://vike.dev/header-file`, { onlyOnce: true });
     // Remove the imports
     const res = (0, replaceImportStatements_js_1.replaceImportStatements)(codeOriginal, filePathToShowToUser);
@@ -279,7 +277,7 @@ function triggerPrepareStackTrace(err) {
 function getErrIntroMsg(operation, filePath) {
     const msg = [
         picocolors_1.default.red(`Failed to ${operation}`),
-        picocolors_1.default.bold(picocolors_1.default.red((0, getFilePathToShowToUser_js_1.getFilePathToShowToUser)(filePath))),
+        picocolors_1.default.bold(picocolors_1.default.red(filePath.filePathToShowToUser)),
         picocolors_1.default.red(`because:`)
     ].join(' ');
     return msg;

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

@@ -3,7 +3,7 @@ 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 globalContext_js_1 = require("../../globalContext.js");
 const utils_js_1 = require("../../utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
@@ -17,15 +17,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)} doesn't match the route of any of your pages`;
+        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 +79,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 +127,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/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/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

@@ -16,7 +16,7 @@ function parseConfigValuesImported(configValuesImported) {
                 file: {
                     // importPath cannot be relative to the current file, since the current file is a virtual file
                     filePathToShowToUser: importPath,
-                    fileExportPath: [configName, 'default'].includes(exportName)
+                    fileExportPathToShowToUser: [configName, 'default'].includes(exportName)
                         ? []
                         : // Side-effect config
                             [exportName]

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

@@ -30,27 +30,26 @@ function serializeConfigValueImported(configValueSource, configName, whitespace,
     (0, utils_js_1.assert)(whitespace.replaceAll(' ', '').length === 0);
     const { valueIsImportedAtRuntime, definedAtInfo } = 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 } = definedAtInfo;
+    (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/page-configs/utils.js

@@ -45,11 +45,13 @@ function getPageConfig(pageId, pageConfigs) {
 }
 exports.getPageConfig = getPageConfig;
 function getConfigDefinedAtString(configName, { definedAt }, sentenceBegin) {
-    const configDefinedAt = `${sentenceBegin ? `Config` : `config`} ${picocolors_1.default.cyan(configName)} defined ${getSourceString(definedAt, configName)}`;
+    const definedAtString = getDefinedAtString(definedAt, configName);
+    const definedAtStr = definedAtString === 'internally' ? definedAtString : `at ${definedAtString}`;
+    const configDefinedAt = `${sentenceBegin ? `Config` : `config`} ${picocolors_1.default.cyan(configName)} defined ${definedAtStr}`;
     return configDefinedAt;
 }
 exports.getConfigDefinedAtString = getConfigDefinedAtString;
-function getSourceString(definedAt, configName) {
+function getDefinedAtString(definedAt, configName) {
     if (definedAt.isComputed) {
         return 'internally';
     }
@@ -61,27 +63,18 @@ function getSourceString(definedAt, configName) {
         files = [definedAt.file];
     }
     (0, utils_js_1.assert)(files.length >= 1);
-    const sourceString = files
+    const definedAtString = files
         .map((source) => {
-        const { filePathToShowToUser, fileExportPath } = source;
+        const { filePathToShowToUser, fileExportPathToShowToUser } = source;
         let s = filePathToShowToUser;
-        const exportPath = (0, getExportPath_js_1.getExportPath)(fileExportPath, configName);
+        const exportPath = (0, getExportPath_js_1.getExportPath)(fileExportPathToShowToUser, configName);
         if (exportPath) {
             s = `${s} > ${picocolors_1.default.cyan(exportPath)}`;
         }
-        if (definedAt.isEffect) {
-            s = `${s} > (${picocolors_1.default.blue('effect')})`;
-        }
         return s;
     })
         .join(' / ');
-    return `at ${sourceString}`;
-}
-function getDefinedAtString(configValue, configName) {
-    let sourceString = getSourceString(configValue.definedAt, configName);
-    if (sourceString.startsWith('at '))
-        sourceString = sourceString.slice('at '.length);
-    return sourceString;
+    return definedAtString;
 }
 exports.getDefinedAtString = getDefinedAtString;
 function getConfigValueFilePathToShowToUser({ definedAt }) {

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);

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

@@ -34,7 +34,7 @@ function getPageRoutes(filesystemRoots, pageFilesAll, pageConfigs, allPageIds) {
                 const configValue = (0, utils_js_3.getConfigValue)(pageConfig, configName);
                 if (configValue) {
                     const route = configValue.value;
-                    const definedAt = (0, utils_js_3.getDefinedAtString)(configValue, configName);
+                    const definedAt = (0, utils_js_3.getDefinedAtString)(configValue.definedAt, configName);
                     if (typeof route === 'string') {
                         pageRoute = {
                             pageId,

package/dist/cjs/utils/projectInfo.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.projectInfo = void 0;
 const assertSingleInstance_js_1 = require("./assertSingleInstance.js");
-const PROJECT_VERSION = '0.4.144-commit-d6e4411';
+const PROJECT_VERSION = '0.4.144-commit-6aef8a6';
 const projectInfo = {
     projectName: 'Vike',
     projectVersion: PROJECT_VERSION,

package/dist/cjs/utils/truncateString.js

@@ -1,17 +1,22 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.truncateString = void 0;
-function truncateString(str, lenMax, dim) {
+const picocolors_1 = __importDefault(require("@brillout/picocolors"));
+const assert_js_1 = require("./assert.js");
+function truncateString(str, lenMax) {
+    const lenMaxReal = lenMax - 3;
+    (0, assert_js_1.assert)(lenMaxReal >= 1); // Show at least one character before the ellipsis
     if (str.length < lenMax) {
         return str;
     }
     else {
-        // May break ANSI codes
-        //  - So far, the str we pass to truncateString(str) are expected to not contain any ANSI code
-        str = str.substring(0, lenMax - 3);
-        let ellipsis = '...';
-        if (dim)
-            ellipsis = dim(ellipsis);
+        // Breaks ANSI codes.
+        //  - So far, the `str` we pass to truncateString(str) is always expected to not contain any ANSI code
+        str = str.substring(0, lenMaxReal);
+        const ellipsis = picocolors_1.default.dim('...');
         str = str + ellipsis;
         return str;
     }

package/dist/esm/node/plugin/plugins/importBuild/index.js

@@ -26,15 +26,15 @@ function importBuild() {
     ];
 }
 function getImporterCode(config, pageFilesEntry) {
-    const importPathAbsolute = toPosixPath(
+    const filePathAbsolute = toPosixPath(
     // [RELATIVE_PATH_FROM_DIST] Current file: node_modules/vike/dist/esm/node/plugin/plugins/importBuild/index.js
     require_.resolve(`../../../../../../dist/esm/node/runtime/globalContext/loadImportBuild.js`));
     const { outDirServer } = getOutDirs(config);
-    const importPath = path.posix.relative(outDirServer, importPathAbsolute);
+    const filePathRelative = path.posix.relative(outDirServer, filePathAbsolute);
     // The only reason we went for using CJS require() instead of ESM import() is because import() doesn't support .json files
     const importerCode = [
         '(async () => {',
-        `  const { setImportBuildGetters } = await import('${importPath}');`,
+        `  const { setImportBuildGetters } = await import('${filePathRelative}');`,
         '  setImportBuildGetters({',
         `    pageFiles: () => import('./${pageFilesEntry}'),`,
         "    clientManifest: () => require('../assets.json'),",

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

@@ -4,7 +4,7 @@ export type { ConfigDefinition };
 export type { ConfigDefinitionInternal };
 export type { ConfigNameGlobal };
 export type { ConfigEffect };
-import type { ConfigEnvInternal, ConfigEnv, ConfigValueSources } from '../../../../../../shared/page-configs/PageConfig.js';
+import type { ConfigEnvInternal, ConfigEnv, ConfigValueSources, DefinedAtFileInfo } from '../../../../../../shared/page-configs/PageConfig.js';
 import type { Config, ConfigNameBuiltIn } from '../../../../../../shared/page-configs/Config.js';
 /** The meta definition of a config.
  *
@@ -46,6 +46,7 @@ type ConfigEffect = (config: {
 type ConfigDefinitionInternal = Omit<ConfigDefinition, 'env'> & {
     _computed?: (configValueSources: ConfigValueSources) => unknown;
     _valueIsFilePath?: true;
+    _userEffectDefinedAt?: DefinedAtFileInfo;
     env: ConfigEnvInternal;
 };
 type ConfigDefinitionsBuiltIn = Record<ConfigNameBuiltIn, ConfigDefinitionInternal>;

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

@@ -11,7 +11,7 @@ export { getLogicalPath };
  * getLocationId('/pages/some-page') => '/pages/some-page'
  * getLocationId('/renderer/+config.js') => '/renderer'
  */
-declare function getLocationId(somePath: string): string;
+declare function getLocationId(filePathAbsoluteVite: string): string;
 /** Get URL determined by filesystem path */
 declare function getFilesystemRouteString(locationId: string): string;
 /**

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

@@ -13,8 +13,8 @@ import { assert, assertPosixPath, getNpmPackageImportPath, isNpmPackageImport, h
  * getLocationId('/pages/some-page') => '/pages/some-page'
  * getLocationId('/renderer/+config.js') => '/renderer'
  */
-function getLocationId(somePath) {
-    const locationId = removeFilename(somePath, true);
+function getLocationId(filePathAbsoluteVite) {
+    const locationId = removeFilename(filePathAbsoluteVite, true);
     assertLocationId(locationId);
     return locationId;
 }
@@ -110,21 +110,21 @@ function removeDirectories(somePath, removeDirs) {
         somePath = '/';
     return somePath;
 }
-function removeFilename(filePath, optional) {
-    assertPosixPath(filePath);
-    assert(filePath.startsWith('/') || isNpmPackageImport(filePath));
+function removeFilename(filePathAbsoluteVite, optional) {
+    assertPosixPath(filePathAbsoluteVite);
+    assert(filePathAbsoluteVite.startsWith('/') || isNpmPackageImport(filePathAbsoluteVite));
     {
-        const filename = filePath.split('/').slice(-1)[0];
+        const filename = filePathAbsoluteVite.split('/').slice(-1)[0];
         if (!filename.includes('.')) {
             assert(optional);
-            return filePath;
+            return filePathAbsoluteVite;
         }
     }
-    filePath = filePath.split('/').slice(0, -1).join('/');
-    if (filePath === '')
-        filePath = '/';
-    assertLocationId(filePath);
-    return filePath;
+    let locationId = filePathAbsoluteVite.split('/').slice(0, -1).join('/');
+    if (locationId === '')
+        locationId = '/';
+    assertLocationId(locationId);
+    return locationId;
 }
 function getFilesystemRouteDefinedBy(locationId) {
     if (locationId === '/')