vike 0.4.165-commit-6dfef11 → 0.4.165-commit-8eba585

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

@@ -19,7 +19,7 @@ import { crawlPlusFiles } from './getVikeConfig/crawlPlusFiles.js';
 import { getConfigFileExport } from './getConfigFileExport.js';
 import { loadConfigFile, loadImportedFile, loadValueFile } from './getVikeConfig/loadFileAtConfigTime.js';
 import { clearFilesEnvMap, resolveImport } from './getVikeConfig/resolveImportPath.js';
-import { resolveFilePathRelativeToUserRootDir } from './getVikeConfig/resolveFilePath.js';
+import { getFilePathResolved } from './getVikeConfig/getFilePath.js';
 assertIsNotProductionRuntime();
 let devServerIsCorrupt = false;
 let wasConfigInvalid = null;
@@ -62,7 +62,7 @@ async function handleReloadSideEffects() {
         }
     }
 }
-async function getVikeConfig(config, isDev, tolerateInvalidConfig = false) {
+async function getVikeConfig(config, isDev, tolerateInvalidConfig) {
     const { outDirRoot } = getOutDirs(config);
     const userRootDir = config.root;
     if (!vikeConfigPromise) {
@@ -92,11 +92,11 @@ async function loadInterfaceFiles(userRootDir, outDirRoot, isDev) {
     await Promise.all([
         // Config files
         ...configFiles.map(async (filePath) => {
-            const { filePathRelativeToUserRootDir } = filePath;
-            assert(filePathRelativeToUserRootDir);
+            const { filePathAbsoluteUserRootDir } = filePath;
+            assert(filePathAbsoluteUserRootDir);
             const { configFile, extendsConfigs } = await loadConfigFile(filePath, userRootDir, [], false);
-            assert(filePath.filePathRelativeToUserRootDir);
-            const locationId = getLocationId(filePathRelativeToUserRootDir);
+            assert(filePath.filePathAbsoluteUserRootDir);
+            const locationId = getLocationId(filePathAbsoluteUserRootDir);
             const interfaceFile = getInterfaceFileFromConfigFile(configFile, false, locationId);
             interfaceFilesByLocationId[locationId] = interfaceFilesByLocationId[locationId] ?? [];
             interfaceFilesByLocationId[locationId].push(interfaceFile);
@@ -145,11 +145,11 @@ async function loadInterfaceFiles(userRootDir, outDirRoot, isDev) {
         }),
         // Value files
         ...valueFiles.map(async (filePath) => {
-            const { filePathRelativeToUserRootDir } = filePath;
-            assert(filePathRelativeToUserRootDir);
-            const configName = getConfigName(filePathRelativeToUserRootDir);
+            const { filePathAbsoluteUserRootDir } = filePath;
+            assert(filePathAbsoluteUserRootDir);
+            const configName = getConfigName(filePathAbsoluteUserRootDir);
             assert(configName);
-            const locationId = getLocationId(filePathRelativeToUserRootDir);
+            const locationId = getLocationId(filePathAbsoluteUserRootDir);
             const interfaceFile = {
                 locationId,
                 filePath,
@@ -348,9 +348,9 @@ async function getGlobalConfigs(interfaceFilesByLocationId, userRootDir, importe
         const interfaceFilesGlobalPaths = [];
         objectEntries(interfaceFilesGlobal).forEach(([locationId, interfaceFiles]) => {
             assert(isGlobalLocation(locationId, locationIds));
-            interfaceFiles.forEach(({ filePath: { filePathRelativeToUserRootDir } }) => {
-                if (filePathRelativeToUserRootDir) {
-                    interfaceFilesGlobalPaths.push(filePathRelativeToUserRootDir);
+            interfaceFiles.forEach(({ filePath: { filePathAbsoluteUserRootDir } }) => {
+                if (filePathAbsoluteUserRootDir) {
+                    interfaceFilesGlobalPaths.push(filePathAbsoluteUserRootDir);
                 }
             });
         });
@@ -459,10 +459,10 @@ async function resolveConfigValueSources(configName, configDef, interfaceFilesRe
 }
 function makeOrderDeterministic(interfaceFile1, interfaceFile2) {
     return lowerFirst((interfaceFile) => {
-        const { filePathRelativeToUserRootDir } = interfaceFile.filePath;
+        const { filePathAbsoluteUserRootDir } = interfaceFile.filePath;
         assert(isInterfaceFileUserLand(interfaceFile));
-        assert(filePathRelativeToUserRootDir);
-        return filePathRelativeToUserRootDir.length;
+        assert(filePathAbsoluteUserRootDir);
+        return filePathAbsoluteUserRootDir.length;
     })(interfaceFile1, interfaceFile2);
 }
 function warnOverridenConfigValues(interfaceFileWinner, interfaceFilesOverriden, configName) {
@@ -536,6 +536,7 @@ async function getConfigValueSource(configName, interfaceFile, configDef, userRo
                 configName !== 'extends') {
                 if (import_.filePathAbsoluteFilesystem) {
                     assert(hasProp(import_, 'filePathAbsoluteFilesystem', 'string')); // Help TS
+                    assert(hasProp(import_, 'filePathToShowToUserResolved', 'string')); // Help TS
                     const fileExport = await loadImportedFile(import_, userRootDir, importedFilesLoaded);
                     configValueSource.value = fileExport;
                 }
@@ -739,7 +740,7 @@ function getComputed(configValueSources, configDefinitions) {
 }
 async function findPlusFiles(userRootDir, outDirRoot, isDev) {
     const files = await crawlPlusFiles(userRootDir, outDirRoot, isDev);
-    const plusFiles = files.map(({ filePathRelativeToUserRootDir }) => resolveFilePathRelativeToUserRootDir(filePathRelativeToUserRootDir, userRootDir));
+    const plusFiles = files.map(({ filePathAbsoluteUserRootDir }) => getFilePathResolved({ filePathAbsoluteUserRootDir, userRootDir, importPathAbsolute: null }));
     return plusFiles;
 }
 function getConfigName(filePath) {
@@ -829,9 +830,9 @@ function getFilesystemRoutingRootEffect(configFilesystemRoutingRoot, configName)
     const configDefinedAt = getConfigDefinedAtString('Config', configName, configFilesystemRoutingRoot);
     assertUsage(typeof value === 'string', `${configDefinedAt} should be a string`);
     assertUsage(value.startsWith('/'), `${configDefinedAt} is ${pc.cyan(value)} but it should start with a leading slash ${pc.cyan('/')}`);
-    const { filePathRelativeToUserRootDir } = configFilesystemRoutingRoot.definedAt;
-    assert(filePathRelativeToUserRootDir);
-    const before = getFilesystemRouteString(getLocationId(filePathRelativeToUserRootDir));
+    const { filePathAbsoluteUserRootDir } = configFilesystemRoutingRoot.definedAt;
+    assert(filePathAbsoluteUserRootDir);
+    const before = getFilesystemRouteString(getLocationId(filePathAbsoluteUserRootDir));
     const after = value;
     const filesystemRoutingRootEffect = { before, after };
     return { filesystemRoutingRootEffect, filesystemRoutingRootDefinedAt: configDefinedAt };

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

@@ -7,7 +7,7 @@ export { isEquivalentErrorWithCodeSnippet };
 export { getPrettyErrMessage };
 // Copied & adapted from https://github.com/vitejs/vite/blob/9c114c5c72a6af87e3330d5573362554b4511265/packages/vite/src/node/server/middlewares/error.ts
 import pc from '@brillout/picocolors';
-import { assert, escapeRegex, getFilePathRelativeToUserRootDir, isObject, removeEmptyLines, stripAnsi, toPosixPath } from '../../utils.js';
+import { assert, escapeRegex, getFilePathAbsoluteUserRootDir, isObject, removeEmptyLines, stripAnsi, toPosixPath } from '../../utils.js';
 function isErrorWithCodeSnippet(err) {
     if (!isObject(err)) {
         return false;
@@ -46,7 +46,7 @@ function getPrettyErrorWithCodeSnippet(err, userRootDir) {
     let { id, frame } = err;
     const msgFirstLine = [
         pc.red('Failed to transpile'),
-        pc.bold(pc.red(getFilePathRelativeToUserRootDir(normalizeId(id), userRootDir))),
+        pc.bold(pc.red(getFilePathAbsoluteUserRootDir(normalizeId(id), userRootDir))),
         pc.red('because:')
     ].join(' ');
     const errMsg = getPrettyErrMessage(err);

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

@@ -138,6 +138,7 @@ async function mergeScriptEntries(pageAssets, isProduction) {
 function getPageContextJsonScriptTag(pageContext) {
     const pageContextSerialized = sanitizeJson(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/esm/node/runtime/renderPage/getPageAssets/getManifestEntry.js

@@ -48,35 +48,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];
-        assert(manifestKeyEnd, debugInfo);
-        assert(!manifestKeyEnd.startsWith('/'), debugInfo);
-        manifestKeyEnd = '/' + manifestKeyEnd;
-        {
-            const { manifestEntry, manifestKey } = findEntryWithKeyEnd(manifestKeyEnd, assetsManifest, id);
-            if (manifestEntry) {
-                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);
+      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) {
-                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 }
         }
-        assert(false, debugInfo);
+      }
+      assert(false, debugInfo)
     }
+    */
     assert(false, debugInfo);
 }
 function findEntryWithKeyEnd(manifestKeyEnd, assetsManifest, id) {

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

@@ -51,7 +51,7 @@ async function renderPage(pageContextInit) {
 async function renderPageAndPrepare(pageContextInit, httpRequestId) {
     // Invalid config
     const handleInvalidConfig = () => {
-        logRuntimeInfo?.(pc.bold(pc.red("Couldn't load configuration: see error above.")), httpRequestId, 'error');
+        logRuntimeInfo?.(pc.bold(pc.red('Error while loading a Vike config file, see error above.')), httpRequestId, 'error');
         const pageContextHttpResponseNull = getPageContextHttpResponseNull(pageContextInit);
         return pageContextHttpResponseNull;
     };
@@ -203,29 +203,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) => pc.bold(isSuccess ? pc.green(String(s)) : pc.red(String(s)));
-    const isRedirect = statusCode && 300 <= statusCode && statusCode <= 399;
-    const type = isRedirect ? 'redirect' : 'response';
-    if (isRedirect) {
-        assert(pageContextReturn.httpResponse);
-        const headerRedirect = pageContextReturn.httpResponse.headers
-            .slice()
-            .reverse()
-            .find((header) => header[0] === 'Location');
-        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
+            assert(errorWhileRendering === null || errorWhileRendering === undefined);
+            msg = `HTTP response ${pc.bold(urlOriginal)} ${pc.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) => pc.bold(isSuccess ? pc.green(String(s)) : pc.red(String(s)));
+            const isRedirect = statusCode && 300 <= statusCode && statusCode <= 399;
+            const type = isRedirect ? 'redirect' : 'response';
+            if (isRedirect) {
+                assert(pageContextReturn.httpResponse);
+                const headerRedirect = pageContextReturn.httpResponse.headers
+                    .slice()
+                    .reverse()
+                    .find((header) => header[0] === 'Location');
+                assert(headerRedirect);
+                const urlRedirect = headerRedirect[1];
+                urlOriginal = urlRedirect;
+            }
+            msg = `HTTP ${type} ${pc.bold(urlOriginal)} ${color(statusCode ?? 'ERR')}`;
+        }
     }
-    logRuntimeInfo?.(`HTTP ${type} ${pc.bold(urlOriginal)} ${color(statusCode ?? 'ERR')}`, httpRequestId, isNominal ? 'info' : 'error');
+    logRuntimeInfo?.(msg, httpRequestId, isNominal ? 'info' : 'error');
 }
 function getPageContextHttpResponseNullWithError(err, pageContextInit) {
     const pageContextHttpResponseNull = {};

package/dist/esm/shared/page-configs/FilePath.d.ts

@@ -0,0 +1,52 @@
+export type { FilePath };
+export type { FilePathResolved };
+type FilePathResolved = FilePath & {
+    filePathAbsoluteFilesystem: string;
+    filePathToShowToUserResolved: string;
+};
+type FilePath = {
+    /** The file's path, non-relative from Vite's perspective.
+     *
+     * Its value is equivalent to `filePath.filePathAbsoluteUserRootDir ?? filePath.importPathAbsolute`, for example:
+     *   - `vike-react/config`, or
+     *   - `/pages/+config.js`.
+     *
+     * We use it to generate import paths in virtual modules. (Since virtual modules cannot have relative import paths.)
+     */
+    filePathAbsoluteVite: string;
+    /** The file's path, absolute starting from the filesystem root.
+     *
+     * Example: `/home/rom/code/my-app/pages/some-page/Page.js`
+     *
+     * The value is `null` upon aliased import paths which we cannot resolve (we'd need to re-implement https://www.npmjs.com/package/@rollup/plugin-alias).
+     */
+    filePathAbsoluteFilesystem: string | null;
+    /** The file's path, shown to user upon logging.
+     *
+     * Unresolved: it may show an import path of a package e.g. `vike-react/config`.
+     *
+     * Currently, its value is equivalent to `FilePath['filePathAbsoluteVite']`.
+     */
+    filePathToShowToUser: string;
+    /** The file's path, shown to user upon logging.
+     *
+     * Resolved: it always shows an absolute file path.
+     *
+     * Currently, its value is equivalent to `FilePath['filePathAbsoluteUserRootDir'] | FilePath['filePathAbsoluteFilesystem'] `.
+     */
+    filePathToShowToUserResolved: string | null;
+    /** The file's path, absolute starting from the user root directory (i.e. Vite's `config.root`).
+     *
+     * Example: `/pages/some-page/Page.js`
+     */
+    filePathAbsoluteUserRootDir: string | null;
+    /** The file's path, as absolute import path. It's either:
+     *  - an npm package import (e.g. `vike-react/config`), or
+     *  - an alias (`#components/Counter').
+     */
+    importPathAbsolute: string | null;
+} & ({
+    importPathAbsolute: string;
+} | {
+    filePathAbsoluteUserRootDir: string;
+});

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

@@ -0,0 +1 @@
+export {};

package/dist/esm/shared/page-configs/PageConfig.d.ts

@@ -14,10 +14,9 @@ export type { ConfigValuesComputed };
 export type { DefinedAt };
 export type { DefinedAtFile };
 export type { DefinedAtFileFullInfo };
-export type { FilePathResolved };
-export type { FilePath };
 import type { ConfigValueImported, ConfigValueSerialized } from './serialize/PageConfigSerialized.js';
 import type { LocationId } from '../../node/plugin/plugins/importUserCode/v1-design/getVikeConfig/filesystemRouting.js';
+import type { FilePath } from './FilePath.js';
 type PageConfigBase = {
     pageId: string;
     isErrorPage?: true;
@@ -100,43 +99,3 @@ type DefinedAtFile = {
     fileExportPathToShowToUser: null | string[];
 };
 type ConfigValues = Record<string, ConfigValue>;
-type FilePathResolved = FilePath & {
-    filePathAbsoluteFilesystem: string;
-};
-type FilePath = {
-    /** The file's path, absolute from Vite's perspective.
-     *
-     * We use this to generate import paths in virtual modules. (Virtual modules cannot have relative import paths.)
-     *
-     * Its value is equivalent to `filePath.filePathRelativeToUserRootDir ?? filePath.importPathAbsolute`, for example:
-     *   - `vike-react/config`, or
-     *   - `/pages/+config.js`.
-     */
-    filePathAbsoluteVite: string;
-    /** The file's path, absolute from the filesystem root.
-     *
-     * Example: `/home/rom/code/my-app/pages/some-page/Page.js`
-     *
-     * The value is `null` upon aliased import paths which we cannot resolve (we'd need to re-implement https://www.npmjs.com/package/@rollup/plugin-alias).
-     */
-    filePathAbsoluteFilesystem: string | null;
-    /** The file's path, shown to user upon logging.
-     *
-     * Currently, its value is equivalent to `FilePath['filePathAbsoluteVite']`.
-     */
-    filePathToShowToUser: string;
-} & ({
-    filePathRelativeToUserRootDir: null;
-    /** The file's path, as absolute import path. It's either:
-     *  - an npm package import (e.g. `vike-react/config`), or
-     *  - an alias (`#components/Counter').
-     */
-    importPathAbsolute: string;
-} | {
-    /** The file's path, relative to Vite's root (i.e. the user project's root directory).
-     *
-     * Example: `/pages/some-page/Page.js`
-     */
-    filePathRelativeToUserRootDir: string;
-    importPathAbsolute: null | string;
-});

package/dist/esm/utils/assert.js

@@ -7,6 +7,7 @@ export { addOnBeforeLogHook };
 export { getAssertErrMsg };
 export { overwriteAssertProductionLogger };
 export { isBug };
+import { onAssertModuleLoad } from './assertSingleInstance.js';
 import { createErrorWithCleanStackTrace } from './createErrorWithCleanStackTrace.js';
 import { getGlobalObject } from './getGlobalObject.js';
 import { isObject } from './isObject.js';
@@ -25,6 +26,7 @@ const globalObject = getGlobalObject('utils/assert.ts', {
     },
     showStackTraceList: new WeakSet()
 });
+onAssertModuleLoad();
 const projectTag = `[vike]`;
 const projectTagWithVersion = `[vike@${projectInfo.projectVersion}]`;
 const numberOfStackTraceLinesToRemove = 2;

package/dist/esm/utils/assertSingleInstance.d.ts

@@ -1,6 +1,6 @@
 export { onClientEntry_ServerRouting };
 export { onClientEntry_ClientRouting };
-export { onProjectInfo };
+export { onAssertModuleLoad };
 declare function onClientEntry_ServerRouting(isProduction: boolean): void;
 declare function onClientEntry_ClientRouting(isProduction: boolean): void;
-declare function onProjectInfo(projectVersion: string): void;
+declare function onAssertModuleLoad(): void;

package/dist/esm/utils/assertSingleInstance.js

@@ -1,11 +1,12 @@
 export { onClientEntry_ServerRouting };
 export { onClientEntry_ClientRouting };
-export { onProjectInfo };
+export { onAssertModuleLoad };
 //  - 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
 import { unique } from './unique.js';
 import { getGlobalObject } from './getGlobalObject.js';
+import { projectInfo } from './projectInfo.js';
 /* Use original assertUsage() & assertWarning() after all CJS is removed from node_modules/vike/dist/
 import { assertUsage, assertWarning } from './assert.js'
 */
@@ -58,9 +59,9 @@ function onClientEntry_ClientRouting(isProduction) {
         globalObject.checkSingleInstance = true;
     assertSingleInstance();
 }
-// 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.projectVersion);
     assertSingleInstance();
 }
 function assertUsage(condition, errorMessage) {

package/dist/esm/utils/assertVersion.js

@@ -22,9 +22,12 @@ function isVersionOrAbove(versionActual, versionExpected) {
 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('.');
     assert(partsStr.length === 3);
+    assert(partsStr.every((s) => s.length > 0));
     const parts = partsStr.map((s) => parseInt(s, 10));
     return parts;
 }

package/dist/esm/utils/getFilePathAbsolute.d.ts

@@ -1,5 +1,5 @@
-export { getFilePathAbsolute };
-export { getFilePathRelativeToUserRootDir };
+export { getFilePathAbsoluteFilesystem };
+export { getFilePathAbsoluteUserRootDir };
 import type { ResolvedConfig } from 'vite';
-declare function getFilePathAbsolute(filePath: string, config: ResolvedConfig): string;
-declare function getFilePathRelativeToUserRootDir(filePathAbsoluteFilesystem: string, userRootDir: string, alwaysRelative?: boolean): string;
+declare function getFilePathAbsoluteFilesystem(filePath: string, config: ResolvedConfig): string;
+declare function getFilePathAbsoluteUserRootDir(filePathAbsoluteFilesystem: string, userRootDir: string, alwaysRelative?: boolean): string;

package/dist/esm/utils/getFilePathAbsolute.js

@@ -1,5 +1,5 @@
-export { getFilePathAbsolute };
-export { getFilePathRelativeToUserRootDir };
+export { getFilePathAbsoluteFilesystem };
+export { getFilePathAbsoluteUserRootDir };
 import { assertPosixPath, toPosixPath } from './filesystemPathHandling.js';
 import { assert } from './assert.js';
 import path from 'path';
@@ -14,7 +14,7 @@ assertIsNotProductionRuntime();
 // 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) {
     assertPosixPath(filePath);
     if (filePath.startsWith('/@fs/')) {
         return filePath;
@@ -42,20 +42,20 @@ function getFilePathAbsolute(filePath, config) {
     assertPathIsFilesystemAbsolute(filePathAbsoluteFilesystem);
     return filePathAbsoluteFilesystem;
 }
-function getFilePathRelativeToUserRootDir(filePathAbsoluteFilesystem, userRootDir, alwaysRelative = false) {
+function getFilePathAbsoluteUserRootDir(filePathAbsoluteFilesystem, userRootDir, alwaysRelative = false) {
     assertPosixPath(filePathAbsoluteFilesystem);
     assertPosixPath(userRootDir);
-    let filePathRelativeToUserRootDir = path.posix.relative(userRootDir, filePathAbsoluteFilesystem);
+    let filePathAbsoluteUserRootDir = path.posix.relative(userRootDir, filePathAbsoluteFilesystem);
     if (filePathAbsoluteFilesystem.startsWith(userRootDir)) {
-        assert(!filePathRelativeToUserRootDir.startsWith('.') && !filePathRelativeToUserRootDir.startsWith('/'), 
+        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;

package/dist/esm/utils/getGlobalObject.d.ts

@@ -1 +1,6 @@
-export declare function getGlobalObject<T extends Record<string, unknown> = never>(key: `${string}.ts`, defaultValue: T): T;
+export { getGlobalObject };
+export { assertIsSingleModuleInstance };
+/** Share information across module instances. */
+declare function getGlobalObject<T extends Record<string, unknown> = never>(key: `${string}.ts`, defaultValue: T): T;
+/** Assert that the module is instantiated only once. */
+declare function assertIsSingleModuleInstance(key: `${string}.ts`): void;

package/dist/esm/utils/getGlobalObject.js

@@ -1,9 +1,25 @@
-export function getGlobalObject(
-// We use the filename as key; each `getGlobalObject()` call should live inside a file with a unique filename.
+export { getGlobalObject };
+export { assertIsSingleModuleInstance };
+import { assert } from './assert.js';
+import { projectInfo } from './projectInfo.js';
+const projectKey = `_${projectInfo.projectName.toLowerCase()}`;
+/** Share information across module instances. */
+function getGlobalObject(
+// 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;
 }
-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();
+    assert(!(key in globalObjects));
+}
+function getGlobalObjects() {
+    // @ts-ignore
+    const globalObjects = (globalThis[projectKey] = globalThis[projectKey] || {});
+    return globalObjects;
+}

package/dist/esm/utils/isNpmPackage.d.ts

@@ -1,14 +1,8 @@
 export { isNpmPackageImport };
-export { isNpmPackageName };
-export { getNpmPackageName };
-export { getNpmPackageImportPath };
 export { isValidPathAlias };
 export { parse };
 export { isDistinguishable };
 declare function isNpmPackageImport(str: string): boolean;
-declare function isNpmPackageName(str: string | undefined): boolean;
-declare function getNpmPackageName(str: string): null | string;
-declare function getNpmPackageImportPath(str: string): null | string;
 declare function isValidPathAlias(alias: string): boolean;
 declare function isDistinguishable(alias: string): boolean;
 declare function parse(str: string | undefined): null | {

package/dist/esm/utils/isNpmPackage.js

@@ -1,8 +1,10 @@
 export { isNpmPackageImport };
-export { isNpmPackageName };
-export { getNpmPackageName };
-export { getNpmPackageImportPath };
 export { isValidPathAlias };
+/* Currently not used
+export { isNpmPackageName }
+export { getNpmPackageName }
+export { getNpmPackageImportPath }
+*/
 // For ./isNpmPackage.spec.ts
 export { parse };
 export { isDistinguishable };

package/dist/esm/utils/parseUrl.js

@@ -12,7 +12,7 @@ export { isUriWithProtocol };
 import { slice } from './slice.js';
 import { assert, assertUsage } from './assert.js';
 import pc from '@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/esm/utils/projectInfo.d.ts

@@ -1,7 +1,7 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-declare const PROJECT_VERSION: "0.4.165-commit-6dfef11";
+declare const PROJECT_VERSION: "0.4.165-commit-8eba585";
 declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.165-commit-6dfef11";
+    projectVersion: "0.4.165-commit-8eba585";
 };

package/dist/esm/utils/projectInfo.js

@@ -1,10 +1,7 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-import { onProjectInfo } from './assertSingleInstance.js';
-const PROJECT_VERSION = '0.4.165-commit-6dfef11';
+const PROJECT_VERSION = '0.4.165-commit-8eba585';
 const projectInfo = {
     projectName: 'Vike',
     projectVersion: PROJECT_VERSION
 };
-// 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.)
-onProjectInfo(projectInfo.projectVersion);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.165-commit-6dfef11",
+  "version": "0.4.165-commit-8eba585",
   "scripts": {
     "dev": "tsc --watch",
     "build": "rimraf dist/ && pnpm run build:esm && pnpm run build:cjs",
@@ -188,7 +188,7 @@
     "@types/node": "^20.10.5",
     "@types/resolve": "^1.20.6",
     "@types/source-map-support": "^0.5.10",
-    "react-streaming": "^0.3.22",
+    "react-streaming": "^0.3.24",
     "rimraf": "^5.0.5",
     "typescript": "^5.3.3",
     "vite": "npm:@brillout/vite@5.1.0-commit-3dc7abd"