vike 0.4.165-commit-b3cc3cb → 0.4.165-commit-8eba585

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("./getVikeConfig/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/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/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.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;
+}

package/dist/cjs/utils/isNpmPackage.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isDistinguishable = exports.parse = exports.isValidPathAlias = exports.getNpmPackageImportPath = exports.getNpmPackageName = exports.isNpmPackageName = exports.isNpmPackageImport = void 0;
+exports.isDistinguishable = exports.parse = exports.isValidPathAlias = exports.isNpmPackageImport = void 0;
 const assert_js_1 = require("./assert.js");
 const assertIsNotBrowser_js_1 = require("./assertIsNotBrowser.js");
 (0, assertIsNotBrowser_js_1.assertIsNotBrowser)();
@@ -13,21 +13,18 @@ function isNpmPackageName(str) {
     const res = parse(str);
     return res !== null && res.importPath === null;
 }
-exports.isNpmPackageName = isNpmPackageName;
 function getNpmPackageName(str) {
     const res = parse(str);
     if (!res)
         return null;
     return res.pkgName;
 }
-exports.getNpmPackageName = getNpmPackageName;
 function getNpmPackageImportPath(str) {
     const res = parse(str);
     if (!res)
         return null;
     return res.importPath;
 }
-exports.getNpmPackageImportPath = getNpmPackageImportPath;
 function isValidPathAlias(alias) {
     // Cannot be distinguished from npm package names
     if (!isDistinguishable(alias))

package/dist/cjs/utils/parseUrl.js

@@ -10,7 +10,7 @@ exports.isUriWithProtocol = exports.createUrlFromComponents = exports.assertUrlC
 const slice_js_1 = require("./slice.js");
 const assert_js_1 = require("./assert.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-const PROTOCOLS = ['http://', 'https://', 'tauri://'];
+const PROTOCOLS = ['http://', 'https://', 'tauri://', 'file://'];
 function isParsable(url) {
     // `parseUrl()` works with these URLs
     return (PROTOCOLS.some((p) => url.startsWith(p)) ||

package/dist/cjs/utils/projectInfo.js

@@ -1,13 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = exports.projectInfo = void 0;
-const assertSingleInstance_js_1 = require("./assertSingleInstance.js");
-const PROJECT_VERSION = '0.4.165-commit-b3cc3cb';
+const PROJECT_VERSION = '0.4.165-commit-8eba585';
 exports.PROJECT_VERSION = PROJECT_VERSION;
 const projectInfo = {
     projectName: 'Vike',
     projectVersion: PROJECT_VERSION
 };
 exports.projectInfo = projectInfo;
-// Trick: since `utils/asserts.ts` depends on this file (`utils/projectInfo.ts`), we can have confidence that this file is always instantiated. So that we don't have to initialize this code snippet at every possible entry. (There are a *lot* of entries: `client/router/`, `client/`, `node/`, `node/plugin/`, `node/cli`, etc.)
-(0, assertSingleInstance_js_1.onProjectInfo)(projectInfo.projectVersion);

package/dist/esm/node/plugin/plugins/baseUrls.js

@@ -8,7 +8,7 @@ function baseUrls(configVike) {
     return {
         name: 'vike:baseUrls',
         enforce: 'post',
-        config: (config) => {
+        async config(config) {
             const bases = resolveBaseFromUserConfig(config, configVike);
             baseServer = bases.baseServer;
             baseAssets = bases.baseAssets;

package/dist/esm/node/plugin/plugins/buildConfig/fixServerAssets.js

@@ -43,10 +43,14 @@ async function copyAssets(filesToCopy, config) {
         return;
     assert(existsSync(assetsDirServer));
     const concurrencyLimit = pLimit(10);
-    await Promise.all(filesToCopy.map((file) => concurrencyLimit(() => fs.cp(path.posix.join(outDirServer, file), path.posix.join(outDirClient, file), {
+    await Promise.all(filesToCopy.map((file) => concurrencyLimit(() => 
+    // TODO: move instead of copying
+    fs.cp(path.posix.join(outDirServer, file), path.posix.join(outDirClient, file), {
         recursive: true
     }))));
-    await fs.rm(assetsDirServer, { recursive: true });
+    /* We cannot do that because, with some edge case Rollup settings (outputing JavaScript chunks and static assets to the same directoy), this removes JavaScript chunks, see https://github.com/vikejs/vike/issues/1154#issuecomment-1975762404
+    await fs.rm(assetsDirServer, { recursive: true })
+    */
 }
 // Add serverManifest resources to clientManifest
 function addServerAssets(clientManifest, serverManifest) {

package/dist/esm/node/plugin/plugins/buildConfig.js

@@ -2,7 +2,7 @@ export { buildConfig };
 export { assertRollupInput };
 export { analyzeClientEntries };
 export { manifestTempFile };
-import { assert, resolveOutDir, viteIsSSR, getFilePathAbsolute, addOnBeforeLogHook, removeFileExtention, unique, assertPosixPath, assertUsage, injectRollupInputs, normalizeRollupInput, getOutDirs, isNpmPackageImport, assertNodeEnv_build } from '../utils.js';
+import { assert, resolveOutDir, viteIsSSR, getFilePathAbsoluteFilesystem, addOnBeforeLogHook, removeFileExtention, unique, assertPosixPath, assertUsage, injectRollupInputs, normalizeRollupInput, getOutDirs, isNpmPackageImport, assertNodeEnv_build } from '../utils.js';
 import { getVikeConfig, isV1Design } from './importUserCode/v1-design/getVikeConfig.js';
 import { getConfigValue } from '../../../shared/page-configs/helpers.js';
 import { findPageFiles } from '../shared/findPageFiles.js';
@@ -208,7 +208,7 @@ function getEntryFromClientEntry(clientEntry, config, addExtractAssetsQuery) {
     const filePath = clientEntry;
     assertPosixPath(filePath);
     assert(filePath.startsWith('/'));
-    let entryTarget = getFilePathAbsolute(filePath, config);
+    let entryTarget = getFilePathAbsoluteFilesystem(filePath, config);
     if (addExtractAssetsQuery)
         entryTarget = extractAssetsAddQuery(entryTarget);
     let entryName = filePath;

package/dist/esm/node/plugin/plugins/commonConfig/assertResolveAlias.js

@@ -1,6 +1,18 @@
 export { assertResolveAlias };
 import { assert, assertUsage, assertWarning, isValidPathAlias } from '../../utils.js';
 import pc from '@brillout/picocolors';
+// Recommend users to avoid un-distinguishable path aliases.
+// There are a lot of libraries that don't or cannot follow that recommendation, for example:
+// - Nx
+//   - Not sure why, but Nx seems to add a path alias for each monorepo package
+//   - https://github.com/vikejs/vike/discussions/1134
+// - MUI
+//   - https://mui.com/material-ui/guides/minimizing-bundle-size/#how-to-use-custom-bundles
+//   - https://github.com/vikejs/vike/discussions/1549#discussioncomment-8789002
+// - @preact/preset-vite
+//   - Aliases react imports
+// - @vitejs/plugin-vue2
+//   - https://github.com/vikejs/vike/issues/1329
 // TODO/v1-release: replace assertWarning() with assertUsage()
 function assertResolveAlias(config) {
     const aliases = getAliases(config);

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

@@ -20,7 +20,7 @@ async function getConfigVikPromise(vikeConfig, config) {
     const fromPluginOptions = (vikeConfig ?? {});
     const fromViteConfig = (config.vike ?? {});
     const configs = [fromPluginOptions, fromViteConfig];
-    const { globalVikeConfig: fromPlusConfigFile } = await getVikeConfig(config, isDev2(config), false);
+    const { globalVikeConfig: fromPlusConfigFile } = await getVikeConfig(config, isDev2(config));
     configs.push(fromPlusConfigFile);
     assertVikeConfig(fromPlusConfigFile, ({ prop, errMsg }) => {
         // TODO: add config file path ?

package/dist/esm/node/plugin/plugins/devConfig/determineOptimizeDeps.js

@@ -1,6 +1,6 @@
 export { determineOptimizeDeps };
 import { findPageFiles } from '../../shared/findPageFiles.js';
-import { assert, getFilePathAbsolute, isNpmPackageImport, unique } from '../../utils.js';
+import { assert, getFilePathAbsoluteFilesystem, isNpmPackageImport, unique } from '../../utils.js';
 import { getVikeConfig } from '../importUserCode/v1-design/getVikeConfig.js';
 import { getConfigValueSourcesNotOverriden } from '../../shared/getConfigValueSourcesNotOverriden.js';
 import { analyzeClientEntries } from '../buildConfig.js';
@@ -35,7 +35,7 @@ async function getPageDeps(config, pageConfigs, isDev) {
                 const { definedAt, configEnv } = configValueSource;
                 if (!configEnv.client)
                     return;
-                if (definedAt.filePathRelativeToUserRootDir !== null) {
+                if (definedAt.filePathAbsoluteUserRootDir !== null) {
                     const { filePathAbsoluteFilesystem } = definedAt;
                     assert(filePathAbsoluteFilesystem);
                     // Surprisingly Vite expects entries to be absolute paths
@@ -70,7 +70,7 @@ async function getPageDeps(config, pageConfigs, isDev) {
     {
         const pageFiles = await findPageFiles(config, ['.page', '.page.client'], isDev);
         pageFiles.forEach((filePath) => {
-            const entry = getFilePathAbsolute(filePath, config);
+            const entry = getFilePathAbsoluteFilesystem(filePath, config);
             entries.push(entry);
         });
     }

package/dist/esm/node/plugin/plugins/envVars.js

@@ -2,7 +2,7 @@ export { envVarsPlugin };
 // For ./envVars.spec.ts
 export { applyEnvVar };
 import { loadEnv } from 'vite';
-import { assert, assertPosixPath, assertUsage, assertWarning, escapeRegex, getFilePathRelativeToUserRootDir, lowerFirst } from '../utils.js';
+import { assert, assertPosixPath, assertUsage, assertWarning, escapeRegex, getFilePathAbsoluteUserRootDir, lowerFirst } from '../utils.js';
 import { sourceMapPassthrough } from '../shared/rollupSourceMap.js';
 function envVarsPlugin() {
     let envsAll;
@@ -45,7 +45,7 @@ function envVarsPlugin() {
                     if (isPrivate && isClientSide) {
                         if (!code.includes(envStatement))
                             return;
-                        const filePathToShowToUser = getFilePathRelativeToUserRootDir(id, config.root);
+                        const filePathToShowToUser = getFilePathAbsoluteUserRootDir(id, config.root);
                         const errMsgAddendum = isBuild ? '' : ' (Vike will prevent your app from building for production)';
                         const keyPublic = `${publicPrefix}${envName}`;
                         const errMsg = `${envStatement} is used in client-side file ${filePathToShowToUser} which means that the environment variable ${envName} will be included in client-side bundles and, therefore, ${envName} will be publicly exposed which can be a security leak${errMsgAddendum}. Use ${envStatement} only in server-side files, or rename ${envName} to ${keyPublic}, see https://vike.dev/env`;