vike 0.4.222-commit-5513d32 → 0.4.222-commit-fab3841

package/dist/cjs/client/shared/getPageContextProxyForUser.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPageContextProxyForUser = getPageContextProxyForUser;
 const utils_js_1 = require("../server-routing-runtime/utils.js");
 const notSerializable_js_1 = require("../../shared/notSerializable.js");
-const globalObject = (0, utils_js_1.getGlobalObject)('getPageContextProxyForUser.ts', {});
+const globalObject = (0, utils_js_1.getGlobalObject)('shared/getPageContextProxyForUser.ts', {});
 /**
  * Throw error when pageContext value isn't:
  * - serializable, or

package/dist/cjs/node/api/prepareViteApiCall.js

@@ -48,7 +48,7 @@ const path_1 = __importDefault(require("path"));
 const utils_js_1 = require("./utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const globalContext_js_1 = require("../runtime/globalContext.js");
-const globalObject = (0, utils_js_1.getGlobalObject)('prepareViteApiCall.ts', {});
+const globalObject = (0, utils_js_1.getGlobalObject)('api/prepareViteApiCall.ts', {});
 async function prepareViteApiCall(viteConfigFromOptions, operation) {
     clear();
     (0, context_js_1.setContextApiOperation)(operation);

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

@@ -6,6 +6,7 @@ const utils_js_1 = require("../utils.js");
 const rollupSourceMap_js_1 = require("../shared/rollupSourceMap.js");
 const getFilePath_js_1 = require("../shared/getFilePath.js");
 const normalizeId_js_1 = require("../shared/normalizeId.js");
+const viteIsSSR_js_1 = require("../shared/viteIsSSR.js");
 // TODO/enventually: (after we implemented vike.config.js)
 // - Make import.meta.env work inside +config.js
 //   - For it to work, we'll probably need the user to define the settings (e.g. `envDir`) for loadEnv() inside vike.config.js instead of vite.config.js
@@ -38,7 +39,7 @@ function envVarsPlugin() {
             if (!code.includes('import.meta.env.'))
                 return;
             const isBuild = config.command === 'build';
-            const isClientSide = getIsClientSide(config, options);
+            const isClientSide = !(0, viteIsSSR_js_1.viteIsSSR_safe)(config, options);
             Object.entries(envsAll)
                 .filter(([key]) => {
                 // Already handled by Vite
@@ -84,19 +85,3 @@ function envVarsPlugin() {
 function applyEnvVar(envStatementRegEx, envVal, code) {
     return code.replace(envStatementRegEx, JSON.stringify(envVal));
 }
-function getIsClientSide(config, options) {
-    const isBuild = config.command === 'build';
-    if (isBuild) {
-        (0, utils_js_1.assert)(typeof config.build.ssr === 'boolean');
-        const isServerSide = config.build.ssr;
-        if (options !== undefined) {
-            (0, utils_js_1.assert)(options.ssr === isServerSide);
-        }
-        return !isServerSide;
-    }
-    else {
-        (0, utils_js_1.assert)(typeof options?.ssr === 'boolean');
-        const isServerSide = options.ssr;
-        return !isServerSide;
-    }
-}

package/dist/cjs/node/plugin/plugins/extractAssetsPlugin.js

@@ -48,7 +48,7 @@ function extractAssetsPlugin() {
                 }
                 // TODO/now: add meta.default
                 (0, utils_js_1.assert)(vikeConfig.global.config.includeAssetsImportedByServer ?? true);
-                (0, utils_js_1.assert)(!(0, viteIsSSR_js_1.viteIsSSR_options)(options));
+                (0, utils_js_1.assert)(!(0, viteIsSSR_js_1.viteIsSSR_safe)(config, options));
                 const importStatements = await (0, parseEsModule_js_1.getImportStatements)(src);
                 const moduleNames = getImportedModules(importStatements);
                 const code = moduleNames.map((moduleName) => `import '${moduleName}';`).join('\n');
@@ -65,7 +65,7 @@ function extractAssetsPlugin() {
             //  - Vite's `vite:resolve` plugin; https://github.com/vitejs/vite/blob/d649daba7682791178b711d9a3e44a6b5d00990c/packages/vite/src/node/plugins/resolve.ts#L105
             enforce: 'pre',
             async resolveId(source, importer, options) {
-                if ((0, viteIsSSR_js_1.viteIsSSR_options)(options)) {
+                if ((0, viteIsSSR_js_1.viteIsSSR_safe)(config, options)) {
                     // When building for the server, there should never be a `?extractAssets` query
                     (0, utils_js_1.assert)(!extractAssetsRE.test(source));
                     (0, utils_js_1.assert)(importer === undefined || !extractAssetsRE.test(importer));

package/dist/cjs/node/plugin/plugins/extractExportNamesPlugin.js

@@ -11,7 +11,7 @@ const viteIsSSR_js_1 = require("../shared/viteIsSSR.js");
 const extractExportNamesRE = /(\?|&)extractExportNames(?:&|$)/;
 exports.extractExportNamesRE = extractExportNamesRE;
 const debug = (0, utils_js_1.createDebugger)('vike:extractExportNames');
-const globalObject = (0, utils_js_1.getGlobalObject)('extractExportNamesPlugin.ts', {});
+const globalObject = (0, utils_js_1.getGlobalObject)('plugins/extractExportNamesPlugin.ts', {});
 function extractExportNamesPlugin() {
     let isDev = false;
     return {

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

@@ -16,7 +16,7 @@ const getEnvVarObject_js_1 = require("../../../../shared/getEnvVarObject.js");
 const execA = (0, util_1.promisify)(child_process_1.exec);
 const debug = (0, utils_js_1.createDebugger)('vike:crawl');
 (0, utils_js_1.assertIsNotProductionRuntime)();
-(0, utils_js_1.assertIsSingleModuleInstance)('crawlPlusFiles.ts');
+(0, utils_js_1.assertIsSingleModuleInstance)('getVikeConfig/crawlPlusFiles.ts');
 let gitIsNotUsable = false;
 async function crawlPlusFiles(userRootDir, outDirAbsoluteFilesystem) {
     (0, utils_js_1.assertPosixPath)(userRootDir);

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

@@ -13,7 +13,7 @@ exports.getConfigDefinitionOptional = getConfigDefinitionOptional;
 const utils_js_1 = require("../../../utils.js");
 const configDefinitionsBuiltIn_js_1 = require("./getVikeConfig/configDefinitionsBuiltIn.js");
 const filesystemRouting_js_1 = require("./getVikeConfig/filesystemRouting.js");
-const isConfigInvalid_js_1 = require("../../../../runtime/renderPage/isConfigInvalid.js");
+const isVikeConfigInvalid_js_1 = require("../../../../runtime/renderPage/isVikeConfigInvalid.js");
 const globalContext_js_1 = require("../../../../runtime/globalContext.js");
 const loggerNotProd_js_1 = require("../../../shared/loggerNotProd.js");
 const removeSuperfluousViteLog_js_1 = require("../../../shared/loggerVite/removeSuperfluousViteLog.js");
@@ -43,7 +43,7 @@ function reloadVikeConfig(config) {
     handleReloadSideEffects();
 }
 async function handleReloadSideEffects() {
-    wasConfigInvalid = !!isConfigInvalid_js_1.isConfigInvalid;
+    wasConfigInvalid = !!isVikeConfigInvalid_js_1.isVikeConfigInvalid;
     const vikeConfigPromisePrevious = vikeConfigPromise;
     try {
         await vikeConfigPromise;
@@ -58,7 +58,7 @@ async function handleReloadSideEffects() {
         // Let the next handleReloadSideEffects() call handle side effects
         return;
     }
-    if (!isConfigInvalid_js_1.isConfigInvalid) {
+    if (!isVikeConfigInvalid_js_1.isVikeConfigInvalid) {
         if (wasConfigInvalid) {
             wasConfigInvalid = false;
             (0, loggerNotProd_js_1.logConfigErrorRecover)();
@@ -111,13 +111,13 @@ async function loadVikeConfig_withErrorHandling(userRootDir, isDev, vikeVitePlug
     if (!hasError) {
         (0, utils_js_1.assert)(ret);
         (0, utils_js_1.assert)(err === undefined);
-        (0, isConfigInvalid_js_1.isConfigInvalid_set)(false);
+        (0, isVikeConfigInvalid_js_1.isVikeConfigInvalid_set)(false);
         return ret;
     }
     else {
         (0, utils_js_1.assert)(ret === undefined);
         (0, utils_js_1.assert)(err);
-        (0, isConfigInvalid_js_1.isConfigInvalid_set)({ err });
+        (0, isVikeConfigInvalid_js_1.isVikeConfigInvalid_set)({ err });
         if (!isDev) {
             (0, utils_js_1.assert)((0, globalContext_js_1.getViteDevServer)() === null);
             throw err;

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

@@ -2,21 +2,30 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.viteIsSSR = viteIsSSR;
 exports.viteIsSSR_options = viteIsSSR_options;
+exports.viteIsSSR_safe = viteIsSSR_safe;
 const assert_js_1 = require("../../../utils/assert.js");
-const isObject_js_1 = require("../../../utils/isObject.js");
 function viteIsSSR(config) {
     return !!config?.build?.ssr;
 }
-// https://github.com/vitejs/vite/discussions/5109#discussioncomment-1450726
 function viteIsSSR_options(options) {
-    if (options === undefined) {
-        return false;
-    }
-    if (typeof options === 'boolean') {
-        return options;
+    return !!options?.ssr;
+}
+// Vite is quite messy about setting `ssr: boolean`, thus we use an extra safe implemention for security purposes.
+// It's used for .client.js and .server.js guarantee thus we use agressive assert() calls for added safety.
+function viteIsSSR_safe(config, options) {
+    if (config.command === 'build') {
+        (0, assert_js_1.assert)(typeof config.build.ssr === 'boolean');
+        const val = config.build.ssr;
+        if (options?.ssr !== undefined)
+            (0, assert_js_1.assert)(val === options.ssr);
+        return val;
     }
-    if ((0, isObject_js_1.isObject)(options)) {
-        return !!options.ssr;
+    else {
+        (0, assert_js_1.assert)(typeof options?.ssr === 'boolean');
+        const val = options.ssr;
+        /* This assert() fails (which is very unexpected).
+        if (typeof config.build.ssr === 'boolean') assert(val === config.build.ssr)
+        //*/
+        return val;
     }
-    (0, assert_js_1.assert)(false);
 }

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

@@ -37,7 +37,7 @@ const assertV1Design_js_1 = require("../shared/assertV1Design.js");
 const getPageConfigsRuntime_js_1 = require("../../shared/getPageConfigsRuntime.js");
 const resolveBase_js_1 = require("../shared/resolveBase.js");
 const debug = (0, utils_js_1.createDebugger)('vike:globalContext');
-const globalObject = (0, utils_js_1.getGlobalObject)('globalContext.ts', getInitialGlobalContext());
+const globalObject = (0, utils_js_1.getGlobalObject)('runtime/globalContext.ts', getInitialGlobalContext());
 async function getGlobalContextInternal() {
     // getGlobalContextInternal() should always be called after initGlobalContext()
     (0, utils_js_1.assert)(globalObject.isInitialized);

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

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.assertNoInfiniteHttpRedirect = assertNoInfiniteHttpRedirect;
 const utils_js_1 = require("../../utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-const globalObject = (0, utils_js_1.getGlobalObject)('assertNoInfiniteHttpRedirect.ts', {
+const globalObject = (0, utils_js_1.getGlobalObject)('createHttpResponse/assertNoInfiniteHttpRedirect.ts', {
     redirectGraph: {}
 });
 function assertNoInfiniteHttpRedirect(urlRedirectTarget, urlLogical) {

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

@@ -5,6 +5,7 @@ exports.createHttpResponsePageContextJson = createHttpResponsePageContextJson;
 exports.createHttpResponseError = createHttpResponseError;
 exports.createHttpResponseRedirect = createHttpResponseRedirect;
 exports.createHttpResponseFavicon404 = createHttpResponseFavicon404;
+exports.createHttpResponseBaseIsMissing = createHttpResponseBaseIsMissing;
 const utils_js_1 = require("../utils.js");
 const error_page_js_1 = require("../../../shared/error-page.js");
 const getHttpResponseBody_js_1 = require("./getHttpResponseBody.js");
@@ -40,6 +41,29 @@ function createHttpResponseFavicon404() {
     const httpResponse = createHttpResponse(404, 'text/html;charset=utf-8', [], "<p>No favicon.ico found.</p><script>console.log('This HTTP response was generated by Vike.')</script>");
     return httpResponse;
 }
+function createHttpResponseBaseIsMissing(urlOriginal, baseServer) {
+    const httpResponse = createHttpResponse(
+    // We use the error code `500` to signal a failing state because this HTTP response should never be used, see https://vike.dev/base-url#setup
+    // In other words: this HTTP response is expected to be generated but isn't expected to be actually used.
+    500, 'text/html;charset=utf-8', [], `
+<h1>Error: Base URL is missing</h1>
+<p>
+  <a href="https://vike.dev/renderPage"><code>renderPage(pageContextInit)</code></a> called with <code>pageContextInit.urlOriginal===${JSON.stringify(urlOriginal)}</code> which doesn't start with the Base URL <code>${baseServer}</code>.
+</p>
+<p>
+  See <a href="https://vike.dev/base-url#setup">vike.dev/base-url#setup</a> for how to properly setup your server while using a Base URL.
+</p>
+<style>
+  code {
+    font-family: monospace;
+    background-color: #eaeaea;
+    padding: 3px 5px;
+    border-radius: 4px;
+  }
+</style>
+`);
+    return httpResponse;
+}
 function createHttpResponseError(pageContext) {
     const reason = (() => {
         if (!pageContext) {

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

@@ -8,7 +8,7 @@ const retrieveAssetsProd_js_1 = require("./getPageAssets/retrieveAssetsProd.js")
 const inferMediaType_js_1 = require("./inferMediaType.js");
 const getManifestEntry_js_1 = require("./getPageAssets/getManifestEntry.js");
 const sortPageAssetsForEarlyHintsHeader_js_1 = require("./getPageAssets/sortPageAssetsForEarlyHintsHeader.js");
-const globalObject = (0, utils_js_1.getGlobalObject)('getPageAssets.ts', {
+const globalObject = (0, utils_js_1.getGlobalObject)('renderPage/getPageAssets.ts', {
     resolveClientEntriesDev: null
 });
 async function getPageAssets(pageContext, clientDependencies, clientEntries) {

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.handlePageContextRequestUrl = handlePageContextRequestUrl;
 const getPageContextRequestUrl_js_1 = require("../../../shared/getPageContextRequestUrl.js");
 const utils_js_1 = require("../utils.js");
-// See shared/getPageContextRequestUrl.ts
+// See also shared/getPageContextRequestUrl.ts
 function handlePageContextRequestUrl(url) {
     if (!hasSuffix(url)) {
         return { urlWithoutPageContextRequestSuffix: url, isPageContextRequest: false };

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.isNewError = isNewError;
 exports.setAlreadyLogged = setAlreadyLogged;
 const utils_js_1 = require("../utils.js");
-const globalObject = (0, utils_js_1.getGlobalObject)('runtime/renderPage/isNewError.ts', {
+const globalObject = (0, utils_js_1.getGlobalObject)('renderPage/isNewError.ts', {
     wasAlreadyLogged: new WeakSet()
 });
 function isNewError(errErrorPage, errNominalPage) {

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

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isVikeConfigInvalid_set = exports.isVikeConfigInvalid = void 0;
+const utils_js_1 = require("../utils.js");
+let isVikeConfigInvalid;
+const isVikeConfigInvalid_set = (val) => {
+    (0, utils_js_1.assert)(val === false || val.err);
+    exports.isVikeConfigInvalid = isVikeConfigInvalid = val;
+};
+exports.isVikeConfigInvalid_set = isVikeConfigInvalid_set;

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

@@ -16,7 +16,7 @@ const loggerRuntime_js_1 = require("./renderPage/loggerRuntime.js");
 const isNewError_js_1 = require("./renderPage/isNewError.js");
 const assertArguments_js_1 = require("./renderPage/assertArguments.js");
 const index_js_2 = require("./renderPage/log404/index.js");
-const isConfigInvalid_js_1 = require("./renderPage/isConfigInvalid.js");
+const isVikeConfigInvalid_js_1 = require("./renderPage/isVikeConfigInvalid.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const serializePageContextClientSide_js_1 = require("./html/serializePageContextClientSide.js");
 const error_page_js_1 = require("../../shared/error-page.js");
@@ -30,12 +30,11 @@ const globalObject = (0, utils_js_1.getGlobalObject)('runtime/renderPage.ts', {
 async function renderPage(pageContextInit) {
     (0, assertArguments_js_1.assertArguments)(...arguments);
     (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageContextInit, 'urlOriginal', 'string')); // assertUsage() already implemented at assertArguments()
-    (0, utils_js_1.onSetupRuntime)();
     assertIsUrl(pageContextInit.urlOriginal);
-    const urlPathnameWithBase = (0, utils_js_1.parseUrl)(pageContextInit.urlOriginal, '/').pathname;
-    assertIsNotViteRequest(urlPathnameWithBase, pageContextInit.urlOriginal);
-    if (urlPathnameWithBase.endsWith('/favicon.ico'))
-        return getPageContextHttpResponseFavicon404(pageContextInit);
+    (0, utils_js_1.onSetupRuntime)();
+    const pageContextInvalidRequest = renderInvalidRequest(pageContextInit);
+    if (pageContextInvalidRequest)
+        return pageContextInvalidRequest;
     const httpRequestId = getRequestId();
     const urlOriginalPretty = (0, utils_js_1.getUrlPretty)(pageContextInit.urlOriginal);
     logHttpRequest(urlOriginalPretty, httpRequestId);
@@ -55,15 +54,10 @@ function renderPage_addAsyncHookwrapper(wrapper) {
 }
 async function renderPageAndPrepare(pageContextInit, httpRequestId) {
     // Invalid config
-    const handleInvalidConfig = (err) => {
-        (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 pageContextWithError = getPageContextHttpResponseError(err, pageContextInit, null);
-        return pageContextWithError;
-    };
-    if (isConfigInvalid_js_1.isConfigInvalid) {
+    if (isVikeConfigInvalid_js_1.isVikeConfigInvalid) {
         if (1 < 2 // Make TS happy
         ) {
-            return handleInvalidConfig(isConfigInvalid_js_1.isConfigInvalid.err);
+            return renderInvalidVikeConfig(isVikeConfigInvalid_js_1.isVikeConfigInvalid.err, pageContextInit, httpRequestId);
         }
     }
     // Prepare context
@@ -81,15 +75,19 @@ async function renderPageAndPrepare(pageContextInit, httpRequestId) {
         const pageContextWithError = getPageContextHttpResponseError(err, pageContextInit, null);
         return pageContextWithError;
     }
-    if (isConfigInvalid_js_1.isConfigInvalid) {
-        return handleInvalidConfig(isConfigInvalid_js_1.isConfigInvalid.err);
+    if (isVikeConfigInvalid_js_1.isVikeConfigInvalid) {
+        return renderInvalidVikeConfig(isVikeConfigInvalid_js_1.isVikeConfigInvalid.err, pageContextInit, httpRequestId);
     }
     else {
-        // From now on, globalContext contains all the configuration data; getVikeConfig() isn't called anymore for this request
+        // `globalContext` now contains the entire Vike config and getVikeConfig() isn't called anymore for this request.
     }
     const globalContext = await (0, globalContext_js_1.getGlobalContextInternal)();
     // Check Base URL
-    await assertBaseUrl(pageContextInit, globalContext);
+    {
+        const pageContextHttpResponse = await checkBaseUrl(pageContextInit, globalContext);
+        if (pageContextHttpResponse)
+            return pageContextHttpResponse;
+    }
     // Normalize URL
     {
         const pageContextHttpResponse = await normalizeUrl(pageContextInit, globalContext, httpRequestId);
@@ -257,15 +255,6 @@ function getPageContextHttpResponseError(err, pageContextInit, pageContext) {
     });
     return pageContextWithError;
 }
-function getPageContextHttpResponseFavicon404(pageContextInit) {
-    const pageContext = createPageContext(pageContextInit);
-    const httpResponse = (0, createHttpResponse_js_1.createHttpResponseFavicon404)();
-    (0, utils_js_1.objectAssign)(pageContext, {
-        httpResponse
-    });
-    (0, utils_js_1.checkType)(pageContext);
-    return pageContext;
-}
 function createPageContext(pageContextInit) {
     const pageContext = {
         _isPageContextObject: true
@@ -458,10 +447,35 @@ pageContextNominalPageInit, httpRequestId, pageContextErrorPageInit, globalConte
     (0, utils_js_1.assert)(pageContextAbort.abortStatusCode);
     return { pageContextAbort };
 }
-async function assertBaseUrl(pageContextInit, globalContext) {
+async function checkBaseUrl(pageContextInit, globalContext) {
     const { baseServer } = globalContext;
     const { urlOriginal } = pageContextInit;
-    const { urlWithoutPageContextRequestSuffix } = (0, handlePageContextRequestUrl_js_1.handlePageContextRequestUrl)(urlOriginal);
-    const { isBaseMissing } = (0, utils_js_1.parseUrl)(urlWithoutPageContextRequestSuffix, baseServer);
-    (0, utils_js_1.assertUsage)(!isBaseMissing, `${picocolors_1.default.code('renderPage(pageContextInit)')} (https://vike.dev/renderPage) called with ${picocolors_1.default.code(`pageContextInit.urlOriginal===${JSON.stringify(urlOriginal)}`)} which doesn't start with Base URL ${picocolors_1.default.code(baseServer)} (https://vike.dev/base-url)`);
+    const { isBaseMissing } = (0, utils_js_1.parseUrl)(urlOriginal, baseServer);
+    if (!isBaseMissing)
+        return;
+    const pageContext = createPageContext(pageContextInit);
+    const httpResponse = (0, createHttpResponse_js_1.createHttpResponseBaseIsMissing)(urlOriginal, baseServer);
+    (0, utils_js_1.objectAssign)(pageContext, {
+        httpResponse,
+        isBaseMissing: true
+    });
+    (0, utils_js_1.checkType)(pageContext);
+    return pageContext;
+}
+function renderInvalidRequest(pageContextInit) {
+    const urlPathnameWithBase = (0, utils_js_1.parseUrl)(pageContextInit.urlOriginal, '/').pathname;
+    assertIsNotViteRequest(urlPathnameWithBase, pageContextInit.urlOriginal);
+    if (urlPathnameWithBase.endsWith('/favicon.ico')) {
+        const pageContext = createPageContext(pageContextInit);
+        const httpResponse = (0, createHttpResponse_js_1.createHttpResponseFavicon404)();
+        (0, utils_js_1.objectAssign)(pageContext, { httpResponse });
+        (0, utils_js_1.checkType)(pageContext);
+        return pageContext;
+    }
+    return null;
+}
+function renderInvalidVikeConfig(err, pageContextInit, httpRequestId) {
+    (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 pageContextWithError = getPageContextHttpResponseError(err, pageContextInit, null);
+    return pageContextWithError;
 }

package/dist/cjs/shared/getPageContextRequestUrl.js

@@ -9,7 +9,7 @@ exports.pageContextJsonFileExtension = pageContextJsonFileExtension;
 // `/some-base-url/index.pageContext.json` instead of `/some-base-url.pageContext.json` in order to comply to common reverse proxy setups, see https://github.com/vikejs/vike/issues/443
 const doNotCreateExtraDirectory = false;
 exports.doNotCreateExtraDirectory = doNotCreateExtraDirectory;
-// See node/renderPage/handlePageContextRequestUrl.ts
+// See also node/renderPage/handlePageContextRequestUrl.ts
 function getPageContextRequestUrl(url) {
     const pageContextRequestUrl = (0, urlToFile_js_1.urlToFile)(url, pageContextJsonFileExtension, doNotCreateExtraDirectory);
     return pageContextRequestUrl;

package/dist/cjs/shared/getPageContextUrlComputed.js

@@ -39,26 +39,29 @@ function getUrlParsed(pageContext) {
     //  6. The value of pageContext.urlPathname is now '/login': the pathname of `pageContext.urlLogical`. (While pageContext.urlOriginal is still '/fr-FR/admin'.)
     // Reproduction: https://github.com/vikejs/vike/discussions/1436#discussioncomment-8142023
     // Determine logical URL
-    // TODO/soon: revert https://github.com/vikejs/vike/issues/2138#issuecomment-2631713411
-    const assertUrlResolved = (src) => (0, utils_js_1.assert)(urlResolved && typeof urlResolved === 'string', { src, urlResolved });
+    const assertUrlResolved = (src) => (0, utils_js_1.assert)(urlResolved && typeof urlResolved === 'string', 
+    // TODO/eventually: remove debug logs, see:
+    // - https://github.com/vikejs/vike/issues/2138#issuecomment-2631713411
+    // - https://github.com/vikejs/vike/commit/5c7810f3080ab62536950f26e019bb2a3a517082
+    { src, urlResolved });
     let urlResolved;
-    let baseToBeRemoved;
+    let isBaseToBeRemoved;
     if (pageContext.urlLogical) {
         // Set by onBeforeRoute()
         urlResolved = pageContext.urlLogical;
-        baseToBeRemoved = false;
+        isBaseToBeRemoved = false;
         assertUrlResolved(1);
     }
     else if (pageContext._urlRewrite) {
         // Set by `throw render()`
         urlResolved = pageContext._urlRewrite;
-        baseToBeRemoved = false;
+        isBaseToBeRemoved = false;
         assertUrlResolved(2);
     }
     else {
         // Set by renderPage()
         urlResolved = pageContext.urlOriginal;
-        baseToBeRemoved = true;
+        isBaseToBeRemoved = true;
         assertUrlResolved(3);
     }
     assertUrlResolved(4);
@@ -71,7 +74,7 @@ function getUrlParsed(pageContext) {
     // - We assume there isn't any Base URL to the URLs set by the user at `throw render()` and onBeforeRoute()
     //   - This makes sense because the Base URL is merely a setting: ideally the user should write code that doesn't know anything about it (so that the user can remove/add/change Base URL without having to modify any code).
     // - pageContext.urlOriginal is the URL of the HTTP request and thus contains the Base URL.
-    const baseServer = !baseToBeRemoved ? '/' : pageContext._baseServer;
+    const baseServer = !isBaseToBeRemoved ? '/' : pageContext._baseServer;
     // Parse URL
     return (0, utils_js_1.parseUrl)(urlResolved, baseServer);
 }

package/dist/cjs/shared/hooks/getHook.js

@@ -14,7 +14,7 @@ const helpers_js_1 = require("../page-configs/helpers.js");
 const getConfigValueRuntime_js_1 = require("../page-configs/getConfigValueRuntime.js");
 const utils_js_1 = require("../utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
-const globalObject = (0, getGlobalObject_js_1.getGlobalObject)('getHook.ts', {});
+const globalObject = (0, getGlobalObject_js_1.getGlobalObject)('hooks/getHook.ts', {});
 function getHook(pageContext, hookName) {
     if (!(hookName in pageContext.exports)) {
         return null;

package/dist/cjs/utils/PROJECT_VERSION.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = void 0;
 // Automatically updated by @brillout/release-me
-exports.PROJECT_VERSION = '0.4.222-commit-5513d32';
+exports.PROJECT_VERSION = '0.4.222-commit-fab3841';

package/dist/cjs/utils/assertSetup.js

@@ -21,7 +21,7 @@ const isVitest_js_1 = require("./isVitest.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 (0, assertIsNotBrowser_js_1.assertIsNotBrowser)();
 const debug = (0, debug_js_1.createDebugger)('vike:setup');
-const setup = (0, getGlobalObject_js_1.getGlobalObject)('utils/assertIsNotProductionRuntime.ts', {});
+const setup = (0, getGlobalObject_js_1.getGlobalObject)('utils/assertSetup.ts', {});
 // Called by Vike modules that want to ensure that they aren't loaded by the server runtime in production
 function assertIsNotProductionRuntime() {
     if (debug.isActivated)

package/dist/cjs/utils/assertSingleInstance.js

@@ -16,7 +16,7 @@ const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 /* Use original assertUsage() & assertWarning() after all CJS is removed from node_modules/vike/dist/
 import { assertUsage, assertWarning } from './assert.js'
 */
-const globalObject = (0, getGlobalObject_js_1.getGlobalObject)('assertSingleInstance.ts', {
+const globalObject = (0, getGlobalObject_js_1.getGlobalObject)('utils/assertSingleInstance.ts', {
     instances: [],
     alreadyLogged: new Set()
 });

package/dist/cjs/utils/getGlobalObject.js

@@ -4,17 +4,13 @@ exports.getGlobalObject = getGlobalObject;
 exports.assertIsSingleModuleInstance = assertIsSingleModuleInstance;
 const assert_js_1 = require("./assert.js");
 /** 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) {
+function getGlobalObject(key, defaultValue) {
     const globalObjects = getGlobalObjects();
     const globalObject = (globalObjects[key] = globalObjects[key] || defaultValue);
     return globalObject;
 }
 /** Assert that the module is instantiated only once. */
-function assertIsSingleModuleInstance(
-// We use the filename (or file path) as key.
-key) {
+function assertIsSingleModuleInstance(key) {
     const globalObjects = getGlobalObjects();
     (0, assert_js_1.assert)(!(key in globalObjects));
 }

package/dist/esm/client/client-routing-runtime/getPageContextCurrent.js

@@ -1,7 +1,7 @@
 export { setPageContextCurrent };
 export { getPageContextCurrent };
 import { getGlobalObject } from './utils.js';
-const globalObject = getGlobalObject('getPageContextCurrent.ts', {
+const globalObject = getGlobalObject('client-routing-runtime/getPageContextCurrent.ts', {
     pageContextCurrent: null
 });
 function getPageContextCurrent() {

package/dist/esm/client/client-routing-runtime/getPageContextFromHooks.js

@@ -18,7 +18,7 @@ import { executeGuardHook } from '../../shared/route/executeGuardHook.js';
 import { AbortRender, isAbortPageContext } from '../../shared/route/abort.js';
 import { pageContextInitIsPassedToClient } from '../../shared/misc/pageContextInitIsPassedToClient.js';
 import { isServerSideError } from '../../shared/misc/isServerSideError.js';
-const globalObject = getGlobalObject('router/getPageContext.ts', {});
+const globalObject = getGlobalObject('client-routing-runtime/getPageContextFromHooks.ts', {});
 // TODO/eventually: rename
 function getPageContextFromHooks_serialized() {
     const pageContextSerialized = getPageContextSerializedInHtml();

package/dist/esm/client/client-routing-runtime/history.js

@@ -7,7 +7,7 @@ export { monkeyPatchHistoryAPI };
 import { getCurrentUrl } from '../shared/getCurrentUrl.js';
 import { assert, assertUsage, getGlobalObject, isObject } from './utils.js';
 initHistoryState(); // we redundantly call initHistoryState() to ensure it's called early
-const globalObject = getGlobalObject('history.ts', { previous: getHistoryInfo() });
+const globalObject = getGlobalObject('client-routing-runtime/history.ts', { previous: getHistoryInfo() });
 // `window.history.state === null` when:
 // - The very first render
 // - Click on `<a href="#some-hash" />`

package/dist/esm/client/client-routing-runtime/prefetch.js

@@ -19,7 +19,7 @@ import { PAGE_CONTEXT_MAX_AGE_DEFAULT, getPrefetchSettings } from './prefetch/ge
 import pc from '@brillout/picocolors';
 import { normalizeUrlArgument } from './normalizeUrlArgument.js';
 assertClientRouting();
-const globalObject = getGlobalObject('prefetch.ts', {
+const globalObject = getGlobalObject('client-routing-runtime/prefetch.ts', {
     linkPrefetchHandlerAdded: new WeakSet(),
     addLinkPrefetchHandlers_debounce: null,
     mutationObserver: new MutationObserver(addLinkPrefetchHandlers),

package/dist/esm/client/client-routing-runtime/renderPageClientSide.js

@@ -20,7 +20,7 @@ import { getErrorPageId } from '../../shared/error-page.js';
 import { setPageContextCurrent } from './getPageContextCurrent.js';
 import { getRouteStringParameterList } from '../../shared/route/resolveRouteString.js';
 import { getCurrentUrl } from '../shared/getCurrentUrl.js';
-const globalObject = getGlobalObject('renderPageClientSide.ts', (() => {
+const globalObject = getGlobalObject('client-routing-runtime/renderPageClientSide.ts', (() => {
     const { promise: firstRenderStartPromise, resolve: firstRenderStartPromiseResolve } = genPromise();
     return {
         previousPageContext: null,

package/dist/esm/client/client-routing-runtime/scrollRestoration.js

@@ -6,7 +6,7 @@ export { scrollRestoration_initialRenderIsDone };
 // - Firefox doesn't restore the scroll position upon page reload but does upon Cmd-Shift-T
 // See also: https://github.com/cyco130/knave/blob/e9e1bc7687848504293197f1b314b7d12ad0d228/design.md#scroll-restoration
 import { getGlobalObject, onPageHide, onPageShow } from './utils.js';
-const globalObject = getGlobalObject('scrollRestoration.ts', {});
+const globalObject = getGlobalObject('client-routing-runtime/scrollRestoration.ts', {});
 function scrollRestoration_init() {
     // Use the native scroll restoration mechanism only for the first render
     scrollRestoration_enable();

package/dist/esm/client/shared/getPageContextProxyForUser.js

@@ -1,7 +1,7 @@
 export { getPageContextProxyForUser };
 import { assert, assertUsage, assertWarning, getGlobalObject, getPropAccessNotation } from '../server-routing-runtime/utils.js';
 import { notSerializable } from '../../shared/notSerializable.js';
-const globalObject = getGlobalObject('getPageContextProxyForUser.ts', {});
+const globalObject = getGlobalObject('shared/getPageContextProxyForUser.ts', {});
 /**
  * Throw error when pageContext value isn't:
  * - serializable, or

package/dist/esm/node/api/prepareViteApiCall.js

@@ -10,7 +10,7 @@ import path from 'path';
 import { assert, assertUsage, getGlobalObject, isObject, toPosixPath } from './utils.js';
 import pc from '@brillout/picocolors';
 import { clearGlobalContext } from '../runtime/globalContext.js';
-const globalObject = getGlobalObject('prepareViteApiCall.ts', {});
+const globalObject = getGlobalObject('api/prepareViteApiCall.ts', {});
 async function prepareViteApiCall(viteConfigFromOptions, operation) {
     clear();
     setContextApiOperation(operation);