vike 0.4.193 → 0.4.195-commit-486b49a

package/LICENSE.md

@@ -0,0 +1,9 @@
+MIT License
+
+Copyright (c) 2021-present Romuald Brillout
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/RenderErrorPage.js

@@ -1,2 +1,3 @@
 // eslint doesn't seem to support `package.json#exports`.
 export * from './dist/shared/RenderErrorPage.mjs'
+export { default } from './dist/shared/RenderErrorPage.mjs'

package/__internal/setup.js

@@ -1,2 +1,3 @@
 // eslint doesn't seem to support `package.json#exports`.
 export * from '../dist/esm/node/runtime/page-files/setup.mjs'
+export { default } from '../dist/esm/node/runtime/page-files/setup.mjs'

package/__internal.js

@@ -1,2 +1,3 @@
 // eslint doesn't seem to support `package.json#exports`.
 export * from './dist/__internal/index.mjs'
+export { default } from './dist/__internal/index.mjs'

package/abort.js

@@ -1,2 +1,3 @@
 // eslint doesn't seem to support `package.json#exports`.
 export * from './dist/shared/abort.mjs'
+export { default } from './dist/shared/abort.mjs'

package/cli.js

@@ -1,2 +1,3 @@
 // eslint doesn't seem to support `package.json#exports`.
 export * from './dist/esm/node/cli/index.mjs'
+export { default } from './dist/esm/node/cli/index.mjs'

package/client/router.js

@@ -1,2 +1,3 @@
 // eslint doesn't seem to support `package.json#exports`.
 export * from '../dist/esm/client/client-routing-runtime'
+export { default } from '../dist/esm/client/client-routing-runtime'

package/client.js

@@ -1,2 +1,3 @@
 // eslint doesn't seem to support `package.json#exports`.
 export * from './dist/esm/client/server-routing-runtime'
+export { default } from './dist/esm/client/server-routing-runtime'

package/dist/cjs/node/plugin/plugins/importBuild/index.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.set_ASSETS_MAP = exports.importBuild = void 0;
-const plugin_js_1 = require("@brillout/vite-plugin-server-entry/plugin.js");
+const plugin_1 = require("@brillout/vite-plugin-server-entry/plugin");
 const utils_js_1 = require("../../utils.js");
 const path_1 = __importDefault(require("path"));
 const module_1 = require("module");
@@ -28,7 +28,7 @@ function importBuild() {
                 configVike = await (0, getConfigVike_js_1.getConfigVike)(config);
             }
         },
-        ...(0, plugin_js_1.serverEntryPlugin)({
+        ...(0, plugin_1.serverEntryPlugin)({
             getImporterCode: () => {
                 return getEntryCode(config, configVike);
             },

package/dist/cjs/node/plugin/plugins/importUserCode/index.js

@@ -99,17 +99,13 @@ function handleHotUpdate(ctx, config) {
         `${msg} — ${pc.cyan('no HMR')}, see https://vike.dev/on-demand-compiler`,
         'info',
         null,
-        true,
-        clear,
-        config
+        true
       )
       return
     }
     //*/
-    // HMR can resolve errors => we clear previously shown errors.
     // It can hide an error it shouldn't hide (because the error isn't shown again), but it's ok since users can reload the page and the error will be shown again (Vite transpilation errors are shown again upon a page reload).
     if (!isVikeConfig && isViteModule) {
-        (0, loggerNotProd_js_1.clearLogs)({ clearErrors: true });
         return;
     }
     if (isVikeConfig) {

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

@@ -77,7 +77,11 @@ const configDefinitionsBuiltIn = {
     meta: {
         env: { config: true }
     },
-    clientEntryLoaded: {
+    // Whether the page loads:
+    //  - Vike's client runtime
+    //  - User's client hooks
+    // In other words, whether the page is "HTML-only" (https://vike.dev/render-modes). HTML-only pages shouldn't load the client runtime nor client hooks.
+    isClientRuntimeLoaded: {
         env: { server: true, client: true },
         eager: true,
         _computed: (configValueSources) => {

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

@@ -37,7 +37,7 @@ function reloadVikeConfig(userRootDir, outDirRoot) {
 }
 exports.reloadVikeConfig = reloadVikeConfig;
 async function handleReloadSideEffects() {
-    wasConfigInvalid = isConfigInvalid_js_1.isConfigInvalid;
+    wasConfigInvalid = !!isConfigInvalid_js_1.isConfigInvalid;
     const vikeConfigPromisePrevious = vikeConfigPromise;
     try {
         await vikeConfigPromise;
@@ -214,7 +214,7 @@ async function loadVikeConfig_withErrorHandling(userRootDir, outDirRoot, isDev,
     else {
         (0, utils_js_1.assert)(ret === undefined);
         (0, utils_js_1.assert)(err);
-        (0, isConfigInvalid_js_1.isConfigInvalid_set)(true);
+        (0, isConfigInvalid_js_1.isConfigInvalid_set)({ err });
         if (!isDev) {
             (0, utils_js_1.assert)((0, globalContext_js_1.getViteDevServer)() === null);
             throw err;

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

@@ -48,15 +48,10 @@ function addSsrMiddleware(middlewares, config, isPreview) {
                 if (value)
                     res.setHeader(name, value);
         }
-        if (!pageContext.httpResponse) {
-            return next();
-        }
-        else {
-            const { statusCode, headers } = pageContext.httpResponse;
-            headers.forEach(([name, value]) => res.setHeader(name, value));
-            res.statusCode = statusCode;
-            pageContext.httpResponse.pipe(res);
-        }
+        const { httpResponse } = pageContext;
+        httpResponse.headers.forEach(([name, value]) => res.setHeader(name, value));
+        res.statusCode = httpResponse.statusCode;
+        httpResponse.pipe(res);
     });
 }
 exports.addSsrMiddleware = addSsrMiddleware;

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

@@ -3,16 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.applyViteSourceMapToStackTrace = exports.screenHasErrors = exports.clearScreen = exports.isFirstLog = exports.logDirectly = exports.logWithVikeTag = exports.logWithViteTag = void 0;
+exports.applyViteSourceMapToStackTrace = exports.logDirectly = exports.logWithVikeTag = exports.logWithViteTag = void 0;
 const utils_js_1 = require("../../utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const isErrorDebug_js_1 = require("../../../shared/isErrorDebug.js");
 const globalContext_js_1 = require("../../../runtime/globalContext.js");
 (0, utils_js_1.assertIsNotProductionRuntime)();
-let isFirstLog = true;
-exports.isFirstLog = isFirstLog;
-let screenHasErrors = false;
-exports.screenHasErrors = screenHasErrors;
 function logWithVikeTag(msg, logType, category, showVikeVersion = false) {
     const projectTag = getProjectTag(showVikeVersion);
     msg = prependTags(msg, projectTag, category, logType);
@@ -39,7 +35,6 @@ exports.logWithViteTag = logWithViteTag;
 //  - Production => logs aren't managed by loggerNotProd.ts => logDirectly() is never called (not even loaded as asserted by assertIsVitePluginCode())
 function logDirectly(thing, logType) {
     applyViteSourceMapToStackTrace(thing);
-    exports.isFirstLog = isFirstLog = false;
     if (logType === 'info') {
         console.log(thing);
         return;
@@ -49,7 +44,6 @@ function logDirectly(thing, logType) {
         return;
     }
     if (logType === 'error') {
-        exports.screenHasErrors = screenHasErrors = true;
         console.error(thing);
         return;
     }
@@ -61,12 +55,6 @@ function logDirectly(thing, logType) {
     (0, utils_js_1.assert)(false);
 }
 exports.logDirectly = logDirectly;
-function clearScreen(viteConfig) {
-    // We use Vite's logger in order to respect the user's `clearScreen: false` setting
-    viteConfig.logger.clearScreen('error');
-    exports.screenHasErrors = screenHasErrors = false;
-}
-exports.clearScreen = clearScreen;
 function applyViteSourceMapToStackTrace(thing) {
     if ((0, isErrorDebug_js_1.isErrorDebug)())
         return;

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

@@ -9,7 +9,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.clearLogs = exports.logErrorDebugNote = exports.logConfigErrorRecover = exports.logConfigError = exports.logConfigInfo = exports.logViteError = exports.logViteAny = void 0;
+exports.logErrorDebugNote = exports.logConfigErrorRecover = exports.logConfigError = exports.logConfigInfo = exports.logViteError = exports.logViteAny = void 0;
 const abort_js_1 = require("../../../shared/route/abort.js");
 const globalContext_js_1 = require("../../runtime/globalContext.js");
 const loggerRuntime_js_1 = require("../../runtime/renderPage/loggerRuntime.js");
@@ -21,15 +21,12 @@ const transpileAndExecuteFile_js_1 = require("../plugins/importUserCode/v1-desig
 const log_js_1 = require("./loggerNotProd/log.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 const isNewError_js_1 = require("../../runtime/renderPage/isNewError.js");
-const isConfigInvalid_js_1 = require("../../runtime/renderPage/isConfigInvalid.js");
 const loggerProd_js_1 = require("../../runtime/renderPage/loggerProd.js");
 const executeHook_js_1 = require("../../../shared/hooks/executeHook.js");
 (0, utils_js_1.assertIsNotProductionRuntime)();
 (0, loggerRuntime_js_1.overwriteRuntimeProductionLogger)(logRuntimeError, logRuntimeInfo);
 (0, utils_js_1.overwriteAssertProductionLogger)(assertLogger);
-function logRuntimeInfo(msg, httpRequestId, logType, clearErrors) {
-    if (clearErrors)
-        clearLogs({ clearErrors: true });
+function logRuntimeInfo(msg, httpRequestId, logType) {
     const category = getCategory(httpRequestId);
     (0, utils_js_1.assert)(category);
     (0, log_js_1.logWithVikeTag)(msg, logType, category);
@@ -51,7 +48,6 @@ function logConfigInfo(msg, logType) {
 exports.logConfigInfo = logConfigInfo;
 function logConfigErrorRecover() {
     const msg = picocolors_1.default.bold(picocolors_1.default.green('Configuration successfully loaded'));
-    clearLogs({ clearAlsoIfConfigIsInvalid: true });
     const category = getConfigCategory();
     (0, log_js_1.logWithVikeTag)(msg, 'error-recover', category);
 }
@@ -113,7 +109,6 @@ function logErr(err, httpRequestId = null, errorComesFromVite) {
     (0, loggerProd_js_1.onRuntimeError)(err);
 }
 function logConfigError(err) {
-    clearLogs({ clearAlsoIfConfigIsInvalid: true });
     (0, utils_js_1.warnIfErrorIsNotObject)(err);
     const category = getConfigCategory();
     {
@@ -177,23 +172,6 @@ function assertLogger(thing, logType) {
     const { assertMsg, showVikeVersion } = res;
     (0, log_js_1.logWithVikeTag)(assertMsg, logType, category, showVikeVersion);
 }
-function clearLogs(conditions = {}) {
-    if (!conditions.clearAlsoIfConfigIsInvalid && isConfigInvalid_js_1.isConfigInvalid) {
-        // Avoid hiding the config error: the config error is printed only once
-        return;
-    }
-    if (conditions.clearErrors && !log_js_1.screenHasErrors) {
-        return;
-    }
-    if (conditions.clearIfFirstLog && !log_js_1.isFirstLog) {
-        return;
-    }
-    const viteConfig = (0, globalContext_js_1.getViteConfig)();
-    if (viteConfig) {
-        (0, log_js_1.clearScreen)(viteConfig);
-    }
-}
-exports.clearLogs = clearLogs;
 /** Note shown to user when vike does something risky:
  *  - When vike dedupes (i.e. swallows) an error with getHttpRequestAsyncStore().shouldErrorBeSwallowed(err)
  *  - When vike modifies the error with getPrettyErrorWithCodeSnippet(err)

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

@@ -39,9 +39,6 @@ function intercept(logType, config) {
             (0, utils_js_1.assert)(!(0, isErrorDebug_js_1.isErrorDebug)());
             return;
         }
-        // Only allow Vite to clear for its first log. All other clearing is controlled by vike.
-        if (options.clear)
-            (0, loggerNotProd_js_1.clearLogs)({ clearIfFirstLog: true });
         // Vite's default logger preprends the "[vite]" tag if and only if options.timestamp is true
         const prependViteTag = options.timestamp || !!store?.httpRequestId;
         (0, loggerNotProd_js_1.logViteAny)(msg, logType, store?.httpRequestId ?? null, prependViteTag);

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setImportBuildGetters = exports.loadImportBuild = void 0;
-const importServerEntry_js_1 = require("@brillout/vite-plugin-server-entry/importServerEntry.js");
+const runtime_1 = require("@brillout/vite-plugin-server-entry/runtime");
 const utils_js_1 = require("../utils.js");
 const buildGetters = (globalThis.__vike_buildGetters = globalThis.__vike_buildGetters || {
     getters: null
@@ -12,7 +12,7 @@ function setImportBuildGetters(getters) {
 exports.setImportBuildGetters = setImportBuildGetters;
 async function loadImportBuild(outDir) {
     if (!buildGetters.getters) {
-        await (0, importServerEntry_js_1.importServerEntry)(outDir);
+        await (0, runtime_1.importServerEntry)(outDir);
         (0, utils_js_1.assert)(buildGetters.getters);
     }
     const [pageFiles, assetsManifest, pluginManifest] = await Promise.all([

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

@@ -25,7 +25,7 @@ function getHtmlTags(pageContext, streamFromReactStreamingPackage, injectFilter,
         if (asset.isEntry && asset.assetType === 'script') {
             // We could allow the user to change the position of <script> but we currently don't:
             //  - Because of mergeScriptEntries()
-            //  - We would need to add STREAM to to PreloadFilterInject
+            //  - We would need to add HTML_STREAM to to PreloadFilterInject
             // To suppor this, we should add the JavaScript entry to injectFilterEntries (with an `src` value of `null`)
             return false;
         }
@@ -82,31 +82,36 @@ function getHtmlTags(pageContext, streamFromReactStreamingPackage, injectFilter,
     // ==========
     // JavaScript
     // ==========
-    // - The pageContext JSON should be fully sent before Vike's client runtime starts executing.
+    // - By default, we place the entry <script> towards the end of the HTML for better performance.
+    //   - Performance-wise, it's more interesting to start showing the page (parse HTML and load CSS) before starting loading scripts.
+    //   - But with HTML streaming, in order to support [Progressive Rendering](https://vike.dev/streaming#progressive-rendering), the entry <script> should be injected earlier instead.
+    // - The entry <script> shouldn't be `<script defer>` upon HTML streaming, otherwise progressive hydration while SSR streaming won't work.
+    // - `<script id="vike_pageContext" type="application/json">` (the `pageContext` JSON) should be fully sent before Vike's client runtime starts executing.
     //   - Otherwise, race condition "SyntaxError: Unterminated string in JSON": https://github.com/vikejs/vike/issues/567
-    //   - <script id="vike_pageContext" type="application/json"> must appear before the entry <script> (which loads Vike's client runtime).
-    //   - <script id="vike_pageContext" type="application/json"> can't be async nor defer.
-    // - The entry <script> can't be defer, otherwise progressive hydration while SSR streaming won't work.
-    // - The entry <script> should be towards the end of the HTML as performance-wise it's more interesting to parse <div id="page-view"> before running the entry <script> which initiates the hydration.
-    //   - But with HTML streaming, in order to support [Progressive Rendering](https://vike.dev/streaming#progressive-rendering), the entry <script> should be injected early instead.
+    //   - `<script id="vike_pageContext" type="application/json">` must appear before the entry <script> (which loads Vike's client runtime).
+    //   - `<script id="vike_pageContext" type="application/json">` can't be async nor defer.
+    const positionJavaScriptDefault = 'HTML_END';
     const positionJavaScriptEntry = (() => {
         if (injectScriptsAt !== null) {
             if (pageContext._pageContextPromise) {
                 (0, utils_js_1.assertWarning)(injectScriptsAt === 'HTML_END' || !isStream, `You're setting injectScriptsAt to ${picocolors_1.default.code(JSON.stringify(injectScriptsAt))} while using HTML streaming with a pageContext promise (https://vike.dev/streaming#initial-data-after-stream-end) which is contradictory: the pageContext promise is skipped.`, { onlyOnce: true });
             }
+            if (injectScriptsAt === 'HTML_STREAM' && !isStream) {
+                return positionJavaScriptDefault;
+            }
             return injectScriptsAt;
         }
         if (pageContext._pageContextPromise) {
             // - If there is a pageContext._pageContextPromise then <script id="vike_pageContext" type="application/json"> needs to await for it.
             // - pageContext._pageContextPromise is typically resolved only after the page's components are rendered and the stream ended.
             // - https://vike.dev/streaming#initial-data-after-stream-end
-            return 'HTML_END';
+            return positionJavaScriptDefault;
         }
         if (streamFromReactStreamingPackage && !streamFromReactStreamingPackage.hasStreamEnded()) {
             // If there is a stream then, in order to support progressive hydration, inject the JavaScript during the stream after React(/Vue/Solid/...) resolved the first suspense boundary.
-            return 'STREAM';
+            return 'HTML_STREAM';
         }
-        return 'HTML_END';
+        return positionJavaScriptDefault;
     })();
     if (pageContext._pageContextPromise && streamFromReactStreamingPackage) {
         // - Should we show this warning for Solid as well? Solid seems to also support progressive rendering.
@@ -140,7 +145,7 @@ function getHtmlTags(pageContext, streamFromReactStreamingPackage, injectFilter,
         const htmlTag = (0, inferHtmlTags_js_1.inferPreloadTag)(asset);
         if (!asset.inject)
             return;
-        // Ideally, instead of this conditional ternary operator, we should add STREAM to PreloadFilterInject (or a better fitting name such as HTML_STREAM)
+        // Ideally, instead of this conditional ternary operator, we should add HTML_STREAM to PreloadFilterInject
         const position = asset.inject === 'HTML_END' ? positionJavaScriptEntry : asset.inject;
         htmlTags.push({ htmlTag, position });
     });
@@ -223,6 +228,6 @@ function getInjectScriptsAt(pageId, pageConfigs) {
     (0, utils_js_1.assertUsage)(injectScriptsAt === null ||
         injectScriptsAt === 'HTML_BEGIN' ||
         injectScriptsAt === 'HTML_END' ||
-        injectScriptsAt === 'STREAM', `${configDefinedAt} has an invalid value`);
+        injectScriptsAt === 'HTML_STREAM', `${configDefinedAt} has an invalid value`);
     return injectScriptsAt;
 }

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

@@ -13,7 +13,7 @@ function injectHtmlTags(htmlString, htmlTags, position) {
 exports.injectHtmlTags = injectHtmlTags;
 // Is it worth it? Should we remove this? https://github.com/vikejs/vike/pull/1740#issuecomment-2230540892
 function injectHtmlTagsUsingStream(htmlTags, streamFromReactStreamingPackage) {
-    const htmlFragment = joinHtmlTags(htmlTags.filter((h) => h.position === 'STREAM'));
+    const htmlFragment = joinHtmlTags(htmlTags.filter((h) => h.position === 'HTML_STREAM'));
     if (htmlFragment) {
         (0, utils_js_1.assert)(!streamFromReactStreamingPackage.hasStreamEnded());
         streamFromReactStreamingPackage.injectToStream(htmlFragment, { flush: true });

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

@@ -13,7 +13,7 @@ async function injectHtmlTagsToString(htmlParts, pageContext, injectFilter) {
     let htmlString = htmlPartsToString(htmlParts, pageAssets);
     htmlString = injectToHtmlBegin(htmlString, htmlTags);
     htmlString = injectToHtmlEnd(htmlString, htmlTags);
-    (0, utils_js_1.assert)(htmlTags.filter((snippet) => snippet.position === 'STREAM').length === 0);
+    (0, utils_js_1.assert)(htmlTags.filter((snippet) => snippet.position === 'HTML_STREAM').length === 0);
     return htmlString;
 }
 exports.injectHtmlTagsToString = injectHtmlTagsToString;
@@ -41,7 +41,7 @@ function injectHtmlTagsToStream(pageContext, streamFromReactStreamingPackage, in
         if (streamFromReactStreamingPackage)
             return null;
         (0, utils_js_1.assert)(htmlTags);
-        const tags = htmlTags.filter((h) => h.position === 'STREAM');
+        const tags = htmlTags.filter((h) => h.position === 'HTML_STREAM');
         if (tags.length === 0)
             return null;
         const htmlFragment = (0, injectHtmlTags_js_1.joinHtmlTags)(tags);

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

@@ -9,17 +9,17 @@ const globalContext_js_1 = require("../globalContext.js");
 const getConfigValue_js_1 = require("../../../shared/page-configs/getConfigValue.js");
 function analyzePage(pageFilesAll, pageConfig, pageId) {
     if (pageConfig) {
-        const { clientEntryLoaded, isClientRouting } = (0, analyzeClientSide_js_1.analyzeClientSide)(pageConfig, pageFilesAll, pageId);
+        const { isClientRuntimeLoaded, isClientRouting } = (0, analyzeClientSide_js_1.analyzeClientSide)(pageConfig, pageFilesAll, pageId);
         const clientEntries = [];
         const clientFilePath = (0, getConfigValue_js_1.getConfigValueRuntime)(pageConfig, 'client', 'string')?.value ?? null;
         if (clientFilePath)
             clientEntries.push(clientFilePath);
-        if (clientEntryLoaded)
+        if (isClientRuntimeLoaded)
             clientEntries.push((0, determineClientEntry_js_1.getVikeClientEntry)(isClientRouting));
         const clientDependencies = [];
         clientDependencies.push({
             id: (0, virtualFilePageConfigValuesAll_js_1.getVirtualFileIdPageConfigValuesAll)(pageConfig.pageId, true),
-            onlyAssets: clientEntryLoaded ? false : true,
+            onlyAssets: isClientRuntimeLoaded ? false : true,
             eagerlyImported: false
         });
         // In production we inject the import of the server virtual module with ?extractAssets inside the client virtual module
@@ -55,7 +55,7 @@ function analyzePage(pageFilesAll, pageConfig, pageId) {
             });
         });
         return {
-            isHtmlOnly: !clientEntryLoaded,
+            isHtmlOnly: !isClientRuntimeLoaded,
             isClientRouting,
             clientEntries,
             clientDependencies,

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

@@ -7,14 +7,14 @@ exports.assertArguments = void 0;
 const utils_js_1 = require("../utils.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 function assertArguments(...args) {
-    const prefix = `[renderPage(${picocolors_1.default.cyan('pageContextInit')})]`;
+    const prefix = `${picocolors_1.default.code('renderPage(pageContextInit)')} (https://vike.dev/renderPage)`;
     const pageContextInit = args[0];
     (0, utils_js_1.assertUsage)(pageContextInit !== undefined && pageContextInit !== null, prefix + ` argument ${picocolors_1.default.cyan('pageContextInit')} is missing`, { showStackTrace: true });
     const len = args.length;
-    (0, utils_js_1.assertUsage)(len === 1, `${prefix} You passed ${len} arguments but renderPage() accepts only one argument.'`, {
+    (0, utils_js_1.assertUsage)(len === 1, `${prefix} called with ${len} arguments but renderPage() accepts only one argument.'`, {
         showStackTrace: true
     });
-    (0, utils_js_1.assertUsage)((0, utils_js_1.isObject)(pageContextInit), `${prefix} ${picocolors_1.default.cyan('pageContextInit')} should be an object, but ${picocolors_1.default.cyan(`typeof pageContextInit === ${JSON.stringify(typeof pageContextInit)}`)}`, { showStackTrace: true });
+    (0, utils_js_1.assertUsage)((0, utils_js_1.isObject)(pageContextInit), `${prefix} called with ${picocolors_1.default.code(`typeof pageContextInit === ${JSON.stringify(typeof pageContextInit)}`)} but ${picocolors_1.default.code('pageContextInit')} should be an object.`, { showStackTrace: true });
     // TODO/v1-release: remove
     if ('url' in pageContextInit) {
         (0, utils_js_1.assertWarning)(false, '`pageContextInit.url` has been renamed to `pageContextInit.urlOriginal`: replace `renderPage({ url })` with `renderPage({ urlOriginal })`. (See https://vike.dev/migration/0.4.23 for more information.)', { showStackTrace: true, onlyOnce: true });

package/dist/cjs/node/runtime/renderPage/{createHttpResponseObject.js → createHttpResponse.js}

@@ -1,16 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createHttpResponseObjectRedirect = exports.createHttpResponsePageContextJson = exports.createHttpResponseObject = void 0;
+exports.createHttpResponseFavicon404 = exports.createHttpResponseRedirect = exports.createHttpResponseError = exports.createHttpResponsePageContextJson = exports.createHttpResponsePage = void 0;
 const utils_js_1 = require("../utils.js");
 const error_page_js_1 = require("../../../shared/error-page.js");
 const getHttpResponseBody_js_1 = require("./getHttpResponseBody.js");
 const getEarlyHints_js_1 = require("./getEarlyHints.js");
-const getCacheControl_js_1 = require("./createHttpResponseObject/getCacheControl.js");
-const assertNoInfiniteHttpRedirect_js_1 = require("./createHttpResponseObject/assertNoInfiniteHttpRedirect.js");
-async function createHttpResponseObject(htmlRender, renderHook, pageContext) {
-    if (htmlRender === null) {
-        return null;
-    }
+const getCacheControl_js_1 = require("./createHttpResponse/getCacheControl.js");
+const assertNoInfiniteHttpRedirect_js_1 = require("./createHttpResponse/assertNoInfiniteHttpRedirect.js");
+async function createHttpResponsePage(htmlRender, renderHook, pageContext) {
     let statusCode = pageContext.abortStatusCode;
     if (!statusCode) {
         const isError = !pageContext._pageId || (0, error_page_js_1.isErrorPage)(pageContext._pageId, pageContext._pageConfigs);
@@ -33,15 +30,37 @@ async function createHttpResponseObject(htmlRender, renderHook, pageContext) {
     if (cacheControl) {
         headers.push(['Cache-Control', cacheControl]);
     }
-    return getHttpResponse(statusCode, 'text/html;charset=utf-8', headers, htmlRender, earlyHints, renderHook);
+    return createHttpResponse(statusCode, 'text/html;charset=utf-8', headers, htmlRender, earlyHints, renderHook);
+}
+exports.createHttpResponsePage = createHttpResponsePage;
+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;
+}
+exports.createHttpResponseFavicon404 = createHttpResponseFavicon404;
+function createHttpResponseError(pageContext) {
+    const reason = (() => {
+        if (!pageContext) {
+            return 'no error page (https://vike.dev/error-page) could be rendered';
+        }
+        const errorPageId = (0, error_page_js_1.getErrorPageId)(pageContext._pageFilesAll, pageContext._pageConfigs);
+        if (errorPageId) {
+            return "the error page (https://vike.dev/error-page) couldn't be rendered (for example if an error occurred while rendering the error page)";
+        }
+        else {
+            return 'no error page (https://vike.dev/error-page) is defined, make sure to create one';
+        }
+    })();
+    const httpResponse = createHttpResponse(500, 'text/html;charset=utf-8', [], `<p>An error occurred.</p><script>console.log(${JSON.stringify(`This HTTP response was generated by Vike. Vike returned this response because ${reason}.`)})</script>`);
+    return httpResponse;
 }
-exports.createHttpResponseObject = createHttpResponseObject;
+exports.createHttpResponseError = createHttpResponseError;
 async function createHttpResponsePageContextJson(pageContextSerialized) {
-    const httpResponse = getHttpResponse(200, 'application/json', [], pageContextSerialized, [], null);
+    const httpResponse = createHttpResponse(200, 'application/json', [], pageContextSerialized, [], null);
     return httpResponse;
 }
 exports.createHttpResponsePageContextJson = createHttpResponsePageContextJson;
-function createHttpResponseObjectRedirect({ url, statusCode }, 
+function createHttpResponseRedirect({ url, statusCode }, 
 // The URL we assume the redirect to be logically based on
 urlLogical) {
     (0, assertNoInfiniteHttpRedirect_js_1.assertNoInfiniteHttpRedirect)(url, urlLogical);
@@ -49,13 +68,13 @@ urlLogical) {
     (0, utils_js_1.assert)(statusCode);
     (0, utils_js_1.assert)(300 <= statusCode && statusCode <= 399);
     const headers = [['Location', url]];
-    return getHttpResponse(statusCode, 'text/html;charset=utf-8', headers, 
+    return createHttpResponse(statusCode, 'text/html;charset=utf-8', headers, 
     // For bots / programmatic crawlig: show what's going on.
     // For users: showing a blank page is probably better than a flickering text.
-    `<p style="display: none">Redirecting to ${url}</p>`);
+    `<p style="display: none">Redirecting to ${url}</p><script>console.log('This HTTP response was generated by Vike.')</script>`);
 }
-exports.createHttpResponseObjectRedirect = createHttpResponseObjectRedirect;
-function getHttpResponse(statusCode, contentType, headers, htmlRender, earlyHints = [], renderHook = null) {
+exports.createHttpResponseRedirect = createHttpResponseRedirect;
+function createHttpResponse(statusCode, contentType, headers, htmlRender, earlyHints = [], renderHook = null) {
     headers.push(['Content-Type', contentType]);
     (0, utils_js_1.assert)(renderHook || typeof htmlRender === 'string');
     return {

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

@@ -22,9 +22,6 @@ async function executeOnRenderHtmlHook(pageContext) {
     const { documentHtml, pageContextProvidedByRenderHook, pageContextPromise, injectFilter } = processHookReturnValue(hookReturnValue, renderHook);
     Object.assign(pageContext, pageContextProvidedByRenderHook);
     (0, utils_js_1.objectAssign)(pageContext, { _pageContextPromise: pageContextPromise });
-    if (documentHtml === null || documentHtml === undefined) {
-        return { htmlRender: null, renderHook };
-    }
     const onErrorWhileStreaming = (err) => {
         // Should the stream inject the following?
         // ```
@@ -81,7 +78,7 @@ function getRenderHook(pageContext) {
     return hookFound;
 }
 function processHookReturnValue(hookReturnValue, renderHook) {
-    let documentHtml = null;
+    let documentHtml;
     let pageContextPromise = null;
     let pageContextProvidedByRenderHook = null;
     let injectFilter = null;
@@ -108,7 +105,8 @@ function processHookReturnValue(hookReturnValue, renderHook) {
         (0, utils_js_1.assertUsage)((0, utils_js_1.isCallable)(hookReturnValue.injectFilter), 'injectFilter should be a function');
         injectFilter = hookReturnValue.injectFilter;
     }
-    if (hookReturnValue.documentHtml) {
+    (0, utils_js_1.assertUsage)(hookReturnValue.documentHtml, `${errPrefix} returned an object that is missing the ${picocolors_1.default.code('documentHtml')} property.`);
+    {
         let val = hookReturnValue.documentHtml;
         const errBegin = `${errPrefix} returned ${picocolors_1.default.cyan('{ documentHtml }')}, but ${picocolors_1.default.cyan('documentHtml')}`;
         if (typeof val === 'string') {

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

@@ -7,7 +7,7 @@ exports.handleErrorWithoutErrorPage = void 0;
 const stringify_1 = require("@brillout/json-serializer/stringify");
 const globalContext_js_1 = require("../globalContext.js");
 const utils_js_1 = require("../utils.js");
-const createHttpResponseObject_js_1 = require("./createHttpResponseObject.js");
+const createHttpResponse_js_1 = require("./createHttpResponse.js");
 const picocolors_1 = __importDefault(require("@brillout/picocolors"));
 // When the user hasn't defined _error.page.js
 async function handleErrorWithoutErrorPage(pageContext) {
@@ -18,13 +18,14 @@ async function handleErrorWithoutErrorPage(pageContext) {
         warnMissingErrorPage(isV1);
     }
     if (!pageContext.isClientSideNavigation) {
-        (0, utils_js_1.objectAssign)(pageContext, { httpResponse: null });
+        const httpResponse = (0, createHttpResponse_js_1.createHttpResponseError)(pageContext);
+        (0, utils_js_1.objectAssign)(pageContext, { httpResponse });
         return pageContext;
     }
     else {
         const __getPageAssets = async () => [];
         (0, utils_js_1.objectAssign)(pageContext, { __getPageAssets });
-        const httpResponse = await (0, createHttpResponseObject_js_1.createHttpResponseObject)((0, stringify_1.stringify)({ serverSideError: true }), null, pageContext);
+        const httpResponse = await (0, createHttpResponse_js_1.createHttpResponsePage)((0, stringify_1.stringify)({ serverSideError: true }), null, pageContext);
         (0, utils_js_1.objectAssign)(pageContext, { httpResponse });
         return pageContext;
     }

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

@@ -26,6 +26,9 @@ function inferMediaType(href) {
     if (href.endsWith('.svg')) {
         return { assetType: 'image', mediaType: 'image/svg+xml' };
     }
+    if (href.endsWith('.avif')) {
+        return { assetType: 'image', mediaType: 'image/avif' };
+    }
     // Fonts
     if (href.endsWith('.ttf')) {
         return { assetType: 'font', mediaType: 'font/ttf' };

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

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