vike 0.4.194 → 0.4.195

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

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createHttpResponseFavicon404 = exports.createHttpResponseRedirect = exports.createHttpResponseError = exports.createHttpResponsePageContextJson = exports.createHttpResponse = 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 createHttpResponse(htmlRender, renderHook, pageContext) {
+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);
@@ -30,21 +30,21 @@ async function createHttpResponse(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.createHttpResponse = createHttpResponse;
+exports.createHttpResponsePage = createHttpResponsePage;
 function createHttpResponseFavicon404() {
-    const httpResponse = getHttpResponse(404, 'text/html;charset=utf-8', [], "<p>No favicon.ico found.</p><script>console.log('This HTTP response was generated by Vike.')</script>");
+    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() {
-    const httpResponse = getHttpResponse(500, 'text/html;charset=utf-8', [], "<p>An error occurred.</p><script>console.log('This HTTP response was generated by Vike. This response is used instead of rendering the error page (https://vike.dev/error-page), either because there isn't error page or because an error occurred while rendering the error page.')</script>");
+    const httpResponse = createHttpResponse(500, 'text/html;charset=utf-8', [], "<p>An error occurred.</p><script>console.log('This HTTP response was generated by Vike. This response is used instead of rendering the error page (https://vike.dev/error-page), either because there isn't error page or because an error occurred while rendering the error page.')</script>");
     return httpResponse;
 }
 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;
@@ -56,13 +56,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><script>console.log('This HTTP response was generated by Vike.')</script>`);
 }
 exports.createHttpResponseRedirect = createHttpResponseRedirect;
-function getHttpResponse(statusCode, contentType, headers, htmlRender, earlyHints = [], renderHook = null) {
+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/handleErrorWithoutErrorPage.js

@@ -25,7 +25,7 @@ async function handleErrorWithoutErrorPage(pageContext) {
     else {
         const __getPageAssets = async () => [];
         (0, utils_js_1.objectAssign)(pageContext, { __getPageAssets });
-        const httpResponse = await (0, createHttpResponse_js_1.createHttpResponse)((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/renderPageAlreadyRouted.js

@@ -58,7 +58,7 @@ async function renderPageAlreadyRouted(pageContext) {
     }
     const renderHookResult = await (0, executeOnRenderHtmlHook_js_1.executeOnRenderHtmlHook)(pageContext);
     const { htmlRender, renderHook } = renderHookResult;
-    const httpResponse = await (0, createHttpResponse_js_1.createHttpResponse)(htmlRender, renderHook, pageContext);
+    const httpResponse = await (0, createHttpResponse_js_1.createHttpResponsePage)(htmlRender, renderHook, pageContext);
     (0, utils_js_1.objectAssign)(pageContext, { httpResponse });
     return pageContext;
 }

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

@@ -242,6 +242,9 @@ function logHttpResponse(urlOriginalPretty, httpRequestId, pageContextReturn) {
     }
     (0, loggerRuntime_js_1.logRuntimeInfo)?.(msg, httpRequestId, isNominal ? 'info' : 'error');
 }
+function prettyUrl(url) {
+    return picocolors_1.default.bold(decodeURI(url));
+}
 function getPageContextHttpResponseError(err, pageContextInit) {
     const pageContextWithError = createPageContext(pageContextInit);
     const httpResponse = (0, createHttpResponse_js_1.createHttpResponseError)();
@@ -284,6 +287,7 @@ async function renderPageNominal(pageContext) {
         }
     }
     (0, utils_js_1.assert)((0, utils_js_1.hasProp)(pageContext, '_pageId', 'string'));
+    (0, utils_js_1.assert)(pageContext.errorWhileRendering === null);
     // Render
     const pageContextAfterRender = await (0, renderPageAlreadyRouted_js_1.renderPageAlreadyRouted)(pageContext);
     (0, utils_js_1.assert)(pageContext === pageContextAfterRender);
@@ -446,8 +450,5 @@ function assertBaseUrl(pageContextInit) {
     const { urlOriginal } = pageContextInit;
     const { urlWithoutPageContextRequestSuffix } = (0, handlePageContextRequestUrl_js_1.handlePageContextRequestUrl)(urlOriginal);
     const { hasBaseServer } = (0, utils_js_1.parseUrl)(urlWithoutPageContextRequestSuffix, baseServer);
-    (0, utils_js_1.assertUsage)(hasBaseServer, `${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 ${prettyUrl(baseServer)} (https://vike.dev/base-url)`);
-}
-function prettyUrl(url) {
-    return picocolors_1.default.code(decodeURI(url));
+    (0, utils_js_1.assertUsage)(hasBaseServer, `${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)`);
 }

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

@@ -72,7 +72,7 @@ async function getPageContextFromHook(onBeforeRouteHook, pageContext) {
     }
     if ((0, utils_js_1.hasProp)(hookReturn.pageContext, 'urlLogical')) {
         (0, utils_js_1.assertUsageUrlPathnameAbsolute)(
-        // We type-cast to string instead of assertUsage() in order to save client-side KBs
+        // We skip validation and type-cast instead of assertUsage() in order to save client-side KBs
         hookReturn.pageContext.urlLogical, `${errPrefix} returned ${picocolors_1.default.cyan('{ pageContext: { urlLogical } }')} but ${picocolors_1.default.cyan('urlLogical')}`);
     }
     (0, assertPageContextProvidedByUser_js_1.assertPageContextProvidedByUser)(hookReturn.pageContext, {

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.194';
+exports.PROJECT_VERSION = '0.4.195';

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

@@ -20,6 +20,7 @@ import { getErrorPageId } from '../../shared/error-page.js';
 const globalObject = getGlobalObject('renderPageClientSide.ts', { renderCounter: 0 });
 async function renderPageClientSide(renderArgs) {
     const { scrollTarget, urlOriginal = getCurrentUrl(), overwriteLastHistoryEntry = false, isBackwardNavigation, pageContextsFromRewrite = [], redirectCount = 0, isUserLandPushStateNavigation, isClientSideNavigation = true } = renderArgs;
+    const { previousPageContext } = globalObject;
     const { isRenderOutdated, setHydrationCanBeAborted, isFirstRender } = getIsRenderOutdated();
     // Note that pageContext.isHydration isn't equivalent to isFirstRender
     // - Thus pageContext.isHydration isn't equivalent to !pageContext.isClientSideNavigation
@@ -41,7 +42,6 @@ async function renderPageClientSide(renderArgs) {
             return;
         // onPageTransitionStart()
         if (globalObject.isFirstRenderDone) {
-            const { previousPageContext } = globalObject;
             assert(previousPageContext);
             // We use the hook of the previous page in order to be able to call onPageTransitionStart() before fetching the files of the next page.
             // https://github.com/vikejs/vike/issues/1560
@@ -96,8 +96,8 @@ async function renderPageClientSide(renderArgs) {
             }
             assert(hasProp(pageContextFromRoute, '_pageId', 'string')); // Help TS
             const isSamePage = pageContextFromRoute._pageId &&
-                globalObject.previousPageContext?._pageId &&
-                pageContextFromRoute._pageId === globalObject.previousPageContext._pageId;
+                previousPageContext?._pageId &&
+                pageContextFromRoute._pageId === previousPageContext._pageId;
             if (isUserLandPushStateNavigation && isSamePage) {
                 // Skip's Vike's rendering; let the user handle the navigation
                 return;
@@ -171,7 +171,7 @@ async function renderPageClientSide(renderArgs) {
         objectAssign(pageContext, {
             isBackwardNavigation,
             isClientSideNavigation,
-            _previousPageContext: globalObject.previousPageContext
+            _previousPageContext: previousPageContext
         });
         {
             const pageContextFromAllRewrites = getPageContextFromAllRewrites(pageContextsFromRewrite);
@@ -367,7 +367,6 @@ async function renderPageClientSide(renderArgs) {
         // onPageTransitionEnd()
         if (globalObject.isTransitioning) {
             globalObject.isTransitioning = undefined;
-            const { previousPageContext } = globalObject;
             assert(previousPageContext);
             assertHook(previousPageContext, 'onPageTransitionEnd');
             const hook = getHook(previousPageContext, 'onPageTransitionEnd');

package/dist/esm/node/runtime/html/injectAssets/getHtmlTags.d.ts

@@ -22,7 +22,7 @@ type InjectFilterEntry = {
     isEntry: boolean;
     inject: PreloadFilterInject;
 };
-type Position = 'HTML_BEGIN' | 'HTML_END' | 'STREAM';
+type Position = 'HTML_BEGIN' | 'HTML_END' | 'HTML_STREAM';
 type HtmlTag = {
     htmlTag: string | (() => string);
     position: Position;

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

@@ -20,7 +20,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;
         }
@@ -77,31 +77,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) {
                 assertWarning(injectScriptsAt === 'HTML_END' || !isStream, `You're setting injectScriptsAt to ${pc.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.
@@ -135,7 +140,7 @@ function getHtmlTags(pageContext, streamFromReactStreamingPackage, injectFilter,
         const htmlTag = 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 });
     });
@@ -217,6 +222,6 @@ function getInjectScriptsAt(pageId, pageConfigs) {
     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/esm/node/runtime/html/injectAssets/injectHtmlTags.js

@@ -16,7 +16,7 @@ function injectHtmlTags(htmlString, htmlTags, position) {
 }
 // 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) {
         assert(!streamFromReactStreamingPackage.hasStreamEnded());
         streamFromReactStreamingPackage.injectToStream(htmlFragment, { flush: true });

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

@@ -12,7 +12,7 @@ async function injectHtmlTagsToString(htmlParts, pageContext, injectFilter) {
     let htmlString = htmlPartsToString(htmlParts, pageAssets);
     htmlString = injectToHtmlBegin(htmlString, htmlTags);
     htmlString = injectToHtmlEnd(htmlString, htmlTags);
-    assert(htmlTags.filter((snippet) => snippet.position === 'STREAM').length === 0);
+    assert(htmlTags.filter((snippet) => snippet.position === 'HTML_STREAM').length === 0);
     return htmlString;
 }
 function injectHtmlTagsToStream(pageContext, streamFromReactStreamingPackage, injectFilter) {
@@ -39,7 +39,7 @@ function injectHtmlTagsToStream(pageContext, streamFromReactStreamingPackage, in
         if (streamFromReactStreamingPackage)
             return null;
         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 = joinHtmlTags(tags);

package/dist/esm/node/runtime/renderPage/createHttpResponse.d.ts

@@ -1,4 +1,4 @@
-export { createHttpResponse };
+export { createHttpResponsePage };
 export { createHttpResponsePageContextJson };
 export { createHttpResponseError };
 export { createHttpResponseRedirect };
@@ -18,7 +18,7 @@ type HttpResponse = {
     /** **Deprecated**: use `headers` instead, see https://vike.dev/migration/0.4.134 */
     contentType: 'application/json' | 'text/html;charset=utf-8';
 } & HttpResponseBody;
-declare function createHttpResponse(htmlRender: HtmlRender, renderHook: null | RenderHook, pageContext: {
+declare function createHttpResponsePage(htmlRender: HtmlRender, renderHook: null | RenderHook, pageContext: {
     _pageId: null | string;
     is404: null | boolean;
     errorWhileRendering: null | Error;

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

@@ -1,4 +1,4 @@
-export { createHttpResponse };
+export { createHttpResponsePage };
 export { createHttpResponsePageContextJson };
 export { createHttpResponseError };
 export { createHttpResponseRedirect };
@@ -7,9 +7,9 @@ import { assert, assertWarning } from '../utils.js';
 import { isErrorPage } from '../../../shared/error-page.js';
 import { getHttpResponseBody, getHttpResponseBodyStreamHandlers } from './getHttpResponseBody.js';
 import { getEarlyHints } from './getEarlyHints.js';
-import { getCacheControl } from './createHttpResponseObject/getCacheControl.js';
-import { assertNoInfiniteHttpRedirect } from './createHttpResponseObject/assertNoInfiniteHttpRedirect.js';
-async function createHttpResponse(htmlRender, renderHook, pageContext) {
+import { getCacheControl } from './createHttpResponse/getCacheControl.js';
+import { assertNoInfiniteHttpRedirect } from './createHttpResponse/assertNoInfiniteHttpRedirect.js';
+async function createHttpResponsePage(htmlRender, renderHook, pageContext) {
     let statusCode = pageContext.abortStatusCode;
     if (!statusCode) {
         const isError = !pageContext._pageId || isErrorPage(pageContext._pageId, pageContext._pageConfigs);
@@ -32,18 +32,18 @@ async function createHttpResponse(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);
 }
 function createHttpResponseFavicon404() {
-    const httpResponse = getHttpResponse(404, 'text/html;charset=utf-8', [], "<p>No favicon.ico found.</p><script>console.log('This HTTP response was generated by Vike.')</script>");
+    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 createHttpResponseError() {
-    const httpResponse = getHttpResponse(500, 'text/html;charset=utf-8', [], "<p>An error occurred.</p><script>console.log('This HTTP response was generated by Vike. This response is used instead of rendering the error page (https://vike.dev/error-page), either because there isn't error page or because an error occurred while rendering the error page.')</script>");
+    const httpResponse = createHttpResponse(500, 'text/html;charset=utf-8', [], "<p>An error occurred.</p><script>console.log('This HTTP response was generated by Vike. This response is used instead of rendering the error page (https://vike.dev/error-page), either because there isn't error page or because an error occurred while rendering the error page.')</script>");
     return httpResponse;
 }
 async function createHttpResponsePageContextJson(pageContextSerialized) {
-    const httpResponse = getHttpResponse(200, 'application/json', [], pageContextSerialized, [], null);
+    const httpResponse = createHttpResponse(200, 'application/json', [], pageContextSerialized, [], null);
     return httpResponse;
 }
 function createHttpResponseRedirect({ url, statusCode }, 
@@ -54,12 +54,12 @@ urlLogical) {
     assert(statusCode);
     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><script>console.log('This HTTP response was generated by Vike.')</script>`);
 }
-function getHttpResponse(statusCode, contentType, headers, htmlRender, earlyHints = [], renderHook = null) {
+function createHttpResponse(statusCode, contentType, headers, htmlRender, earlyHints = [], renderHook = null) {
     headers.push(['Content-Type', contentType]);
     assert(renderHook || typeof htmlRender === 'string');
     return {

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

@@ -2,7 +2,7 @@ export { handleErrorWithoutErrorPage };
 import { stringify } from '@brillout/json-serializer/stringify';
 import { getGlobalContext } from '../globalContext.js';
 import { assert, assertWarning, objectAssign } from '../utils.js';
-import { createHttpResponse, createHttpResponseError } from './createHttpResponse.js';
+import { createHttpResponsePage, createHttpResponseError } from './createHttpResponse.js';
 import pc from '@brillout/picocolors';
 // When the user hasn't defined _error.page.js
 async function handleErrorWithoutErrorPage(pageContext) {
@@ -20,7 +20,7 @@ async function handleErrorWithoutErrorPage(pageContext) {
     else {
         const __getPageAssets = async () => [];
         objectAssign(pageContext, { __getPageAssets });
-        const httpResponse = await createHttpResponse(stringify({ serverSideError: true }), null, pageContext);
+        const httpResponse = await createHttpResponsePage(stringify({ serverSideError: true }), null, pageContext);
         objectAssign(pageContext, { httpResponse });
         return pageContext;
     }

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

@@ -10,7 +10,7 @@ import { assert, assertUsage, assertWarning, hasProp, normalizeHeaders, objectAs
 import { serializePageContextClientSide } from '../html/serializePageContextClientSide.js';
 import { getPageContextUrlComputed } from '../../../shared/getPageContextUrlComputed.js';
 import { getGlobalContext } from '../globalContext.js';
-import { createHttpResponse, createHttpResponsePageContextJson } from './createHttpResponse.js';
+import { createHttpResponsePage, createHttpResponsePageContextJson } from './createHttpResponse.js';
 import { loadUserFilesServerSide } from './loadUserFilesServerSide.js';
 import { executeOnRenderHtmlHook } from './executeOnRenderHtmlHook.js';
 import { executeOnBeforeRenderAndDataHooks } from './executeOnBeforeRenderAndDataHooks.js';
@@ -57,7 +57,7 @@ async function renderPageAlreadyRouted(pageContext) {
     }
     const renderHookResult = await executeOnRenderHtmlHook(pageContext);
     const { htmlRender, renderHook } = renderHookResult;
-    const httpResponse = await createHttpResponse(htmlRender, renderHook, pageContext);
+    const httpResponse = await createHttpResponsePage(htmlRender, renderHook, pageContext);
     objectAssign(pageContext, { httpResponse });
     return pageContext;
 }

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

@@ -236,6 +236,9 @@ function logHttpResponse(urlOriginalPretty, httpRequestId, pageContextReturn) {
     }
     logRuntimeInfo?.(msg, httpRequestId, isNominal ? 'info' : 'error');
 }
+function prettyUrl(url) {
+    return pc.bold(decodeURI(url));
+}
 function getPageContextHttpResponseError(err, pageContextInit) {
     const pageContextWithError = createPageContext(pageContextInit);
     const httpResponse = createHttpResponseError();
@@ -278,6 +281,7 @@ async function renderPageNominal(pageContext) {
         }
     }
     assert(hasProp(pageContext, '_pageId', 'string'));
+    assert(pageContext.errorWhileRendering === null);
     // Render
     const pageContextAfterRender = await renderPageAlreadyRouted(pageContext);
     assert(pageContext === pageContextAfterRender);
@@ -440,8 +444,5 @@ function assertBaseUrl(pageContextInit) {
     const { urlOriginal } = pageContextInit;
     const { urlWithoutPageContextRequestSuffix } = handlePageContextRequestUrl(urlOriginal);
     const { hasBaseServer } = parseUrl(urlWithoutPageContextRequestSuffix, baseServer);
-    assertUsage(hasBaseServer, `${pc.code('renderPage(pageContextInit)')} (https://vike.dev/renderPage) called with ${pc.code(`pageContextInit.urlOriginal===${JSON.stringify(urlOriginal)}`)} which doesn't start with Base URL ${prettyUrl(baseServer)} (https://vike.dev/base-url)`);
-}
-function prettyUrl(url) {
-    return pc.code(decodeURI(url));
+    assertUsage(hasBaseServer, `${pc.code('renderPage(pageContextInit)')} (https://vike.dev/renderPage) called with ${pc.code(`pageContextInit.urlOriginal===${JSON.stringify(urlOriginal)}`)} which doesn't start with Base URL ${pc.code(baseServer)} (https://vike.dev/base-url)`);
 }

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

@@ -358,7 +358,7 @@ type ConfigBuiltIn = {
      *
      * https://vike.dev/injectScriptsAt
      */
-    injectScriptsAt?: 'HTML_BEGIN' | 'HTML_END' | 'STREAM' | null;
+    injectScriptsAt?: 'HTML_BEGIN' | 'HTML_END' | 'HTML_STREAM' | null;
     /** Used by Vike extensions to set their name.
      *
      * https://vike.dev/extends

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

@@ -66,7 +66,7 @@ async function getPageContextFromHook(onBeforeRouteHook, pageContext) {
     }
     if (hasProp(hookReturn.pageContext, 'urlLogical')) {
         assertUsageUrlPathnameAbsolute(
-        // We type-cast to string instead of assertUsage() in order to save client-side KBs
+        // We skip validation and type-cast instead of assertUsage() in order to save client-side KBs
         hookReturn.pageContext.urlLogical, `${errPrefix} returned ${pc.cyan('{ pageContext: { urlLogical } }')} but ${pc.cyan('urlLogical')}`);
     }
     assertPageContextProvidedByUser(hookReturn.pageContext, {

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

@@ -1 +1 @@
-export declare const PROJECT_VERSION: "0.4.194";
+export declare const PROJECT_VERSION: "0.4.195";

package/dist/esm/utils/PROJECT_VERSION.js

@@ -1,2 +1,2 @@
 // Automatically updated by @brillout/release-me
-export const PROJECT_VERSION = '0.4.194';
+export const PROJECT_VERSION = '0.4.195';

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

@@ -1,4 +1,4 @@
 export declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.194";
+    projectVersion: "0.4.195";
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.194",
+  "version": "0.4.195",
   "repository": "https://github.com/vikejs/vike",
   "exports": {
     "./server": {