vike 0.4.165 → 0.4.166-commit-a5e2596

package/dist/cjs/node/prerender/runPrerender.js

@@ -31,7 +31,6 @@ require("../runtime/page-files/setup.js");
 const path_1 = __importDefault(require("path"));
 const index_js_1 = require("../../shared/route/index.js");
 const utils_js_1 = require("./utils.js");
-const pLimit_js_1 = require("../../utils/pLimit.js");
 const renderPageAlreadyRouted_js_1 = require("../runtime/renderPage/renderPageAlreadyRouted.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const os_1 = require("os");
@@ -45,13 +44,13 @@ const helpers_js_1 = require("../../shared/page-configs/helpers.js");
 const loadConfigValues_js_1 = require("../../shared/page-configs/loadConfigValues.js");
 const error_page_js_1 = require("../../shared/error-page.js");
 const addUrlComputedProps_js_1 = require("../../shared/addUrlComputedProps.js");
-const assertPathIsFilesystemAbsolute_js_1 = require("../../utils/assertPathIsFilesystemAbsolute.js");
 const abort_js_1 = require("../../shared/route/abort.js");
 const loadUserFilesServerSide_js_1 = require("../runtime/renderPage/loadUserFilesServerSide.js");
 const getHook_js_1 = require("../../shared/hooks/getHook.js");
 const noRouteMatch_js_1 = require("../../shared/route/noRouteMatch.js");
 const getVikeConfig_js_1 = require("../plugin/plugins/importUserCode/v1-design/getVikeConfig.js");
 const logErrorHint_js_1 = require("../runtime/renderPage/logErrorHint.js");
+const executeHook_js_1 = require("../../shared/hooks/executeHook.js");
 async function runPrerenderFromAPI(options = {}) {
     await runPrerender(options, 'prerender()');
     // - We purposely propagate the error to the user land, so that the error interrupts the user land. It's also, I guess, a nice-to-have that the user has control over the error.
@@ -103,8 +102,8 @@ async function runPrerender(options, manuallyTriggered) {
         });
     }
     const { partial = false, noExtraDir = false, parallel = true } = prerenderConfig || {};
-    const concurrencyLimit = (0, pLimit_js_1.pLimit)(parallel === false || parallel === 0 ? 1 : parallel === true || parallel === undefined ? (0, os_1.cpus)().length : parallel);
-    (0, assertPathIsFilesystemAbsolute_js_1.assertPathIsFilesystemAbsolute)(outDirRoot); // Needed for loadImportBuild(outDir) of @brillout/vite-plugin-server-entry
+    const concurrencyLimit = (0, utils_js_1.pLimit)(parallel === false || parallel === 0 ? 1 : parallel === true || parallel === undefined ? (0, os_1.cpus)().length : parallel);
+    (0, utils_js_1.assertPathIsFilesystemAbsolute)(outDirRoot); // Needed for loadImportBuild(outDir) of @brillout/vite-plugin-server-entry
     await (0, globalContext_js_1.initGlobalContext)(true, outDirRoot);
     const renderContext = await (0, renderPageAlreadyRouted_js_1.getRenderContext)();
     renderContext.pageFilesAll.forEach(assertExportNames);
@@ -245,7 +244,7 @@ async function callOnBeforePrerenderStartHooks(prerenderContext, renderContext,
         if (doNotPrerenderList.find((p) => p.pageId === pageId)) {
             return;
         }
-        const prerenderResult = await (0, utils_js_1.executeHook)(() => hookFn(), { hookName, hookFilePath, hookTimeout });
+        const prerenderResult = await (0, executeHook_js_1.executeHook)(() => hookFn(), { hookName, hookFilePath, hookTimeout });
         const result = normalizeOnPrerenderHookResult(prerenderResult, hookFilePath, hookName);
         result.forEach(({ url, pageContext }) => {
             {
@@ -410,7 +409,7 @@ async function callOnPrerenderStartHook(prerenderContext, renderContext) {
         pageContext._urlOriginalBeforeHook = pageContext.urlOriginal;
     });
     const docLink = 'https://vike.dev/i18n#pre-rendering';
-    let result = await (0, utils_js_1.executeHook)(() => hookFn({
+    let result = await (0, executeHook_js_1.executeHook)(() => hookFn({
         pageContexts: prerenderContext.pageContexts,
         // TODO/v1-release: remove warning
         get prerenderPageContexts() {
@@ -734,7 +733,7 @@ function assertIsNotAbort(err, urlOr404) {
     if (!(0, abort_js_1.isAbortError)(err))
         return;
     const pageContextAbort = err._pageContextAbort;
-    const hookLoc = (0, utils_js_1.isUserHookError)(err);
+    const hookLoc = (0, executeHook_js_1.isUserHookError)(err);
     (0, utils_js_1.assert)(hookLoc);
     const thrownBy = ` by ${picocolors_1.default.cyan(`${hookLoc.hookName}()`)} hook defined at ${hookLoc.hookFilePath}`;
     const abortCaller = pageContextAbort._abortCaller;

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

@@ -26,6 +26,7 @@ __exportStar(require("../../utils/getOutDirs.js"), exports);
 __exportStar(require("../../utils/isPropertyGetter.js"), exports);
 __exportStar(require("../../utils/filesystemPathHandling.js"), exports);
 __exportStar(require("../../utils/urlToFile.js"), exports);
-__exportStar(require("../../shared/hooks/executeHook.js"), exports);
 __exportStar(require("../../utils/isPlainObject.js"), exports);
 __exportStar(require("../../utils/assertNodeEnv.js"), exports);
+__exportStar(require("../../utils/pLimit.js"), exports);
+__exportStar(require("../../utils/assertPathIsFilesystemAbsolute.js"), exports);

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/executeOnBeforeRenderAndDataHooks.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeOnBeforeRenderAndDataHooks = void 0;
 const getHook_js_1 = require("../../../shared/hooks/getHook.js");
 const preparePageContextForUserConsumptionServerSide_js_1 = require("./preparePageContextForUserConsumptionServerSide.js");
-const utils_js_1 = require("../utils.js");
 const assertOnBeforeRenderHookReturn_js_1 = require("../../../shared/assertOnBeforeRenderHookReturn.js");
+const executeHook_js_1 = require("../../../shared/hooks/executeHook.js");
 async function executeOnBeforeRenderAndDataHooks(pageContext) {
     if (pageContext._pageContextAlreadyProvidedByOnPrerenderHook) {
         return;
@@ -16,7 +16,7 @@ async function executeOnBeforeRenderAndDataHooks(pageContext) {
     }
     (0, preparePageContextForUserConsumptionServerSide_js_1.preparePageContextForUserConsumptionServerSide)(pageContext);
     if (dataHook) {
-        const hookResult = await (0, utils_js_1.executeHook)(() => dataHook.hookFn(pageContext), dataHook);
+        const hookResult = await (0, executeHook_js_1.executeHook)(() => dataHook.hookFn(pageContext), dataHook);
         // Note: hookResult can be anything (e.g. an object) and is to be assigned to pageContext.data
         const pageContextFromHook = {
             data: hookResult
@@ -24,7 +24,7 @@ async function executeOnBeforeRenderAndDataHooks(pageContext) {
         Object.assign(pageContext, pageContextFromHook);
     }
     if (onBeforeRenderHook) {
-        const hookResult = await (0, utils_js_1.executeHook)(() => onBeforeRenderHook.hookFn(pageContext), onBeforeRenderHook);
+        const hookResult = await (0, executeHook_js_1.executeHook)(() => onBeforeRenderHook.hookFn(pageContext), onBeforeRenderHook);
         (0, assertOnBeforeRenderHookReturn_js_1.assertOnBeforeRenderHookReturn)(hookResult, onBeforeRenderHook.hookFilePath);
         const pageContextFromHook = hookResult?.pageContext;
         Object.assign(pageContext, pageContextFromHook);

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

@@ -13,11 +13,12 @@ const preparePageContextForUserConsumptionServerSide_js_1 = require("./preparePa
 const assertHookReturnedObject_js_1 = require("../../../shared/assertHookReturnedObject.js");
 const loggerRuntime_js_1 = require("./loggerRuntime.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
+const executeHook_js_1 = require("../../../shared/hooks/executeHook.js");
 async function executeOnRenderHtmlHook(pageContext) {
     const { renderHook, hookFn } = getRenderHook(pageContext);
     (0, utils_js_1.objectAssign)(pageContext, { _renderHook: renderHook });
     (0, preparePageContextForUserConsumptionServerSide_js_1.preparePageContextForUserConsumptionServerSide)(pageContext);
-    const hookReturnValue = await (0, utils_js_1.executeHook)(() => hookFn(pageContext), renderHook);
+    const hookReturnValue = await (0, executeHook_js_1.executeHook)(() => hookFn(pageContext), renderHook);
     const { documentHtml, pageContextProvidedByRenderHook, pageContextPromise, injectFilter } = processHookReturnValue(hookReturnValue, renderHook);
     Object.assign(pageContext, pageContextProvidedByRenderHook);
     (0, utils_js_1.objectAssign)(pageContext, { _pageContextPromise: pageContextPromise });

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

@@ -2,11 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getManifestEntry = void 0;
 const utils_js_1 = require("../../utils.js");
-const assertClientEntryId_js_1 = require("./assertClientEntryId.js");
 const virtualFilePageConfigValuesAll_js_1 = require("../../../shared/virtual-files/virtualFilePageConfigValuesAll.js");
 const prependEntriesDir_js_1 = require("../../../shared/prependEntriesDir.js");
 function getManifestEntry(id, assetsManifest) {
-    (0, assertClientEntryId_js_1.assertClientEntryId)(id);
     const debugInfo = getDebugInfo(id, assetsManifest);
     // Vike client entry
     if (id.startsWith('@@vike/')) {
@@ -44,42 +42,42 @@ function getManifestEntry(id, assetsManifest) {
         return { manifestEntry, manifestKey };
     }
     // npm package import
-    if ((0, utils_js_1.isNpmPackageImport)(id)) {
-        const found = Object.entries(assetsManifest).find(([, e]) => e.name === (0, prependEntriesDir_js_1.prependEntriesDir)(id));
-        (0, utils_js_1.assert)(found);
-        const [manifestKey, manifestEntry] = found;
-        return { manifestEntry, manifestKey };
-    }
+    (0, utils_js_1.assertIsNpmPackageImport)(id);
+    const found = Object.entries(assetsManifest).find(([, e]) => e.name === (0, prependEntriesDir_js_1.prependEntriesDir)(id));
+    (0, utils_js_1.assert)(found);
+    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 };
-            }
+      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 }
         }
-        {
-            (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);
-        }
-        {
-            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;
 function findEntryWithKeyEnd(manifestKeyEnd, assetsManifest, id) {

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

@@ -11,15 +11,16 @@ function retrieveAssetsProd(clientDependencies, assetsManifest, includeAssetsImp
     clientDependencies.forEach(({ id, onlyAssets, eagerlyImported }) => {
         if (eagerlyImported)
             return; // Eagerly imported assets aren't imported with import() and therefore don't create a new Rollup entry and aren't listed in the manifest file
-        if (onlyAssets) {
-            if (!includeAssetsImportedByServer)
-                return;
+        // TODO/v1-release: remove
+        if (includeAssetsImportedByServer &&
+            onlyAssets &&
+            id.includes('.page.server.') &&
             // We assume that all npm packages have already built their files: bundlers (Rollup, esbuild, tsup, ...) extract the CSS out of JavaScript => we can assume JavaScript to not import any CSS/assets.
-            if ((0, utils_js_1.isNpmPackageImport)(id))
-                return;
-            if (id.includes('.page.server.')) {
-                id = (0, extractAssetsQuery_js_1.extractAssetsAddQuery)(id);
-            }
+            !(0, utils_js_1.isNpmPackageImport)(id, {
+                // I presume Vite already resolves path aliases when Vite sets the module's id
+                cannotBePathAlias: true
+            })) {
+            id = (0, extractAssetsQuery_js_1.extractAssetsAddQuery)(id);
         }
         const { manifestKey } = (0, getManifestEntry_js_1.getManifestEntry)(id, assetsManifest);
         collectAssets(manifestKey, assetUrls, visistedAssets, assetsManifest, onlyAssets);

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

@@ -8,7 +8,6 @@ const inferMediaType_js_1 = require("./inferMediaType.js");
 const getManifestEntry_js_1 = require("./getPageAssets/getManifestEntry.js");
 const sortPageAssetsForEarlyHintsHeader_js_1 = require("./getPageAssets/sortPageAssetsForEarlyHintsHeader.js");
 const globalContext_js_1 = require("../globalContext.js");
-const assertClientEntryId_js_1 = require("./getPageAssets/assertClientEntryId.js");
 const import_1 = require("@brillout/import");
 async function getPageAssets(pageContext, clientDependencies, clientEntries) {
     const globalContext = (0, globalContext_js_1.getGlobalContext)();
@@ -59,7 +58,6 @@ async function getPageAssets(pageContext, clientDependencies, clientEntries) {
 }
 exports.getPageAssets = getPageAssets;
 async function resolveClientEntriesDev(clientEntry, viteDevServer) {
-    (0, assertClientEntryId_js_1.assertClientEntryId)(clientEntry);
     let root = viteDevServer.config.root;
     (0, utils_js_1.assert)(root);
     root = (0, utils_js_1.toPosixPath)(root);
@@ -76,11 +74,9 @@ async function resolveClientEntriesDev(clientEntry, viteDevServer) {
     (0, utils_js_1.assertPosixPath)(clientEntry);
     let filePath;
     if (clientEntry.startsWith('/')) {
-        // User files
         filePath = (0, utils_js_1.pathJoin)(root, clientEntry);
     }
-    else if (clientEntry.startsWith('@@vike/') || (0, utils_js_1.isNpmPackageImport)(clientEntry)) {
-        // Vike client entry
+    else {
         const { createRequire } = (await (0, import_1.import_)('module')).default;
         const { dirname } = (await (0, import_1.import_)('path')).default;
         const { fileURLToPath } = (await (0, import_1.import_)('url')).default;
@@ -91,10 +87,7 @@ async function resolveClientEntriesDev(clientEntry, viteDevServer) {
         // @ts-expect-error
         // Bun workaround https://github.com/vikejs/vike/pull/1048
         const res = typeof Bun !== 'undefined' ? (toPath) => Bun.resolveSync(toPath, __dirname_) : require_.resolve;
-        if ((0, utils_js_1.isNpmPackageImport)(clientEntry)) {
-            filePath = res(clientEntry);
-        }
-        else {
+        if (clientEntry.startsWith('@@vike/')) {
             (0, utils_js_1.assert)(clientEntry.endsWith('.js'));
             try {
                 // For Vitest (which doesn't resolve vike to its dist but to its source files)
@@ -107,9 +100,10 @@ async function resolveClientEntriesDev(clientEntry, viteDevServer) {
                 filePath = (0, utils_js_1.toPosixPath)(res(clientEntry.replace('@@vike/dist/esm/client/', '../../../../../dist/esm/client/')));
             }
         }
-    }
-    else {
-        (0, utils_js_1.assert)(false);
+        else {
+            (0, utils_js_1.assertIsNpmPackageImport)(clientEntry);
+            filePath = res(clientEntry);
+        }
     }
     if (!filePath.startsWith('/')) {
         (0, utils_js_1.assert)(process.platform === 'win32');

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/node/runtime/utils.js

@@ -48,7 +48,6 @@ __exportStar(require("../../utils/isPropertyGetter.js"), exports);
 __exportStar(require("../../utils/debug.js"), exports);
 __exportStar(require("../../utils/urlToFile.js"), exports);
 __exportStar(require("../../utils/getGlobalObject.js"), exports);
-__exportStar(require("../../shared/hooks/executeHook.js"), exports);
 __exportStar(require("../../utils/freezePartial.js"), exports);
 __exportStar(require("../../utils/isNpmPackage.js"), exports);
 __exportStar(require("../../utils/isNotNullish.js"), exports);

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

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

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

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.assertNoInfiniteAbortLoop = exports.AbortRender = exports.getPageContextFromAllRewrites = exports.logAbortErrorHandled = exports.isAbortPageContext = exports.isAbortError = exports.RenderErrorPage = exports.render = exports.redirect = void 0;
+const executeHook_js_1 = require("../hooks/executeHook.js");
 const utils_js_1 = require("./utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 /**
@@ -121,7 +122,7 @@ function logAbortErrorHandled(err, isProduction, pageContext) {
     (0, utils_js_1.assert)(urlCurrent);
     const abortCall = err._pageContextAbort._abortCall;
     (0, utils_js_1.assert)(abortCall);
-    const hookLoc = (0, utils_js_1.isUserHookError)(err);
+    const hookLoc = (0, executeHook_js_1.isUserHookError)(err);
     let thrownBy = '';
     if (hookLoc) {
         thrownBy = ` by ${picocolors_1.default.cyan(`${hookLoc.hookName}()`)} hook defined at ${hookLoc.hookFilePath}`;

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeGuardHook = void 0;
 const getHook_js_1 = require("../hooks/getHook.js");
 const utils_js_1 = require("./utils.js");
+const executeHook_js_1 = require("../hooks/executeHook.js");
 const errIntro = 'The guard() hook defined by';
 async function executeGuardHook(pageContext, prepareForUserConsumption) {
     let hook;
@@ -22,7 +23,7 @@ async function executeGuardHook(pageContext, prepareForUserConsumption) {
     const res = prepareForUserConsumption(pageContext);
     if (res)
         pageContextForUserConsumption = res;
-    const hookResult = await (0, utils_js_1.executeHook)(() => guard(pageContextForUserConsumption), hook);
+    const hookResult = await (0, executeHook_js_1.executeHook)(() => guard(pageContextForUserConsumption), hook);
     (0, utils_js_1.assertUsage)(hookResult === undefined, `${errIntro} ${hook.hookFilePath} returns a value, but guard() shouldn't return any value`);
 }
 exports.executeGuardHook = executeGuardHook;

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

@@ -8,6 +8,7 @@ const assertPageContextProvidedByUser_js_1 = require("../assertPageContextProvid
 const utils_js_1 = require("./utils.js");
 const resolveRouteFunction_js_1 = require("./resolveRouteFunction.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
+const executeHook_js_1 = require("../hooks/executeHook.js");
 async function executeOnBeforeRouteHook(pageContext) {
     const pageContextFromOnBeforeRouteHook = {};
     if (!pageContext._onBeforeRouteHook)
@@ -41,7 +42,7 @@ async function getPageContextFromHook(onBeforeRouteHook, pageContext) {
     let hookReturn = onBeforeRouteHook.hookFn(pageContext);
     (0, resolveRouteFunction_js_1.assertSyncRouting)(hookReturn, `The onBeforeRoute() hook ${onBeforeRouteHook.hookFilePath}`);
     // TODO/v1-release: make executeOnBeforeRouteHook() and route() sync
-    hookReturn = await (0, utils_js_1.executeHook)(() => hookReturn, onBeforeRouteHook);
+    hookReturn = await (0, executeHook_js_1.executeHook)(() => hookReturn, onBeforeRouteHook);
     const errPrefix = `The onBeforeRoute() hook defined by ${onBeforeRouteHook.hookFilePath}`;
     (0, utils_js_1.assertUsage)(hookReturn === null ||
         hookReturn === undefined ||

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

@@ -39,9 +39,8 @@ async function route(pageContextForRoute) {
     (0, utils_js_1.objectAssign)(pageContext, pageContextFromOnBeforeRouteHook);
     // Vike's routing
     const allPageIds = pageContext._allPageIds;
-    (0, utils_js_1.assert)(allPageIds.length >= 0);
-    (0, utils_js_1.assertUsage)(pageContext._pageFilesAll.length > 0 || pageContext._pageConfigs.length > 0, 'No *.page.js file found. You must create at least one *.page.js file.');
-    (0, utils_js_1.assertUsage)(allPageIds.length > 0, "You must create at least one *.page.js file that isn't _default.page.*");
+    (0, utils_js_1.assertUsage)(allPageIds.length > 0, 'No page found. You must create at least one page.');
+    (0, utils_js_1.assert)(pageContext._pageFilesAll.length > 0 || pageContext._pageConfigs.length > 0);
     const { urlPathname } = pageContext;
     (0, utils_js_1.assert)(urlPathname.startsWith('/'));
     const routeMatches = [];

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

@@ -35,7 +35,6 @@ __exportStar(require("../../utils/isStringRecord.js"), exports);
 __exportStar(require("../../utils/unique.js"), exports);
 __exportStar(require("../../utils/isBrowser.js"), exports);
 __exportStar(require("../../utils/parseUrl.js"), exports);
-__exportStar(require("../hooks/executeHook.js"), exports);
 __exportStar(require("../../utils/checkType.js"), exports);
 __exportStar(require("../../utils/joinEnglish.js"), exports);
 __exportStar(require("../../utils/projectInfo.js"), exports);

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/assertPathIsFilesystemAbsolute.js

@@ -10,6 +10,7 @@ const filesystemPathHandling_js_1 = require("./filesystemPathHandling.js");
 /** Assert path is absolute from the filesystem root */
 function assertPathIsFilesystemAbsolute(p) {
     (0, filesystemPathHandling_js_1.assertPosixPath)(p);
+    (0, assert_js_1.assert)(!p.startsWith('/@fs/'));
     if (process.platform === 'win32') {
         (0, assert_js_1.assert)(path_1.default.win32.isAbsolute(p));
     }

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/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;
+}