vike 0.4.171-commit-978d69d → 0.4.171-commit-42245b5

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

@@ -13,7 +13,7 @@ const transformFileImports_js_1 = require("./transformFileImports.js");
 const getConfigFileExport_js_1 = require("../getConfigFileExport.js");
 const resolvePointerImport_js_1 = require("./resolvePointerImport.js");
 (0, utils_js_1.assertIsNotProductionRuntime)();
-// Load fake import
+// Load pointer import
 async function loadImportedFile(import_, userRootDir, importedFilesLoaded) {
     const f = import_.filePathAbsoluteFilesystem;
     if (!importedFilesLoaded[f]) {
@@ -35,7 +35,7 @@ async function loadValueFile(interfaceValueFile, configName, userRootDir) {
     });
 }
 exports.loadValueFile = loadValueFile;
-// Load +config.js, including all its extends fake imports
+// Load +config.js, including all its extends pointer imports
 async function loadConfigFile(configFilePath, userRootDir, visited, isExtensionConfig) {
     const { filePathAbsoluteFilesystem } = configFilePath;
     assertNoInfiniteLoop(visited, filePathAbsoluteFilesystem);

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

@@ -11,11 +11,19 @@ const path_1 = __importDefault(require("path"));
 const getFilePath_js_1 = require("../../../../shared/getFilePath.js");
 const filesEnvMap = new Map();
 function resolvePointerImportOfConfig(configValue, importerFilePath, userRootDir, configEnv, configName) {
-    if (typeof configValue !== 'string')
-        return null;
-    const pointerImportData = (0, transformFileImports_js_1.parsePointerImportData)(configValue);
-    if (!pointerImportData)
+    const pointerImportData = typeof configValue === 'string' && (0, transformFileImports_js_1.parsePointerImportData)(configValue);
+    if (!pointerImportData) {
+        // Temporary workaround to support document.title config.
+        // - We'll be able to remove that workaround once Vike supports custom nested configs (being able to define document.title and document.description as two different configs).
+        replaceStringValues(configValue, (str) => {
+            const pointerImportData = (0, transformFileImports_js_1.parsePointerImportData)(str);
+            if (pointerImportData) {
+                const filePath = resolvePointerImport(pointerImportData, importerFilePath, userRootDir);
+                return filePath.filePathAbsoluteVite;
+            }
+        });
         return null;
+    }
     const { importPath, exportName } = pointerImportData;
     const filePath = resolvePointerImport(pointerImportData, importerFilePath, userRootDir);
     const fileExportPathToShowToUser = exportName === 'default' || exportName === configName ? [] : [exportName];
@@ -127,3 +135,29 @@ function clearFilesEnvMap() {
     filesEnvMap.clear();
 }
 exports.clearFilesEnvMap = clearFilesEnvMap;
+function replaceStringValues(obj, replacer) {
+    const visited = new WeakSet();
+    return traverse(obj, replacer);
+    function traverse(obj, replacer) {
+        // Check if the input is an object
+        if ((0, utils_js_1.isObject)(obj)) {
+            if (visited.has(obj))
+                return;
+            visited.add(obj);
+            for (const key in obj) {
+                if (!obj.hasOwnProperty(key))
+                    continue;
+                const val = obj[key];
+                if (typeof val !== 'string') {
+                    traverse(val, replacer);
+                }
+                else {
+                    const replacement = replacer(val);
+                    if (replacement) {
+                        obj[key] = replacement;
+                    }
+                }
+            }
+        }
+    }
+}

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

@@ -552,7 +552,7 @@ async function getConfigValueSource(configName, interfaceFile, configDef, userRo
                 valueIsDefinedByValueFile: false,
                 definedAtFilePath: pointerImport
             };
-            // Load fake import
+            // Load pointer import
             if (isConfigEnv(configDef, configName) &&
                 // The value of `extends` was already loaded and already used: we don't need the value of `extends` anymore
                 configName !== 'extends') {

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

@@ -13,7 +13,8 @@ function addSsrMiddleware(middlewares) {
         const userAgent = headers['user-agent'];
         const pageContextInit = {
             urlOriginal: url,
-            userAgent
+            userAgent,
+            headers
         };
         let pageContext;
         try {

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

@@ -170,35 +170,44 @@ async function renderTemplate(templateContent, pageContext) {
             setStream(templateVar);
             continue;
         }
-        const getErrMsg = (typeText, end) => {
+        const getErrMsg = (msg) => {
             const { hookName, hookFilePath } = pageContext._renderHook;
             const nth = (i === 0 && '1st') || (i === 1 && '2nd') || (i === 2 && '3rd') || `${i}-th`;
-            return [`The ${nth} HTML variable is ${typeText}, see ${hookName}() hook defined by ${hookFilePath}.`, end]
+            return [
+                `The ${nth} HTML variable is ${msg}`,
+                `The HTML was provided by the ${hookName}() hook at ${hookFilePath}.`
+            ]
                 .filter(Boolean)
                 .join(' ');
         };
-        (0, utils_js_1.assertUsage)(!(0, utils_js_1.isPromise)(templateVar), getErrMsg('a promise', `Did you forget to ${picocolors_1.default.cyan('await')} the promise?`));
+        (0, utils_js_1.assertUsage)(!(0, utils_js_1.isPromise)(templateVar), getErrMsg(`a promise, did you forget to ${picocolors_1.default.cyan('await')} the promise?`));
         if (templateVar === undefined || templateVar === null) {
-            (0, utils_js_1.assertWarning)(false, getErrMsg(`${picocolors_1.default.cyan(String(templateVar))} which will be converted to an empty string`, `Pass the empty string ${picocolors_1.default.cyan("''")} instead of ${picocolors_1.default.cyan(String(templateVar))} to remove this warning.`), { onlyOnce: false });
+            const msgVal = picocolors_1.default.cyan(String(templateVar));
+            const msgEmptyString = picocolors_1.default.cyan("''");
+            const msg = `${msgVal} which will be converted to an empty string. Pass the empty string ${msgEmptyString} instead of ${msgVal} to remove this warning.`;
+            (0, utils_js_1.assertWarning)(false, getErrMsg(msg), { onlyOnce: false });
             templateVar = '';
         }
         {
             const varType = typeof templateVar;
-            const streamNote = ['boolean', 'number', 'bigint', 'symbol'].includes(varType)
-                ? null
-                : '(See https://vike.dev/streaming for HTML streaming.)';
-            (0, utils_js_1.assertUsage)(varType === 'string', getErrMsg(picocolors_1.default.cyan(`typeof htmlVar === "${varType}"`), streamNote));
+            if (varType !== 'string') {
+                const msgType = picocolors_1.default.cyan(`typeof htmlVariable === "${varType}"`);
+                const msg = `${msgType} but a string or stream (https://vike.dev/streaming) is expected instead.`;
+                (0, utils_js_1.assertUsage)(false, getErrMsg(msg));
+            }
         }
         {
             const { isProduction } = (0, globalContext_js_1.getGlobalContext)();
             if ((0, utils_js_1.isHtml)(templateVar) &&
                 // We don't show this warning in production because it's expected that some users may (un)willingly do some XSS injection: we avoid flooding the production logs.
                 !isProduction) {
-                (0, utils_js_1.assertWarning)(false, getErrMsg(`${picocolors_1.default.cyan(templateVar)} which seems to be HTML code`, 'Did you forget to wrap the value with dangerouslySkipEscape()?'), { onlyOnce: false });
+                const msgVal = picocolors_1.default.cyan(String(templateVar));
+                const msg = `${msgVal} which seems to be HTML code. Did you forget to wrap the value with dangerouslySkipEscape()?`;
+                (0, utils_js_1.assertWarning)(false, getErrMsg(msg), { onlyOnce: false });
             }
         }
         // Escape untrusted template variable
-        addHtmlPart(escapeHtml(templateVar));
+        addHtmlPart((0, utils_js_1.escapeHtml)(templateVar));
     }
     (0, utils_js_1.assert)(templateStrings.length === templateVariables.length + 1);
     addHtmlPart(templateStrings[templateStrings.length - 1]);
@@ -214,16 +223,6 @@ async function renderTemplate(templateContent, pageContext) {
         htmlPartsEnd
     };
 }
-function escapeHtml(unsafeString) {
-    // Source: https://stackoverflow.com/questions/6234773/can-i-escape-html-special-chars-in-javascript/6234804#6234804
-    const safe = unsafeString
-        .replace(/&/g, '&')
-        .replace(/</g, '&lt;')
-        .replace(/>/g, '&gt;')
-        .replace(/"/g, '&quot;')
-        .replace(/'/g, '&#039;');
-    return safe;
-}
 async function getHtmlString(htmlRender) {
     if (typeof htmlRender === 'string') {
         return htmlRender;

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

@@ -109,9 +109,9 @@ async function prerender404Page(renderContext, pageContextInit_) {
         _debugRouteMatches: []
     };
     const pageContextInit = {
-        urlOriginal: '/fake-404-url', // A URL is needed for `applyViteHtmlTransform`
-        ...pageContextInit_
+        urlOriginal: '/fake-404-url' // A URL is needed for `applyViteHtmlTransform`
     };
+    (0, utils_js_1.objectAssign)(pageContextInit, pageContextInit_);
     {
         const pageContextInitEnhanced = getPageContextInitEnhanced(pageContextInit, renderContext);
         (0, utils_js_1.objectAssign)(pageContext, pageContextInitEnhanced);
@@ -127,8 +127,9 @@ function getPageContextInitEnhanced(pageContextInit, renderContext, { urlCompute
 } } = {}) {
     (0, utils_js_1.assert)(pageContextInit.urlOriginal);
     const globalContext = (0, globalContext_js_1.getGlobalContext)();
-    const pageContextInitEnhanced = {
-        ...pageContextInit,
+    const pageContextInitEnhanced = {};
+    (0, utils_js_1.objectAssign)(pageContextInitEnhanced, pageContextInit);
+    (0, utils_js_1.objectAssign)(pageContextInitEnhanced, {
         _objectCreatedByVike: true,
         // The following is defined on `pageContext` because we can eventually make these non-global (e.g. sot that two pages can have different includeAssetsImportedByServer settings)
         _baseServer: globalContext.baseServer,
@@ -145,7 +146,7 @@ function getPageContextInitEnhanced(pageContextInit, renderContext, { urlCompute
         _urlRewrite: urlRewrite,
         _urlHandler: urlHandler,
         isClientSideNavigation
-    };
+    });
     (0, addUrlComputedProps_js_1.addUrlComputedProps)(pageContextInitEnhanced, !urlComputedPropsNonEnumerable);
     return pageContextInitEnhanced;
 }

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

@@ -289,12 +289,13 @@ async function renderPageNominal(pageContext) {
 async function getPageContextErrorPageInit(pageContextInit, errNominalPage, pageContextNominalPagePartial, renderContext, httpRequestId) {
     const pageContextInitEnhanced = getPageContextInitEnhancedSSR(pageContextInit, renderContext, null, httpRequestId);
     (0, utils_js_1.assert)(errNominalPage);
-    const pageContext = {
-        ...pageContextInitEnhanced,
+    const pageContext = {};
+    (0, utils_js_1.objectAssign)(pageContext, pageContextInitEnhanced);
+    (0, utils_js_1.objectAssign)(pageContext, {
         is404: false,
         errorWhileRendering: errNominalPage,
         routeParams: {}
-    };
+    });
     (0, utils_js_1.objectAssign)(pageContext, {
         _debugRouteMatches: pageContextNominalPagePartial._debugRouteMatches || 'ROUTING_ERROR'
     });
@@ -346,7 +347,9 @@ function normalizeUrl(pageContextInit, httpRequestId) {
         return null;
     (0, loggerRuntime_js_1.logRuntimeInfo)?.(`URL normalized from ${picocolors_1.default.cyan(urlOriginal)} to ${picocolors_1.default.cyan(urlNormalized)} (https://vike.dev/url-normalization)`, httpRequestId, 'info');
     const httpResponse = (0, createHttpResponseObject_js_1.createHttpResponseObjectRedirect)({ url: urlNormalized, statusCode: 301 }, pageContextInit.urlOriginal);
-    const pageContextHttpResponse = { ...pageContextInit, httpResponse };
+    const pageContextHttpResponse = {};
+    (0, utils_js_1.objectAssign)(pageContextHttpResponse, pageContextInit);
+    (0, utils_js_1.objectAssign)(pageContextHttpResponse, { httpResponse });
     return pageContextHttpResponse;
 }
 function getPermanentRedirect(pageContextInit, httpRequestId) {
@@ -381,7 +384,9 @@ function getPermanentRedirect(pageContextInit, httpRequestId) {
     }
     (0, loggerRuntime_js_1.logRuntimeInfo)?.(`Permanent redirect defined by your config.redirects (https://vike.dev/redirects)`, httpRequestId, 'info');
     const httpResponse = (0, createHttpResponseObject_js_1.createHttpResponseObjectRedirect)({ url: urlTarget, statusCode: 301 }, urlWithoutBase);
-    const pageContextHttpResponse = { ...pageContextInit, httpResponse };
+    const pageContextHttpResponse = {};
+    (0, utils_js_1.objectAssign)(pageContextHttpResponse, pageContextInit);
+    (0, utils_js_1.objectAssign)(pageContextHttpResponse, { httpResponse });
     return pageContextHttpResponse;
 }
 async function handleAbortError(errAbort, pageContextsFromRewrite, pageContextInit, 
@@ -397,11 +402,11 @@ pageContextNominalPageInit, httpRequestId, renderContext, pageContextErrorPageIn
             (0, utils_js_1.assert)(abortCall);
             (0, utils_js_1.assertUsage)(errorPageId, `You called ${picocolors_1.default.cyan(abortCall)} but you didn't define an error page, make sure to define one https://vike.dev/error-page`);
             const pageContext = {
-                _pageId: errorPageId,
-                ...pageContextAbort,
-                ...pageContextErrorPageInit,
-                ...renderContext
+                _pageId: errorPageId
             };
+            (0, utils_js_1.objectAssign)(pageContext, pageContextAbort);
+            (0, utils_js_1.objectAssign)(pageContext, pageContextErrorPageInit);
+            (0, utils_js_1.objectAssign)(pageContext, renderContext);
             (0, utils_js_1.objectAssign)(pageContext, await (0, loadUserFilesServerSide_js_1.loadUserFilesServerSide)(pageContext));
             // We include pageContextInit: we don't only serialize pageContextAbort because the error page may need to access pageContextInit
             pageContextSerialized = (0, serializePageContextClientSide_js_1.serializePageContextClientSide)(pageContext);
@@ -422,10 +427,9 @@ pageContextNominalPageInit, httpRequestId, renderContext, pageContextErrorPageIn
         return { pageContextReturn };
     }
     if (pageContextAbort._urlRedirect) {
-        const pageContextReturn = {
-            ...pageContextInit,
-            ...pageContextAbort
-        };
+        const pageContextReturn = {};
+        (0, utils_js_1.objectAssign)(pageContextReturn, pageContextInit);
+        (0, utils_js_1.objectAssign)(pageContextReturn, pageContextAbort);
         const httpResponse = (0, createHttpResponseObject_js_1.createHttpResponseObjectRedirect)(pageContextAbort._urlRedirect, (() => {
             const { pathname, searchOriginal } = pageContextNominalPageInit.urlParsed;
             const urlLogical = (0, utils_js_1.createUrlFromComponents)(null, pathname, searchOriginal, 

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

@@ -68,3 +68,4 @@ __exportStar(require("../../utils/truncateString.js"), exports);
 __exportStar(require("../../utils/formatHintLog.js"), exports);
 __exportStar(require("../../utils/joinEnglish.js"), exports);
 __exportStar(require("../../utils/isArrayOfStrings.js"), exports);
+__exportStar(require("../../utils/escapeHtml.js"), exports);

package/dist/cjs/shared/sortPageContext.js

@@ -4,14 +4,10 @@ exports.sortPageContext = void 0;
 const utils_js_1 = require("./utils.js");
 // Sort `pageContext` keys alphabetically, in order to make reading `console.log(pageContext)` easier
 function sortPageContext(pageContext) {
-    const entries = Object.entries(pageContext);
-    for (const key in pageContext) {
+    let descriptors = Object.getOwnPropertyDescriptors(pageContext);
+    for (const key of Object.keys(pageContext))
         delete pageContext[key];
-    }
-    entries
-        .sort(([key1], [key2]) => (0, utils_js_1.compareString)(key1, key2))
-        .forEach(([key, val]) => {
-        pageContext[key] = val;
-    });
+    descriptors = Object.fromEntries(Object.entries(descriptors).sort(([key1], [key2]) => (0, utils_js_1.compareString)(key1, key2)));
+    Object.defineProperties(pageContext, descriptors);
 }
 exports.sortPageContext = sortPageContext;

package/dist/cjs/utils/escapeHtml.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.escapeHtml = void 0;
+// Copied from https://stackoverflow.com/questions/6234773/can-i-escape-html-special-chars-in-javascript/6234804#6234804
+function escapeHtml(unsafeString) {
+    const safe = unsafeString
+        .replace(/&/g, '&')
+        .replace(/</g, '&lt;')
+        .replace(/>/g, '&gt;')
+        .replace(/"/g, '&quot;')
+        .replace(/'/g, '&#039;');
+    return safe;
+}
+exports.escapeHtml = escapeHtml;

package/dist/cjs/utils/objectKeys.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.objectKeys = exports.objectFromEntries = exports.objectEntries = void 0;
+// export { forEach }
 // https://stackoverflow.com/questions/60141960/typescript-key-value-relation-preserving-object-entries-type/75337277#75337277
 /** Same as Object.entries() but with type inference */
 function objectEntries(obj) {
@@ -19,8 +20,11 @@ function objectKeys(obj) {
     return Object.keys(obj);
 }
 exports.objectKeys = objectKeys;
-/*
-function objectKeys2<T extends Record<string, unknown>>(obj: T): Array<keyof T> {
-  return Object.keys(obj)
+/* Not used yet, but can be quite useful.
+function forEach<Obj extends object>(
+  obj: Obj,
+  iterator: <Key extends keyof Obj>(key: Key, val: Obj[Key]) => void
+): void {
+  Object.entries(obj).forEach(([key, val]) => iterator(key as keyof Obj, val))
 }
-*/
+//*/

package/dist/cjs/utils/projectInfo.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PROJECT_VERSION = exports.projectInfo = void 0;
-const PROJECT_VERSION = '0.4.171-commit-978d69d';
+const PROJECT_VERSION = '0.4.171-commit-42245b5';
 exports.PROJECT_VERSION = PROJECT_VERSION;
 const projectInfo = {
     projectName: 'Vike',

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

@@ -10,7 +10,7 @@ import { parsePointerImportData } from './transformFileImports.js';
 import { getConfigFileExport } from '../getConfigFileExport.js';
 import { resolvePointerImport } from './resolvePointerImport.js';
 assertIsNotProductionRuntime();
-// Load fake import
+// Load pointer import
 async function loadImportedFile(import_, userRootDir, importedFilesLoaded) {
     const f = import_.filePathAbsoluteFilesystem;
     if (!importedFilesLoaded[f]) {
@@ -30,7 +30,7 @@ async function loadValueFile(interfaceValueFile, configName, userRootDir) {
         interfaceValueFile.fileExportsByConfigName[configName_] = { configValue };
     });
 }
-// Load +config.js, including all its extends fake imports
+// Load +config.js, including all its extends pointer imports
 async function loadConfigFile(configFilePath, userRootDir, visited, isExtensionConfig) {
     const { filePathAbsoluteFilesystem } = configFilePath;
     assertNoInfiniteLoop(visited, filePathAbsoluteFilesystem);

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

@@ -2,17 +2,25 @@ export { resolvePointerImportOfConfig };
 export { resolvePointerImport };
 export { clearFilesEnvMap };
 import pc from '@brillout/picocolors';
-import { assert, assertIsNpmPackageImport, assertPosixPath, assertUsage, deepEqual, isPathFilesystemAbsolute, requireResolve } from '../../../../utils.js';
+import { assert, assertIsNpmPackageImport, assertPosixPath, assertUsage, deepEqual, isObject, isPathFilesystemAbsolute, requireResolve } from '../../../../utils.js';
 import { parsePointerImportData } from './transformFileImports.js';
 import path from 'path';
 import { getFilePathAbsoluteUserRootDir, getFilePathResolved, getFilePathUnresolved } from '../../../../shared/getFilePath.js';
 const filesEnvMap = new Map();
 function resolvePointerImportOfConfig(configValue, importerFilePath, userRootDir, configEnv, configName) {
-    if (typeof configValue !== 'string')
-        return null;
-    const pointerImportData = parsePointerImportData(configValue);
-    if (!pointerImportData)
+    const pointerImportData = typeof configValue === 'string' && parsePointerImportData(configValue);
+    if (!pointerImportData) {
+        // Temporary workaround to support document.title config.
+        // - We'll be able to remove that workaround once Vike supports custom nested configs (being able to define document.title and document.description as two different configs).
+        replaceStringValues(configValue, (str) => {
+            const pointerImportData = parsePointerImportData(str);
+            if (pointerImportData) {
+                const filePath = resolvePointerImport(pointerImportData, importerFilePath, userRootDir);
+                return filePath.filePathAbsoluteVite;
+            }
+        });
         return null;
+    }
     const { importPath, exportName } = pointerImportData;
     const filePath = resolvePointerImport(pointerImportData, importerFilePath, userRootDir);
     const fileExportPathToShowToUser = exportName === 'default' || exportName === configName ? [] : [exportName];
@@ -121,3 +129,29 @@ function assertFileEnv(filePathAbsoluteFilesystem, importPath, configEnv, config
 function clearFilesEnvMap() {
     filesEnvMap.clear();
 }
+function replaceStringValues(obj, replacer) {
+    const visited = new WeakSet();
+    return traverse(obj, replacer);
+    function traverse(obj, replacer) {
+        // Check if the input is an object
+        if (isObject(obj)) {
+            if (visited.has(obj))
+                return;
+            visited.add(obj);
+            for (const key in obj) {
+                if (!obj.hasOwnProperty(key))
+                    continue;
+                const val = obj[key];
+                if (typeof val !== 'string') {
+                    traverse(val, replacer);
+                }
+                else {
+                    const replacement = replacer(val);
+                    if (replacement) {
+                        obj[key] = replacement;
+                    }
+                }
+            }
+        }
+    }
+}

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

@@ -547,7 +547,7 @@ async function getConfigValueSource(configName, interfaceFile, configDef, userRo
                 valueIsDefinedByValueFile: false,
                 definedAtFilePath: pointerImport
             };
-            // Load fake import
+            // Load pointer import
             if (isConfigEnv(configDef, configName) &&
                 // The value of `extends` was already loaded and already used: we don't need the value of `extends` anymore
                 configName !== 'extends') {

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

@@ -11,7 +11,8 @@ function addSsrMiddleware(middlewares) {
         const userAgent = headers['user-agent'];
         const pageContextInit = {
             urlOriginal: url,
-            userAgent
+            userAgent,
+            headers
         };
         let pageContext;
         try {

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

@@ -3,7 +3,7 @@ export { dangerouslySkipEscape };
 export { renderDocumentHtml };
 export { isDocumentHtml };
 export { getHtmlString };
-import { assert, assertUsage, assertWarning, checkType, hasProp, isHtml, isPromise, objectAssign } from '../utils.js';
+import { assert, assertUsage, assertWarning, checkType, escapeHtml, hasProp, isHtml, isPromise, objectAssign } from '../utils.js';
 import { injectHtmlTagsToString, injectHtmlTagsToStream } from './injectAssets.js';
 import { processStream, isStream, streamToString } from './stream.js';
 import { isStreamReactStreaming } from './stream/react-streaming.js';
@@ -165,31 +165,40 @@ async function renderTemplate(templateContent, pageContext) {
             setStream(templateVar);
             continue;
         }
-        const getErrMsg = (typeText, end) => {
+        const getErrMsg = (msg) => {
             const { hookName, hookFilePath } = pageContext._renderHook;
             const nth = (i === 0 && '1st') || (i === 1 && '2nd') || (i === 2 && '3rd') || `${i}-th`;
-            return [`The ${nth} HTML variable is ${typeText}, see ${hookName}() hook defined by ${hookFilePath}.`, end]
+            return [
+                `The ${nth} HTML variable is ${msg}`,
+                `The HTML was provided by the ${hookName}() hook at ${hookFilePath}.`
+            ]
                 .filter(Boolean)
                 .join(' ');
         };
-        assertUsage(!isPromise(templateVar), getErrMsg('a promise', `Did you forget to ${pc.cyan('await')} the promise?`));
+        assertUsage(!isPromise(templateVar), getErrMsg(`a promise, did you forget to ${pc.cyan('await')} the promise?`));
         if (templateVar === undefined || templateVar === null) {
-            assertWarning(false, getErrMsg(`${pc.cyan(String(templateVar))} which will be converted to an empty string`, `Pass the empty string ${pc.cyan("''")} instead of ${pc.cyan(String(templateVar))} to remove this warning.`), { onlyOnce: false });
+            const msgVal = pc.cyan(String(templateVar));
+            const msgEmptyString = pc.cyan("''");
+            const msg = `${msgVal} which will be converted to an empty string. Pass the empty string ${msgEmptyString} instead of ${msgVal} to remove this warning.`;
+            assertWarning(false, getErrMsg(msg), { onlyOnce: false });
             templateVar = '';
         }
         {
             const varType = typeof templateVar;
-            const streamNote = ['boolean', 'number', 'bigint', 'symbol'].includes(varType)
-                ? null
-                : '(See https://vike.dev/streaming for HTML streaming.)';
-            assertUsage(varType === 'string', getErrMsg(pc.cyan(`typeof htmlVar === "${varType}"`), streamNote));
+            if (varType !== 'string') {
+                const msgType = pc.cyan(`typeof htmlVariable === "${varType}"`);
+                const msg = `${msgType} but a string or stream (https://vike.dev/streaming) is expected instead.`;
+                assertUsage(false, getErrMsg(msg));
+            }
         }
         {
             const { isProduction } = getGlobalContext();
             if (isHtml(templateVar) &&
                 // We don't show this warning in production because it's expected that some users may (un)willingly do some XSS injection: we avoid flooding the production logs.
                 !isProduction) {
-                assertWarning(false, getErrMsg(`${pc.cyan(templateVar)} which seems to be HTML code`, 'Did you forget to wrap the value with dangerouslySkipEscape()?'), { onlyOnce: false });
+                const msgVal = pc.cyan(String(templateVar));
+                const msg = `${msgVal} which seems to be HTML code. Did you forget to wrap the value with dangerouslySkipEscape()?`;
+                assertWarning(false, getErrMsg(msg), { onlyOnce: false });
             }
         }
         // Escape untrusted template variable
@@ -209,16 +218,6 @@ async function renderTemplate(templateContent, pageContext) {
         htmlPartsEnd
     };
 }
-function escapeHtml(unsafeString) {
-    // Source: https://stackoverflow.com/questions/6234773/can-i-escape-html-special-chars-in-javascript/6234804#6234804
-    const safe = unsafeString
-        .replace(/&/g, '&')
-        .replace(/</g, '&lt;')
-        .replace(/>/g, '&gt;')
-        .replace(/"/g, '&quot;')
-        .replace(/'/g, '&#039;');
-    return safe;
-}
 async function getHtmlString(htmlRender) {
     if (typeof htmlRender === 'string') {
         return htmlRender;

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

@@ -37,6 +37,8 @@ declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles
     documentHtml: string;
     pageContextSerialized: null;
     pageContext: {
+        urlOriginal: string;
+    } & {
         _objectCreatedByVike: boolean;
         _baseServer: string;
         _baseAssets: string | null;
@@ -53,7 +55,6 @@ declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles
         _urlRewrite: string | null;
         _urlHandler: ((url: string) => string) | null;
         isClientSideNavigation: boolean;
-        urlOriginal: string;
     } & import("../../../shared/addUrlComputedProps.js").PageContextUrlComputedPropsClient & {
         _urlRewrite: string | null;
     } & {
@@ -87,6 +88,8 @@ declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles
     documentHtml: string;
     pageContextSerialized: string;
     pageContext: {
+        urlOriginal: string;
+    } & {
         _objectCreatedByVike: boolean;
         _baseServer: string;
         _baseAssets: string | null;
@@ -103,7 +106,6 @@ declare function prerenderPage(pageContext: PageContextInitEnhanced & PageFiles
         _urlRewrite: string | null;
         _urlHandler: ((url: string) => string) | null;
         isClientSideNavigation: boolean;
-        urlOriginal: string;
     } & import("../../../shared/addUrlComputedProps.js").PageContextUrlComputedPropsClient & {
         _urlRewrite: string | null;
     } & {
@@ -138,6 +140,8 @@ declare function prerender404Page(renderContext: RenderContext, pageContextInit_
     documentHtml: string;
     pageContextSerialized: null;
     pageContext: {
+        urlOriginal: string;
+    } & {
         _objectCreatedByVike: boolean;
         _baseServer: string;
         _baseAssets: string | null;
@@ -154,7 +158,6 @@ declare function prerender404Page(renderContext: RenderContext, pageContextInit_
         _urlRewrite: string | null;
         _urlHandler: ((url: string) => string) | null;
         isClientSideNavigation: boolean;
-        urlOriginal: string;
     } & import("../../../shared/addUrlComputedProps.js").PageContextUrlComputedPropsClient & {
         _urlRewrite: string | null;
     } & {
@@ -188,6 +191,8 @@ declare function prerender404Page(renderContext: RenderContext, pageContextInit_
     documentHtml: string;
     pageContextSerialized: string;
     pageContext: {
+        urlOriginal: string;
+    } & {
         _objectCreatedByVike: boolean;
         _baseServer: string;
         _baseAssets: string | null;
@@ -204,7 +209,6 @@ declare function prerender404Page(renderContext: RenderContext, pageContextInit_
         _urlRewrite: string | null;
         _urlHandler: ((url: string) => string) | null;
         isClientSideNavigation: boolean;
-        urlOriginal: string;
     } & import("../../../shared/addUrlComputedProps.js").PageContextUrlComputedPropsClient & {
         _urlRewrite: string | null;
     } & {
@@ -246,6 +250,8 @@ declare function getPageContextInitEnhanced(pageContextInit: {
         isClientSideNavigation: boolean;
     };
 }): {
+    urlOriginal: string;
+} & {
     _objectCreatedByVike: boolean;
     _baseServer: string;
     _baseAssets: string | null;
@@ -262,7 +268,6 @@ declare function getPageContextInitEnhanced(pageContextInit: {
     _urlRewrite: string | null;
     _urlHandler: ((url: string) => string) | null;
     isClientSideNavigation: boolean;
-    urlOriginal: string;
 } & import("../../../shared/addUrlComputedProps.js").PageContextUrlComputedPropsClient & {
     _urlRewrite: string | null;
 };

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

@@ -106,9 +106,9 @@ async function prerender404Page(renderContext, pageContextInit_) {
         _debugRouteMatches: []
     };
     const pageContextInit = {
-        urlOriginal: '/fake-404-url', // A URL is needed for `applyViteHtmlTransform`
-        ...pageContextInit_
+        urlOriginal: '/fake-404-url' // A URL is needed for `applyViteHtmlTransform`
     };
+    objectAssign(pageContextInit, pageContextInit_);
     {
         const pageContextInitEnhanced = getPageContextInitEnhanced(pageContextInit, renderContext);
         objectAssign(pageContext, pageContextInitEnhanced);
@@ -123,8 +123,9 @@ function getPageContextInitEnhanced(pageContextInit, renderContext, { urlCompute
 } } = {}) {
     assert(pageContextInit.urlOriginal);
     const globalContext = getGlobalContext();
-    const pageContextInitEnhanced = {
-        ...pageContextInit,
+    const pageContextInitEnhanced = {};
+    objectAssign(pageContextInitEnhanced, pageContextInit);
+    objectAssign(pageContextInitEnhanced, {
         _objectCreatedByVike: true,
         // The following is defined on `pageContext` because we can eventually make these non-global (e.g. sot that two pages can have different includeAssetsImportedByServer settings)
         _baseServer: globalContext.baseServer,
@@ -141,7 +142,7 @@ function getPageContextInitEnhanced(pageContextInit, renderContext, { urlCompute
         _urlRewrite: urlRewrite,
         _urlHandler: urlHandler,
         isClientSideNavigation
-    };
+    });
     addUrlComputedProps(pageContextInitEnhanced, !urlComputedPropsNonEnumerable);
     return pageContextInitEnhanced;
 }

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

@@ -283,12 +283,13 @@ async function renderPageNominal(pageContext) {
 async function getPageContextErrorPageInit(pageContextInit, errNominalPage, pageContextNominalPagePartial, renderContext, httpRequestId) {
     const pageContextInitEnhanced = getPageContextInitEnhancedSSR(pageContextInit, renderContext, null, httpRequestId);
     assert(errNominalPage);
-    const pageContext = {
-        ...pageContextInitEnhanced,
+    const pageContext = {};
+    objectAssign(pageContext, pageContextInitEnhanced);
+    objectAssign(pageContext, {
         is404: false,
         errorWhileRendering: errNominalPage,
         routeParams: {}
-    };
+    });
     objectAssign(pageContext, {
         _debugRouteMatches: pageContextNominalPagePartial._debugRouteMatches || 'ROUTING_ERROR'
     });
@@ -340,7 +341,9 @@ function normalizeUrl(pageContextInit, httpRequestId) {
         return null;
     logRuntimeInfo?.(`URL normalized from ${pc.cyan(urlOriginal)} to ${pc.cyan(urlNormalized)} (https://vike.dev/url-normalization)`, httpRequestId, 'info');
     const httpResponse = createHttpResponseObjectRedirect({ url: urlNormalized, statusCode: 301 }, pageContextInit.urlOriginal);
-    const pageContextHttpResponse = { ...pageContextInit, httpResponse };
+    const pageContextHttpResponse = {};
+    objectAssign(pageContextHttpResponse, pageContextInit);
+    objectAssign(pageContextHttpResponse, { httpResponse });
     return pageContextHttpResponse;
 }
 function getPermanentRedirect(pageContextInit, httpRequestId) {
@@ -375,7 +378,9 @@ function getPermanentRedirect(pageContextInit, httpRequestId) {
     }
     logRuntimeInfo?.(`Permanent redirect defined by your config.redirects (https://vike.dev/redirects)`, httpRequestId, 'info');
     const httpResponse = createHttpResponseObjectRedirect({ url: urlTarget, statusCode: 301 }, urlWithoutBase);
-    const pageContextHttpResponse = { ...pageContextInit, httpResponse };
+    const pageContextHttpResponse = {};
+    objectAssign(pageContextHttpResponse, pageContextInit);
+    objectAssign(pageContextHttpResponse, { httpResponse });
     return pageContextHttpResponse;
 }
 async function handleAbortError(errAbort, pageContextsFromRewrite, pageContextInit, 
@@ -391,11 +396,11 @@ pageContextNominalPageInit, httpRequestId, renderContext, pageContextErrorPageIn
             assert(abortCall);
             assertUsage(errorPageId, `You called ${pc.cyan(abortCall)} but you didn't define an error page, make sure to define one https://vike.dev/error-page`);
             const pageContext = {
-                _pageId: errorPageId,
-                ...pageContextAbort,
-                ...pageContextErrorPageInit,
-                ...renderContext
+                _pageId: errorPageId
             };
+            objectAssign(pageContext, pageContextAbort);
+            objectAssign(pageContext, pageContextErrorPageInit);
+            objectAssign(pageContext, renderContext);
             objectAssign(pageContext, await loadUserFilesServerSide(pageContext));
             // We include pageContextInit: we don't only serialize pageContextAbort because the error page may need to access pageContextInit
             pageContextSerialized = serializePageContextClientSide(pageContext);
@@ -416,10 +421,9 @@ pageContextNominalPageInit, httpRequestId, renderContext, pageContextErrorPageIn
         return { pageContextReturn };
     }
     if (pageContextAbort._urlRedirect) {
-        const pageContextReturn = {
-            ...pageContextInit,
-            ...pageContextAbort
-        };
+        const pageContextReturn = {};
+        objectAssign(pageContextReturn, pageContextInit);
+        objectAssign(pageContextReturn, pageContextAbort);
         const httpResponse = createHttpResponseObjectRedirect(pageContextAbort._urlRedirect, (() => {
             const { pathname, searchOriginal } = pageContextNominalPageInit.urlParsed;
             const urlLogical = createUrlFromComponents(null, pathname, searchOriginal, 

package/dist/esm/node/runtime/utils.d.ts

@@ -49,3 +49,4 @@ export * from '../../utils/truncateString.js';
 export * from '../../utils/formatHintLog.js';
 export * from '../../utils/joinEnglish.js';
 export * from '../../utils/isArrayOfStrings.js';
+export * from '../../utils/escapeHtml.js';

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

@@ -52,3 +52,4 @@ export * from '../../utils/truncateString.js';
 export * from '../../utils/formatHintLog.js';
 export * from '../../utils/joinEnglish.js';
 export * from '../../utils/isArrayOfStrings.js';
+export * from '../../utils/escapeHtml.js';

package/dist/esm/shared/sortPageContext.js

@@ -2,13 +2,9 @@ import { compareString } from './utils.js';
 export { sortPageContext };
 // Sort `pageContext` keys alphabetically, in order to make reading `console.log(pageContext)` easier
 function sortPageContext(pageContext) {
-    const entries = Object.entries(pageContext);
-    for (const key in pageContext) {
+    let descriptors = Object.getOwnPropertyDescriptors(pageContext);
+    for (const key of Object.keys(pageContext))
         delete pageContext[key];
-    }
-    entries
-        .sort(([key1], [key2]) => compareString(key1, key2))
-        .forEach(([key, val]) => {
-        pageContext[key] = val;
-    });
+    descriptors = Object.fromEntries(Object.entries(descriptors).sort(([key1], [key2]) => compareString(key1, key2)));
+    Object.defineProperties(pageContext, descriptors);
 }

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

@@ -0,0 +1 @@
+export declare function escapeHtml(unsafeString: string): string;

package/dist/esm/utils/escapeHtml.js

@@ -0,0 +1,10 @@
+// Copied from https://stackoverflow.com/questions/6234773/can-i-escape-html-special-chars-in-javascript/6234804#6234804
+export function escapeHtml(unsafeString) {
+    const safe = unsafeString
+        .replace(/&/g, '&')
+        .replace(/</g, '&lt;')
+        .replace(/>/g, '&gt;')
+        .replace(/"/g, '&quot;')
+        .replace(/'/g, '&#039;');
+    return safe;
+}

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

@@ -1,10 +1,8 @@
 export { objectEntries };
 export { objectFromEntries };
 export { objectKeys };
-type ValueOf<T> = T[keyof T];
-type Entries<T> = [keyof T, ValueOf<T>][];
 /** Same as Object.entries() but with type inference */
-declare function objectEntries<T extends object>(obj: T): Entries<T>;
+declare function objectEntries<T extends object>(obj: T): [keyof T, T[keyof T]][];
 /** Same as Object.fromEntries() but with type inference */
 declare function objectFromEntries<T extends [PropertyKey, unknown][]>(arr: T): Record<T[number][0], T[number][1]>;
 /** Same as Object.keys() but with type inference */

package/dist/esm/utils/objectKeys.js

@@ -1,6 +1,7 @@
 export { objectEntries };
 export { objectFromEntries };
 export { objectKeys };
+// export { forEach }
 // https://stackoverflow.com/questions/60141960/typescript-key-value-relation-preserving-object-entries-type/75337277#75337277
 /** Same as Object.entries() but with type inference */
 function objectEntries(obj) {
@@ -16,8 +17,11 @@ function objectFromEntries(arr) {
 function objectKeys(obj) {
     return Object.keys(obj);
 }
-/*
-function objectKeys2<T extends Record<string, unknown>>(obj: T): Array<keyof T> {
-  return Object.keys(obj)
+/* Not used yet, but can be quite useful.
+function forEach<Obj extends object>(
+  obj: Obj,
+  iterator: <Key extends keyof Obj>(key: Key, val: Obj[Key]) => void
+): void {
+  Object.entries(obj).forEach(([key, val]) => iterator(key as keyof Obj, val))
 }
-*/
+//*/

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

@@ -1,7 +1,7 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-declare const PROJECT_VERSION: "0.4.171-commit-978d69d";
+declare const PROJECT_VERSION: "0.4.171-commit-42245b5";
 declare const projectInfo: {
     projectName: "Vike";
-    projectVersion: "0.4.171-commit-978d69d";
+    projectVersion: "0.4.171-commit-42245b5";
 };

package/dist/esm/utils/projectInfo.js

@@ -1,6 +1,6 @@
 export { projectInfo };
 export { PROJECT_VERSION };
-const PROJECT_VERSION = '0.4.171-commit-978d69d';
+const PROJECT_VERSION = '0.4.171-commit-42245b5';
 const projectInfo = {
     projectName: 'Vike',
     projectVersion: PROJECT_VERSION

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike",
-  "version": "0.4.171-commit-978d69d",
+  "version": "0.4.171-commit-42245b5",
   "scripts": {
     "dev": "tsc --watch",
     "build": "rimraf dist/ && pnpm run build:esm && pnpm run build:cjs",