vike 0.4.165 → 0.4.166

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

@@ -16,13 +16,12 @@ require("source-map-support/register.js");
 (0, utils_js_1.assertIsNotProductionRuntime)();
 const debug = (0, utils_js_1.createDebugger)('vike:pointer-imports');
 async function transpileAndExecuteFile(filePath, userRootDir, isConfigFile) {
-    const { filePathAbsoluteFilesystem } = filePath;
+    const { filePathAbsoluteFilesystem, filePathToShowToUserResolved } = filePath;
     const fileExtension = getFileExtension(filePathAbsoluteFilesystem);
-    const filePathToShowToUser2 = getFilePathToShowToUser2(filePath);
-    (0, utils_js_1.assertUsage)((0, utils_js_1.isJavaScriptFile)(filePathAbsoluteFilesystem), `${filePathToShowToUser2} has file extension .${fileExtension} but a config file can only be a JavaScript/TypeScript file`);
+    (0, utils_js_1.assertUsage)((0, utils_js_1.isJavaScriptFile)(filePathAbsoluteFilesystem), `${filePathToShowToUserResolved} has file extension .${fileExtension} but a config file can only be a JavaScript/TypeScript file`);
     const isHeader = isHeaderFile(filePathAbsoluteFilesystem);
     if (isHeader) {
-        (0, utils_js_1.assertWarning)(false, `${picocolors_1.default.cyan('.h.js')} files are deprecated: simply renaming ${filePathToShowToUser2} to ${removeHeaderFileExtension(filePathToShowToUser2)} is usually enough, although you may occasionally need to use ${picocolors_1.default.cyan("with { type: 'pointer' }")} as explained at https://vike.dev/config#pointer-imports`, { onlyOnce: true });
+        (0, utils_js_1.assertWarning)(false, `${picocolors_1.default.cyan('.h.js')} files are deprecated: simply renaming ${filePathToShowToUserResolved} to ${removeHeaderFileExtension(filePathToShowToUserResolved)} is usually enough, although you may occasionally need to use ${picocolors_1.default.cyan("with { type: 'pointer' }")} as explained at https://vike.dev/config#pointer-imports`, { onlyOnce: true });
     }
     if (isConfigFile === 'is-extension-config' && !isHeader && fileExtension.endsWith('js')) {
         // This doesn't track dependencies => we should never use this for user land configs
@@ -38,28 +37,27 @@ async function transpileAndExecuteFile(filePath, userRootDir, isConfigFile) {
 }
 exports.transpileAndExecuteFile = transpileAndExecuteFile;
 async function transpileFile(filePath, transformImports, userRootDir) {
-    const filePathToShowToUser2 = getFilePathToShowToUser2(filePath);
-    const { filePathAbsoluteFilesystem } = filePath;
+    const { filePathAbsoluteFilesystem, filePathToShowToUserResolved } = filePath;
     (0, utils_js_1.assertPosixPath)(filePathAbsoluteFilesystem);
     getVikeConfig_js_1.vikeConfigDependencies.add(filePathAbsoluteFilesystem);
     if (debug.isEnabled)
-        debug('transpile', filePathToShowToUser2);
+        debug('transpile', filePathToShowToUserResolved);
     let { code, pointerImports } = await transpileWithEsbuild(filePath, userRootDir, transformImports);
     if (debug.isEnabled)
-        debug(`code, post esbuild (${filePathToShowToUser2})`, code);
+        debug(`code, post esbuild (${filePathToShowToUserResolved})`, code);
     let isImportTransformed = false;
     if (transformImports) {
-        const codeMod = (0, transformFileImports_js_1.transformFileImports)(code, filePathToShowToUser2, pointerImports);
+        const codeMod = (0, transformFileImports_js_1.transformFileImports)(code, filePathToShowToUserResolved, pointerImports);
         if (codeMod) {
             code = codeMod;
             isImportTransformed = true;
             if (debug.isEnabled)
-                debug(`code, post transformImports() (${filePathToShowToUser2})`, code);
+                debug(`code, post transformImports() (${filePathToShowToUserResolved})`, code);
         }
     }
     if (!isImportTransformed) {
         if (debug.isEnabled)
-            debug(`code, no transformImports() (${filePathToShowToUser2})`);
+            debug(`code, no transformImports() (${filePathToShowToUserResolved})`);
     }
     return code;
 }
@@ -298,19 +296,12 @@ function triggerPrepareStackTrace(err) {
     }
 }
 function getErrIntroMsg(operation, filePath) {
-    const filePathToShowToUser2 = getFilePathToShowToUser2(filePath);
+    const { filePathToShowToUserResolved } = filePath;
     const msg = [
         // prettier ignore
         picocolors_1.default.red(`Failed to ${operation}`),
-        picocolors_1.default.bold(picocolors_1.default.red(filePathToShowToUser2)),
+        picocolors_1.default.bold(picocolors_1.default.red(filePathToShowToUserResolved)),
         picocolors_1.default.red(`because:`)
     ].join(' ');
     return msg;
 }
-/** `filePath.filePathToShowToUser` may show the import path of a package, use `filePathToShowToUser2` instead always show a file path instead. */
-function getFilePathToShowToUser2(filePath) {
-    const { filePathAbsoluteFilesystem, filePathRelativeToUserRootDir } = filePath;
-    const filePathToShowToUser2 = filePathRelativeToUserRootDir || filePathAbsoluteFilesystem;
-    (0, utils_js_1.assert)(filePathToShowToUser2);
-    return filePathToShowToUser2;
-}

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

@@ -20,7 +20,7 @@ const crawlPlusFiles_js_1 = require("./getVikeConfig/crawlPlusFiles.js");
 const getConfigFileExport_js_1 = require("./getConfigFileExport.js");
 const loadFileAtConfigTime_js_1 = require("./getVikeConfig/loadFileAtConfigTime.js");
 const resolveImportPath_js_1 = require("./getVikeConfig/resolveImportPath.js");
-const resolveFilePath_js_1 = require("./getVikeConfig/resolveFilePath.js");
+const getFilePath_js_1 = require("../../../shared/getFilePath.js");
 (0, utils_js_1.assertIsNotProductionRuntime)();
 let devServerIsCorrupt = false;
 let wasConfigInvalid = null;
@@ -65,7 +65,7 @@ async function handleReloadSideEffects() {
         }
     }
 }
-async function getVikeConfig(config, isDev, tolerateInvalidConfig = false) {
+async function getVikeConfig(config, isDev, tolerateInvalidConfig) {
     const { outDirRoot } = (0, utils_js_1.getOutDirs)(config);
     const userRootDir = config.root;
     if (!vikeConfigPromise) {
@@ -97,11 +97,11 @@ async function loadInterfaceFiles(userRootDir, outDirRoot, isDev) {
     await Promise.all([
         // Config files
         ...configFiles.map(async (filePath) => {
-            const { filePathRelativeToUserRootDir } = filePath;
-            (0, utils_js_1.assert)(filePathRelativeToUserRootDir);
+            const { filePathAbsoluteUserRootDir } = filePath;
+            (0, utils_js_1.assert)(filePathAbsoluteUserRootDir);
             const { configFile, extendsConfigs } = await (0, loadFileAtConfigTime_js_1.loadConfigFile)(filePath, userRootDir, [], false);
-            (0, utils_js_1.assert)(filePath.filePathRelativeToUserRootDir);
-            const locationId = (0, filesystemRouting_js_1.getLocationId)(filePathRelativeToUserRootDir);
+            (0, utils_js_1.assert)(filePath.filePathAbsoluteUserRootDir);
+            const locationId = (0, filesystemRouting_js_1.getLocationId)(filePathAbsoluteUserRootDir);
             const interfaceFile = getInterfaceFileFromConfigFile(configFile, false, locationId);
             interfaceFilesByLocationId[locationId] = interfaceFilesByLocationId[locationId] ?? [];
             interfaceFilesByLocationId[locationId].push(interfaceFile);
@@ -150,11 +150,11 @@ async function loadInterfaceFiles(userRootDir, outDirRoot, isDev) {
         }),
         // Value files
         ...valueFiles.map(async (filePath) => {
-            const { filePathRelativeToUserRootDir } = filePath;
-            (0, utils_js_1.assert)(filePathRelativeToUserRootDir);
-            const configName = getConfigName(filePathRelativeToUserRootDir);
+            const { filePathAbsoluteUserRootDir } = filePath;
+            (0, utils_js_1.assert)(filePathAbsoluteUserRootDir);
+            const configName = getConfigName(filePathAbsoluteUserRootDir);
             (0, utils_js_1.assert)(configName);
-            const locationId = (0, filesystemRouting_js_1.getLocationId)(filePathRelativeToUserRootDir);
+            const locationId = (0, filesystemRouting_js_1.getLocationId)(filePathAbsoluteUserRootDir);
             const interfaceFile = {
                 locationId,
                 filePath,
@@ -353,9 +353,9 @@ async function getGlobalConfigs(interfaceFilesByLocationId, userRootDir, importe
         const interfaceFilesGlobalPaths = [];
         (0, utils_js_1.objectEntries)(interfaceFilesGlobal).forEach(([locationId, interfaceFiles]) => {
             (0, utils_js_1.assert)((0, filesystemRouting_js_1.isGlobalLocation)(locationId, locationIds));
-            interfaceFiles.forEach(({ filePath: { filePathRelativeToUserRootDir } }) => {
-                if (filePathRelativeToUserRootDir) {
-                    interfaceFilesGlobalPaths.push(filePathRelativeToUserRootDir);
+            interfaceFiles.forEach(({ filePath: { filePathAbsoluteUserRootDir } }) => {
+                if (filePathAbsoluteUserRootDir) {
+                    interfaceFilesGlobalPaths.push(filePathAbsoluteUserRootDir);
                 }
             });
         });
@@ -464,10 +464,10 @@ async function resolveConfigValueSources(configName, configDef, interfaceFilesRe
 }
 function makeOrderDeterministic(interfaceFile1, interfaceFile2) {
     return (0, utils_js_1.lowerFirst)((interfaceFile) => {
-        const { filePathRelativeToUserRootDir } = interfaceFile.filePath;
+        const { filePathAbsoluteUserRootDir } = interfaceFile.filePath;
         (0, utils_js_1.assert)(isInterfaceFileUserLand(interfaceFile));
-        (0, utils_js_1.assert)(filePathRelativeToUserRootDir);
-        return filePathRelativeToUserRootDir.length;
+        (0, utils_js_1.assert)(filePathAbsoluteUserRootDir);
+        return filePathAbsoluteUserRootDir.length;
     })(interfaceFile1, interfaceFile2);
 }
 function warnOverridenConfigValues(interfaceFileWinner, interfaceFilesOverriden, configName) {
@@ -541,6 +541,7 @@ async function getConfigValueSource(configName, interfaceFile, configDef, userRo
                 configName !== 'extends') {
                 if (import_.filePathAbsoluteFilesystem) {
                     (0, utils_js_1.assert)((0, utils_js_1.hasProp)(import_, 'filePathAbsoluteFilesystem', 'string')); // Help TS
+                    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(import_, 'filePathToShowToUserResolved', 'string')); // Help TS
                     const fileExport = await (0, loadFileAtConfigTime_js_1.loadImportedFile)(import_, userRootDir, importedFilesLoaded);
                     configValueSource.value = fileExport;
                 }
@@ -744,7 +745,7 @@ function getComputed(configValueSources, configDefinitions) {
 }
 async function findPlusFiles(userRootDir, outDirRoot, isDev) {
     const files = await (0, crawlPlusFiles_js_1.crawlPlusFiles)(userRootDir, outDirRoot, isDev);
-    const plusFiles = files.map(({ filePathRelativeToUserRootDir }) => (0, resolveFilePath_js_1.resolveFilePathRelativeToUserRootDir)(filePathRelativeToUserRootDir, userRootDir));
+    const plusFiles = files.map(({ filePathAbsoluteUserRootDir }) => (0, getFilePath_js_1.getFilePathResolved)({ filePathAbsoluteUserRootDir, userRootDir, importPathAbsolute: null }));
     return plusFiles;
 }
 function getConfigName(filePath) {
@@ -834,9 +835,9 @@ function getFilesystemRoutingRootEffect(configFilesystemRoutingRoot, configName)
     const configDefinedAt = (0, helpers_js_1.getConfigDefinedAtString)('Config', configName, configFilesystemRoutingRoot);
     (0, utils_js_1.assertUsage)(typeof value === 'string', `${configDefinedAt} should be a string`);
     (0, utils_js_1.assertUsage)(value.startsWith('/'), `${configDefinedAt} is ${picocolors_1.default.cyan(value)} but it should start with a leading slash ${picocolors_1.default.cyan('/')}`);
-    const { filePathRelativeToUserRootDir } = configFilesystemRoutingRoot.definedAt;
-    (0, utils_js_1.assert)(filePathRelativeToUserRootDir);
-    const before = (0, filesystemRouting_js_1.getFilesystemRouteString)((0, filesystemRouting_js_1.getLocationId)(filePathRelativeToUserRootDir));
+    const { filePathAbsoluteUserRootDir } = configFilesystemRoutingRoot.definedAt;
+    (0, utils_js_1.assert)(filePathAbsoluteUserRootDir);
+    const before = (0, filesystemRouting_js_1.getFilesystemRouteString)((0, filesystemRouting_js_1.getLocationId)(filePathAbsoluteUserRootDir));
     const after = value;
     const filesystemRoutingRootEffect = { before, after };
     return { filesystemRoutingRootEffect, filesystemRoutingRootDefinedAt: configDefinedAt };

package/dist/cjs/node/plugin/shared/getFilePath.js

@@ -0,0 +1,88 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getFilePathUnresolved = exports.getFilePathResolved = void 0;
+const path_1 = __importDefault(require("path"));
+const utils_js_1 = require("../utils.js");
+function getFilePathUnresolved(args) {
+    const { filePathAbsoluteFilesystem, filePathAbsoluteUserRootDir } = args;
+    let filePathAbsoluteVite;
+    if (args.filePathAbsoluteUserRootDir !== null) {
+        filePathAbsoluteVite = args.filePathAbsoluteUserRootDir;
+    }
+    else {
+        (0, utils_js_1.assert)(args.importPathAbsolute !== null); // Help TS
+        filePathAbsoluteVite = args.importPathAbsolute;
+    }
+    return {
+        ...args,
+        filePathAbsoluteVite,
+        filePathToShowToUser: filePathAbsoluteVite,
+        filePathToShowToUserResolved: filePathAbsoluteUserRootDir || filePathAbsoluteFilesystem
+    };
+}
+exports.getFilePathUnresolved = getFilePathUnresolved;
+function getFilePathResolved(args) {
+    const { userRootDir, importPathAbsolute } = args;
+    let filePathAbsoluteFilesystem;
+    let filePathAbsoluteUserRootDir;
+    if ('filePathAbsoluteFilesystem' in args) {
+        filePathAbsoluteFilesystem = args.filePathAbsoluteFilesystem;
+        filePathAbsoluteUserRootDir = getFilePathAbsoluteUserRootDir({ filePathAbsoluteFilesystem, userRootDir });
+    }
+    else {
+        filePathAbsoluteUserRootDir = args.filePathAbsoluteUserRootDir;
+        filePathAbsoluteFilesystem = getFilePathAbsoluteUserFilesystem({ filePathAbsoluteUserRootDir, userRootDir });
+    }
+    let filePathResolved;
+    const common = {
+        filePathAbsoluteUserRootDir,
+        filePathAbsoluteFilesystem,
+        importPathAbsolute,
+        userRootDir
+    };
+    if (importPathAbsolute) {
+        filePathResolved = getFilePathUnresolved({
+            ...common,
+            importPathAbsolute
+        });
+    }
+    else {
+        (0, utils_js_1.assert)(filePathAbsoluteUserRootDir);
+        filePathResolved = getFilePathUnresolved({
+            ...common,
+            filePathAbsoluteUserRootDir
+        });
+    }
+    (0, utils_js_1.assert)(filePathAbsoluteFilesystem);
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(filePathResolved, 'filePathAbsoluteFilesystem', 'string'));
+    (0, utils_js_1.assert)((0, utils_js_1.hasProp)(filePathResolved, 'filePathToShowToUserResolved', 'string'));
+    return filePathResolved;
+}
+exports.getFilePathResolved = getFilePathResolved;
+function getFilePathAbsoluteUserFilesystem({ filePathAbsoluteUserRootDir, userRootDir }) {
+    (0, utils_js_1.assertPosixPath)(filePathAbsoluteUserRootDir);
+    (0, utils_js_1.assertPosixPath)(userRootDir);
+    const filePathAbsoluteFilesystem = path_1.default.posix.join(userRootDir, filePathAbsoluteUserRootDir);
+    return filePathAbsoluteFilesystem;
+}
+function getFilePathAbsoluteUserRootDir({ filePathAbsoluteFilesystem, userRootDir }) {
+    (0, utils_js_1.assertPosixPath)(filePathAbsoluteFilesystem);
+    (0, utils_js_1.assertPosixPath)(userRootDir);
+    const filePathRelative = path_1.default.posix.relative(userRootDir, filePathAbsoluteFilesystem);
+    if (!filePathAbsoluteFilesystem.startsWith(userRootDir)) {
+        (0, utils_js_1.assert)(filePathRelative.startsWith('../'));
+        return null;
+    }
+    (0, utils_js_1.assert)(!filePathRelative.startsWith('.') && !filePathRelative.startsWith('/'));
+    const filePathAbsoluteUserRootDir = `/${filePathRelative}`;
+    {
+        let check = filePathAbsoluteFilesystem.slice(userRootDir.length);
+        if (!check.startsWith('/'))
+            check = '/' + check;
+        (0, utils_js_1.assert)(filePathAbsoluteUserRootDir === check);
+    }
+    return filePathAbsoluteUserRootDir;
+}

package/dist/cjs/node/plugin/shared/loggerNotProd/errorWithCodeSnippet.js

@@ -48,7 +48,7 @@ function getPrettyErrorWithCodeSnippet(err, userRootDir) {
     let { id, frame } = err;
     const msgFirstLine = [
         picocolors_1.default.red('Failed to transpile'),
-        picocolors_1.default.bold(picocolors_1.default.red((0, utils_js_1.getFilePathRelativeToUserRootDir)(normalizeId(id), userRootDir))),
+        picocolors_1.default.bold(picocolors_1.default.red((0, utils_js_1.getFilePathAbsoluteUserRootDir)(normalizeId(id), userRootDir))),
         picocolors_1.default.red('because:')
     ].join(' ');
     const errMsg = getPrettyErrMessage(err);

package/dist/cjs/node/runtime/html/injectAssets/getHtmlTags.js

@@ -144,6 +144,7 @@ async function mergeScriptEntries(pageAssets, isProduction) {
 function getPageContextJsonScriptTag(pageContext) {
     const pageContextSerialized = (0, sanitizeJson_js_1.sanitizeJson)((0, serializePageContextClientSide_js_1.serializePageContextClientSide)(pageContext));
     const htmlTag = `<script id="vike_pageContext" type="application/json">${pageContextSerialized}</script>`;
+    // Used by contra.com https://github.com/gajus
     // @ts-expect-error
     pageContext._pageContextHtmlTag = htmlTag;
     return htmlTag;

package/dist/cjs/node/runtime/html/injectAssets/injectHtmlTags.js

@@ -95,7 +95,7 @@ function injectBreakLines(htmlFragment, before, after) {
     const whitespaceExtra = paddingParent ? '  ' : '';
     const whitespace = `${paddingParent}${whitespaceExtra}`;
     const padding = `\n${whitespace}`;
-    htmlFragment = htmlFragment.split(/<(?=[^\/])/).join(`${padding}<`);
+    htmlFragment = htmlFragment.replace(/<[^\/]/g, (match) => `${padding}${match}`);
     if (isBlankLine) {
         (0, utils_js_1.assert)(htmlFragment.startsWith(padding), { htmlFragment });
         htmlFragment = whitespaceExtra + htmlFragment.slice(padding.length);

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

@@ -50,35 +50,37 @@ function getManifestEntry(id, assetsManifest) {
         const [manifestKey, manifestEntry] = found;
         return { manifestEntry, manifestKey };
     }
+    /* Can we remove this?
     // extensions[number].pageConfigsSrcDir
     if (id.startsWith('/node_modules/') || id.startsWith('/../')) {
-        let manifestKeyEnd = id.split('/node_modules/').slice(-1)[0];
-        (0, utils_js_1.assert)(manifestKeyEnd, debugInfo);
-        (0, utils_js_1.assert)(!manifestKeyEnd.startsWith('/'), debugInfo);
-        manifestKeyEnd = '/' + manifestKeyEnd;
-        {
-            const { manifestEntry, manifestKey } = findEntryWithKeyEnd(manifestKeyEnd, assetsManifest, id);
-            if (manifestEntry) {
-                (0, utils_js_1.assert)(manifestKey, debugInfo);
-                return { manifestEntry, manifestKey };
-            }
-        }
-        {
-            (0, utils_js_1.assert)(manifestKeyEnd.startsWith('/'), debugInfo);
-            const dirS = manifestKeyEnd.split('/');
-            (0, utils_js_1.assert)(dirS[0] === '', debugInfo);
-            manifestKeyEnd = '/' + dirS.slice(2).join('/');
-            (0, utils_js_1.assert)(manifestKeyEnd.startsWith('/'), debugInfo);
+      let manifestKeyEnd = id.split('/node_modules/').slice(-1)[0]
+      assert(manifestKeyEnd, debugInfo)
+      assert(!manifestKeyEnd.startsWith('/'), debugInfo)
+      manifestKeyEnd = '/' + manifestKeyEnd
+      {
+        const { manifestEntry, manifestKey } = findEntryWithKeyEnd(manifestKeyEnd, assetsManifest, id)
+        if (manifestEntry) {
+          assert(manifestKey, debugInfo)
+          return { manifestEntry, manifestKey }
         }
-        {
-            const { manifestEntry, manifestKey } = findEntryWithKeyEnd(manifestKeyEnd, assetsManifest, id);
-            if (manifestEntry) {
-                (0, utils_js_1.assert)(manifestKey, debugInfo);
-                return { manifestEntry, manifestKey };
-            }
+      }
+      {
+        assert(manifestKeyEnd.startsWith('/'), debugInfo)
+        const dirS = manifestKeyEnd.split('/')
+        assert(dirS[0] === '', debugInfo)
+        manifestKeyEnd = '/' + dirS.slice(2).join('/')
+        assert(manifestKeyEnd.startsWith('/'), debugInfo)
+      }
+      {
+        const { manifestEntry, manifestKey } = findEntryWithKeyEnd(manifestKeyEnd, assetsManifest, id)
+        if (manifestEntry) {
+          assert(manifestKey, debugInfo)
+          return { manifestEntry, manifestKey }
         }
-        (0, utils_js_1.assert)(false, debugInfo);
+      }
+      assert(false, debugInfo)
     }
+    */
     (0, utils_js_1.assert)(false, debugInfo);
 }
 exports.getManifestEntry = getManifestEntry;

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

@@ -1,7 +1,11 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getHint = exports.isKnownError = exports.isCjsEsmError = exports.logErrorHint = void 0;
 const utils_js_1 = require("../utils.js");
+const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const knownErrors = [
     {
         errMsg: 'jsxDEV is not a function',
@@ -44,6 +48,7 @@ function getHint(error) {
 exports.getHint = getHint;
 function logHint(hint) {
     hint = (0, utils_js_1.formatHintLog)(hint);
+    hint = picocolors_1.default.bold(hint);
     console.error(hint);
 }
 function isKnownError(error) {

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

@@ -57,7 +57,7 @@ exports.renderPage = renderPage;
 async function renderPageAndPrepare(pageContextInit, httpRequestId) {
     // Invalid config
     const handleInvalidConfig = () => {
-        (0, loggerRuntime_js_1.logRuntimeInfo)?.(picocolors_1.default.bold(picocolors_1.default.red("Couldn't load configuration: see error above.")), httpRequestId, 'error');
+        (0, loggerRuntime_js_1.logRuntimeInfo)?.(picocolors_1.default.bold(picocolors_1.default.red('Error while loading a Vike config file, see error above.')), httpRequestId, 'error');
         const pageContextHttpResponseNull = getPageContextHttpResponseNull(pageContextInit);
         return pageContextHttpResponseNull;
     };
@@ -209,29 +209,42 @@ function getRequestInfoMessage(urlOriginal) {
 }
 function logHttpResponse(urlOriginal, httpRequestId, pageContextReturn) {
     const statusCode = pageContextReturn.httpResponse?.statusCode ?? null;
+    let msg;
+    let isNominal;
     {
-        // If URL doesn't include Base URL
         const { errorWhileRendering } = pageContextReturn;
-        const isSkipped = statusCode === null && (errorWhileRendering === null || errorWhileRendering === undefined);
-        if (isSkipped)
-            return;
-    }
-    const isSuccess = statusCode !== null && statusCode >= 200 && statusCode <= 399;
-    const isNominal = isSuccess || statusCode === 404;
-    const color = (s) => picocolors_1.default.bold(isSuccess ? picocolors_1.default.green(String(s)) : picocolors_1.default.red(String(s)));
-    const isRedirect = statusCode && 300 <= statusCode && statusCode <= 399;
-    const type = isRedirect ? 'redirect' : 'response';
-    if (isRedirect) {
-        (0, utils_js_1.assert)(pageContextReturn.httpResponse);
-        const headerRedirect = pageContextReturn.httpResponse.headers
-            .slice()
-            .reverse()
-            .find((header) => header[0] === 'Location');
-        (0, utils_js_1.assert)(headerRedirect);
-        const urlRedirect = headerRedirect[1];
-        urlOriginal = urlRedirect;
+        const isSkipped = statusCode === null && !errorWhileRendering;
+        if (isSkipped) {
+            // - URL doesn't include Base URL
+            //   - Can we abort earlier so that `logHttpResponse()` and `logHttpRequest()` aren't even called?
+            // - Error loading a Vike config file
+            //   - We should show `HTTP response ${urlOriginal} ERR` instead.
+            //   - Maybe we can/should make the error available at pageContext.errorWhileRendering
+            (0, utils_js_1.assert)(errorWhileRendering === null || errorWhileRendering === undefined);
+            msg = `HTTP response ${picocolors_1.default.bold(urlOriginal)} ${picocolors_1.default.dim('null')}`;
+            // Erroneous value (it shoud sometimes be `false`) but it's fine as it doesn't seem to have much of an impact.
+            isNominal = true;
+        }
+        else {
+            const isSuccess = statusCode !== null && statusCode >= 200 && statusCode <= 399;
+            isNominal = isSuccess || statusCode === 404;
+            const color = (s) => picocolors_1.default.bold(isSuccess ? picocolors_1.default.green(String(s)) : picocolors_1.default.red(String(s)));
+            const isRedirect = statusCode && 300 <= statusCode && statusCode <= 399;
+            const type = isRedirect ? 'redirect' : 'response';
+            if (isRedirect) {
+                (0, utils_js_1.assert)(pageContextReturn.httpResponse);
+                const headerRedirect = pageContextReturn.httpResponse.headers
+                    .slice()
+                    .reverse()
+                    .find((header) => header[0] === 'Location');
+                (0, utils_js_1.assert)(headerRedirect);
+                const urlRedirect = headerRedirect[1];
+                urlOriginal = urlRedirect;
+            }
+            msg = `HTTP ${type} ${picocolors_1.default.bold(urlOriginal)} ${color(statusCode ?? 'ERR')}`;
+        }
     }
-    (0, loggerRuntime_js_1.logRuntimeInfo)?.(`HTTP ${type} ${picocolors_1.default.bold(urlOriginal)} ${color(statusCode ?? 'ERR')}`, httpRequestId, isNominal ? 'info' : 'error');
+    (0, loggerRuntime_js_1.logRuntimeInfo)?.(msg, httpRequestId, isNominal ? 'info' : 'error');
 }
 function getPageContextHttpResponseNullWithError(err, pageContextInit) {
     const pageContextHttpResponseNull = {};

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

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/cjs/utils/assert.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isBug = exports.overwriteAssertProductionLogger = exports.getAssertErrMsg = exports.addOnBeforeLogHook = exports.getProjectError = exports.assertInfo = exports.assertWarning = exports.assertUsage = exports.assert = void 0;
+const assertSingleInstance_js_1 = require("./assertSingleInstance.js");
 const createErrorWithCleanStackTrace_js_1 = require("./createErrorWithCleanStackTrace.js");
 const getGlobalObject_js_1 = require("./getGlobalObject.js");
 const isObject_js_1 = require("./isObject.js");
@@ -22,6 +23,7 @@ const globalObject = (0, getGlobalObject_js_1.getGlobalObject)('utils/assert.ts'
     },
     showStackTraceList: new WeakSet()
 });
+(0, assertSingleInstance_js_1.onAssertModuleLoad)();
 const projectTag = `[vike]`;
 const projectTagWithVersion = `[vike@${projectInfo_js_1.projectInfo.projectVersion}]`;
 const numberOfStackTraceLinesToRemove = 2;

package/dist/cjs/utils/assertSingleInstance.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.onProjectInfo = exports.onClientEntry_ClientRouting = exports.onClientEntry_ServerRouting = void 0;
+exports.onAssertModuleLoad = exports.onClientEntry_ClientRouting = exports.onClientEntry_ServerRouting = void 0;
 //  - Throw error if there are two different versions of vike loaded
 //  - Show warning if entry of Client Routing and entry of Server Routing are both loaded
 //  - Show warning if vike is loaded twice
 const unique_js_1 = require("./unique.js");
 const getGlobalObject_js_1 = require("./getGlobalObject.js");
+const projectInfo_js_1 = require("./projectInfo.js");
 /* Use original assertUsage() & assertWarning() after all CJS is removed from node_modules/vike/dist/
 import { assertUsage, assertWarning } from './assert.js'
 */
@@ -60,12 +61,12 @@ function onClientEntry_ClientRouting(isProduction) {
     assertSingleInstance();
 }
 exports.onClientEntry_ClientRouting = onClientEntry_ClientRouting;
-// Called by utils/projectInfo.ts which is loaded by all entries (since utils/asserts.ts depends on utils/projectInfo.ts, we can have confidence that onProjectInfo() is called by each entry). 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`).
-function onProjectInfo(projectVersion) {
-    globalObject.instances.push(projectVersion);
+// 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`.)
+function onAssertModuleLoad() {
+    globalObject.instances.push(projectInfo_js_1.projectInfo.projectVersion);
     assertSingleInstance();
 }
-exports.onProjectInfo = onProjectInfo;
+exports.onAssertModuleLoad = onAssertModuleLoad;
 function assertUsage(condition, errorMessage) {
     if (condition) {
         return;

package/dist/cjs/utils/assertVersion.js

@@ -25,9 +25,12 @@ exports.isVersionOrAbove = isVersionOrAbove;
 function parseVersion(version) {
     // Remove pre-release tag
     version = version.split('-')[0];
+    let partsStr = version.split('.');
+    // Git seems to be using a fourth number: https://github.com/git/git/tree/master/Documentation/RelNotes
+    partsStr = partsStr.slice(0, 3);
     // major.minor.patch
-    const partsStr = version.split('.');
     (0, assert_js_1.assert)(partsStr.length === 3);
+    (0, assert_js_1.assert)(partsStr.every((s) => s.length > 0));
     const parts = partsStr.map((s) => parseInt(s, 10));
     return parts;
 }

package/dist/cjs/utils/getFilePathAbsolute.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.getFilePathRelativeToUserRootDir = exports.getFilePathAbsolute = void 0;
+exports.getFilePathAbsoluteUserRootDir = exports.getFilePathAbsoluteFilesystem = void 0;
 const filesystemPathHandling_js_1 = require("./filesystemPathHandling.js");
 const assert_js_1 = require("./assert.js");
 const path_1 = __importDefault(require("path"));
@@ -18,7 +18,7 @@ const require_ = (0, module_1.createRequire)(importMetaUrl);
 // Vite handles paths such as /pages/index.page.js which are relative to `config.root`.
 // Make them absolute starting from the filesystem root.
 // Also resolve plus files living in npm packages such as restack/renderer/+onRenderHtml.js
-function getFilePathAbsolute(filePath, config) {
+function getFilePathAbsoluteFilesystem(filePath, config) {
     (0, filesystemPathHandling_js_1.assertPosixPath)(filePath);
     if (filePath.startsWith('/@fs/')) {
         return filePath;
@@ -46,25 +46,25 @@ function getFilePathAbsolute(filePath, config) {
     (0, assertPathIsFilesystemAbsolute_js_1.assertPathIsFilesystemAbsolute)(filePathAbsoluteFilesystem);
     return filePathAbsoluteFilesystem;
 }
-exports.getFilePathAbsolute = getFilePathAbsolute;
-function getFilePathRelativeToUserRootDir(filePathAbsoluteFilesystem, userRootDir, alwaysRelative = false) {
+exports.getFilePathAbsoluteFilesystem = getFilePathAbsoluteFilesystem;
+function getFilePathAbsoluteUserRootDir(filePathAbsoluteFilesystem, userRootDir, alwaysRelative = false) {
     (0, filesystemPathHandling_js_1.assertPosixPath)(filePathAbsoluteFilesystem);
     (0, filesystemPathHandling_js_1.assertPosixPath)(userRootDir);
-    let filePathRelativeToUserRootDir = path_1.default.posix.relative(userRootDir, filePathAbsoluteFilesystem);
+    let filePathAbsoluteUserRootDir = path_1.default.posix.relative(userRootDir, filePathAbsoluteFilesystem);
     if (filePathAbsoluteFilesystem.startsWith(userRootDir)) {
-        (0, assert_js_1.assert)(!filePathRelativeToUserRootDir.startsWith('.') && !filePathRelativeToUserRootDir.startsWith('/'), 
+        (0, assert_js_1.assert)(!filePathAbsoluteUserRootDir.startsWith('.') && !filePathAbsoluteUserRootDir.startsWith('/'), 
         // Surprinsingly, this assertion seem to fail sometimes: https://github.com/vikejs/vike/issues/1139
-        { filePathRelativeToUserRootDir, filePathAbsoluteFilesystem, userRootDir });
-        filePathRelativeToUserRootDir = `/${filePathRelativeToUserRootDir}`;
-        return filePathRelativeToUserRootDir;
+        { filePathAbsoluteUserRootDir, filePathAbsoluteFilesystem, userRootDir });
+        filePathAbsoluteUserRootDir = `/${filePathAbsoluteUserRootDir}`;
+        return filePathAbsoluteUserRootDir;
     }
     else {
         if (alwaysRelative) {
-            return filePathRelativeToUserRootDir;
+            return filePathAbsoluteUserRootDir;
         }
         else {
             return filePathAbsoluteFilesystem;
         }
     }
 }
-exports.getFilePathRelativeToUserRootDir = getFilePathRelativeToUserRootDir;
+exports.getFilePathAbsoluteUserRootDir = getFilePathAbsoluteUserRootDir;

package/dist/cjs/utils/getGlobalObject.js

@@ -1,13 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getGlobalObject = void 0;
+exports.assertIsSingleModuleInstance = exports.getGlobalObject = void 0;
+const assert_js_1 = require("./assert.js");
+const projectInfo_js_1 = require("./projectInfo.js");
+const projectKey = `_${projectInfo_js_1.projectInfo.projectName.toLowerCase()}`;
+/** Share information across module instances. */
 function getGlobalObject(
-// We use the filename as key; each `getGlobalObject()` call should live inside a file with a unique filename.
+// We use the filename (or file path) as key. There should be only one getGlobalObject() usage per file. Thus the key should be unique, assuming the filename (or file path) is unique.
 key, defaultValue) {
-    // @ts-ignore
-    const globalObjectsAll = (globalThis[projectKey] = globalThis[projectKey] || {});
-    const globalObject = (globalObjectsAll[key] = globalObjectsAll[key] || defaultValue);
+    const globalObjects = getGlobalObjects();
+    const globalObject = (globalObjects[key] = globalObjects[key] || defaultValue);
     return globalObject;
 }
 exports.getGlobalObject = getGlobalObject;
-const projectKey = '_vike';
+/** Assert that the module is instantiated only once. */
+function assertIsSingleModuleInstance(
+// We use the filename (or file path) as key.
+key) {
+    const globalObjects = getGlobalObjects();
+    (0, assert_js_1.assert)(!(key in globalObjects));
+}
+exports.assertIsSingleModuleInstance = assertIsSingleModuleInstance;
+function getGlobalObjects() {
+    // @ts-ignore
+    const globalObjects = (globalThis[projectKey] = globalThis[projectKey] || {});
+    return globalObjects;
+}